From 14e15b44370afce24507c0835ebfead161472e74 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sat, 6 Jan 2024 18:07:09 +1100 Subject: [PATCH] Large tail marking (#23551) * add * fix copyright * large --- Resources/Locale/en-US/markings/reptilian.ftl | 3 +++ .../Mobs/Customization/Markings/reptilian.yml | 9 +++++++++ .../Customization/reptilian_parts.rsi/meta.json | 14 +++++++++++++- .../reptilian_parts.rsi/tail_large.png | Bin 0 -> 1666 bytes .../reptilian_parts.rsi/tail_large_behind.png | Bin 0 -> 1521 bytes .../reptilian_parts.rsi/tail_large_front.png | Bin 0 -> 1330 bytes 6 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large.png create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_behind.png create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_front.png diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl index b466ebade0..10b9e36dbe 100644 --- a/Resources/Locale/en-US/markings/reptilian.ftl +++ b/Resources/Locale/en-US/markings/reptilian.ftl @@ -25,6 +25,9 @@ marking-LizardHornsSimple = Lizard Horns marking-LizardTailSmooth-tail_smooth = Lizard Tail (Smooth) marking-LizardTailSmooth = Lizard Tail (Smooth) +marking-LizardTailLarge-tail_large = Lizard Tail (Large) +marking-LizardTailLarge = Lizard Tail (Large) + marking-LizardTailSpikes-tail_spikes = Lizard Tail (Spiky) marking-LizardTailSpikes = Lizard Tail (Spiky) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml index 1e2975bc9a..81827adb8d 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml @@ -126,6 +126,15 @@ - sprite: Mobs/Customization/reptilian_parts.rsi state: tail_smooth +- type: marking + id: LizardTailLarge + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Reptilian] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: tail_large + - type: marking id: LizardTailSpikes bodyPart: Tail diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json index 604239f75f..763e212529 100644 --- a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14.", + "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297, while Argali, Ayrshire, Myrsore and Bighorn are drawn by Ubaser, and Kobold Ears are drawn by Pigeonpeas. Body_underbelly made by Nairod(github) for SS14. Large is drawn by Ubaser.", "size": { "x": 32, "y": 32 @@ -11,6 +11,10 @@ "name": "tail_smooth_front", "directions": 4 }, + { + "name": "tail_large_front", + "directions": 4 + }, { "name": "tail_spikes_front", "directions": 4 @@ -27,6 +31,10 @@ "name": "tail_smooth_behind", "directions": 4 }, + { + "name": "tail_large_behind", + "directions": 4 + }, { "name": "tail_spikes_behind", "directions": 4 @@ -43,6 +51,10 @@ "name": "tail_smooth", "directions": 4 }, + { + "name": "tail_large", + "directions": 4 + }, { "name": "tail_spikes", "directions": 4 diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large.png new file mode 100644 index 0000000000000000000000000000000000000000..46cffce6d7c0b6bdc2a16882cb83d6f9625b2326 GIT binary patch literal 1666 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F;KxA5N2eb5`33|fjKWTB%&n3*T*V3KUXg?B|j-uuOhbq ztjngt3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D3TAo+dIm~% zTnY*bHbp6ERzWUqQ0+jTtx`rwNr9EVetCJhUb(Seeo?xG?W zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$ z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F zXfoK|;*u17BnA3L1_l&2TID3>rQ0f1=%%EmC6?xtDA^UI0)r_hGcnIbAEFFZJ46)KR2zLP4zK}v+bS|B zwKzYg6cq4wmZmn~us{(+!~jG?1U3!Gg6J9oGV)9EfeET8Gubn*B(t0{EQH;md6^}4Faywpk#r$Nj+J9kNqK%zb_h5kkU|ls8mKvt5JgI%kmL^zePH^x zshAFt5+u{8WXJVv-|x5I`dT$rql+cnB!@eCez#dV!;G4Z5fytgVp@J2 zDY25>dH;Qy#pvUpyR~G+CI9bxf5}PRdb>@Ak9{)l-Ms55OeHJYZ3N^QUMSqI zn0E8@(@$CZ(`+R!=~URwe`d?@IOF)^z(+sc_6M)NI>~G4ByJ_ompYHLe%08ibI+db zU>CAEuYHTo9);Imt9EG@XG=_azsP9clcfP}KThu!ak<#){5|vv|6@Bow~bw3_^?8a5R`2qHB(sfo65o(_pMS= z-6rV_u4=rB*S^L+U}2cd%f{>|>vuX;amE%?2Wb$$b?j<(tP3*xJGXr6+w{3?cj%3Su?u;nCbC}Od3%Gea^{37 z$FKIXDYstPV|SQo_0?C0C2Hjkm0Ha`cKD&e#HM0qi#r={zxA0PE9iG-N$=uyea&pQ zzJ&AN-Sdi-<<4@)2R4G++L{g&ALuZVke$DElf?F~yDNV4hb|HO@WcOO7O4F9boFyt I=akR{0Ek*!ssI20 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_behind.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_behind.png new file mode 100644 index 0000000000000000000000000000000000000000..ddeaeac18b73a259d597c71086094dd4f59b0163 GIT binary patch literal 1521 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F;KxA5N2eb5`33|fjKWTB%&n3*T*V3KUXg?B|j-uuOhbq ztjngt3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D3TAo+dIm~% zTnY*bHbp6ERzWUqQ0+jTtx`rwNr9EVetCJhUb(Seeo?xG?W zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$ z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F zXfoK|;*u17BnA3L1_l&2TID3>rQ0f1=%%EmC6?xtDA^UI0)r_hGcnIbAEFFZJ46)KR2zLP4zK}v+bS|B zwKzYg6cq4wmZmn~us{(+!~jG?1U3!Gg6J9oGV)9EfeET8Gubn*B(t0{EQH;md6^}4Faywpk#r$Nj+J9kNqK%zb_h5kkU|ls8mKvt5JgI%kmL^zePH^x z^7q#o+Pt!sjR?AR+A?1MT19W7GNX_JF4S1>lJK$by3XlYhaV=q z+O_TU#rt{Ylb`>L{&?@=hn1!mmov3W9hW|E;az){+^)ThEjeW#yTu#wZ`ZEpkua8b z4crjlkj0SvOz=U~-bLKo_S$SaVsU3{zfEEHVt(BtkNs_Qo-Vq}FIjIRmv_osLflx7 zIYFxVM`LrFtoY@-Cj6Dh*Y3P_+^J{#v8w6!Q+A~HF{?N*;Y0>*4xiay-MF>#SgmQ* zRkr0uhEI$4Ff8DU5NTa2@1q&?TPLI0ZN5$bv%`hIb@^edr-q$>@_7NTRP8LO2LB6| zXRf9-axpaJZjb(4V;8$Khfi&{RKTfbw~VXX;u#Or%vxslb!pfN-hbks7YMFrGRfZb zK$XF8|IM5;f9vLdeaD@{&=8h!%|U`yA+z7%`RALn@@E|j2~|BmE0#a^0td$hp0^dU zaj8w({oT?td8(4)-aTYYjr?})#9zxV#~*LJ`L@i@Ym&;gEA>`$-$ZP`^!Ch_-u2hB zi+9Gv2;BU-bGG=whKAQ>9Tt6WS1T$M$Qy_mNirwviad_}E0u2_&G!0M!fB50pyJlk L)z4*}Q$iB}RJ#g8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_front.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_front.png new file mode 100644 index 0000000000000000000000000000000000000000..5198a6b5fa85156fa57d22bb70f2c0d354eaf9b0 GIT binary patch literal 1330 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F;KxA5N2eb5`33|fjKWTB%&n3*T*V3KUXg?B|j-uuOhbq ztjngt3dqb&ElE_U$j!+swyLmI0;{kBvO&W7N(x{lCE2!05xxNm&iO^D3TAo+dIm~% zTnY*bHbp6ERzWUqQ0+jTtx`rwNr9EVetCJhUb(Seeo?xG?W zUP)qwZeFo6#1NP{E~&-IMVSR9nfZANAafIw@=Hr>m6Sjh!2!gbDamkq3QCJ|z_z3$ z>!;?V=BDPA6zd!68R}!xSCW~AaA96CG&q0(qYsh+YBRv9&9k5+*#sC;t`$J{K>Y`F zXfoK|;*u17BnA3L1_l&2TID3>rQ0f1=%%EmC6?xtDA^UI0)r_hGcnIbAEFFZJ46)KR2zLP4zK}v+bS|B zwKzYg6cq4wmZmn~us{(+!~jG?1U3!Gg6J9oGV)9EfeET8Gubn*B(t0{EQH;md6^}4Faywpk#r$Nj+J9kNqK%zb_h5kkU|ls8mKvt5JgI%kmL^zePH^x zen~fwqT1n?(OuHoWlbe-Y>ZO!kguQ}#t+ ziB$_{s(7Tm@C`b7n_E^o^;h+pELRB*g$4#DOyYpOP=`+1+gRZpSz1;vjoc3tH?{K4e@?A@0? zIBGA@@t*noW~g)Q^>soflkz*?E6n5i8#cQ?bV2r)_@>mzC%fe0k684j-Zm3|%y&qq zLG4q1MD_pI7kG_MZ}PufzBW