Merge pull request Simple-Station#119 from Memeji/Clothing---Nikko

Clothing-Nikko
Mnemotechnician · Aug 19, 2024 · 8f0216c · 8f0216c
2 parents 41e6a16 + c9b45c2
commit 8f0216c
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 1 deletion.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -23,6 +23,7 @@
     ClothingUniformLoinCloth: 5 # FloofStation
     ClothingNeckCollarBlue: 1 # Floofstation - Collar addition
     ClothingNeckCollarBlack: 1 # Floofstation - Collar addition
+    ClothingNeckCollarPink: 1 # Floofstation - Collar addition
     ClothingLongcoatNT: 2 # Floofstation
     ClothingLongcoatAL: 2 # Floofstation
     ClothingLongcoatBrown: 2 # Floofstation

diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml
@@ -29,4 +29,4 @@
        ClothingUnderSocksBee: 1
   emaggedInventory:
       # 3 for more friends!
-      ClothingUnderSocksCoderValid: 3 # Floofstation
+      ClothingUnderSocksCoderValid: 3 # Floofstation
diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml b/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml
@@ -20,6 +20,17 @@
   - type: Clothing
     sprite: Floof/Clothing/Neck/collar_black.rsi
 
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCollarPink
+  name: pink collar
+  description: A cute pink collar.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Neck/collar_pink.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Neck/collar_pink.rsi
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCollarEpi

diff --git a/Resources/Prototypes/Floof/Loadouts/neck.yml b/Resources/Prototypes/Floof/Loadouts/neck.yml
@@ -101,6 +101,14 @@
   items:
     - ClothingNeckCollarBlack
 
+- type: loadout
+  id: LoadoutItemsNeckPinkCollar
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckCollarPink
+
 - type: loadout
   id: LoadoutItemsNeckSyndieCollar
   category: Neck

diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/equipped-NECK.png
diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/icon.png b/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/icon.png
diff --git a/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/meta.json b/Resources/Textures/Floof/Clothing/Neck/collar_pink.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Splurtstation (https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    }
+  ]
+}