Merge pull request Simple-Station#105 from Fansana/Nikkos_Toybox

Collar Me Surprised

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

@@ -15,3 +15,4 @@
     ClothingOuterWinterMiner: 2
     ClothingNeckScarfStripedBrown: 3
     ClothingShoesBootsWinterCargo: 2
+    ClothingNeckCollarLogi: 1 # Floofstation - Collar addition

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

@@ -19,3 +19,4 @@
     ClothingNeckScarfStripedCentcom: 3
     ClothingShoesBootsWinterCentCom: 2 #Delta V: Add departmental winter boots
     ClothingNeckCloakCentcom: 3
+    ClothingNeckCollarCC: 3 # Floofstation - Collar addition

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

@@ -21,6 +21,8 @@
     ClothingHandsGlovesColorBlack: 4
     ClothingEyesGlassesCheapSunglasses: 2
     ClothingUniformLoinCloth: 5 # FloofStation
+    ClothingNeckCollarBlue: 1 # Floofstation - Collar addition
+    ClothingNeckCollarBlack: 1 # Floofstation - Collar addition
     ClothingLongcoatNT: 2 # Floofstation
     ClothingLongcoatAL: 2 # Floofstation
     ClothingLongcoatBrown: 2 # Floofstation

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

@@ -16,3 +16,4 @@
     ClothingOuterWinterEngi: 2
     ClothingNeckScarfStripedOrange: 3
     ClothingShoesBootsWinterEngi: 2
+    ClothingNeckCollarEngi: 1 # Floofstation - Collar addition

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

@@ -22,6 +22,7 @@
     ClothingHeadHatSurgcapBlue: 4
     ClothingHeadHatSurgcapPurple: 4
     ClothingShoesBootsWinterMed: 2
+    ClothingNeckCollarMed: 1 # Floofstation - Collar addition
   contrabandInventory: #DeltaV
     UniformScrubsColorCybersun: 1 #DeltaV
     ClothingHeadHatSurgcapCybersun: 1 #DeltaV

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

@@ -14,5 +14,6 @@
     ClothingMaskGas: 3
     ClothingOuterWinterSci: 2
     ClothingNeckScarfStripedPurple: 3
+    ClothingNeckCollarEpi: 1 # Floofstation - Collar addition
     ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
     ClothingShoesBootsWinterSci: 2

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

@@ -23,7 +23,8 @@
 ##    ClothingOuterArmorBasicSlim: 2
     ClothingNeckScarfStripedRed: 3
     ClothingEyesBlindfold: 1
+    ClothingNeckCollarSec: 1 # Floofstation - Collar addition
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
     ClothingShoesBootsCowboyBlack: 1
-    ClothingHeadHatCowboyBlack: 1
+    ClothingHeadHatCowboyBlack: 1

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

@@ -15,6 +15,7 @@
     ClothingNeckScarfStripedSyndieGreen: 2
     ClothingNeckScarfStripedSyndieRed: 2
     ClothingShoesBootsWinterSyndicate: 2
+    ClothingNeckCollarSyndi: 1 # Floofstation - Collar addition
 
   emaggedInventory:
     ClothingOuterCoatSyndieCapArmored: 1

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

@@ -1142,6 +1142,8 @@
       - CarpetPurple
       - CarpetCyan
       - CarpetWhite
+      # Floofstation - Collars
+      - ClothingNeckCollarCmd
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - ClothingHeadHatCentcomcap

Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml

@@ -0,0 +1,109 @@
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCollarBlue
+  name: blue collar
+  description: A cute blue collar.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Neck/collar_blue.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Neck/collar_blue.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCollarBlack
+  name: black collar
+  description: A cute black collar.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Neck/collar_black.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Neck/collar_black.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCollarEpi
+  name: epistemics collar
+  description: A collar showing how loyal you are to science!
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Neck/collar_epi.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Neck/collar_epi.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCollarEngi
+  name: engineering collar
+  description: A collar showing your deft skill utilizing your hands!
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Neck/collar_engi.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Neck/collar_engi.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCollarLogi
+  name: logistics collar
+  description: Who's a good courier?
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Neck/collar_logi.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Neck/collar_logi.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCollarMed
+  name: medical collar
+  description: Put your patients at ease by letting them know you're here to help.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Neck/collar_med.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Neck/collar_med.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCollarSec
+  name: security collar
+  description: Be the best guard dog on the station!
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Neck/collar_sec.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Neck/collar_sec.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCollarCmd
+  name: Captain's collar
+  description: The top dog (or cat) around.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Neck/collar_cmd.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Neck/collar_cmd.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCollarCC
+  name: CentCom collar
+  description: All bark with a whole lotta bite.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Neck/collar_cc.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Neck/collar_cc.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCollarSyndi
+  name: Blood-Red collar
+  description: Sometimes you gotta be naughty.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Neck/collar_syndi.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Neck/collar_syndi.rsi

Resources/Prototypes/Floof/Loadouts/neck.yml

@@ -5,3 +5,106 @@
   exclusive: true
   items:
     - ClothingNeckCloakMoth
+
+# Collars
+- type: loadout 
+  id: LoadoutCommandCapCollar
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Captain
+  items:
+    - ClothingNeckCollarCmd
+
+- type: loadout
+  id: LoadoutCargoNeckCollar
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - CargoTechnician
+        - SalvageSpecialist
+        - Quartermaster
+  items:
+    - ClothingNeckCollarLogi
+
+- type: loadout
+  id: LoadoutEngineeringNeckCollar
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - StationEngineer
+        - AtmosphericTechnician
+        - ChiefEngineer 
+  items:
+    - ClothingNeckCollarEngi
+
+- type: loadout
+  id: LoadoutMedicalNeckCollar
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - MedicalDoctor
+        - Paramedic
+        - ChiefMedicalOfficer
+        - MedicalIntern
+        - Brigmedic
+  items:
+    - ClothingNeckCollarMed
+
+- type: loadout
+  id: LoadoutScienceNeckCollar
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Scientist
+        - ResearchAssistant
+        - ResearchDirector
+  items:
+    - ClothingNeckCollarEpi
+
+- type: loadout
+  id: LoadoutSecurityNeckCollar
+  category: Jobs
+  cost: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+         - SecurityOfficer
+         - Warden
+         - HeadOfSecurity
+  items:
+    - ClothingNeckCollarSec
+
+- type: loadout
+  id: LoadoutItemsNeckBlueCollar
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckCollarBlue
+
+- type: loadout
+  id: LoadoutItemsNeckBlackCollar
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckCollarBlack
+
+- type: loadout
+  id: LoadoutItemsNeckSyndieCollar
+  category: Neck
+  cost: 3
+  exclusive: true
+  items:
+    - ClothingNeckCollarSyndi

Resources/Prototypes/Recipes/Lathes/clothing.yml

@@ -1282,3 +1282,12 @@
   completetime: 1
   materials:
     Cloth: 100
+
+# Floofstation - Collars
+- type: latheRecipe
+  id: ClothingNeckCollarCmd
+  result: ClothingNeckCollarCmd
+  completetime: 2
+  materials:
+    Cloth: 100
+    Durathread: 50

Resources/Textures/Floof/Clothing/Neck/collar_black.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
+    }
+  ]
+}

Resources/Textures/Floof/Clothing/Neck/collar_blue.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
+    }
+  ]
+}

Resources/Textures/Floof/Clothing/Neck/collar_cc.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
+    }
+  ]
+}

Resources/Textures/Floof/Clothing/Neck/collar_cmd.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
+    }
+  ]
+}

Resources/Textures/Floof/Clothing/Neck/collar_engi.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
+    }
+  ]
+}