Merge pull request #136 from ShatteredSwords/DakoFix

Clothing Additions By DakoDemon

Resources/Prototypes/Catalog/Cargo/cargo_vending.yml

@@ -43,7 +43,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockAutoDrobeFilled
-  cost: 1730
+  cost: 2000 #FloofStation due to "Arbitrage"
   category: cargoproduct-category-name-service
   group: market
 

Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml

@@ -16,4 +16,8 @@
     ClothingOuterVest: 2
     ClothingBeltBandolier: 2
     ClothingEyesGlassesSunglasses: 2
+    # Floofstation - Departmental Socks ect
+    ClothingUniformBartenderThong: 3
+    ClothingUnderSocksBartender: 3
+    ClothingHandsBartenderWarmers: 3
 

Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml

@@ -13,3 +13,7 @@
     ClothingShoesBootsWinterChef: 2 #Delta V: Add departmental winter boots
     ClothingShoesChef: 2
     ClothingBeltChef: 2
+    # Floofstation - Departmental Socks ect
+    ClothingHandsChefWarmers: 2
+    ClothingUnderSocksChef: 2
+    ClothingUniformChefThong: 2

Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml

@@ -20,4 +20,8 @@
     ClothingOuterApronChemist: 2 # Realistic PPE apron for chemistry
     ClothingEyesGlassesChemist: 2 # Safety glasses
     ClothingHandsGlovesChemist: 2 # Heavy duty chemistry gloves
-    # End of modified code
+    # End of modified code
+    # Floofstation - Departmental Socks ect
+    ClothingHandsChemistsWarmers: 1
+    ClothingUnderSocksChemists: 1
+    ClothingUniformChemistsThong: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml

@@ -11,3 +11,5 @@
     ClothingHeadsetRobotics: 2
     ClothingOuterWinterRobo: 2
     ClothingShoesBootsWinterRobo: 2 #Delta V: Add departmental winter boots
+    ClothingOuterRoboOveralls: 2 #Floofstation - Add overalls
+    ClothingOuterPlainOveralls: 2 # Floofstation

Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml

@@ -24,9 +24,9 @@
     ClothingNeckScarfStripedRed: 3
     ClothingEyesBlindfold: 1
     ClothingNeckCollarSec: 1 # Floofstation - Collar addition
-    ClothingHandsSecurityWarmers: 1 # Floofstation
-    ClothingUnderSocksSecurity: 1 # Floofstation
-    ClothingUniformSecurityThong: 1 # Floofstation
+    ClothingHandsSecurityWarmers: 2 # Floofstation
+    ClothingUnderSocksSecurity: 2 # Floofstation
+    ClothingUniformSecurityThong: 2 # Floofstation
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
     ClothingShoesBootsCowboyBlack: 1

Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml

@@ -90,6 +90,15 @@
     ClothingMaskNeckGaiterRed: 2
     ClothingNeckBellCollar: 2
     ClothingOuterUnathiRobe: 1
+    # Floofstation - Departmental Socks ect
+    ClothingUniformMusicianThong: 2
+    ClothingUnderSocksMusician: 2
+    ClothingHandsMusicianWarmers: 2
+    ClothingHandsStripeWhiteWarmers: 1
+    ClothingUnderSocksStripedWhite: 1
+    ClothingUniformStripedThongWhite: 1
+    ClothingUniformMusicKingBlack: 2
+    ClothingUniformMusicKing: 2
   emaggedInventory:
     ClothingShoesBling: 1
     ClothingShoesBootsCowboyFancy: 1

Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml

@@ -27,6 +27,12 @@
        ClothingUniformColorRainbow: 2
        ClothingUnderSocksCoder: 1
        ClothingUnderSocksBee: 1
+       ClothingHandsBeeWarmers: 1 # Floofstation
+       ClothingHandsCoderWarmers: 1 # Floofstation
+       ClothingUniformThongCoder: 1 # Floofstation
+       ClothingUniformThongBee: 1 # Floofstation
   emaggedInventory:
       # 3 for more friends!
       ClothingUnderSocksCoderValid: 3 # Floofstation
+      ClothingHandsCoderValidWarmers: 3 # Floofstation
+      ClothingUniformThongCoderValid: 3 # Floofstation

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -1160,6 +1160,15 @@
       - ClothingHandsStripeWhiteWarmers
       - ClothingUnderSocksStripedWhite
       - ClothingUniformStripedThongWhite
+      - ClothingHandsCoderWarmers
+      - ClothingUnderSocksCoder
+      - ClothingUniformThongCoder
+      - ClothingHandsCoderValidWarmers
+      - ClothingUnderSocksCoderValid
+      - ClothingUniformThongCoderValid
+      - ClothingHandsBeeWarmers
+      - ClothingUnderSocksBee
+      - ClothingUniformThongBee
       # Floofstation - Department Socks, Armwarmers ect
       - ClothingHandsCaptainWarmers
       - ClothingUnderSocksCaptain

Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml

@@ -100,7 +100,7 @@
     sprite: Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi
   - type: Fiber
     fiberMaterial: fibers-synthetic
-    fiberColor: fibers-colorful
+    fiberColor: fibers-purple
   - type: FingerprintMask
 
 - type: entity

Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/MiscOuterwear.yml

@@ -53,3 +53,59 @@
     sprite: Floof/Clothing/OuterClothing/Misc/marshoodie.rsi
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHatHoodMarsHoodieHood
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterRoboOveralls
+  name: robotocist overalls
+  description: A simple pair of overalls, designed to go over a jumpsuit.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/OuterClothing/Misc/robooveralls.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/OuterClothing/Misc/robooveralls.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterPlainOveralls
+  name: plain overalls
+  description: A simple pair of overalls, designed to go over a jumpsuit.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/OuterClothing/Misc/plainoveralls.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/OuterClothing/Misc/plainoveralls.rsi
+
+#Cybercoats
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterCyberJacketYellow
+  name: yellow cyberjacket
+  description: a brightly coloured jacket, with a short crop.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketyellow.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketyellow.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterCyberJacketPurple
+  name: purple cyberjacket
+  description: a brightly coloured jacket, with a short crop.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketpurple.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketpurple.rsi
+
+- type: entity
+  parent: ClothingOuterWinterCoat
+  id: ClothingOuterCyberJacketWhite
+  name: white cyberjacket
+  description: a mono coloured jacket, with a short crop.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketwhite.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/OuterClothing/WinterCoats/cyberjacketwhite.rsi

Resources/Prototypes/Floof/Entities/Clothing/Uniforms/misc.yml

@@ -144,6 +144,8 @@
     tags:
     - Skirt
 
+
+#Other Outfits
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformSexCompRed
@@ -174,7 +176,7 @@
 
 - type: entity
   parent: ClothingUniformBase
-  id: ClothingUniforReotaSuit
+  id: ClothingUniformReotaSuit
   name: casual suit
   description: A rather casual looking suit
   components:
@@ -183,3 +185,24 @@
   - type: Clothing
     sprite: Floof/Clothing/Uniforms/reotasuit.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformMusicKing
+  name: musician king
+  description: A musicians outfit, fit for a king
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Uniforms/musicianking.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Uniforms/musicianking.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformMusicKingBlack
+  name: musician king black
+  description: A musicians outfit, fit for a king
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Uniforms/musiciankingblack.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Uniforms/musiciankingblack.rsi