From 9610b23d55fbcb5badd0114dd689b3d4d7178731 Mon Sep 17 00:00:00 2001 From: paige404 <59348003+paige404@users.noreply.github.com> Date: Fri, 9 May 2025 07:48:08 -0400 Subject: [PATCH] Rainbow Jumpskirt (#37291) * Add a rainbow jumpskirt. <3 * minor spelling mistake dot gif Co-authored-by: Tayrtahn --------- Co-authored-by: Tayrtahn --- .../VendingMachines/Inventories/pride.yml | 1 + .../Clothing/Uniforms/color_jumpskirts.yml | 12 ++++++++ .../Entities/Objects/Decoration/present.yml | 2 ++ .../Loadouts/Jobs/Civilian/passenger.yml | 9 ++++++ .../rainbow.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1586 bytes .../Uniforms/Jumpskirt/rainbow.rsi/icon.png | Bin 0 -> 620 bytes .../Jumpskirt/rainbow.rsi/inhand-left.png | Bin 0 -> 787 bytes .../Jumpskirt/rainbow.rsi/inhand-right.png | Bin 0 -> 735 bytes .../Uniforms/Jumpskirt/rainbow.rsi/meta.json | 26 ++++++++++++++++++ 9 files changed, 50 insertions(+) create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml index 92057ab21c..23d836b7c1 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml @@ -42,3 +42,4 @@ ClothingUnderSocksBee: 2 contrabandInventory: ClothingNeckScarfStripedLesbianLong: 2 + ClothingUniformJumpskirtColorRainbow: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml index 3f48b0260f..3add5b5875 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml @@ -489,3 +489,15 @@ - state: equipped-INNERCLOTHING color: "#cc295f" - state: trinkets-equipped-INNERCLOTHING + +# Rainbow Jumpskirt +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtColorRainbow + name: rainbow jumpskirt + description: A multi-colored jumpskirt! + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/rainbow.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/rainbow.rsi diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 9a08e3983e..de25ec9eb4 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -322,6 +322,8 @@ orGroup: GiftPool - id: ClothingUniformColorRainbow orGroup: GiftPool + - id: ClothingUniformJumpskirtColorRainbow + orGroup: GiftPool - id: ClothingUniformOveralls orGroup: GiftPool - id: ClothingUniformJumpskirtDetectiveGrey diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml index 535c2aacf3..edb9c8d1fc 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml @@ -48,6 +48,15 @@ equipment: jumpsuit: ClothingUniformColorRainbow +# Rainbow Jumpskirt +- type: loadout + id: RainbowJumpskirt + effects: + - !type:GroupLoadoutEffect + proto: GreyTider + equipment: + jumpsuit: ClothingUniformJumpskirtColorRainbow + # Ancient - type: loadout id: AncientJumpsuit diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..145f1b336a176ecbad8b9d17e152ed4014bdcfb5 GIT binary patch literal 1586 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5c552db8f043a758c040416b856ea902ef8880b4 GIT binary patch literal 735 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_q{y zo-U3d6>)E8?adZ(lsGp3bXEDrj~rEwM~*seiR6fIv1k!7lUgUjB0W|6Qm0ZzVq&6r zZcBr!*4B^u5q~n6%+!~7N6Zdx;SjP>$(mY`b8M!q-l@8R$voxO+~;*ppFOw7`1hXu zJ7+$c#~k6&z=8{jH11ZO!vv@ zN6valu1*x)e9rI6-$(aM?^Jx!TE%~B{{NQ`AC{>b*4-)a`6}1Nz0TCCK%X%_jIn&% z{bYbNr_tRIIGd}pn<@K~!z=HKm?92BPdY4Ndm|JK2W1n`u z!_lYn>*9}Re9_b6s`)2-cWqeqdcLc9$(9T5oe9k`n|`=+~Vy}N)-a1F74N2TCs}mNO7qaQ> z=(|z3oll?T-D4X$XEo`&|K~BM%T6}R`u@r^s2uYmujYicRcxWb|$H`=sS2-N2#6kX(N$X=3=>!rBP^)-(KkJgmrHJ-8A z+%CnQ?APYcYy2Nrd2Bomn23p_{iRvn3iDi ob6;2w-x|eSK6OT+4SfgVFW2OAA6F?_3QVyKp00i_>zopr03-W2&j0`b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/meta.json new file mode 100644 index 0000000000..f03ba648ea --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified by paige404 for SS14. Sprite adapted from https://github.com/space-wizards/space-station-14/blob/40044203e6ae7d7d2958c02e0d5e98dacdcd23d8/Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/, with coloration from https://github.com/space-wizards/space-station-14/tree/f46a6a8d813dd20f4a86d5d0bc4a0c70cbd821dd/Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} -- 2.51.2