From 1ec3e53f8cb7a6be218c7b07d33dd4acd3a8f7a9 Mon Sep 17 00:00:00 2001
From: 20kdc <asdd2808@gmail.com>
Date: Thu, 29 Oct 2020 10:21:38 +0000
Subject: [PATCH] Fill lockers with stuff (#2427)

* Fill lockers with stuff (see detail)

+ atmos/engineer/ce hardsuits, breath masks and oxygen tanks
+ chef can actually get meat
+ fix janitor closet misorganization
+ medical/medical doctor randomly can get latex gloves (they don't DO anything but they don't have to r/n)
+ detective gets pen & 3 paper

* Filled "Detective locker" no longer contains stuff
---
 .../Prototypes/Catalog/Fills/lockers.yml      | 68 +++++++++++++++----
 .../Storage/Closets/job_closests.yml          |  8 +++
 2 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/lockers.yml b/Resources/Prototypes/Catalog/Fills/lockers.yml
index 8001709552..7bb7414e36 100644
--- a/Resources/Prototypes/Catalog/Fills/lockers.yml
+++ b/Resources/Prototypes/Catalog/Fills/lockers.yml
@@ -1,18 +1,3 @@
-- type: entity
-  id: LockerJanitor
-  parent: WardrobeMixed
-  name: "custodial closet"
-  description: "It's a storage unit for janitorial clothes and gear."
-  components:
-  - type: StorageFill
-    contents:
-      - name: MopItem
-      - name: MopBucket
-      - name: WetFloorSign
-        amount: 3
-      - name: TrashBag
-        amount: 2
-
 - type: entity
   id: LockerToolFilled
   parent: LockerTool
@@ -91,6 +76,13 @@
   id: LockerChiefEngineerFilled
   suffix: Filled
   parent: LockerChiefEngineer
+  components:
+  - type: StorageFill
+    contents:
+      - name: HelmetHardsuitCE
+      - name: HardsuitCE
+      - name: BreathMaskClothing
+      - name: OxygenTankFilled
 
 - type: entity
   id: LockerElectricalSuppliesFilled
@@ -106,11 +98,25 @@
   id: LockerAtmosphericsFilled
   suffix: Filled
   parent: LockerAtmospherics
+  components:
+  - type: StorageFill
+    contents:
+      - name: HelmetHardsuitAtmos
+      - name: HardsuitAtmos
+      - name: BreathMaskClothing
+      - name: OxygenTankFilled
 
 - type: entity
   id: LockerEngineerFilled
   suffix: Filled
   parent: LockerEngineer
+  components:
+  - type: StorageFill
+    contents:
+      - name: HelmetHardsuitEngineering
+      - name: HardsuitEngineering
+      - name: BreathMaskClothing
+      - name: OxygenTankFilled
 
 - type: entity
   id: LockerBotanistFilled
@@ -126,6 +132,11 @@
   id: LockerMedicalFilled
   suffix: Filled
   parent: LockerMedical
+  components:
+  - type: StorageFill
+    contents:
+      - name: GlovesLatex
+        prob: 0.4
 
 - type: entity
   id: LockerChemistryFilled
@@ -157,6 +168,7 @@
   suffix: Filled
   parent: LockerSecurity
 
+# Before adding to this - See https://github.com/space-wizards/space-station-14/pull/2427#issuecomment-718152557
 - type: entity
   id: LockerDetectiveFilled
   suffix: Filled
@@ -171,11 +183,27 @@
   id: LockerChefFilled
   suffix: Filled
   parent: LockerChef
+  components:
+  - type: StorageFill
+    contents:
+      - name: CrowbarRed
+      - name: FoodContainerMonkeyCubeBox
+      - name: SprayBottleWater
+      - name: ReagentContainerFlour
 
 - type: entity
   id: LockerJanitorFilled
   suffix: Filled
   parent: LockerJanitor
+  components:
+  - type: StorageFill
+    contents:
+      - name: MopItem
+      - name: MopBucket
+      - name: WetFloorSign
+        amount: 3
+      - name: TrashBag
+        amount: 2
 
 - type: entity
   id: LockerLegalFilled
@@ -211,6 +239,11 @@
   id: WardrobeMedicalDoctorFilled
   suffix: Filled
   parent: WardrobeMedicalDoctor
+  components:
+  - type: StorageFill
+    contents:
+      - name: GlovesLatex
+        prob: 0.4
 
 - type: entity
   id: WardrobeRoboticsFilled
@@ -281,6 +314,11 @@
   id: LockerRadiationSuitFilled
   parent: LockerRadiationSuit
   suffix: Filled
+# at time of writing, rad suits do nothing, let's not get anyone's hopes up
+#  components:
+#  - type: StorageFill
+#    contents:
+#      - name: OuterclothingRadSuit
 
 - type: entity
   id: LockerFireFilled
diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml
index c7465709ad..e76f747493 100644
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/job_closests.yml
@@ -25,3 +25,11 @@
       state_closed: atmos_wardrobe_door
   - type: Icon
     state: atmos_wardrobe_icon
+
+# Janitor locker (moved here from the Fills group because it was being misused)
+- type: entity
+  id: LockerJanitor
+  parent: WardrobeMixed
+  name: "custodial closet"
+  description: "It's a storage unit for janitorial clothes and gear."
+