vending machine pass (space-wizards#216)

rbertoche · Jun 14, 2022 · 5c1a106 · 5c1a106
1 parent fe1e9c6
commit 5c1a106
Show file tree

Hide file tree

Showing 13 changed files with 138 additions and 18 deletions.
diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml
@@ -38561,7 +38561,7 @@ entities:
   - color: '#FF0000FF'
     type: AtmosPipeColor
 - uid: 3778
-  type: LockerDetectiveFilled
+  type: LockerForensicMantisFilled
   components:
   - pos: -3.5,-11.5
     parent: 4
@@ -44708,7 +44708,7 @@ entities:
     parent: 4
     type: Transform
 - uid: 4584
-  type: LockerResearchDirectorFilled
+  type: LockerMystagogueFilled
   components:
   - pos: -23.5,-8.5
     parent: 4
@@ -48268,13 +48268,13 @@ entities:
     parent: 4
     type: Transform
 - uid: 4974
-  type: VendingMachineSciDrobe
+  type: VendingMachineEpiDrobe
   components:
   - pos: -19.5,-12.5
     parent: 4
     type: Transform
 - uid: 4975
-  type: VendingMachineRoboDrobe
+  type: VendingMachineAutomatrobe
   components:
   - pos: -20.5,-12.5
     parent: 4

diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml
@@ -19467,7 +19467,7 @@ entities:
     parent: 100
     type: Transform
 - uid: 325
-  type: LockerDetectiveFilled
+  type: LockerForensicMantisFilled
   components:
   - pos: 9.5,-17.5
     parent: 100
@@ -19479,7 +19479,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 326
-  type: VendingMachineDetDrobe
+  type: VendingMachineForensicsDrobe
   components:
   - pos: 8.5,-17.5
     parent: 100
@@ -20731,7 +20731,7 @@ entities:
     parent: 100
     type: Transform
 - uid: 523
-  type: VendingMachineSciDrobe
+  type: VendingMachineEpiDrobe
   components:
   - pos: -20.5,-4.5
     parent: 100
@@ -40859,7 +40859,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 3388
-  type: VendingMachineRoboDrobe
+  type: VendingMachineAutomatrobe
   components:
   - pos: -17.5,-18.5
     parent: 100
@@ -106301,7 +106301,7 @@ entities:
     parent: 100
     type: Transform
 - uid: 11884
-  type: LockerResearchDirectorFilled
+  type: LockerMystagogueFilled
   components:
   - pos: -12.5,-3.5
     parent: 100

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
@@ -6287,7 +6287,7 @@ entities:
     parent: 852
     type: Transform
 - uid: 728
-  type: LockerResearchDirectorFilled
+  type: LockerMystagogueFilled
   components:
   - pos: -2.5,-23.5
     parent: 852
@@ -40559,7 +40559,7 @@ entities:
     parent: 852
     type: Transform
 - uid: 4210
-  type: VendingMachineDetDrobe
+  type: VendingMachineForensicsDrobe
   components:
   - pos: -3.5,14.5
     parent: 852
@@ -59624,7 +59624,7 @@ entities:
     parent: 852
     type: Transform
 - uid: 6692
-  type: VendingMachineSciDrobe
+  type: VendingMachineEpiDrobe
   components:
   - pos: -13.5,-17.5
     parent: 852
@@ -75297,7 +75297,7 @@ entities:
     parent: 852
     type: Transform
 - uid: 8908
-  type: VendingMachineRoboDrobe
+  type: VendingMachineAutomatrobe
   components:
   - pos: -14.5,-17.5
     parent: 852

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -5,7 +5,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingNeckCloakQm
       - id: ClothingHeadsetCargo
       - id: PlushieLizard
         prob: 0.1
@@ -20,7 +19,6 @@
       - id: SupplyComputerCircuitboard
       - id: CigPackGreen
         prob: 0.50
-      - id: DoorRemoteCargo
       - id: RubberStampQm
 
 - type: entity

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -10,7 +10,6 @@
     ClothingHeadHatHoodChaplainHood: 1
     ClothingOuterRobeNun: 1
     ClothingHeadHatHoodNunHood: 1
-    ClothingHeadHatFez: 1
     ClothingHeadHatPlaguedoctor: 1
     ClothingHeadHatWitch: 1
     ClothingHeadHatWitch1: 1

diff --git a/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/Entities/Objects/Devices/door_remote.yml
@@ -58,6 +58,7 @@
   - type: Access
     groups:
     - Service
+    - Cargo
 
 - type: entity
   parent: DoorRemoteDefault

diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -1335,6 +1335,7 @@
     - type: WiresVisualizer
   - type: AccessReader
     access: [["Medical"]]
+
 # Gas Tank Dispenser
 
 - type: entity
@@ -1349,6 +1350,7 @@
   - type: Sprite
     sprite: Structures/Machines/VendingMachines/tankdispenser.rsi #TODO add visualiser for remaining tanks as layers
     state: dispenser
+
 - type: entity
   parent: VendingMachine
   id: VendingMachineTankDispenserEngineering

diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/ourjobs.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Lockers/ourjobs.yml
@@ -0,0 +1,54 @@
+- type: entity
+  id: LockerMystagogueFilled
+  suffix: Filled
+  parent: LockerResearchDirector
+  name: mystagogue's locker
+  components:
+  - type: StorageFill
+    contents:
+      - id: ResearchComputerCircuitboard
+      - id: ProtolatheMachineCircuitboard
+      - id: CircuitImprinterMachineCircuitboard
+      - id: ClothingHeadsetMedicalScience
+      - id: ClothingOuterHardsuitRd
+      - id: PlushieSlime
+        prob: 0.1
+      - id: DoorRemoteResearch
+      - id: RubberStampRd
+      - id: Telebaton
+
+- type: entity
+  id: LockerEpistemicsFilled
+  suffix: Filled
+  parent: LockerScientist
+  name: epistemologist's locker
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadsetScience
+      - id: ClothingMaskSterile
+      - id: ClothingOuterRobeWhite
+      - id: Paper
+
+- type: entity
+  id: LockerForensicMantisFilled
+  suffix: Filled
+  parent: LockerDetective
+  name: forensic mantis' cabinet
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingHeadHatFez
+      - id: FlashlightSeclite
+      - id: ForensicScanner
+      - id: BoxForensicPad
+
+- type: entity
+  id: VendingMachineForensics
+  name: Forensics Wardrobe
+  description: A fez dispenser.
+  components:
+  - type: VendingMachine
+    pack: DetDrobeInventory
+  - type: AccessReader
+    access: [["Detective"]]
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/automatrobe.yml
@@ -0,0 +1,12 @@
+- type: vendingMachineInventory
+  id: AutomatrobeInventory
+  name: Automatrobe
+  spriteName: robodrobe
+  startingInventory:
+    ClothingUniformJumpsuitColorBlack: 2
+    ClothingUniformJumpskirtColorBlack: 2
+    ClothingShoesColorBlack: 2
+    ClothingHeadTechPriest: 2
+    ClothingOuterRobeTechPriest: 2
+    ClothingHeadsetScience: 2
+    ClothingOuterWinterRobo: 2
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/epidrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/epidrobe.yml
@@ -0,0 +1,15 @@
+- type: vendingMachineInventory
+  id: EpiDrobeInventory
+  name: EpiDrobe
+  spriteName: scidrobe
+  startingInventory:
+    ClothingBackpackScience: 3
+    ClothingBackpackSatchelScience: 3
+    ClothingBackpackDuffelScience: 3
+    ClothingUniformJumpsuitColorWhite: 3
+    ClothingUniformJumpskirtColorWhite: 3
+    ClothingOuterRobeWhite: 3
+    ClothingShoesColorWhite: 3
+    ClothingHeadsetScience: 3
+    ClothingMaskGas: 3
+    ClothingOuterWinterSci: 2
diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/forensicsdrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/forensicsdrobe.yml
@@ -0,0 +1,10 @@
+- type: vendingMachineInventory
+  id: ForensicsDrobeInventory
+  name: ForensicsDrobe
+  spriteName: detdrobe
+  startingInventory:
+    ClothingUniformJumpsuitColorBlue: 2
+    ClothingShoesColorBlue: 2
+    ClothingHeadHatFez: 2
+    ClothingEyesGlassesSunglasses: 2
+    ClothingHeadsetScience: 2
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/vending_machines.yml
@@ -24,4 +24,33 @@
       normalUnshaded: true
       denyUnshaded: true
       broken: true
-    - type: WiresVisualizer
+    - type: WiresVisualizer
+
+- type: entity
+  parent: VendingMachineDetDrobe
+  id: VendingMachineForensicsDrobe
+  name: Forensics Wardrobe
+  description: A fez dispenser.
+  components:
+  - type: VendingMachine
+    pack: ForensicsDrobeInventory
+  - type: AccessReader
+    access: [["Detective"]]
+
+- type: entity
+  parent: VendingMachineSciDrobe
+  id: VendingMachineEpiDrobe
+  name: EpiDrobe
+  description: These white robes have to be cleaned quite a lot, you know.
+  components:
+  - type: VendingMachine
+    pack: EpiDrobeInventory
+
+- type: entity
+  parent: VendingMachineRoboDrobe
+  id: VendingMachineAutomatrobe
+  name: Automatrobe
+  description: Automatically good.
+  components:
+  - type: VendingMachine
+    pack: AutomatrobeInventory
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensic_mantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensic_mantis.yml
@@ -19,7 +19,7 @@
     back: ClothingBackpackDetectiveFilled
     shoes: ClothingShoesColorBlue
     head: ClothingHeadHatFez
-    id: DetectivePDA
+    id: ForensicMantisPDA
     eyes: ClothingEyesGlassesSunglasses
     ears: ClothingHeadsetScience
     pocket2: ForensicScanner
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,7 @@ @@
       - type: Access
         groups:
         - Service
+        - Cargo
     - type: entity
       parent: DoorRemoteDefault
@@ Expand Down @@