vend tweaks and clothes (#14961)

2023-03-31 14:31:51 +10:00
parent be2d3c4277
commit dbf9f71ee8
66 changed files with 380 additions and 24 deletions
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
@@ -45,15 +45,43 @@
       - id: ClothingUniformJumpskirtChemistry
         amount: 1

-# - type: entity
-#   id: WardrobeGeneticsFilled
-#   suffix: Filled
-#   parent: WardrobeGenetics
+ - type: entity
+   id: WardrobeGeneticsFilled
+   suffix: Filled
+   parent: WardrobeGenetics
+   description: "The sleek blue threads contained within make you much less likely to be thrown out of the genetics lab."
+   components:
+   - type: StorageFill
+     contents:
+       - id: ClothingUniformJumpsuitGenetics
+         amount: 1
+       - id: ClothingBackpackGenetics
+         amount: 1
+       - id: ClothingShoesColorWhite
+         amount: 1
+       - id: ClothingOuterCoatLabGene
+         amount: 1
+       - id: ClothingUniformJumpskirtGenetics
+         amount: 1

-# - type: entity
-#   id: WardrobeVirologyFilled
-#   suffix: Filled
-#   parent: WardrobeVirology
+ - type: entity
+   id: WardrobeVirologyFilled
+   suffix: Filled
+   parent: WardrobeVirology
+   description: "The sleek green threads contained within make you much less likely to be thrown out of the virology lab."
+   components:
+   - type: StorageFill
+     contents:
+       - id: ClothingUniformJumpsuitVirology
+         amount: 1
+       - id: ClothingBackpackVirology
+         amount: 1
+       - id: ClothingShoesColorWhite
+         amount: 1
+       - id: ClothingOuterCoatLabViro
+         amount: 1
+       - id: ClothingUniformJumpskirtVirology
+         amount: 1

 - type: entity
   id: WardrobeScienceFilled
@@ -201,10 +229,22 @@
       - id: ClothingUniformJumpsuitSalvageSpecialist
         amount: 2

-# - type: entity
-#   id: WardrobeAtmosphericsFilled
-#   suffix: Filled
-#   parent: WardrobeAtmospherics
+ - type: entity
+   id: WardrobeAtmosphericsFilled
+   suffix: Filled
+   parent: WardrobeAtmospherics
+   description: "This locker contains a uniform for atmospheric technicians."
+   components:
+   - type: StorageFill
+     contents:
+       - id: ClothingUniformJumpsuitAtmos
+         amount: 1
+       - id: ClothingBackpackEngineering
+         amount: 1
+       - id: ClothingShoesColorWhite
+         amount: 1
+       - id: ClothingUniformJumpskirtAtmos
+         amount: 1

 - type: entity
   id: WardrobeEngineeringFilled
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml
@@ -1,8 +1,11 @@
 - type: vendingMachineInventory
  id: GeneDrobeInventory
  startingInventory:
+    ClothingUniformJumpsuitGenetics: 2
+    ClothingUniformJumpskirtGenetics: 2
    ClothingShoesColorWhite: 2
-    ClothingOuterCoatLab: 2
-    ClothingHandsGlovesLatex: 2
-    ClothingHeadsetMedical: 2
+    ClothingOuterCoatLabGene: 2
    ClothingOuterWinterGen: 2
+    ClothingBackpackGenetics: 2
+    ClothingBackpackSatchelGenetics: 2
+    ClothingBackpackDuffelGenetics: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/virodrobe.yml
@@ -1,10 +1,12 @@
 - type: vendingMachineInventory
  id: ViroDrobeInventory
  startingInventory:
+    ClothingUniformJumpsuitVirology: 2
+    ClothingUniformJumpskirtVirology: 2
    ClothingShoesColorWhite: 2
    ClothingOuterCoatLabViro: 2
-    ClothingBackpackVirology: 2
-    ClothingBackpackDuffelVirology: 2
-    ClothingBackpackSatchelVirology: 2
-    ClothingHeadsetMedical: 2
    ClothingOuterWinterViro: 2
+    ClothingMaskSterile: 2
+    ClothingBackpackVirology: 2
+    ClothingBackpackSatchelVirology: 2
+    ClothingBackpackDuffelVirology: 2
--- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -120,6 +120,15 @@
  - type: Sprite
    sprite: Clothing/Back/Backpacks/virology.rsi

+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackGenetics
+  name: genetics backpack
+  description: A backpack designed to be super tough, just in case someone hulks out on you.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/genetics.rsi
+
 - type: entity
  parent: ClothingBackpack
  id: ClothingBackpackSalvage
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -92,6 +92,15 @@
  components:
  - type: Sprite
    sprite: Clothing/Back/Duffels/virology.rsi
+    
+- type: entity
+  parent: ClothingBackpackDuffel
+  id: ClothingBackpackDuffelGenetics
+  name: genetics duffel bag
+  description: A large duffel bag for holding extra genetic mutations.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Duffels/genetics.rsi

 - type: entity
  parent: ClothingBackpackDuffel
--- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -68,6 +68,15 @@
  components:
  - type: Sprite
    sprite: Clothing/Back/Satchels/virology.rsi
+    
+- type: entity
+  parent: ClothingBackpackSatchel
+  id: ClothingBackpackSatchelGenetics
+  name: genetics satchel
+  description: A sterile satchel with geneticist colours.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/genetics.rsi

 - type: entity
  parent: ClothingBackpackSatchel
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -94,12 +94,12 @@
  - type: Armor
    modifiers:
      coefficients:
-        Caustic: 0.9
+        Caustic: 0.75

 - type: entity
  parent: ClothingOuterStorageBase
  id: ClothingOuterCoatLabChem
-  name: lab coat (chem)
+  name: chemist lab coat
  description: A suit that protects against minor chemical spills. Has an orange stripe on the shoulder.
  components:
  - type: Sprite
@@ -114,7 +114,7 @@
 - type: entity
  parent: ClothingOuterStorageBase
  id: ClothingOuterCoatLabViro
-  name: lab coat (viro)
+  name: virologist lab coat
  description: A suit that protects against bacteria and viruses. Has an green stripe on the shoulder.
  components:
  - type: Sprite
@@ -124,7 +124,23 @@
  - type: Armor
    modifiers:
      coefficients:
-        Caustic: 0.9
+        Caustic: 0.75
+
+
+- type: entity
+  parent: ClothingOuterStorageBase
+  id: ClothingOuterCoatLabGene
+  name: geneticist lab coat
+  description: A suit that protects against minor chemical spills. Has an blue stripe on the shoulder.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/labcoat_gene.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/labcoat_gene.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Caustic: 0.75


 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -79,6 +79,28 @@
  - type: Clothing
    sprite: Clothing/Uniforms/Jumpskirt/chemistry.rsi

+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtVirology
+  name: virology jumpskirt
+  description: It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/virology.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/virology.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtGenetics
+  name: genetics jumpskirt
+  description: It's made of a special fiber that gives special protection against biohazards. It has a geneticist rank stripe on it.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/genetics.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/genetics.rsi
+
 - type: entity
  parent: ClothingUniformSkirtBase
  id: ClothingUniformJumpskirtCMO
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -139,6 +139,28 @@
  - type: Clothing
    sprite: Clothing/Uniforms/Jumpsuit/chemistry.rsi

+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitVirology
+  name: virology jumpsuit
+  description: It's made of a special fiber that gives special protection against biohazards. It has a virologist rank stripe on it.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/virology.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/virology.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitGenetics
+  name: genetics jumpsuit
+  description: It's made of a special fiber that gives special protection against biohazards. It has a geneticist rank stripe on it.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/genetics.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/genetics.rsi
+
 - type: entity
  parent: ClothingUniformBase
  id: ClothingUniformJumpsuitClown