From: paige404 <59348003+paige404@users.noreply.github.com>
Date: Fri, 9 May 2025 11:48:08 +0000 (-0400)
Subject: Rainbow Jumpskirt (#37291)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=9610b23d55fbcb5badd0114dd689b3d4d7178731;p=space-station-14.git

Rainbow Jumpskirt (#37291)

* Add a rainbow jumpskirt. <3

* minor spelling mistake dot gif

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
---

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 0000000000..145f1b336a
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/icon.png
new file mode 100644
index 0000000000..5d80118067
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/inhand-left.png
new file mode 100644
index 0000000000..34145fadf5
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/inhand-left.png differ
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 0000000000..5c552db8f0
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/rainbow.rsi/inhand-right.png differ
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
+    }
+  ]
+}