Colored Drip 1 - Coats, Dresses, Jumpsuits and Skirts (#437)

cosmatic-drift-14 · Oct 8, 2024 · 92f87a2 · 92f87a2
1 parent a95819a
commit 92f87a2
Show file tree

Hide file tree

Showing 10 changed files with 102 additions and 5 deletions.
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -33,7 +33,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 3000
+  cost: 6460 # Cosmatic Drift
   category: cargoproduct-category-name-service
   group: market
 

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -42,6 +42,16 @@
     ClothingUniformJumpskirtColorDarkGreen: 2
     ClothingUniformJumpsuitColorTeal: 2
     ClothingUniformJumpskirtColorTeal: 2
+    # CD Below
+    ClothingUniformJumpsuitColorLightBrown: 2
+    ClothingUniformJumpskirtColorLightBrown: 2
+    ClothingUniformJumpsuitColorBrown: 2
+    ClothingUniformJumpskirtColorBrown: 2
+    ClothingUniformJumpsuitColorMaroon: 2
+    ClothingUniformJumpskirtColorMaroon: 2
+    ClothingUniformJumpsuitColorDarkPurple: 2
+    ClothingUniformJumpskirtColorDarkPurple: 2
+    # End CD
     ClothingUniformJumpsuitHawaiBlack: 2
     ClothingUniformJumpsuitHawaiBlue: 2
     ClothingUniformJumpsuitHawaiRed: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml
@@ -31,6 +31,17 @@
     ClothingNeckScarfStripedNonBinary: 3
     ClothingNeckScarfStripedRainbow: 3
     ClothingNeckScarfStripedTrans: 3
+    ClothingOuterWinterColorBlack: 6
+    ClothingOuterWinterColorPurple: 6
+    ClothingOuterWinterColorRed: 6
+    ClothingOuterWinterColorBlue: 6
+    ClothingOuterWinterColorBrown: 6
+    ClothingOuterWinterColorGray: 6
+    ClothingOuterWinterColorGreen: 6
+    ClothingOuterWinterColorLightBrown: 6
+    ClothingOuterWinterColorOrange: 6
+    ClothingOuterWinterColorWhite: 6
+    ClothingOuterWinterColorYellow: 6
 
   emaggedInventory:
     ClothingNeckScarfStripedSyndieGreen: 3

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -894,7 +894,7 @@
     clothingVisuals:
       outerClothing:
       - state: coatybits-equipped-OUTERCLOTHING
-        color: "#1d1d1d"
+        color: "#3f3f3f" # color changed to match other sprites, makes it slightly lighter - CD
       - state: winterbits-equipped-OUTERCLOTHING
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodWinterColorBlack

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
@@ -488,4 +488,4 @@
       jumpsuit:
       - state: equipped-INNERCLOTHING
         color: "#cc295f"
-      - state: trinkets-equipped-INNERCLOTHING
+      - state: trinkets-equipped-INNERCLOTHING
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
@@ -500,4 +500,4 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
+    sprite: Clothing/Uniforms/Jumpsuit/rainbow.rsi
diff --git a/Resources/Prototypes/_CD/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/_CD/Catalog/Cargo/cargo_vending.yml
@@ -12,6 +12,6 @@
     sprite: _CD/Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockQuickThreadsFilled
-  cost: 4500
+  cost: 5180
   category: cargoproduct-category-name-service
   group: market
diff --git a/Resources/Prototypes/_CD/Catalog/VendingMachines/Inventories/quickthreads.yml b/Resources/Prototypes/_CD/Catalog/VendingMachines/Inventories/quickthreads.yml
@@ -84,3 +84,19 @@
     ClothingEyesGlassesSunglasses: 2
     ClothingEyesGlassesAviator: 4
     BoxPridePins: 2
+    ClothingUniformJumpskirtBlackElegantDress: 4
+    ClothingUniformJumpskirtRedElegantDress: 4
+    ClothingUniformJumpskirtGreenElegantDress: 4
+    ClothingUniformJumpskirtBlueElegantDress: 4
+    ClothingUniformJumpskirtPurpleElegantDress: 4
+    ClothingUniformJumpskirtPurpleTurtleneckDress: 4
+    ClothingUniformJumpskirtRedTurtleneckDress: 4
+    ClothingUniformJumpskirtGreenTurtleneckDress: 4 
+    ClothingUniformJumpskirtBlueTurtleneckDress: 4 
+    ClothingUniformJumpskirtYellowTurtleneckDress: 4 
+    ClothingUniformJumpskirtYellowOldDress: 4
+    ClothingUniformJumpskirtCyanStripedDress: 4
+    ClothingUniformJumpskirtRedStripedDress: 4
+    ClothingUniformJumpskirtGreenStripedDress: 4
+    ClothingUniformJumpskirtPinkStripedDress: 4
+    ClothingUniformJumpskirtOrangeStripedDress: 4
diff --git a/Resources/Prototypes/_CD/Entities/Clothing/Uniforms/color_jumpskirts.yml b/Resources/Prototypes/_CD/Entities/Clothing/Uniforms/color_jumpskirts.yml
@@ -0,0 +1,30 @@
+# Dark Purple Jumpskirt
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtColorDarkPurple
+  name: dark purple jumpskirt
+  description: A generic dark purple jumpskirt with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    layers:
+    - state: icon
+      color: "#8100ac"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#8100ac"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#8100ac"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#8100ac"
+      - state: trinkets-equipped-INNERCLOTHING
diff --git a/Resources/Prototypes/_CD/Entities/Clothing/Uniforms/color_jumpsuits.yml b/Resources/Prototypes/_CD/Entities/Clothing/Uniforms/color_jumpsuits.yml
@@ -0,0 +1,30 @@
+# Dark Purple Jumpsuit
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitColorDarkPurple
+  name: dark purple jumpsuit
+  description: A generic dark purple jumpsuit with no rank markings.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    layers:
+    - state: icon
+      color: "#8100ac"
+    - state: trinkets-icon
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#8100ac"
+      - state: trinkets-inhand-left
+      right:
+      - state: inhand-right
+        color: "#8100ac"
+      - state: trinkets-inhand-right
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+    clothingVisuals:
+      jumpsuit:
+      - state: equipped-INNERCLOTHING
+        color: "#8100ac"
+      - state: trinkets-equipped-INNERCLOTHING