From ecb74e8568f92147234e89fa65c3855d94d4269d Mon Sep 17 00:00:00 2001 From: Angelo Fallaria Date: Tue, 13 Aug 2024 23:10:43 +0800 Subject: [PATCH] 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