From 82b2b31a599beff9fc59de98642a199f01224dab Mon Sep 17 00:00:00 2001 From: Angelo Fallaria Date: Tue, 13 Aug 2024 04:38:38 +0800 Subject: [PATCH 01/10] tweak: add human noses to Felinids, Onis and Harpies --- .../Mobs/Customization/Markings/human_noses.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml index 51fc2fd15a2..bfca2ff488a 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_noses.yml @@ -4,7 +4,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] sprites: - sprite: Mobs/Customization/human_noses.rsi state: schnozz @@ -15,7 +15,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] sprites: - sprite: Mobs/Customization/human_noses.rsi state: nubby @@ -26,7 +26,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] sprites: - sprite: Mobs/Customization/human_noses.rsi state: droop @@ -37,7 +37,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] sprites: - sprite: Mobs/Customization/human_noses.rsi state: blob @@ -48,7 +48,7 @@ markingCategory: Snout followSkinColor: true forcedColoring: true - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Harpy] sprites: - sprite: Mobs/Customization/human_noses.rsi state: uppie From 81a89dd6a2567aacfec1f3bbfd6ebeed30059d46 Mon Sep 17 00:00:00 2001 From: Angelo Fallaria Date: Tue, 13 Aug 2024 06:42:08 +0800 Subject: [PATCH 02/10] feat: add goblin tusks for onis --- .../Locale/en-US/markings/goblin_markings.ftl | 9 ++++++ .../Mobs/Customization/Markings/tusks.yml | 27 ++++++++++++++++++ .../Prototypes/Nyanotrasen/Species/Oni.yml | 3 ++ .../goblin_tusks.rsi/goblin_tusks_big.png | Bin 0 -> 617 bytes .../goblin_tusks.rsi/goblin_tusks_none.png | Bin 0 -> 7430 bytes .../goblin_tusks.rsi/goblin_tusks_small.png | Bin 0 -> 607 bytes .../Customization/goblin_tusks.rsi/meta.json | 23 +++++++++++++++ 7 files changed, 62 insertions(+) create mode 100644 Resources/Locale/en-US/markings/goblin_markings.ftl create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/tusks.yml create mode 100644 Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png create mode 100644 Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_none.png create mode 100644 Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_small.png create mode 100644 Resources/Textures/Mobs/Customization/goblin_tusks.rsi/meta.json diff --git a/Resources/Locale/en-US/markings/goblin_markings.ftl b/Resources/Locale/en-US/markings/goblin_markings.ftl new file mode 100644 index 00000000000..21b1afea238 --- /dev/null +++ b/Resources/Locale/en-US/markings/goblin_markings.ftl @@ -0,0 +1,9 @@ +# goblin tusks +marking-GoblinTusksBasic = No Tusks +marking-GoblinTusksBasic-goblin_tusks_none = No Tusks + +marking-GoblinTusksSmall = Small Tusks +marking-GoblinTusksSmall-goblin_tusks_small = Small Tusks + +marking-GoblinTusksBig = Long Tusks +marking-GoblinTusksBig-goblin_tusks_big = Long Tusks diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tusks.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tusks.yml new file mode 100644 index 00000000000..e2b74b44847 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tusks.yml @@ -0,0 +1,27 @@ +- type: marking + id: GoblinTusksSmall + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#d9d9d9" + sprites: + - sprite: Mobs/Customization/goblin_tusks.rsi + state: goblin_tusks_small + +- type: marking + id: GoblinTusksBig + bodyPart: Snout + markingCategory: Snout + speciesRestriction: [Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#d9d9d9" + sprites: + - sprite: Mobs/Customization/goblin_tusks.rsi + state: goblin_tusks_big diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml index a6a63b29526..607d489a38b 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml @@ -31,6 +31,9 @@ points: 1 required: true defaultMarkings: [ OniHornSingleCurved ] + Snout: + points: 2 + required: false Chest: points: 1 required: false diff --git a/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png b/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/goblin_tusks_big.png new file mode 100644 index 0000000000000000000000000000000000000000..fb706ac649e82e68a92ceb77b165f81a9b9ad22f GIT binary patch literal 617 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/meta.json b/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/meta.json new file mode 100644 index 00000000000..0983b297549 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/goblin_tusks.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "copyright": "Sprited by erhardsteinhauer (discord)", + "license": "CC-BY-SA-4.0", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "goblin_tusks_small", + "directions": 4 + }, + { + "name": "goblin_tusks_big", + "directions": 4 + }, + { + "name": "goblin_tusks_none", + "directions": 4 + } + ] +} From ded6c4d194c0b490a6d33a7f3b56afe1a83c955b Mon Sep 17 00:00:00 2001 From: Angelo Fallaria Date: Tue, 13 Aug 2024 06:42:26 +0800 Subject: [PATCH 03/10] tweak: set default Oni horn to double curved --- Resources/Prototypes/Nyanotrasen/Species/Oni.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml index 607d489a38b..1beda4aceeb 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml @@ -30,7 +30,7 @@ HeadTop: points: 1 required: true - defaultMarkings: [ OniHornSingleCurved ] + defaultMarkings: [ OniHornDoubleCurved ] Snout: points: 2 required: false From 67625d4b642bb01f307d18bb8d1745e860efd551 Mon Sep 17 00:00:00 2001 From: Angelo Fallaria Date: Tue, 13 Aug 2024 06:44:21 +0800 Subject: [PATCH 04/10] feat: add pointy ears for Onis --- .../Locale/en-US/markings/pointy_ears.ftl | 20 +++++ .../Customization/Markings/pointy_ears.yml | 69 ++++++++++++++++++ .../Prototypes/Nyanotrasen/Species/Oni.yml | 4 + Resources/Prototypes/Species/human.yml | 1 + .../Customization/pointy_ears.rsi/meta.json | 39 ++++++++++ .../pointy_ears.rsi/pointy_ears_none.png | Bin 0 -> 678 bytes .../pointy_ears.rsi/pointy_ears_slanted.png | Bin 0 -> 858 bytes .../pointy_ears.rsi/pointy_ears_standard.png | Bin 0 -> 761 bytes .../pointy_ears.rsi/pointy_ears_tall.png | Bin 0 -> 813 bytes .../pointy_ears.rsi/pointy_ears_thin.png | Bin 0 -> 562 bytes .../pointy_ears.rsi/pointy_ears_upwards.png | Bin 0 -> 797 bytes .../pointy_ears.rsi/pointy_ears_wide.png | Bin 0 -> 687 bytes 12 files changed, 133 insertions(+) create mode 100644 Resources/Locale/en-US/markings/pointy_ears.ftl create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml create mode 100644 Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_none.png create mode 100644 Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_slanted.png create mode 100644 Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png create mode 100644 Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_tall.png create mode 100644 Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_thin.png create mode 100644 Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_upwards.png create mode 100644 Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png diff --git a/Resources/Locale/en-US/markings/pointy_ears.ftl b/Resources/Locale/en-US/markings/pointy_ears.ftl new file mode 100644 index 00000000000..629db160803 --- /dev/null +++ b/Resources/Locale/en-US/markings/pointy_ears.ftl @@ -0,0 +1,20 @@ +marking-PointyEarsStandard-pointy_ears_standard = Standard Ears +marking-PointyEarsStandard = Standard Ears + +marking-PointyEarsWide-pointy_ears_wide = Wide Ears +marking-PointyEarsWide = Wide Ears + +marking-PointyEarsUpwards-pointy_ears_upwards = Upward Ears +marking-PointyEarsUpwards = Upward Ears + +marking-PointyEarsTall-pointy_ears_tall = Tall Ears +marking-PointyEarsTall = Tall Ears + +marking-PointyEarsSlanted-pointy_ears_slanted = Slanted Ears +marking-PointyEarsSlanted = Slanted Ears + +marking-PointyEarsThin-pointy_ears_thin = Thin Ears +marking-PointyEarsThin = Thin Ears + +marking-PointyEarsNone-pointy_ears_none = No Ears +marking-PointyEarsNone = No Ears diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml new file mode 100644 index 00000000000..8720dc2d817 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml @@ -0,0 +1,69 @@ +- type: marking + id: PointyEarsStandard + bodyPart: HeadSide + markingCategory: HeadSide + forcedColoring: true + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/pointy_ears.rsi + state: pointy_ears_standard + +- type: marking + id: PointyEarsWide + bodyPart: HeadSide + markingCategory: HeadSide + forcedColoring: true + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/pointy_ears.rsi + state: pointy_ears_wide + +- type: marking + id: PointyEarsUpwards + bodyPart: HeadSide + markingCategory: HeadSide + forcedColoring: true + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/pointy_ears.rsi + state: pointy_ears_upwards + +- type: marking + id: PointyEarsTall + bodyPart: HeadSide + markingCategory: HeadSide + forcedColoring: true + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/pointy_ears.rsi + state: pointy_ears_tall + +- type: marking + id: PointyEarsSlanted + bodyPart: HeadSide + markingCategory: HeadSide + forcedColoring: true + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/pointy_ears.rsi + state: pointy_ears_slanted + +- type: marking + id: PointyEarsThin + bodyPart: HeadSide + markingCategory: HeadSide + forcedColoring: true + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/pointy_ears.rsi + state: pointy_ears_thin + +- type: marking + id: PointyEarsNone + bodyPart: HeadSide + markingCategory: HeadSide + forcedColoring: true + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/pointy_ears.rsi + state: pointy_ears_none diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml index 1beda4aceeb..17ad03a4039 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml @@ -31,6 +31,10 @@ points: 1 required: true defaultMarkings: [ OniHornDoubleCurved ] + HeadSide: + points: 1 + required: false + defaultMarkings: [ PointyEarsStandard ] Snout: points: 2 required: false diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml index 49f8839cac3..99ec35da2e1 100644 --- a/Resources/Prototypes/Species/human.yml +++ b/Resources/Prototypes/Species/human.yml @@ -33,6 +33,7 @@ RFoot: MobHumanRFoot Tail: MobHumanoidAnyMarking # Nyanotrasen - Felinid HeadTop: MobHumanoidAnyMarking # Nyanotrasen - Felinid & Oni + HeadSide: MobHumanoidAnyMarking - type: markingPoints id: MobHumanMarkingLimits diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json new file mode 100644 index 00000000000..6a8f4c679d3 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by angelofallars (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pointy_ears_standard", + "directions": 4 + }, + { + "name": "pointy_ears_wide", + "directions": 4 + }, + { + "name": "pointy_ears_thin", + "directions": 4 + }, + { + "name": "pointy_ears_upwards", + "directions": 4 + }, + { + "name": "pointy_ears_tall", + "directions": 4 + }, + { + "name": "pointy_ears_slanted", + "directions": 4 + }, + { + "name": "pointy_ears_none", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_none.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_none.png new file mode 100644 index 0000000000000000000000000000000000000000..967ff66c8bdbb37071ea64a85c44578be94a1c17 GIT binary patch literal 678 zcmV;X0$KfuP)EX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`ULkVwY zf{(*0UV(-iU_wXeC`crs8XGYzL3u|a|CdYwOqj`Rxg!DqGiK@%Lf5mN*ZW=L+(#VA z_IU2qVELb)dT5&0Ng70w#fhlu*F05~EKVd1qCrn74I)uhE6R0?F?9WR6ID|#pTa1` zU-k3o@*MyG0000000000X03KVz;`aPSgx#hgWbCitj#V%E538Fb_A;K=zpo$(-`{+ z)(}G1o9qC(>?fGEL&$9oCo#rMW&rowRYausN)7-300000004jN2|encG>Q>+6#xJL M07*qoM6N<$f+|`kQ2+n{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_slanted.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_slanted.png new file mode 100644 index 0000000000000000000000000000000000000000..f964e4eeca6b292c3c34617b444494c15d3756d8 GIT binary patch literal 858 zcmV-g1Eu_lP)EX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`UL*ckUrS==2WSONi^5=qdKfV?h7L|c=?D-rtr%#ZhS@9t%}1Bj@|X1@5- z_$uqyN+grpL9cYu&3u7fyck-%M9V;{{w}^$eN_}7BJ%aQ+{ZVE{i4nb0Nf6GP)eyw z8&Gw9c(w)ENyGSTSJN=gL&dW#c(!G{{%<)w+d8RlOd7^W!?^HRZRQKfV@>}9^7$?Cz7A0tO+v=JckcP3;J1qdfY&=o`@bva^`3M{)$)ZGMQKGi1^~oK5l|%&F z)q4MZWf!kC0{KaJcz(gn{T=F^7EHWAG1Y)9O0Zq65lkng7q8WTAI9OT8ZaA=ptJKt kL_|bHL_|bHMD!nh19WOA2YTfbbpQYW07*qoM6N<$f_;F6jsO4v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png new file mode 100644 index 0000000000000000000000000000000000000000..e37ab643ee97edecd726f80e204c69fe23b19760 GIT binary patch literal 761 zcmVEX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`ULSWQy zf)4Io{0hE&*jm4W9nv{Ng>;EcCo7b;5Rl_yBnF}>ty=Z}+XDCIIrpAB9ti;cG5c&m zztdKIzv0>U;d!fc&%<5twr={Em?WKEUN2Q(F~6*ae0G*!CEKbLF^dvO^6ldTnOW%` zclY^VBuQ3lHdfZ9e12AUz6^JlB$uQ`^Eaw2sx=#m!@ypDUTQuVDGq~`9zLHx?Dmw7 zCo1;9%#@BN8g_eMk`Dj?0000000000zh0&J07;c+1b$L+K4IC}gm;(F@3b|G63S9iz}_u r1>E1>NLqd*2LJ#700000fIsX7w@Z+I!So`N00000NkvXXu0mjf*>F`1 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_tall.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_tall.png new file mode 100644 index 0000000000000000000000000000000000000000..350d33a210bea8e620d610c7730d5fda9f471b12 GIT binary patch literal 813 zcmV+|1JeA7P)EX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`ULhs>ccb6HD2?%?|(&5#t5(C=n5nE)QYo{16eNO_a&I&Tra;HpP#00iow&HJTRvaS zX9ztPq38a&@cKHIWBh%_{*g)0csjv) zxljOKYtGQ&#!0I rfbuh*CdCsG5fKp)5fKp)5nY%sm#r^gSBX^j00000NkvXXu0mjfH(+$R literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_thin.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_thin.png new file mode 100644 index 0000000000000000000000000000000000000000..2f6a681de336d484c160cfde5a8b90aaff1305c0 GIT binary patch literal 562 zcmV-20?qx2P)EX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`UL7!W1PhWGTJ{7J@6DF824&jLxZ8>qF;$X@m9{;zFWGc)&Z{Qv*}00000yuxU` z AEC2ui literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_upwards.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_upwards.png new file mode 100644 index 0000000000000000000000000000000000000000..e1960546cb7dcc0ef741a64ec3f08b38895ee1b3 GIT binary patch literal 797 zcmV+&1LFLNP)EX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`UL% z@!Ou?4yt9wH7&oWs=5ZB4#ujg+NAsku7J?@=GRA;=l{mq``Kr%?;kf>_;UWx_x>C+ z^u3k*o915lraoWabM3%STw#F)it7-J-j6N&mkCHVmW0000000026b1Lb(H))Qx0lCGCuc|x$TYx-$ z`WhEsxB!LD2UxCi0(HpFsmS>NXL~$5NE#=S#)-^^6RGr7TjR}~4JY&YK7E}9NaIAl-aaJi2Zc_C6k0*{bGW*D*s21&JUn+a00000 b0CvzfH^lOvZ!Ula00000NkvXXu0mjfg|l$7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png new file mode 100644 index 0000000000000000000000000000000000000000..942c8d23493c9a58038e8475ce4767fe2d5d8866 GIT binary patch literal 687 zcmV;g0#N;lP)EX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`ULkVwY zfB4z+^kJ9R-P-P>mG{5)=>!sPEH}oiNKR-F_kf@W)JDL43Jt@p-x3n5MP& z#F_Q}*lC01cfQ&~)4Gp%>oiMJRaJdgr>dGIse0?Q&r|Z&X-T=S6c_vMpKqda%H>n= z)(!Hjdh5hn_wwWNwW0b000000000000KiwPy+4n_KxXqr;c?w V#T3owMJ)gT002ovPDHLkV1hUEHcS8j literal 0 HcmV?d00001 From 323c5c90bc9e940744fecab4e139344c3a44ef20 Mon Sep 17 00:00:00 2001 From: Angelo Fallaria Date: Tue, 13 Aug 2024 08:26:45 +0800 Subject: [PATCH 05/10] feat: update oni ears --- Resources/Locale/en-US/markings/pointy_ears.ftl | 3 +++ .../Mobs/Customization/Markings/pointy_ears.yml | 10 ++++++++++ .../Prototypes/Nyanotrasen/Species/Oni.yml | 2 +- .../Customization/pointy_ears.rsi/meta.json | 4 ++++ .../pointy_ears.rsi/pointy_ears_large.png | Bin 0 -> 896 bytes .../pointy_ears.rsi/pointy_ears_tall.png | Bin 813 -> 826 bytes .../pointy_ears.rsi/pointy_ears_upwards.png | Bin 797 -> 802 bytes 7 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_large.png diff --git a/Resources/Locale/en-US/markings/pointy_ears.ftl b/Resources/Locale/en-US/markings/pointy_ears.ftl index 629db160803..53750f05f76 100644 --- a/Resources/Locale/en-US/markings/pointy_ears.ftl +++ b/Resources/Locale/en-US/markings/pointy_ears.ftl @@ -16,5 +16,8 @@ marking-PointyEarsSlanted = Slanted Ears marking-PointyEarsThin-pointy_ears_thin = Thin Ears marking-PointyEarsThin = Thin Ears +marking-PointyEarsLarge-pointy_ears_large = Large Ears +marking-PointyEarsLarge = Large Ears + marking-PointyEarsNone-pointy_ears_none = No Ears marking-PointyEarsNone = No Ears diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml index 8720dc2d817..ab5420e04a6 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml @@ -58,6 +58,16 @@ - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_thin +- type: marking + id: PointyEarsLarge + bodyPart: HeadSide + markingCategory: HeadSide + forcedColoring: true + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/pointy_ears.rsi + state: pointy_ears_large + - type: marking id: PointyEarsNone bodyPart: HeadSide diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml index 17ad03a4039..ba5e5661f9f 100644 --- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml @@ -34,7 +34,7 @@ HeadSide: points: 1 required: false - defaultMarkings: [ PointyEarsStandard ] + defaultMarkings: [ PointyEarsUpwards ] Snout: points: 2 required: false diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json index 6a8f4c679d3..e9ae8701cf0 100644 --- a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json @@ -31,6 +31,10 @@ "name": "pointy_ears_slanted", "directions": 4 }, + { + "name": "pointy_ears_large", + "directions": 4 + }, { "name": "pointy_ears_none", "directions": 4 diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_large.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_large.png new file mode 100644 index 0000000000000000000000000000000000000000..88f08547407f0c957a2c64724c9ae7759c903d30 GIT binary patch literal 896 zcmV-`1AqL9P)EX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`UL(VobSWcxWZU4W-0eraU;2v0>1L%Jf zU;X*kw`B78^yXUR4YqTAC3|G!PYScT@$e%U_Knf zwXH&Orz-%FZ{}T=a;Pmm4RBgldH?sx#cuOtz(Eoo~TSKYV$*p7L(b=JoCEQfJS#% zb!1~d_%-jfny=2vYn6uDY*0Tor1};dowYXF)IUW^iTQB6diTSLCob+Dw64|KAD{*c zC!T1w+9LT~D2r;Nj%KSZcDZ@&3P@K10G!|6m#P9@pB~p1i-?Gbh=_=Yh=_=YHhch5 WDqF4R?!iO=0000?m{+>d?KPqAwpd#@)%q z-629i2xRL?4+A}rr;CwTt#?Tyk^29wUha9x#pOAG=%g%8k;SQ$d`7Z3{TJ~803ss3 zNn~*Z@CskVSvSW1ORCFx+j0v=D#n-BSc|)+QHp*(_T|D5P_aAii;prLeUKh9bcL#I&CL3V2!Dh8aGM{-DU#bB=KZnPc vw~J~(evPM0@kB&KL_|bHL_|bHSLPeZsU>I`aZRKE000R9NkvXXu0mjfCJMlL delta 387 zcmV-}0et?t2CW9Lv;lu)Nklhs>ccb6HD2?%?|(&5#t5( zC=n5nE)QYo{16eNO_a&I&Tra;HpP#00iow&HJTRwkZ&1VQb7oq3=x$ycr zmSg|AX6U(9{;qP@JB!cv52F*<$94TbROR2_#$z|MRsNAl(0Dq*dbv;llqOWImkTwX zPC9KsnLiGERiqh|`o0aN6pA!M9QeKDCn6#uA|fIpA|fIpqKne`%>6&^v&o!(sN#E> z&DR=mwoPdJZNht%F5uXlUH6^95bAp>_x$kkrhQL494qH5P;!XErlutd#lF^?Vst#k4@9NCokST zL{J1lPmMIFG$7MUwj{AMi6$8FeNJM=o!!}ummLux(`K@$G`{Zn?Vws_+_~i!Rn@G) zHReb$&nJJly{qYoEt|^Yrp|)WXyGJ=ghjOwWIH_VOQ_JMm6^e||}x z9f;ye{|~VFRaMfPY`;4seTcejZ-=jji~JOS}RLO(Fu=~8y9wN%syau8LO-D)k{=~6;JFnJfB z`xUT**&cyrr(MevAW?rpk%@!Ou?4yt9wH7&oW zs=5ZB4#ujg+NAsku7J?@=GRA;=l{mq``Kr%?;kf>_;UWx_x^tzGxWWc{F~-p_@+Kz z-*fH2Ph9E$0XDy?%JL@L-`2^$mnW#zY0IeBH6mghp=Q+UnpUS>Y5{Eis2`X#PQ;kS zX&7T9jT4FbK_&SC0000000000uyZQuyEkc$wgI`ti?6CX|671Oefk;~U$_8;&Ieeo za{_h9&Z)@x0B37^JUd7lCz8gA%!U)G^i^Bq&72J<^ZDgnyokHszf#qUn_JmGJ(k0> zla)SwodrnaM84iWB Date: Tue, 13 Aug 2024 09:25:40 +0800 Subject: [PATCH 06/10] tweak(markings): update Upward Ears --- .../pointy_ears.rsi/pointy_ears_upwards.png | Bin 802 -> 789 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_upwards.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_upwards.png index 4d37cb7cd8e698618f97b6ed73263a17a815fe4d..8454708d9e41e25fcae454885b23a85f80053214 100644 GIT binary patch delta 363 zcmV-x0hIot29*Y|v;luiNkl#eG)o>TsHRYBl7zn^a&?*FZ|znA~>^!$3#!VmKU*ZFhIz;%C)@=wj)yQjWCzogC% z6m^|H18lyk%Hby4@7m-~>J&}qGl_gpM8s5-n#lKLI-hlV0c`$ewKRE>iZT1sFvdup zq_SBpd&vg?000000002M#p&g}`@nOYvnj6j2FT71~hF?Xw)BIRrLuB zp**K1{Q;G?KzU=3JV_-BW0Qrk^wbE_`ebHdELj+vJV|RWzV4qH5P;!XErlutd#lF^?Vst#k4@9NCokST zL{J1lPmMIFG$7MUwj{AMi6$8FeNJM=o!!}ummLux(`K@$G`{Zn?Vws_+_~i!Rn@G) zHReb$&nJJly{qYoEt|^Yrp|)WXyGJ=ghjOwWIH_VOQ_JMm6^e||}x z9f;ye{|~VFRaMfPY`;4seTcejZ-=jji~JOS}RLO(Fu=~8y9wN%syau8LO-D)k{=~6;JFnJfB z`xUT**&cyrr(MevAW?rpk Date: Tue, 13 Aug 2024 22:55:50 +0800 Subject: [PATCH 07/10] tweak(ears): update Large, Slanted, Standard, Thin, Wide --- .../pointy_ears.rsi/pointy_ears_large.png | Bin 896 -> 907 bytes .../pointy_ears.rsi/pointy_ears_slanted.png | Bin 858 -> 865 bytes .../pointy_ears.rsi/pointy_ears_standard.png | Bin 761 -> 753 bytes .../pointy_ears.rsi/pointy_ears_thin.png | Bin 562 -> 601 bytes .../pointy_ears.rsi/pointy_ears_wide.png | Bin 687 -> 691 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_large.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_large.png index 88f08547407f0c957a2c64724c9ae7759c903d30..55c6e6c26d4ea5eaa2666e49c3a03e31c609773e 100644 GIT binary patch delta 482 zcmV<80UiE;2a5-=v;lv@Nkl^2P3N*rgH7J7CYrFt#X7og&Y zfsgrc0wGqjTL^!F`EY_T@b?m*h=_=Yh=_=Yh=_=Y{(`j%YElW>FfEbyveVS{F&uas z_n_S`5UtBc>+@+f`a@FB7njs4Aaq`Ys?95(uW!3|UhHA>XE)a?*L3;>j?xzPI*zbz z8#4AOsBwKDagNGV$J^)bM3-~j-_z{l0Ylh$0V z{s6UD82B(u3-M1P4~msC4Ac76=Cv~*o(TYOdH(VobSWcxWZU4W-0eraU;2v0>1L%JfU;X*kw`B78^yXUR z4Y$~XqiTi2c4TzF}vii zkmn zIQbb@cm=5ZQc9!?L7m$te?=##)-f>Z_i{g)0K}-@L#<;J`T$gZ*S19L2M}U?8bS!f zegN0Dz9l~q5fOh85fKp)5fKp){RNq=u5E4TW~(jA-gb%{5B}KAoPX9{0g*G9tTyVa zhLy;Df*~UEcy4iq6cUW~~V?X#c@3oq* z&dO_*hT3dUKQ^TL795?mHrmubMM{bJaJ+i=!-*#@?jBFHuGQKfpau&ko@ln(BKch? zi)y2eW~(iBxq0mhNLK;?oZsG;ssdi09@iF&h=_=Yh=_=Yh=_ zuh1pCXauJe9V7vzf-cudi5g9!Q3HK`lP~Ap{m+x7j9i$yraW_l69BAmkSxF@Mk zL_|bHL_|bHL_~i?ME_3Sd;cQzSjv((%bxyHhtJyMzEw8>#BNy)(~^CA`U@U@*H&2S z%|^BX0En)kR}a$OD{xLR_a&^I@91T*=h*NZ8}nci-PLP>zWrreIu9oB9Q*j6K->@j zzb8QiQAJVK@bh4TakmG*ckUr zS==2WSONi^5=qdKfV?h7L|c=?D-rtr%#ZhS@9t%}1Bj@|X1@5-_$uqyN+grpL9cYu z&3u7fyck-%M9V;{{w}^$eN_}7BJ%aQ+{ZVE{i4nb0Nf6GP)dKPOB+yieR#G7*-69r zY**7T&O^nsEqJzNy#8-FJ=;2|Z%i7-NW-}BSZ(GD$zx6b1M>PJ0uebrB@mH)eWU*X z0BCgE@Li|O$SB`+(CD^}HlR7|!*?A7(}~KW1ji>^DTORb5KJe^cO9G?6CxraA|fIp zA|fIpBBByZ-}`@G!#CD65^LSlSG9PZw*f$j_W?Pbd-@7@Ui)o8VbI|{`{V1o06-Qc zXms1^ni`OXvD7;)0KjZKQULJu_Hp?L945)4L}gK;wyX8Y9etHV1l!em|9xc_uQdYs zNqBgE!Oi_0>YWx$yg)J4fGkR|U9AyJC#4s!)qo$y;i@SbFdL7cv-3nmL_|bHL_|bH b^dEf#bZRIEdgT*!00000NkvXXu0mjfv%bs{ diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png index e37ab643ee97edecd726f80e204c69fe23b19760..c6cdebef00521c119c35fbefe0efc9c82d6b4b29 100644 GIT binary patch delta 327 zcmV-N0l5D81@Q&2v;lu8NklSWNxf)4Io{0hE&*jm4W zOZE&E(j}5kMhHzIAjic>3`7$Wwd()31@6sr?mc%r5&-;T?z086=|sbQ&x-HE^KtE- zhdcjm-SRPZl5~1`-KoH8eq9aa>>|HOwrf&E7RHif+s6lT&eebJF*94u7n0-#Bd@nE zmGg_b%Vn6EB$*_&&EIIUXfW~=1-^Uzd9Brap(yZsJ$yAkPf}HT;G9#Qq+gZ~00000 z00000006&Uqxk?yjb{XYQguF|>ukciOPEb3%EH)6*5=@5rlP1UjIC%|FE60_5{}Ns zwz)gh*51xXvl2hwegS!s+Vj&=QQ)`gyleXs3MUs=TBi%RzrB&veIy3}00000004kL Z>;)@SkqCm>lfM7}002ovPDHLkV1n1co0R|n delta 335 zcmey!`jd6T7RGu5PZ!6Kid%1Q*?J!i5IOeoxdz8Jj#nuck2dkWi~Ym3ujWS7{wCQ= zmd>puoxbYYQ??0Ac$}odwn%er)Yt#FnZ7@>{65cGj+5b^;qM&B{g=aP_dmS({bA+m zlJkdSKWxkUHDiX#+_*UX&;-N%Yuakcrp2q?UL|7KE#&#>?PKPdk@YX-%D?|iQ1J}Q zHVeD9w5Besd>>Ewbd~8#TtAzy(phCH-F5gtTzy=YorES|^He#z`Sx$VP3cqD`gY(9 zkdi8^j-SNO00;Zymi}b$oSM#37gT7Mc=KjU`Sc6#x0rSdosXQ|ynFYiMQMSLA}@!1 zV(QX=_+rh|*}L6KbKkzLG130`R(wLA`oBLWp)zdTrT4^YIcHAp)?Ry=_0Ii!9#M5F e>`*Hj?BB3%_nuI9@Qc!9kdUXVpUXO@geCyWW}939 diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_thin.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_thin.png index 2f6a681de336d484c160cfde5a8b90aaff1305c0..a910e67f6d07167dd7bdcc25745d90da09a95c24 100644 GIT binary patch delta 174 zcmdnQa+77l7RLGso-U3d6}R5r+Q@atK!o*zc)%{vHH+^*eDweEqw*agYi_KyxZ)@% zc%(s8civ{!yiaW@yE_?vB)<$@kbUc4U2I6Il+x_iw?F4^d+lqVl9%(DkpT=OHoy6| zC;L`M$N8`C^DF*{3ka@Uaca%p$#)d5GY218+C2YUx_xo?@mMw4<$o2$R;PYi2GKar Zg1K8s|0Mrw&VwLxJYD@<);T3K0RVX5P_O_1 delta 134 zcmcb~vWaEG7RI_vPZ!6Kid%1QDe|=#2(VuG_V4?l0=^vA*sJl|IVA*CPq%&lGXIa~ zF+WWP{jl>)o|~jsY&~}(?(6G+>vJQGjlbvrWq^P^hcfm)d7!yl_Pf;D`_Vgev)x`- gUMPH|50QOvg#CAF5Ywz}-}*oTp00i_>zopr09nO5WB>pF diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png index 942c8d23493c9a58038e8475ce4767fe2d5d8866..991ccb68c7bdda06f00d85f86af0c7387915e128 100644 GIT binary patch delta 265 zcmZ3_x|wyu7RLHlo-U3d6}R5rvgK=X5NLZC>;3jk$J|!)4Ig=04hx-2aQ08!D4MoQ z*XKq{R*s4y3+o^Aeg5u04*8`urX81H_>o+uQE=z^t$lHCx0U5=`;=r}_$i?AZhGA6 z#GH3}2RqI3p3d?qSakl*(r>?NQ&+6YykGO}m#^U7*mv)o3O-E=uQ#8q=I77bbxgZcO{&};OkQ@z$fxMUrGv)5{Hspa99YVEmgm5AQw58Q z)z5^}lAC8+7^Y5~eX3ix`_F5;#!V-3pB_DTUC`bPX56p2j8~VQ>U7k(Y5)@QboFyt J=aj(M1OVB#eLMgF delta 260 zcmdnYx}J5z7RLH#o-U3d6}R5rvgK=X5NLaN^VYd@5wCf3_B7eIyY6Y~H9wGIy-Aj} zb9O+lD5sE!0LO~=mnY6OIIVNHPKn{eai3Vnnw?o6D|gn-PlKV8f8+__#v{P(;0`HPB9J*^4;aEZ;dA zqQ8H7{AugLU(5_Ja3Fm3Ui Date: Tue, 13 Aug 2024 23:10:43 +0800 Subject: [PATCH 08/10] feat(ears): add actually wide ears name changes: old Wide Ears -> Standard Ears old Standard Ears -> Small Ears --- Resources/Locale/en-US/markings/pointy_ears.ftl | 3 +++ .../Mobs/Customization/Markings/pointy_ears.yml | 10 ++++++++++ .../Customization/pointy_ears.rsi/meta.json | 4 ++++ .../pointy_ears.rsi/pointy_ears_small.png | Bin 0 -> 753 bytes .../pointy_ears.rsi/pointy_ears_standard.png | Bin 753 -> 686 bytes .../pointy_ears.rsi/pointy_ears_wide.png | Bin 691 -> 675 bytes 6 files changed, 17 insertions(+) create mode 100644 Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_small.png diff --git a/Resources/Locale/en-US/markings/pointy_ears.ftl b/Resources/Locale/en-US/markings/pointy_ears.ftl index 53750f05f76..637f216667f 100644 --- a/Resources/Locale/en-US/markings/pointy_ears.ftl +++ b/Resources/Locale/en-US/markings/pointy_ears.ftl @@ -4,6 +4,9 @@ marking-PointyEarsStandard = Standard Ears marking-PointyEarsWide-pointy_ears_wide = Wide Ears marking-PointyEarsWide = Wide Ears +marking-PointyEarsSmall-pointy_ears_small = Small Ears +marking-PointyEarsSmall = Small Ears + marking-PointyEarsUpwards-pointy_ears_upwards = Upward Ears marking-PointyEarsUpwards = Upward Ears diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml index ab5420e04a6..10016fb9851 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml @@ -18,6 +18,16 @@ - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_wide +- type: marking + id: PointyEarsSmall + bodyPart: HeadSide + markingCategory: HeadSide + forcedColoring: true + speciesRestriction: [Oni] + sprites: + - sprite: Mobs/Customization/pointy_ears.rsi + state: pointy_ears_small + - type: marking id: PointyEarsUpwards bodyPart: HeadSide diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json index e9ae8701cf0..776d9505af0 100644 --- a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/meta.json @@ -15,6 +15,10 @@ "name": "pointy_ears_wide", "directions": 4 }, + { + "name": "pointy_ears_small", + "directions": 4 + }, { "name": "pointy_ears_thin", "directions": 4 diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_small.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_small.png new file mode 100644 index 0000000000000000000000000000000000000000..c6cdebef00521c119c35fbefe0efc9c82d6b4b29 GIT binary patch literal 753 zcmVEX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`ULSWNx zf)4Io{0hE&*jm4WOZE&E(j}5kMhHzIAjic>3`7$Wwd()31@6sr?mc%r5&-;T?z086 z=|sbQ&x-HE^KtE-hdcjm-SRPZl5~1`-KoH8eq9aa>>|HOwrf&E7RHif+s6lT&eiTQ zGh59UlH>*>ueUCh^NYI6Wtf>HnIyH%-)OREF!B@yzI*+7t<`*?DDZndd^JB$QdN84 zoKv2pUzQI500000000000KZ=FQEDoj?TumxjWR>-p)s}65oCSd6L@m(^663x9YrW`w|K#7gt)R3%I|%k<@)8 j2LJ#700000fIsX7D^!sPg4vV500000NkvXXu0mjf7kgDr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_standard.png index c6cdebef00521c119c35fbefe0efc9c82d6b4b29..38d7137e61b3d457bc55880eb9ae2caa0b210bd5 100644 GIT binary patch delta 260 zcmey!x{h_jX2yDkr=Bj3Ar-gY-rCF8WFXS^@LHg``J-nCWOr2Xwsfn;G;>=sGYc<^ zW*739@hVB!Y1JQ&rjNB|hs4i$a_iVSF&vPeT-*3t*YNG@%U_k+)3nzvk#CVVy;1vY zwOrdXwUx!GYsxKW1F2_smX_6qOCOWCxX-e@_I6A0)ZM!So@doe48M9UzvShcg%_7b zZn9&5gFjpDeg3S|cjVy<-g$x%muEz_1#YrWA3vBv*|>`eb0*T!}D?N zo`*aCZQb%Qc9L{@dEKeNYJOb}9)9WZTCFa?XF%?lCi4%@>m71|zSx zE|v3(y31vlnIxGcwawpXvS={!6a~I}{duj`e4!}tdp&$LKTlFsd*GZ?o}^!v4*&oF z000000002LUZeQ{NsVU&eo}Qlq3dkIyGxi&C(6RuO4jD!W~QR3ER3yaS}!l4`Vx-L z#Wy>bz_F5(+05S6ZhFxWB!T)O{oe000000001h aKkNl7RFMdR*^|Ej0000mYYie diff --git a/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png b/Resources/Textures/Mobs/Customization/pointy_ears.rsi/pointy_ears_wide.png index 991ccb68c7bdda06f00d85f86af0c7387915e128..2a643bf6c61c3eb38eddf9c80e635360a6a451ed 100644 GIT binary patch delta 248 zcmdnYx|nst7RLHpo-U3d6}R5r+RJxHLEu1P!57}1+0FS69vMr>U;DwMch}m&;OYj$ z2~(C_w!CV>``5@d`_F&39R=bUk$g)T9`wK5ck;OID9&j$Mo`;n>Oa}<&Ws)y)*yZsuRYc vR;#;hqVMPjJejFC_v-7rZQZ<3V;Xj-E8V|+o?)WJDUgV#tDnm{r-UW|Etz&! delta 265 zcmZ3?x|wyu7RLHlo-U3d6}R5rvgK=X5NLZC>;3jk$J|!)4Ig=04hx-2aQ08!D4MoQ z*XKq{R*s4y3+o^Aeg5u04*8`urX81H_>o+uQE=z^t$lHCx0U5=`;=r}_$i?AZhGA6 z#GH3}2RqI3p3d?qSakl*(r>?NQ&+6YykGO}m#^U7*mv)o3O-E=uQ#8q=I77bbxgZcO{&};OkQ@z$fxMUrGv)5{Hspa99YVEmgm5AQw58Q z)z5^}lAC8+7^Y5~eX3ix`_F5;#!V-3pB_DTUC`bPX56p2j8~VQ>U7k(Y5)@QboFyt J=aj(M1OUxSeJ}t3 From 9716822a1afc804bea608e223a95712c628503a2 Mon Sep 17 00:00:00 2001 From: Angelo Fallaria Date: Wed, 14 Aug 2024 00:42:13 +0800 Subject: [PATCH 09/10] feat(oni): add Two-Toed Feet marking --- Resources/Locale/en-US/markings/oni_feet.ftl | 2 ++ .../Mobs/Customization/Markings/oni_feet.yml | 13 +++++++++++++ .../Mobs/Customization/oni_feet.rsi/meta.json | 15 +++++++++++++++ .../Mobs/Customization/oni_feet.rsi/two_toes.png | Bin 0 -> 748 bytes 4 files changed, 30 insertions(+) create mode 100644 Resources/Locale/en-US/markings/oni_feet.ftl create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml create mode 100644 Resources/Textures/Mobs/Customization/oni_feet.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes.png diff --git a/Resources/Locale/en-US/markings/oni_feet.ftl b/Resources/Locale/en-US/markings/oni_feet.ftl new file mode 100644 index 00000000000..db35a69acdb --- /dev/null +++ b/Resources/Locale/en-US/markings/oni_feet.ftl @@ -0,0 +1,2 @@ +marking-OniTwoToedFeet-two_toes= Two-Toed Feet +marking-OniTwoToedFeet= Two-Toed Feet diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml new file mode 100644 index 00000000000..0ff03df1a0d --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_feet.yml @@ -0,0 +1,13 @@ +- type: marking + id: OniTwoToedFeet + bodyPart: RFoot # Can't be LFoot to avoid visual glitches + markingCategory: Legs + speciesRestriction: [Oni] + coloring: + default: + type: + !type:SimpleColoring + color: "#454545" + sprites: + - sprite: Mobs/Customization/oni_feet.rsi + state: two_toes diff --git a/Resources/Textures/Mobs/Customization/oni_feet.rsi/meta.json b/Resources/Textures/Mobs/Customization/oni_feet.rsi/meta.json new file mode 100644 index 00000000000..c0792d54004 --- /dev/null +++ b/Resources/Textures/Mobs/Customization/oni_feet.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by angelofallars (github), two toes based off of Reptilian ( https://github.com/tgstation/tgstation/blob/8024397cc81c5f47f74cf4279e35728487d0a1a7/icons/mob/human_parts_greyscale.dmi )", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "two_toes", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes.png b/Resources/Textures/Mobs/Customization/oni_feet.rsi/two_toes.png new file mode 100644 index 0000000000000000000000000000000000000000..898f115fe35c948630a08ca7215f16f3406a906d GIT binary patch literal 748 zcmVEX>4Tx04R}tkv&MmP!xqvQ^g_`1v`i+WT;MdQ4z;lg(6f4wL+^7CNKSiCJjl7 zi=*ILaPVib>fqw6tAnc`2>yULJ2)x2NQw6)g%&YBxV(?^-Z|WNA0RX;OtZS;fTr7K zI++l&xmB^}6(NK%Ks72e%b1g-6nxj$Jpz2ci}5V~dw;GzHE%H>AQH!!VcNtS#50?= z!FiuJ!b-AAd`>)JQiH^gTvt4P<6LxE;F%FKlb$Dz5R1hQRyvrKOpSP&II3zo)|5Tqat9cCGGtSBr6841C;;zg^i4Tn@D}J@^XAq%$LRx*p;@JFfP+I| zyhz#WKJN~7&h6hjt@-@`ULrl$=#YHN#vYURaF{>!Pd^bUt2hiqx!yIzSpkD z$8p?z_m9Wpa#H7A{+&Oo>-wRS4FCWD000000000V;i+5H5W;d*9b;72bvm6+|Jrz2 zmdf*7F~+Cf1 Date: Wed, 14 Aug 2024 01:15:53 +0800 Subject: [PATCH 10/10] feat: add chest scars to Onis and Felinids --- .../Entities/Mobs/Customization/Markings/scars.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index f4186295900..79e0a0ff012 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -22,7 +22,7 @@ id: ScarTopSurgeryShort bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Felinid, Oni] sexRestriction: [Male] followSkinColor: true sprites: @@ -33,7 +33,7 @@ id: ScarTopSurgeryLong bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Felinid, Oni] sexRestriction: [Male] followSkinColor: true sprites: @@ -44,7 +44,7 @@ id: ScarChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf] + speciesRestriction: [Human, Dwarf, Felinid, Oni] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi