From 698976029c7d60a03e5cfbc6ad076fc334ce27b3 Mon Sep 17 00:00:00 2001 From: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Date: Mon, 25 Jul 2022 02:47:04 -0300 Subject: [PATCH] Adds axolotl and snake hood frills for reptilians! (#10013) --- Resources/Locale/en-US/markings/reptilian.ftl | 5 +++++ .../Mobs/Customization/Markings/reptilian.yml | 20 ++++++++++++++++++ .../reptilian_parts.rsi/frills_axolotl.png | Bin 0 -> 493 bytes .../frills_hood_primary.png | Bin 0 -> 506 bytes .../frills_hood_secondary.png | Bin 0 -> 342 bytes .../reptilian_parts.rsi/meta.json | 15 ++++++++++++- 6 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_axolotl.png create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_hood_primary.png create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_hood_secondary.png diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl index 1537255923..98f8f49f6e 100644 --- a/Resources/Locale/en-US/markings/reptilian.ftl +++ b/Resources/Locale/en-US/markings/reptilian.ftl @@ -52,3 +52,8 @@ marking-LizardFrillsBig = Lizard Frills (Big) marking-LizardHornsDouble-horns_double = Lizard Horns (Double) marking-LizardHornsDouble = Lizard Horns (Double) +marking-LizardFrillsAxolotl-frills_axolotl = Lizard Frills (Axolotl) +marking-LizardFrillsAxolotl = Lizard Frills (Axolotl) + +marking-LizardFrillsHood-frills_hood = Lizard Frills (Hood) +marking-LizardFrillsHood = Lizard Frills (Hood) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml index 41f2b98685..3de48139bf 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml @@ -43,6 +43,26 @@ - sprite: Mobs/Customization/reptilian_parts.rsi state: frills_big +- type: marking + id: LizardFrillsAxolotl + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Reptilian] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: frills_axolotl + +- type: marking + id: LizardFrillsHood + bodyPart: HeadSide + markingCategory: HeadSide + speciesRestriction: [Reptilian] + sprites: + - sprite: Mobs/Customization/reptilian_parts.rsi + state: frills_hood_primary + - sprite: Mobs/Customization/reptilian_parts.rsi + state: frills_hood_secondary + - type: marking id: LizardHornsAngler bodyPart: HeadTop diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_axolotl.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_axolotl.png new file mode 100644 index 0000000000000000000000000000000000000000..0f8cfbf1e36a3c68fa0b6adb03975887b42d989a GIT binary patch literal 493 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VoH zPZ!6KiaBp*-R*5L;AwfjWU=6?2QxQmG;Gpnb*tDhd7{qGfQBR940E4XCq{0POXsk^ zbk4lVnc0i2|M3sy+ldnUy!v7t{c8RBBiS+%7ry^pdcW($z8ZVqU{U2QXJ>%`UYw~K`XR@G-Uh+H&QIC`{Y-RplM(`s`=`d+^; zV2rMv`DEL+zK<``W0|xRj(+F5?Y4d&e}?Vclq}X4PrSEoe$VK8IU#b|<&8$~Rz02n zO3~EQ^#0#Vbxt zu1GdoCptlRdL@&;&#_wm3hnLtIR3KZchhI?s1D2Ua|-^8fbqxR>FVdQ&MBb@0Jwt5 Avj6}9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_hood_primary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_hood_primary.png new file mode 100644 index 0000000000000000000000000000000000000000..2f72de975b891d8f8a4d55801513c5a3cfc9b479 GIT binary patch literal 506 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Vn4 zPZ!6KiaBp*9qes35ODqPWm)`ytv$qnS;Qq&#DzKJ0Arp^M#I(qloUmwob_jg&hGJ6 z+F&y;y}vcZUO`5b;b8@L#_h7&@9Q#W$*ZW9)uc136~tbzu$zBkQx5kwozqr4hp(x% za#+{Rd%iy1H85e;vg`jV=QTgF=1e#~-)d{>jxFC?{~8u1spr>eHlFvDp8sPxlhdTc z-w{H6lj_;;7prdAoBe0~T^7sNWt=TVS_&y<$BBf2jHI`PQ)cTyQ=6k{AE8%@0PbVBm0P zb+FK4I26bz(8twK5W>*1myh%sjcb>t`LK$<; zXLSyjCM#P1{O?iKZ_9S-gQb``%hUt1lkOij{93#Jknmj=MVa@P6R$~3j|vUluEpG^ z`Sarsy9cobM4?@oO0 V`~LgeIl#zd@O1TaS?83{1OOZc&DQ_` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_hood_secondary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/frills_hood_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..aed527387ca38c5561de568b6c29d35833b45fc4 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|O(6 zr;B4q#hkaZ4)Qh|@VLe=ohRAId81xPErCUB!KcP(ZncSB7ytWr?T9#0r^p%f$4!RY z0f^>oX()}|Ucqi7fZe9m$&fngo<8!$rB0@xNqv5%v)f0pa`jUUOh9_xH5SlRe z=9}q3onPbxT#riif6VQ*FZ|0s-LG-+qj_OJ`uZJ@Y-AveGQ~c;?)$)3Rg@{T;XYHi zVo~N>&kUh}wd@Pj=c_SJO|yS-a=GV$$n^*8U%vIuxX1E+onYRw?aE7EORTxTb$NF4 he`bN>OgPbVX3y%xpX|$7gn$9X;OXk;vd$@?2>=lChR^^2 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 fc40debab6..5cf54d1478 100644 --- a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json @@ -107,9 +107,21 @@ "name": "frills_divinity", "directions": 4 }, - { + { "name": "horns_double", "directions": 4 + }, + { + "name": "frills_axolotl", + "directions": 4 + }, + { + "name": "frills_hood_primary", + "directions": 4 + }, + { + "name": "frills_hood_secondary", + "directions": 4 }, { "name": "frills_big", @@ -118,6 +130,7 @@ { "name": "body_tiger", "directions": 4 + } ] }