From 8544fea510a212b686bd3b647e9bd29337850f0b Mon Sep 17 00:00:00 2001 From: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Date: Fri, 6 May 2022 05:50:00 -0300 Subject: [PATCH] More markings! (#7964) Co-authored-by: metalgearsloth --- Resources/Locale/en-US/markings/reptilian.ftl | 13 + .../Locale/en-US/markings/slimeperson.ftl | 17 ++ Resources/Locale/en-US/markings/tattoos.ftl | 25 ++ .../Mobs/Customization/Markings/reptilian.yml | 66 ++++-- .../Mobs/Customization/Markings/slime.yml | 53 +++++ .../Mobs/Customization/Markings/tattoos.yml | 71 ++++++ .../Entities/Mobs/Species/human.yml | 10 + .../Entities/Mobs/Species/slime.yml | 8 + .../reptilian_parts.rsi/body_tiger.png | Bin 0 -> 570 bytes .../reptilian_parts.rsi/frills_big.png | Bin 0 -> 538 bytes .../reptilian_parts.rsi/frills_divinity.png | Bin 0 -> 603 bytes .../reptilian_parts.rsi/horns_double.png | Bin 0 -> 401 bytes .../reptilian_parts.rsi/meta.json | 224 ++++++++++-------- .../slime_parts.rsi/gradient_l_arm.png | Bin 0 -> 342 bytes .../slime_parts.rsi/gradient_l_hand.png | Bin 0 -> 359 bytes .../slime_parts.rsi/gradient_l_leg.png | Bin 0 -> 453 bytes .../slime_parts.rsi/gradient_r_arm.png | Bin 0 -> 350 bytes .../slime_parts.rsi/gradient_r_hand.png | Bin 0 -> 371 bytes .../slime_parts.rsi/gradient_r_leg.png | Bin 0 -> 451 bytes .../Customization/slime_parts.rsi/meta.json | 35 +++ .../Mobs/Customization/tattoos.rsi/meta.json | 43 ++++ .../tattoos.rsi/tattoo_campbell_l_arm.png | Bin 0 -> 364 bytes .../tattoos.rsi/tattoo_campbell_l_leg.png | Bin 0 -> 342 bytes .../tattoos.rsi/tattoo_campbell_r_arm.png | Bin 0 -> 364 bytes .../tattoos.rsi/tattoo_campbell_r_leg.png | Bin 0 -> 341 bytes .../tattoos.rsi/tattoo_hive_chest.png | Bin 0 -> 380 bytes .../tattoos.rsi/tattoo_nightling.png | Bin 0 -> 412 bytes .../tattoos.rsi/tattoo_silverburgh_l_leg.png | Bin 0 -> 292 bytes .../tattoos.rsi/tattoo_silverburgh_r_leg.png | Bin 0 -> 298 bytes RobustToolbox | 2 +- 30 files changed, 446 insertions(+), 121 deletions(-) create mode 100644 Resources/Locale/en-US/markings/slimeperson.ftl create mode 100644 Resources/Locale/en-US/markings/tattoos.ftl create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_tiger.png create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_big.png create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_divinity.png create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_double.png create mode 100644 Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_arm.png create mode 100644 Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_hand.png create mode 100644 Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_leg.png create mode 100644 Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_arm.png create mode 100644 Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_hand.png create mode 100644 Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_leg.png create mode 100644 Resources/Textures/Mobs/Customization/slime_parts.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_campbell_l_arm.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_campbell_l_leg.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_campbell_r_arm.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_campbell_r_leg.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_silverburgh_l_leg.png create mode 100644 Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_silverburgh_r_leg.png diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl index 96aaf0667a..1537255923 100644 --- a/Resources/Locale/en-US/markings/reptilian.ftl +++ b/Resources/Locale/en-US/markings/reptilian.ftl @@ -39,3 +39,16 @@ marking-LizardSnoutRound = Lizard Snout (Round) marking-LizardSnoutSharp-snout_sharp = Lizard Snout (Sharp) marking-LizardSnoutSharp = Lizard Snout (Sharp) + +marking-LizardChestTiger-chest_tiger = Lizard Chest (Tiger) +marking-LizardChestTiger = Lizard Chest (Tiger) + +marking-LizardFrillsDivinity-frills_divinity = Lizard Frills (Divinity) +marking-LizardFrillsDivinity = Lizard Frills (Divinity) + +marking-LizardFrillsBig-frills_big = Lizard Frills (Big) +marking-LizardFrillsBig = Lizard Frills (Big) + +marking-LizardHornsDouble-horns_double = Lizard Horns (Double) +marking-LizardHornsDouble = Lizard Horns (Double) + diff --git a/Resources/Locale/en-US/markings/slimeperson.ftl b/Resources/Locale/en-US/markings/slimeperson.ftl new file mode 100644 index 0000000000..0de26b2dbc --- /dev/null +++ b/Resources/Locale/en-US/markings/slimeperson.ftl @@ -0,0 +1,17 @@ +marking-SlimeGradientLeftArm-gradient_left_arm = Slime Left Arm (Gradient) +marking-SlimeGradientLeftArm = Slime Left Arm (Gradient) + +marking-SlimeGradientRightArm-gradient_right_arm = Slime Right Arm (Gradient) +marking-SlimeGradientRightArm = Slime Right Arm (Gradient) + +marking-SlimeGradientLeftLeg-gradient_left_leg = Slime Left Leg (Gradient) +marking-SlimeGradientLeftLeg = Slime Left Leg (Gradient) + +marking-SlimeGradientRightLeg-gradient_right_leg = Slime Right Leg (Gradient) +marking-SlimeGradientRightLeg = Slime Right Leg (Gradient) + +marking-SlimeGradientLeftHand-gradient_left_hand = Slime Left Hand (Gradient) +marking-SlimeGradientLeftHand = Slime Left Hand (Gradient) + +marking-SlimeGradientRightHand-gradient_Right_hand = Slime Right Hand (Gradient) +marking-SlimeGradientRightHand = Slime Right Hand (Gradient) diff --git a/Resources/Locale/en-US/markings/tattoos.ftl b/Resources/Locale/en-US/markings/tattoos.ftl new file mode 100644 index 0000000000..b17d945775 --- /dev/null +++ b/Resources/Locale/en-US/markings/tattoos.ftl @@ -0,0 +1,25 @@ +marking-TattooHiveChest-hivechest = Back Tattoo (Hive) +marking-TattooHiveChest = Back Tattoo (Hive) + +marking-TattooNightlingChest-nightlingchest = Chest Tattoo (nightling) +marking-TattooNightlingChest = Chest Tattoo (Nightling) + +marking-TattooSilverburghLeftLeg-silverburghleftleg = Left Leg Tattoo (Silverburg) +marking-TattooSilverburghLeftLeg = Left Leg Tattoo (Silverburg) + +marking-TattooSilverburghRightLeg-silverburghRightleg = Right Leg Tattoo (Silverburg) +marking-TattooSilverburghRightLeg = Right Leg Tattoo (Silverburg) + +marking-TattooCampbellLeftArm-campbelleleftArm = Left Arm Tattoo (Campbelle) +marking-TattooCampbellLeftArm = Left Arm Tattoo (Campbelle) + +marking-TattooCampbellRightArm-campbellrightarm = Right Arm Tattoo (Campbelle) +marking-TattooCampbellRightArm = Right Arm Tattoo (Campbelle) + +marking-TattooCampbellLeftLeg-campbellleftleg = Left Leg Tattoo (Campbelle) +marking-TattooCampbellLeftLeg = Left Leg Tattoo (Campbelle) + +marking-TattooCampbellRightLeg-campbellrightleg = Right Leg Tattoo (Campbelle) +marking-TattooCampbellRightLeg = Right Leg Tattoo (Campbelle) + + diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml index fd0953ef8a..41f2b98685 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml @@ -4,7 +4,7 @@ markingCategory: HeadSide speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_aquatic - type: marking @@ -13,7 +13,7 @@ markingCategory: HeadSide speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_short - type: marking @@ -22,16 +22,34 @@ markingCategory: HeadSide speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_simple +- type: marking + id: LizardFrillsDivinity + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Reptilian] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: frills_divinity + +- type: marking + id: LizardFrillsBig + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Reptilian] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: frills_big + - type: marking id: LizardHornsAngler bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_angler - type: marking @@ -40,7 +58,7 @@ markingCategory: HeadTop speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_curled - type: marking @@ -49,7 +67,7 @@ markingCategory: HeadTop speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_ram - type: marking @@ -58,7 +76,7 @@ markingCategory: HeadTop speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_short - type: marking @@ -67,16 +85,25 @@ markingCategory: HeadTop speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: horns_simple +- type: marking + id: LizardHornsDouble + bodyPart: HeadTop + markingCategory: HeadTop + speciesRestriction: [Reptilian] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: horns_double + - type: marking id: LizardTailSmooth bodyPart: Tail markingCategory: Tail speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: tail_smooth - type: marking @@ -85,7 +112,7 @@ markingCategory: Tail speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: tail_spikes - type: marking @@ -94,7 +121,7 @@ markingCategory: Tail speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: tail_ltiger - type: marking @@ -103,7 +130,7 @@ markingCategory: Tail speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: tail_dtiger - type: marking @@ -113,7 +140,7 @@ followSkinColor: true speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: snout_round - type: marking @@ -123,8 +150,15 @@ followSkinColor: true speciesRestriction: [Reptilian] sprites: - - sprite: Mobs/Customization/reptilian_parts.rsi/ + - sprite: Mobs/Customization/reptilian_parts.rsi state: snout_sharp - - +- type: marking + id: LizardChestTiger + bodyPart: Chest + markingCategory: Chest + followSkinColor: false + speciesRestriction: [Reptilian] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: body_tiger diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml new file mode 100644 index 0000000000..8602d2d900 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/slime.yml @@ -0,0 +1,53 @@ +- type: marking + id: SlimeGradientLeftArm + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [SlimePerson] + sprites: + - sprite: Mobs/Customization/slime_parts.rsi + state: gradient_l_arm + +- type: marking + id: SlimeGradientRightArm + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [SlimePerson] + sprites: + - sprite: Mobs/Customization/slime_parts.rsi + state: gradient_r_arm + +- type: marking + id: SlimeGradientLeftLeg + bodyPart: LFoot + markingCategory: Legs + speciesRestriction: [SlimePerson] + sprites: + - sprite: Mobs/Customization/slime_parts.rsi + state: gradient_l_leg + +- type: marking + id: SlimeGradientRightLeg + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [SlimePerson] + sprites: + - sprite: Mobs/Customization/slime_parts.rsi + state: gradient_r_leg + +- type: marking + id: SlimeGradientLeftHand + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [SlimePerson] + sprites: + - sprite: Mobs/Customization/slime_parts.rsi + state: gradient_l_hand + +- type: marking + id: SlimeGradientRightHand + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [SlimePerson] + sprites: + - sprite: Mobs/Customization/slime_parts.rsi + state: gradient_r_hand diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml new file mode 100644 index 0000000000..e8eaaf5d48 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -0,0 +1,71 @@ +- type: marking + id: TattooHiveChest + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human] + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_hive_chest + +- type: marking + id: TattooNightlingChest + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [Human] + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_nightling + +- type: marking + id: TattooSilverburghLeftLeg + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [Human] + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_silverburgh_l_leg + +- type: marking + id: TattooSilverburghRightLeg + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [Human] + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_silverburgh_r_leg + +- type: marking + id: TattooCampbellLeftArm + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [Human] + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_campbell_l_arm + +- type: marking + id: TattooCampbellRightArm + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [Human] + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_campbell_r_arm + +- type: marking + id: TattooCampbellLeftLeg + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [Human] + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_campbell_l_leg + +- type: marking + id: TattooCampbellRightLeg + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [Human] + sprites: + - sprite: Mobs/Customization/tattoos.rsi + state: tattoo_campbell_r_leg diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 8ed633aaa0..5f4bc090ea 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -170,6 +170,16 @@ HeadTop: points: 0 required: false + Chest: + points: 1 + required: false + Legs: + points: 2 + required: false + Arms: + points: 2 + required: false + - type: Physics bodyType: KinematicController - type: Fixtures diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml index b738d3daaf..478f2ddc8a 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml @@ -90,6 +90,14 @@ - map: [ "head" ] - map: [ "pocket1" ] - map: [ "pocket2" ] + - type: Markings + layerPoints: + Legs: + points: 2 + required: false + Arms: + points: 4 + required: false - type: Body template: HumanoidTemplate preset: SlimePreset diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_tiger.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/body_tiger.png new file mode 100644 index 0000000000000000000000000000000000000000..ea394f611ac19b84eca37d8a52fde83e0bdb369c GIT binary patch literal 570 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vn5 zPZ!6KiaBqiZm&J8z*D+(w`17}zMKD*ty9|1T+j~RloDxjl+7pV_aBp|&B=Z796y>L zcrYqh1Tk>*i7+%Nvo<{Vk;T~exMJPwUl}utgX2v&H(`zH*$DlKv2G<|OJ&!j2 z2wLI2Jmc9KF^6Xsf}V#0w=z6e)q7X?vR1c#D}#lm=z>Y7-tW20JxBhaY{Q+fx=^kO zf~x#IF*eWjd$%u{w~PDBxpQ`5Txu^YF?8j)d%x;c>O$>S3w+x#J!ci8%bQq^ z>QAMa&G!T^e2&}nbMAw=w;p`>&e(B@d*aO852v9cHnzieY zre=Zoj`z$0o4FGF|EV#iEkC%W_JF=3Fos|eRv-CqQ;g#DoqE8;z~JfX=d#Wzp$PzM CukjuL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_big.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_big.png new file mode 100644 index 0000000000000000000000000000000000000000..cad361bf1a73bdad8e2246e7fb55ac055d3bca49 GIT binary patch literal 538 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vn3 zPZ!6KiaBp*-S2HS;AyW{zsnNacrl_;o$W!Vs6?-50?WIeSCgME{^`uLHl?0_X^7{X znj@?yYYtoJDO_9d{&%iK+xk0==fCZ?t_yLvURrYFg>tF`*O|X{w---Y{g|Cq=kzD@ z8^Pjh^d%g0z+9N%#!hS(x3Nxnt|`- zx}4i#a?KwzA8yL;S-=oCA?D0#?GJxyFV}isdeHa7v%GO}=aF028rG}5ZbR4Fh`u=|D()B?eHo9T^gdLttc{-UjpwnmS$gzd`bAR&x5dSdu#dM3JlYWe{A1;?Q+*@fliS>iDgwpfXQ}%m5 wJbJ1!woG~o^ZwuG`!9YzF?TvqE+MyAUJQ6N7#vAwiCkI22$DwI85xtpNbqWm?rHL^|GF0 z%SN4-&Suw7-A{>G&7e2^bjjYh{YC2kxxaNYB-Gf=FSLH>EX!Ib|R3=d1@sr-m7G5UB!&djJ|Ht*6^Oa5y#Y|DNA`ejKKXNqr; zPiUxrac0P+dJzVW=8Ws57vE3Ic@eiv^YL|%n8W?=`ofJFr!GI)dfNZNx6dUOG9dz9 zzxtUP3M2ehF6}9lVY!_Zdg=e8>;S2xOH+cxlI5g>&dCLUjPpv9XzT3V`Z{9W@j12& zmi#};bz$A@R)tNWr}qEXbvX8v;lvIZ2FdBn3Xh8zQeyZTdQLM=D70iS(qo58Hl!Jp z$N#inxBu<^{mw>h2Kz)-GIXRpee=iR@c6r{aYvN*Gg;*h!yqo15pj}(U%!;FY|hZ>T7cjhYk*=_G#wvOT5 zu4iVp_jT=@54?`Q-4`Ctpx-=)H=VmsW)F+mU1o)K4L4r)+KPlVglREY>^#W#{obF5 zPd*HG0?PNoR({iB@c0)j#4p<9F_r7Uay9*}FQXsWpF;Boh9_sTe_&?4+hqP_Lx&VF PwJ>X}SvdzS9aG;Joo*KdKcaywqpN5W4$ z7*4ztDwvmU(Z~FIpM6yJ_FV4QyOJWOJ-ZcWV`{ruDwb)@M$vtBZBY*;ANH1?PcXic zRef06mvLi;x06)el8!ZDflgBQlox3#@WyecoLzVR!)}HBzpgDdSzepX-E)s=qQ*n6 zh&`;2t$Y-`3{Ec9eZiZ*;~!i0!!%a^m93xI`d?TwfZQ;VVS+NFf;*E#A4`J_CxfLB zLy-!KL=<Mct{_?1fZ-@5>nY{`hl`%|4wQ>)`^iR^?S8h(40SsdXPgg&e IbxsLQ04m;@Z2$lO literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json index f674cbe42f..fc40debab6 100644 --- a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json @@ -1,107 +1,123 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/blob/165be097d54c19f2e3de9fd6d95f545bcf356768/icons/mob/mutant_bodyparts.dmi", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/Skyrat-SS13/Skyrat-tg/tree/40e3cdbb15b8bc0d5ef2fb46133adf805bda5297", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "tail_smooth_front", + "directions": 4 }, - "states": [ - { - "name": "tail_smooth_front", - "directions": 4 - }, - { - "name": "tail_spikes_front", - "directions": 4 - }, - { - "name": "tail_dtiger_front", - "directions": 4 - }, - { - "name": "tail_ltiger_front", - "directions": 4 - }, - { - "name": "tail_smooth_behind", - "directions": 4 - }, - { - "name": "tail_spikes_behind", - "directions": 4 - }, - { - "name": "tail_dtiger_behind", - "directions": 4 - }, - { - "name": "tail_ltiger_behind", - "directions": 4 - }, - { - "name": "tail_smooth", - "directions": 4 - }, - { - "name": "tail_spikes", - "directions": 4 - }, - { - "name": "tail_dtiger", - "directions": 4 - }, - { - "name": "tail_ltiger", - "directions": 4 - }, - { - "name": "snout_round", - "directions": 4 - }, - { - "name": "snout_roundlight", - "directions": 4 - }, - { - "name": "snout_sharp", - "directions": 4 - }, - { - "name": "snout_sharplight", - "directions": 4 - }, - { - "name": "horns_simple", - "directions": 4 - }, - { - "name": "horns_short", - "directions": 4 - }, - { - "name": "horns_curled", - "directions": 4 - }, - { - "name": "horns_ram", - "directions": 4 - }, - { - "name": "horns_angler", - "directions": 4 - }, - { - "name": "frills_simple", - "directions": 4 - }, - { - "name": "frills_short", - "directions": 4 - }, - { - "name": "frills_aquatic", - "directions": 4 - } - ] + { + "name": "tail_spikes_front", + "directions": 4 + }, + { + "name": "tail_dtiger_front", + "directions": 4 + }, + { + "name": "tail_ltiger_front", + "directions": 4 + }, + { + "name": "tail_smooth_behind", + "directions": 4 + }, + { + "name": "tail_spikes_behind", + "directions": 4 + }, + { + "name": "tail_dtiger_behind", + "directions": 4 + }, + { + "name": "tail_ltiger_behind", + "directions": 4 + }, + { + "name": "tail_smooth", + "directions": 4 + }, + { + "name": "tail_spikes", + "directions": 4 + }, + { + "name": "tail_dtiger", + "directions": 4 + }, + { + "name": "tail_ltiger", + "directions": 4 + }, + { + "name": "snout_round", + "directions": 4 + }, + { + "name": "snout_roundlight", + "directions": 4 + }, + { + "name": "snout_sharp", + "directions": 4 + }, + { + "name": "snout_sharplight", + "directions": 4 + }, + { + "name": "horns_simple", + "directions": 4 + }, + { + "name": "horns_short", + "directions": 4 + }, + { + "name": "horns_curled", + "directions": 4 + }, + { + "name": "horns_ram", + "directions": 4 + }, + { + "name": "horns_angler", + "directions": 4 + }, + { + "name": "frills_simple", + "directions": 4 + }, + { + "name": "frills_short", + "directions": 4 + }, + { + "name": "frills_aquatic", + "directions": 4 + }, + { + "name": "frills_divinity", + "directions": 4 + }, + { + "name": "horns_double", + "directions": 4 + }, + { + "name": "frills_big", + "directions": 4 + }, + { + "name": "body_tiger", + "directions": 4 + } + ] } diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_arm.png b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..04c66831a9bf399556773557f70a4efdab215b22 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|O(6 zr;B4q#hkad4z4`pAma8=xMHbKlAtI1`f2T3BYI?2Ts^E#=!qWLxj><*=^5*xKmWG} zitp@kzv%jo|B(zsAzy<9yTcr2g>#Go&lx(38~)4P`2KfcZggAXg4erF-+N|z`;qj7 zV}&YwbNT0gT6q3G->K{WkIk7;zWG1H$F}LImd8F@{E_tcI(7_Nn>-o=*Tf-WD%Q@Ek vn*UBkM6f}$n#GkRVzYaIOM@wf%Xc%md06zDd#;WJ1{8y*tDnm{r-UW|oBD@M literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_hand.png b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_hand.png new file mode 100644 index 0000000000000000000000000000000000000000..3e947f387e5c9983e8d611d141c8b70f17322f4c GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TR^ zr;B4q#hkad47-{GMBE-48_eCSec_z!3$|mt>CCsHZ&>b4Se`KVWN7zie_g z{LGqN>m=J6Yws^k+xx1h;qkL>h7Z*;w%N0mDV^T*{_#=SSiTK9-hy_2OJffgep$0> zmBjIl50>e%TgYARe|)ia-tqd>Ype5q3hnun^nTYz|j-+$`au4n(-q_Z=E%*LEZQII*fHQmt_cL^yMDj!(LwdSr21i1c R6)@x&JYD@<);T3K0RXmglH~vZ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_leg.png b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_l_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..1bf51eaacf3b485260402a0d5360b27ea2388e69 GIT binary patch literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R5Z zr;B4q#hkaZ46}|H2)NcOgcm$NB%p8EXnkLE`DxxeKUor`#oyI%xF;(`Ov_=KIZ@`v z|AR?8BhG%%;bl5&d}1QQ1Z74AcP58EmIfJ421_A^A{B-w9t_A573wpVy)2bzOSU<0 ze5~+~gQC}wt_a4zcdHE`~OVqoFWe;yK+=G+8#=7 z&23DL?3*64V% zC4E=^yvwAt|BIwyi4Y4`7a=?KK>YuR&H4|v|ClFZqy6At)SgugHT9u!;SPQau9V*J zU$Xx1ys(3_du^vLm18vh&D8bufnWeoz2G~UnCJ&(FW0}W%Drv22Pkk&Kf(1v*Zs)o z1?M@R?EbBi=r7cj-+o6wVWTd)fBmG_G83dl&uKJSF54dYNO*4Zq;y?9#XrD!VeoYI Kb6Mw<&;$UJ0kQP} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_arm.png b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..74cf02c0d3ee94fa7889cad0bea02f17d3e5168f GIT binary patch literal 350 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TRg zr;B4q#hkad&h|DNh`2s%HmNQPVek>WaPW%Jtf(L#s|F>dRSTGo=?867JEwJS?|n6U zr)#GL1-XB77xFb&ush6QRyfBf@SLHenBj=!ft#$SH`VxGKC)}wna?$k&rUrzn|FfP z@6My!a;s~;eq)?u_pEp4Xjz%)4rlI~$tZ9D|@6>)^fH8Qw`njxg HN@xNAC)G` z!so@zu{>=wYgyu~WtV62Gfzp4tlc}QtM*yJg;g8=)@}Qr*idlg@$>)@*3UMRn=FcJ z*1onn7c=*5y@bLXyX^&DcfaQfZ8$H(e9JW3GSw(*C|1TF@4cs2g h{}78X)6ebzd(L0iEh|4=3I&EDgQu&X%Q~loCIES{nJfSR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_leg.png b/Resources/Textures/Mobs/Customization/slime_parts.rsi/gradient_r_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..6308e23f8a69728e230a00f00fa855843bf88141 GIT binary patch literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|R5J zr;B4q#hkaZ9J^W!L|n2H);)-mm~Gi;t#4Ug^qh0ny&VP573b8<w=4I z+k)*TEByJ-S){`7#Dn3)M1~2QGMo&SLJY_fmiBVTKkk12`)|!GHJ-yC zj-0J9etNFq-P_-9nI4>(qMHyKZsObAb%Qlxolp_0&7t()*8d%3cNjh8`r%Z&!$_5z zWA@q8eV=W@ce3bAPqaMj_QPYZg{Q-h%WHFQ*9utQ%8M49`_%H;<~@#1mx?^*Ftee;`eIt(tMvGYa5Wb=0~L@ic_FDzmEbNvZ_>dV#DtoOXXUgzGx z5Z1-@t-io^?%kTqc!wn+4!pHY%TqK&1Dxj{(3FhvKCoTfIol#u{aza5@cZPdNx6j~(^o%{TysZPZGBB_O07dGt3!v2 z!_}Rk-$h++aqjzDS^7z3t-+a2h8e<)2I@=+ek^ECfJvM)V6t$Ep2qrmR~c_`o4^Na zr`__)+Uu|LDK?zk&h^4`9*<(f7SAoItXq^1JgEi=f8h8s&0f;!z-+@`0!;S=FpaNa Zd>Ed+Qb+1m05JF%JYD@<);T3K0RTw6iemr( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_campbell_l_leg.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_campbell_l_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..2cc43501f3f5fe1076d741b7e0fb4fe7bdb04b29 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|O(6 zr;B4q#hkaZ4)V4b@UV!#lseH}9+%npFFvzTOQZ2HzxVgOM>choEpN!NxzRAC#-Wd; zL57pTQi!2Qh2e<@!-6iGmPPD(Z=JQ)`FN@~_YYf@z4F`I>#s*dHHf~KH3-_XaSOxY_bLHp u4gC$G_PdTvQjih4*$Rvj*8E(>K3YdaN78_~L@H_JZxk z@0G5v-OpGx=g)HYcT9^>>_v71oZaw3yzjBc^UAW%J8aZN6z(pYz4!gsjW@RkFwEYw zzClnee^vMajYHQN`W<$&zS(;HKhK|_QfZl|dusq8H427$-g`GjNtON%c2SQzn91y z7Y(n=DUmtLn6%UNqokVrtJ62O_0G$^AhWMU_9pavYXd%txNQ=Bjx0 z+G}kwGR5P<5k2s#uyfqXUP7I!|elF{r5}E)w C4~X#q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_hive_chest.png new file mode 100644 index 0000000000000000000000000000000000000000..7baf398bc27c76360505ee2e8cd80ae1c9b308bf GIT binary patch literal 380 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TR; zr;B4q#hkaZE^@Xw@VL0|;M&5Gec|6lDIKTi4`-Yl{+upSmrlEPKIy>GJ!?KH*E#gD zG{|r=SPC%|sW3e8U^wBansER7=J(Yl;?Iv3+x9UZHYk~BdzoXylkK^OZO*ISERFR( z6E=N=&gsmJ9W5qI?>r+n)kz&I)VVHZZh5ixGDpE5l^Fu7cc|vB?(C4OSDwqTdRKVW ztYt!zopr0E8Nq^Z)<= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_nightling.png new file mode 100644 index 0000000000000000000000000000000000000000..824a9921df65b88d97c59fe6c7e9a3d6ccf2872c GIT binary patch literal 412 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|TR< zr;B4q#hkaZ0{NN@1YC|EsXm}?-l%*y_kqd_DRV=YE4sN(b1Ur^9o_bOSFYy^(I*}Z zCnhpXP-awcXL9IcamkB&f8+U6za={A*UrUBf3{hld%Nw{|HuQ`4Y&P%eE;gH$tm{0 z#CLb9@8y=)JgEnEKiIy1_X?pKFQOK_XG@5jw&cz4$cFHJ*H3K!6mvtPT3YY+rbX|6 zFZs19n#K0CPR8zSJui0YMb?xu@$lEk96!Ei`xpP%>Qy2MKbp!*PK9b8*r+4XrWolo zl_~D>-F5vQD}oM~y?tqP;KbJ_k!u@b&P!kAI?>9~Aj8REDa25u!hq&_phU;Ng->3; zU%cdtuFiotuVpeW8fTYpW}eS6U%>M9i{A|{za{Jx8Yc(WaQ%@6nV?Ygd1g7|@)vp^ h`ZJ_i&<%agwq)g^{!1Swdjo@;!PC{xWt~$(696Cat^oi5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_silverburgh_l_leg.png b/Resources/Textures/Mobs/Customization/tattoos.rsi/tattoo_silverburgh_l_leg.png new file mode 100644 index 0000000000000000000000000000000000000000..d2bae07b5416a7feee8569f80ab2e61edcf916bc GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1F_k zi(^Q|oVT|wayB~%us!5l!nk_Jzuh~;)*KQNdZ);H6OCzugO1S1n+1mnk~GDQL^L|Ha$)R2}=qc&{U!;fOKA zBT0sjJPj3W4mQjR^B4urGa!TyF=Ve@z4hCofSEH7F%+LG;+Q$piQ#pkf4w-W7XQGGd_t8_pGm;IwQii;@g+<`rm9eh8V_S+T!r+(O%7+-=AvbP5*n# z@PJlD*n=g>4PEK1eqL)EYE72jtr1-ke&Fusc!rNp80}WKJKpkV5}pF|CxfS}pUXO@ GgeCxP3v~?u literal 0 HcmV?d00001 diff --git a/RobustToolbox b/RobustToolbox index 53af37cd56..b0a4593f44 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 53af37cd561c70f820447670bec71c5be827a7ff +Subproject commit b0a4593f445817744bf577ef9d92bfca0118ab23