From 5da795281b027fde0275c43effc35b276e0fa326 Mon Sep 17 00:00:00 2001 From: ZeroDiamond Date: Sun, 14 Aug 2022 01:17:37 -0400 Subject: [PATCH] Musician's Tuxedo & Musician's Winter Coat (#10460) --- .../VendingMachines/Inventories/theater.yml | 1 + .../Clothing/OuterClothing/wintercoats.yml | 11 ++++++++ .../Entities/Clothing/Uniforms/jumpsuits.yml | 11 ++++++++ .../Entities/Structures/Machines/lathe.yml | 2 +- .../Prototypes/Recipes/Lathes/clothing.yml | 6 ++-- .../Roles/Jobs/Civilian/musician.yml | 2 +- .../coatnomi.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 989 bytes .../WinterCoats/coatnomi.rsi/icon.png | Bin 0 -> 554 bytes .../WinterCoats/coatnomi.rsi/inhand-left.png | Bin 0 -> 387 bytes .../WinterCoats/coatnomi.rsi/inhand-right.png | Bin 0 -> 391 bytes .../WinterCoats/coatnomi.rsi/meta.json | 26 ++++++++++++++++++ .../musician.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1441 bytes .../Uniforms/Jumpsuit/musician.rsi/icon.png | Bin 0 -> 366 bytes .../Jumpsuit/musician.rsi/inhand-left.png | Bin 0 -> 511 bytes .../Jumpsuit/musician.rsi/inhand-right.png | Bin 0 -> 511 bytes .../Uniforms/Jumpsuit/musician.rsi/meta.json | 26 ++++++++++++++++++ 16 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 2a15090326..5572e82057 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -5,6 +5,7 @@ startingInventory: ClothingOuterWinterClown: 1 ClothingOuterWinterMime: 1 + ClothingOuterWinterMusician: 1 ClothingMaskJoy: 2 ClothingHeadHatCardborg: 2 ClothingOuterCardborg: 2 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 6f3a11694f..d801bc815a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -284,3 +284,14 @@ Slash: 0.8 Piercing: 0.6 #slightly less bulletproof than wardens normal coat Heat: 0.75 + +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterWinterMusician + name: musician's winter coat + description: An oversized, plasticine space tuxedo that'll have people asking "do you know me?" + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coatnomi.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coatnomi.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 4881e73efe..5e1d7d4384 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -822,3 +822,14 @@ sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitMusician + name: musician's tuxedo + description: A fancy tuxedo for the musically inclined. Perfect for any lounge act! + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/musician.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/musician.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 180804b7b6..74203e7fc2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -432,7 +432,7 @@ - ClothingUniformJumpskirtMedicalDoctor - ClothingUniformJumpsuitMime - ClothingUniformJumpskirtMime - - ClothingUniformJumpsuitLawyerPurple + - ClothingUniformJumpsuitMusician - ClothingUniformJumpsuitParamedic - ClothingUniformJumpskirtParamedic - ClothingUniformJumpsuitPrisoner diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index bde7f8b5d6..797a1f9df0 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -401,11 +401,11 @@ Cloth: 300 - type: latheRecipe - id: ClothingUniformJumpsuitLawyerPurple ##Musician + id: ClothingUniformJumpsuitMusician icon: - sprite: Clothing/Uniforms/Jumpsuit/lawyerpurple.rsi + sprite: Clothing/Uniforms/Jumpsuit/musician.rsi state: icon - result: ClothingUniformJumpsuitLawyerPurple + result: ClothingUniformJumpsuitMusician completetime: 4 materials: Cloth: 300 diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index d3dc43046c..b0d1db3078 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -16,7 +16,7 @@ - type: startingGear id: MusicianGear equipment: - jumpsuit: ClothingUniformJumpsuitLawyerPurple + jumpsuit: ClothingUniformJumpsuitMusician back: ClothingBackpackMusicianFilled eyes: ClothingEyesGlassesSunglasses shoes: ClothingShoesColorBlack diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..d89406f883b8da8ed0df286c7ac27f600c4ca68a GIT binary patch literal 989 zcmV<310wv1P)V=-BOpRWM@dc~L`_Kwc4cyNX>V>IJs>nLFbWBGX=HS0AUz;6G71T3Woc(< zbRaz-GcpQubYXO5AUz-=Y+-kKWpZC)Y;|Q{b0P`}WNC79AUz;73JGR%VQpn|AUz;4 z3L_vzPDCI?O-Ty0OLzwW000McNliru<_HM`1RJgXD+r9>D>_ zX;f1H000DMK}|sb0I`n?{9y$E00QYrL_t(|+U=S#i_}0Eh9_A&6~W?Gy~4^9J=b-? z(o*jP3mY2?{Q>q?7J499_%r+k{t34^SnveV&SDiU1UW?x4p!gb8^*b8GG8`dF00=I zA+t#~@B4k3oy^XRbB19UhG7^+94Ak#&LqdXPEr==)xmAI_57Z@ba{{;KYQkUUjF)R zn)rc#`1meA_vZDEd;IW)+unJZT_-g*PoMXmOeXo~(P&h7O^p7LDkHc_kqMeC`VPgL zphzF(B0qKX(|IS5HDs@hr_Uahp0E4#WA&?u(NC*x^6AU_ESt!xA2>EtJ(dZxkMA`> zk$xFc{a)G0pL@Go`}=!Ok|cH8ucmH&c* zYd`%meQ3r6AFJQ1x*#-h_x|RA-ycjh9lSINb%F=cCeh%n_Aj{8D{EP!1ds?;O^x8& z&=(o?O#m2SYpWT&roK1uiFN{-*01abgix5TD2SuO5*pE>Y5nK~_|*?$5QPbf zvs(UUrricKsbAR-@S!+?I0;OsprK#85u~8MZ?h3>N?+6l{JHso{(l?6Yw3#{!O#R7 z9_`?}qW>3%JqB>t`i5Z`hG7_nVHk$-ztiS_^Cq=KBSN7t*8?0sdMx32?U5PZ!|spo zS=nE+03;s7!{P)3kq|}_V1y<#lQ1uM4vl+6dk_taWBiR9$L3)moI2McoQC&<_q|CF zB_K>jI0w%)16puBg3qEeQgug#^XiBvaO>usJovJuD~rN=LkpUI)en8CB*6b&ad?`u zG1|e0Ng&~TK&!*!$o63E`V4z)np@Xag;OW_S^z6A*TU{NOo5i}RXY;-WPIMahwP5U&qF!^6)T*B<2MHr5Bw zgWvz~J;0mP!&0pe(D1NS>jN}AEZzEmu6W4k!u)&}JQ#*y7|Y5psSL2oSnVe=00000 LNkvXXu0mjf>EO1a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6da884441add9a3e956a78c472a2e8bc0a082daa GIT binary patch literal 554 zcmV+_0@eMAP)Bex7zUUKIi$XHF~gNhmvK50n>a{4NFOl(rvu)7e9Cy{@1$>iwzA88P1h8uMCN9pPZ=lb>%)|s1 z2hpThP7uISH7F!>)m*S9O7uhrQU^;L#N-M_e3nZ|i7-5S_6AJ*dU~Nm2MBM*rfC`l&}_*F%8uxA=-CfnwxbAu9C7s6MR*Me sD|A2@Bu>@pm>58)svQNRU=$Do05u6fZUdGt{{R3007*qoM6N<$f-Ya%=Kufz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..faaf27228f884290c661bfafd2381281b580d912 GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=>?NMQuI$e^IGL?Aygsad4;11o z@Q5sCV30cm!i;$rO6`DxEa{HEjtmSN`?>!lvNA9*3VFIXhE&{odrOh~kb}s9kHT-7 zj&9JC5My&&9PyXKtoi=IC)+pt6nyhdG%@jPo~X;&%jP>0_vF4eGC_R{}Z?mH|DW$9(>N?5)0s>8#jj*GaXctsrNH!P6W*wW>|%zELJ Y_+?LF!?~|~EkR~@y85}Sb4q9e0N8+?NMQuI$e^I9V7B#nb*x0t#^! zctjR6FvuMOVaB`*rFK9;mUKs7M+SzC{oH>NSs54@#XMacLn>~)y|tI?kb%H~k0N(i z#o5abE_6P4F)*f<#hm^A!IRqyJ`3KtyPHFH*UsHsi_TruULvycLchc0U;iC1#Jnu@ zOcwXo1R4zj^_dssRl9GhRqmPha>CBO*E3?S7v7dw8L!utI79V<^E09Cr5}A?ec#9Y zuVUUCerr+JKr!wnhqd9+qVaz7HqDv%OSSXO3^}9x>cmj(UxM1$!Hn)?X7Y22tV9)qp~uvgR{P2g)p9WPH(L Z-eVwactvs*Fr*k5JYD@<);T3K0RRyGo<9Hp literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json new file mode 100644 index 0000000000..af6075230c --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Ian M. Burton, based on the iconic Klaus Nomi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..23329b724522f45f640fea14c18b554fb3f7a695 GIT binary patch literal 1441 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!%1c}$N?cNllZ!G7N;32F7?c&9 zT-`nW6kL2gxyn+Dih*JZwhAVC23(xwnJFb1K#s8y7iUIlW_m^mgi~CSSdt24D&-`W zSEd%lC*_o;#uqDbai(Mz6@xT$ai$d|=B9$!hFr=Du6{0H8d@BeIx*LGBO;Gv-|=wF3&Wq&xaLGB9lH=l+w(%D}+P5a1Ky3KSRO zmzEaS)KIq7RdX@Z3$ihZakI&~t*Sb0+O*xfchB1T{P^+Xw{PG6{Phb^@hBJ#f#DPa zJ1$#U0R6*L666>B9|0JI?w>oyz`)q)>EaktaqI20yG2J7I9iLF^zQm@djEfi?TfP6 z@(EVC`bC1qMt&3YHCSYq*>8Ku6w~mZjiLOMwZIwH0I!2#`Ss^ZV^}rg z_F}!p^*8f;4>6k9&igDZ|4MMzU+xW;)-!0xI*7+IXq|n#vVdX3)2*%n1q-X0TJl#b zWC!$O~(e?qmT-Z)l z!2@qtPs=bqYkd`a_dZj_hYiOW;_OnwMfw@eGCXx}5Mr$O^o+sUf|JA9+JxbeuSx3@ zxf9oI#1ooQ?LRs^u{C5e@E3CUU$KY%a!R0|P-oWe3>F6KZAQQSJo>gxJ9C@+%s$R- noi&Uy44Wi&82g0@*I%|{jD0%SDkv@W6)5p}0!zSkP6NS%Lh&o-U3d6}OTTBv=>G^LNS&dKr^59~uaR@)#D)hF+nL*ltFDing;nDmX3d=26 z99BxFN$RjT)J(9jY*-?~&GciF*h)*FFPj1lxZDmdU|^7N$ouKm=kgmE5DcEKelF{r G5}E++fQ9P- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..4896ed18ac48c9bcc1ac51c4e9845283d1970c8a GIT binary patch literal 511 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=>?NMQuI$e^IGIIxYQH!M0fjgV zJR*x37~~FtFk{|@Qahj^OS+@4BLl<6e(pbstPBi{eV#6kAr-gY-rDbVI6#E$L&%&M zmi8vAlGVZO4gC)kEI1y$dlvmes#5CvgEtCg#VZyyE4-5V%e7s`Deuf#TlH_#-m@?L zS^Qh@++JUA|IIxeFyQp|tz1}zh-=`_b6-!cmUpk4zsD?kBje_mo~1U{`LfNQCBDm7 zE@M65suL$4_PcUkdQsV_O)6O;NQ8h@)>JE+`VV_ip3XuzW%8Q)bJpUX|tK7MO5Bn$=|;pXMXU> zd_Gg0p=R@?@@-o_1I>$#zq_V%-WJ)FWR2EyPZs^~`{R~t zl|fgyCOqjqc~;`y`r7=6Ta_*_zY*-Ndlqs*Ue9h9IBMA!|*|Sh}CRbX(If<5^~qw!@{Y rd8@wMXutM!^}1{S**h{e|7AEcks;}o&$T>YOfh)6`njxgN@xNA@WSX^ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/musician.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..60005dc4d1cbfbb0f9109256f9e1dde29b4c2848 GIT binary patch literal 511 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=>?NMQuI$e^IGH7^*dMGs1{C5f z@Q5sCV30cm!i;$rO6`DxEa{HEjtmSN`?>!lvNA9*_IbKEhE&{od(+VSu!98KgX|Me zlq^K9ER2rr5%{2P!NJ$GWB1M<(to6Xn!Y=Dl`F}-UCWAN(YcG}6AIdPKU-(Jqvn%c zz@;baPR`cP zeWdtF?e1LNIQd&&H|gBwU)WVSZ+r3#@!cGE_ncTBpKH5c_x*gP7uL>K{rb*def~YX zRo2$l{@Uy9k9i;ek?^UUC|o)5wrYOTt&gW~->JH=`C`h;3ZB){el+t$>eYJIQHJ_IKI`#W_QcLRh@?x|72hCDv zNe6fA@hd;@{=EB};;)Y;n{VZP!QZ!R(GNS`w~QL5`hrk!@q*`TiQPqi!y`hDTVyaU zDeb9US}U9*`}p_nnYZjuypof#+7RCMQ^=y0)gkJ*MFmJjvp55obWmTLoOAiNz?5r- q-?n~|RRHm-*