From 2b885272c864bc256ff7cdf88b7ecdd0b48ed6de Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 19 Jun 2024 16:06:03 +0200 Subject: [PATCH] Musician's skirt (#29203) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * Sprites&Meta * Changing prototypes * Adding to Theater vend * Sprite_Change * Sprite_Change * Prototype_Changes Is this exactly how it should be?... * FUCKING FIX * weh --------- Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com> --- .../en-US/preferences/loadout-groups.ftl | 1 + .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 ++++++++ .../Loadouts/Jobs/Civilian/musician.yml | 19 +++++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 7 +++++ .../Prototypes/Loadouts/role_loadouts.yml | 1 + .../Roles/Jobs/Civilian/musician.yml | 1 - .../musician.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1134 bytes .../Uniforms/Jumpskirt/musician.rsi/icon.png | Bin 0 -> 451 bytes .../Jumpskirt/musician.rsi/inhand-left.png | Bin 0 -> 658 bytes .../Jumpskirt/musician.rsi/inhand-right.png | Bin 0 -> 646 bytes .../Uniforms/Jumpskirt/musician.rsi/meta.json | 26 ++++++++++++++++++ 11 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/meta.json diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index a107ee24f8..ef0937c910 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -66,6 +66,7 @@ loadout-group-mime-jumpsuit = Mime jumpsuit loadout-group-mime-backpack = Mime backpack loadout-group-mime-outerclothing = Mime outer clothing +loadout-group-musician-jumpsuit = Musician jumpsuit loadout-group-musician-outerclothing = Musician outer clothing # Cargo diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 5ef711556b..d105d4cd77 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -832,3 +832,14 @@ sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/olddress.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtMusician + name: musician's skirt + description: A fancy skirt for the musically inclined. Perfect for any lounge act! + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/musician.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/musician.rsi diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml index 486ff25d47..eae05d2005 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml @@ -1,3 +1,22 @@ +# Jumpsuit +- type: loadout + id: MusicianJumpsuit + equipment: MusicianJumpsuit + +- type: startingGear + id: MusicianJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitMusician + +- type: loadout + id: MusicianJumpskirt + equipment: MusicianJumpskirt + +- type: startingGear + id: MusicianJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtMusician + # Outerclothing - type: loadout id: MusicianWintercoat diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index cc0aefb69c..3d4583a063 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -429,6 +429,13 @@ loadouts: - MimeWintercoat +- type: loadoutGroup + id: MusicianJumpsuit + name: loadout-group-musician-jumpsuit + loadouts: + - MusicianJumpsuit + - MusicianJumpskirt + - type: loadoutGroup id: MusicianOuterClothing name: loadout-group-musician-outerclothing diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 0e80113ce3..5f0ec2b274 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -137,6 +137,7 @@ - type: roleLoadout id: JobMusician groups: + - MusicianJumpsuit - CommonBackpack - MusicianOuterClothing - Glasses diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index 58335ba52d..5d01cd4938 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -17,7 +17,6 @@ - type: startingGear id: MusicianGear equipment: - jumpsuit: ClothingUniformJumpsuitMusician eyes: ClothingEyesGlassesSunglasses shoes: ClothingShoesBootsLaceup id: MusicianPDA diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..78b2c2ea5dbee201f4e29a1eb776bc1f8a414c0f GIT binary patch literal 1134 zcmV-!1d;oRP)3~KjEN7?ph41{_if&slfAvWop*PMff>l#o!OoFX21R6d3(mFC_NwcIfpT)~{^u5YhB z`u=lmz-=q518;QrViIO;<9$-+_Sh)G4uk0#-f3tBm!T-2AXGz%E+2-Rn&@p(lLx2yz5d2&MI0_wXS*w8T)Q|gC zQKz_DzrUHm!GGHgv7y5bp?+2g_$efSX4Mz#!M#U5v$f^#$|{q0NdEj3-*NSI&BgP$0m5VDK(d+|1cm)6)C+nG!N%L!a(;Oda zrpnLj3y2x~5Q5I3LioUi_)6p#iwM8)5JW^0u%0JH?RmZ-ZAI~m+I<*7D}dO?(#sO8 z3bgk#3t2JAUMGGK0lj_geYB;4BUw6_sy+wm#1|cc7$jx`rBA9JxDVr?@qIa|O&L%I zlmTTx8Bhk40cAiLPzIC%Wk4BF29$wA#XzYyLUZ%4>|n>o#|QAHW5hgBXN$^@8?%9ezI4>GEdpoLUp~1x@Q0umZ`#)H%B7ize!{hQg<-lziI0%7Aa|j}Um_MlR19k_t z`xstz4nYL;mbCYT-H-1BKtNqN1fKy&0z&^8+12*`*0uNdqWm8@xH+k=3@8K2fHH6x z8Tbo#yHZoU@@}gD000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f*QC6 AJOBUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..48c415163267176464dfe9fba198fd9330b5fa59 GIT binary patch literal 451 zcmV;!0X+VRP)T?c-|Z#F#1k2a3`7PZ0|5*)8=V55EXxX62AgBjuhF+ONyx!~ zEU=&RWUWj00^qI6n%rEE%iQF1)ybl5Y1q1No5}PMG}~pyS0@X+49H|# zAN0>`SFr75psbsumKnhFm;SQ4DxaDG+~{O?pKd%4I~|UwFKoOCh-+@X1QWzSv(cj3 z!`_M6sVC<1E2qJbIEd#TGt#wRDgeCwYQ3!N3lNBdg`ZPsFQN*-Z?nyxjzqzO;p6SK t!%;&&E>N_`^^8LXYv;wh$iV++;2RkXndURVXlnof002ovPDHLkV1fbl$%p^| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5919ab9cff200bf1d1af06740d97bbf8b67f8d2a GIT binary patch literal 658 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV2bo~aSW+od^^k5o7qvI&3~h~ zi&B9`id9R(T->MqG%yv3v9Fr^kN1GrDrL#zI`${ASn7$ZO%cUJLzVA4REc%bR+& z>RO!{gG%|O{W@{W7BjuQ{d>`^kN*z-40;xBn2vX62r zd7X20#jNGm&diGM+WfP^^~=|HeD3@=awC5!hWoP34T)}y`eyK(_k!RH*&{U;*EVge zTOr+-{A=ZFJ%$ax_n!UxNucHN<;SZp+4H%cdA(g(EMoTB8S7H-vNl-6)%a+0c*rHc zew?{lw{4BF15bVZ{;TKZpG`cFW2d=n{dv!Hhc4ZTA9GeapE;ayclA2{?Rs`j(P7rH zH9^x@JQ{GL15O8mgfCq659W0YzrRjg*{buy{aaPK+vPXQMqmGTm$76m=Y@kyzD%4G zZp-v%CzC@#Y!*|H&^4nC??d|)%I-2GJWmXH_x0lcUg_A};F_yf1u`s;T>7%(4)38I zOVt)=u2@!CYrAa!XPNtX`3)>{z2cq}-?|WP;kWTEo5FH61=RrE=DXilxfd`uFcfDq zl}ysC?U!QOZp^?Koy`<9>8jDZuN?b>y}qW~e%t@K2h6 S-oOD&YYd*QelF{r5}E+C79%GB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/musician.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..988fda91fabdaf886430b2c45229ac0112d46b09 GIT binary patch literal 646 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVDj~JaSW+od^^j~+u2ay_~ISh zN}_KSEJ9>ScJuv%{7>KAJG!>{!ojs3-6CCAw|=Vsa>(>-wf@TYKZAax zXB18Me)n#=Nvqni4HFnRaiN9-XRkiKqq=eX?Rmeytc&$3iac|BUxML@<>IlC`)@1_ zd46;c6GNN$-RRGTax?Ot-)j2tYhI-7ug_{ZRxfYNn9iWE^4r0gm2d55KYVdkW}8*y zqP=nXbu}fkp0e5gN}R6L0#@U!qQSbG;pxMFnyX#g7QEeb&c#mU*o7J8C3hyjEbva* zyX)^k?y%@xJ=->)IwG~uaQz#Gx$V18ty_~DoVnX@*Cy%Z;tXN?x7H^W+*lYh?|!Oj z%8Re>PFM;3>gc`6?eJ;l-yU5SA0ErELeifvNh+Mw-S_yLx zYkptQdtLrE`H9tYKBfkS0^=)3W;fd0H)QC}@n%$LSay%+$xl5mjcw~i7}Tzqui5zh z{YJ)}-|X)H679&A*RFog_EqIq6sNXQ?ZWTxllJ??KB=DjvnIKztU+!?I7?OdwQZr> zUw;tgVOV|t3dr1020k{0b4l;-r^bkG{T6$)X2#+#JOb|B?-$!LFW}!Wfz^j()HIxmub1+)Sy)c*QvmFXA~@