From c6d935497ce26d957103685129c32d7c7ab8db0f Mon Sep 17 00:00:00 2001 From: nao fujiwara Date: Fri, 26 Apr 2024 14:51:26 -0400 Subject: [PATCH] spooky dress and hairstyle (#27333) * first draft loooong hair * *added the old dress item *added old dress to the theatrical performances create * updated spooky long hair name * fixed an oopsie made when updating item names --- .../Locale/en-US/accessories/human-hair.ftl | 1 + .../Catalog/Fills/Crates/service.yml | 3 +- .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 ++++++++ .../Customization/Markings/human_hair.yml | 7 +++++ .../olddress.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1260 bytes .../Uniforms/Jumpskirt/olddress.rsi/icon.png | Bin 0 -> 533 bytes .../Jumpskirt/olddress.rsi/inhand-left.png | Bin 0 -> 566 bytes .../Jumpskirt/olddress.rsi/inhand-right.png | Bin 0 -> 612 bytes .../Uniforms/Jumpskirt/olddress.rsi/meta.json | 26 ++++++++++++++++++ .../Customization/human_hair.rsi/meta.json | 4 +++ .../human_hair.rsi/spookylong.png | Bin 0 -> 755 bytes 11 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/human_hair.rsi/spookylong.png diff --git a/Resources/Locale/en-US/accessories/human-hair.ftl b/Resources/Locale/en-US/accessories/human-hair.ftl index 3a507ec6cf..f052f232de 100644 --- a/Resources/Locale/en-US/accessories/human-hair.ftl +++ b/Resources/Locale/en-US/accessories/human-hair.ftl @@ -55,6 +55,7 @@ marking-HumanHairCornrows2 = Cornrows 2 marking-HumanHairCornrowbun = Cornrow Bun marking-HumanHairCornrowbraid = Cornrow Braid marking-HumanHairCornrowtail = Cornrow Tail +marking-HumanHairSpookyLong = Spooky Long marking-HumanHairCrewcut = Crewcut marking-HumanHairCrewcut2 = Crewcut 2 marking-HumanHairCurls = Curls diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 141f98edab..38cd6975ee 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -20,7 +20,7 @@ - id: Plunger amount: 2 - id: BoxCleanerGrenades - + - type: entity id: CrateServiceReplacementLights parent: CrateGenericSteel @@ -88,6 +88,7 @@ - id: ClothingNeckCloakVoid - id: RevolverCapGun - id: BarberScissors + - id: ClothingUniformJumpskirtOldDress - type: entity id: CrateServiceCustomSmokable diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index aeebaca31c..998d462898 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -766,3 +766,14 @@ - state: equipped-INNERCLOTHING-jumpskirt - state: equipped-INNERCLOTHING-shirt color: "#b30000" + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtOldDress + name: old dress + description: A worn-looking dress from a very long time ago. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml index 449f8aa2cd..c2a7ac4ebf 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml @@ -397,6 +397,13 @@ sprites: - sprite: Mobs/Customization/human_hair.rsi state: cornrowtail +- type: marking + id: HumanHairSpookyLong + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: Mobs/Customization/human_hair.rsi + state: spookylong - type: marking id: HumanHairCrewcut bodyPart: Hair diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..a300332899cb9269e5bf050ec61f8b37b016aeda GIT binary patch literal 1260 zcmVPx(rb$FWRCt{2no(#QbsWdP-I5YxX_Dr^;7T6iob9@mI*>?+Sd?J34C2E<+7$%L zd{R(Ep*~oA*+cu%2cISpgwf7~u|RPR2vX#T#?dw)%|ekbgtb_VYc|>@w3YKA{Lj01 zx!nJ9NvHfj5EAZx{J!7&-T(e~x!(_9Fc=I5gTY`h8Ztc_6+@%Es5TZF<;CgQsOs30 ztbd9|eDLfUc(`uVnh1^ZqKE6o)hj#}meyL5goULw@#+;`Q-AR68PF!7L$7#vxDS8s z9wD7hA(4pV_u^w|+{1Mv9OmKo2jF&Dkyy@Q?9CT-#Xf2MhC9i{3B&|}h!f0ALaX&H zdQ1@Ud+TZR5BTBt2arg_5f1YJAc>Q4xmhz%)0fkXzUCSb8s){#%8nGgc+5#-BMHn zrv(IqK}8aXzK|(U>+60FAUxjt3&CJeb$dII>&VZ#QGMzJkZb>sgFQonW= zQT#^!)S#XLt9R4VZ$S_gW2xmNwE-Hm;>&%}K(z>#9vvXLn1Gk-LZP?^FV}_DyJ_6{ zHjB*qM$->Ijc_{bxc2!Jh6c{T<2#Sy{i=`R{VpUI6DU18ppI$iE)a{wP})C)^XX3M zyPf3o`D(&t`bG|(!C){L3Lc`>^IG7WE7$?H>ZDzL|Ye$mjE@937)_1U%bHA+_5~xm*^> z=hp3H%Ws9ZZYM>#rXG)4m{J?eZS6u7#gmd9*lIU8kzwMOKYmv-$_v}mqnv3x`q5XeansPWxk-A5L`avibi{a(h z-jZtbq(|WAAMVhGG7RxRw22oZ9t{13OD-mqwfX(Sw$|tK+a;7#JhZz{fx%$>_xT%P W({;BzlHRib0000Px$&q+i@f3ZaQZLlh)gT38)vT!TD^FNb%J)*#$xx#ND%J>SpsJU<@5#>Qrt zh;7HUNL0{_YLTd*#kS*ywO)+Sg!^YE;p05$l!!zH&BuALwkjZToS~9%SQ(T!&S-pi z7B7`L6eSHw67f`i*Xusc1D+QU2n4}0PDrT&R+bkn&22iUHJm^s2qc_9BVp+XNce3| z0RTOW=Y_U#Qg4+VNFWjwG?!Y^CoeZRy+(ptS6*&#x`azDb@hr7qh(fdmN2WD?bnZ+ORC`qRe7W@z~Z XaYDH68c3`_00000NkvXXu0mjfZTaLH literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a85d0a11e9b34c165ea3e90321f93071b342d6da GIT binary patch literal 566 zcmV-60?GY}P)Px$@JU2LRCt{2+ObOlVHgJR$H>8m%4`UV=5T8g8gx34gh=X!f@-j#KdGSxmkJJ1 z2;#;H2_mR1+JdNPP^^f)!QpE$QHX zvzkqd?iT=tr3xvfbhTDTBC*)=dLpriYOM~Xly=jEPIda4kui0lXltdEetP+697-u& zDB3L_=Wgo+vF{#M%1^Bb|d007+GUSMu^5|xKh06@81#$)9ZmuI%` zI)-70-vR;Q2E4t0!9FR8*KvFOAR;0nA|fIpA|j%{;3pREHPK+i$@HB#JE%ajeZA&$ zuQf#fZ!Z+>#s-`?I~EOlnhkJEY8F9!KEM%+hH+}2V{iXJYKb3f`JF`ogp;B67~4xM z?#1%j7It@XSW2f_n$S(t#jXKC5r6<15Oka^P3#(QbA9DI7WcFE z{7ky5_lh+jx1J4|8{0km@gp^hAbJ<*WsWa3i}3G#15U<3nJ6j_v;Y7A07*qoM6N<$ Eg0Us|i~s-t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/olddress.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6da567de572fe274dc39ef8e93e66ba43c74c5 GIT binary patch literal 612 zcmV-q0-ODbP)Px%9!W$&RCt{2+P_O1VHgMSZ%Q*nM2&F}Tbw!+w@e2abUFwIB!jmU)Io>-K@O$R zArw?NLIS07kfllp9D?0Sw?e7n5J@ZIGdR3X3Hfn}_u_la1-~D73HL&HzdYp44bKA* z5fKp)5fKp)5fQMpv#acaqq?8RnJ297oOZ!ckL6ATZHkCG_D)c(y0~iIU~ypv#iE1t z{2EfJRN!~wqFnKmPVSfe8zQ2vTlcW6T+hB`<#64)hlr>+7vagd?SiAq6;FwX`g3{H zSt6p!6|d)7#F1|97yTP^vr{;74*>v~bh5Jm;K)71-0W18`Hj%YJx~Dmpp;n2uHxrK z3jlgPSF)>c4@$B9`2*0-Jy3w>=FtM2pZWhIhjC$Z54;5c;K%npFZ=Sh?5y`$;O4MpK1%%5TSb)F(?%;i?Mieo6wrwYzcRR6uTM-cv5fKp)5fKs5 zF#WB1le9ZSy8ZX35)oA_I#^toiR8S%zQCw3$KDA5sP6vz#}E6Fw9JRK>OYr089O6% z=yn(Y@cl+-za1`URc)tkI-S_K%#+(7NCJCXk_6XO9~t3B8xH+_`=0000Px%tw}^dRCt{2nnALpAPhj`)GRoFOZx~MqPHHHZ6AUo=#rfab;aNOI7s`aO+e5u zud1tUyEGvL2nhf;r{X@Sl(Kl;wk`WTx#hDSR7zPXB>(_ut(W^L41ooiE3Y1}tS=~3ryxrRi z*#rE>=fLl6{LSeEk^#=pc!2j=KiewclG`X;E;$LtglvE_^t8Y3hr|KD$^$r?vS
AKed2l95NYyiuQ1sj4%0}pX6{(tKB{jy1fB* zW3BxdVWrp%eHvy;seD5q#mW%7Jb(KkPz;b;f!y5Q0J}+<_To|kp>HV1^>!N|*BQXm lk@KA3C(f)}p-?ECk}qK>ZBHrb_$UAX002ovPDHLkV1oZvSQ7vM literal 0 HcmV?d00001