From 7f57ff557404a2fe8b476bcd5fbdf10ebb5c1262 Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Sun, 17 Sep 2023 02:26:52 +0300
Subject: [PATCH] Lockers

---
 .../Prototypes/Catalog/Fills/Lockers/cargo.yml     | 14 ++------------
 .../Prototypes/Catalog/Fills/Lockers/medical.yml   |  5 +----
 .../Prototypes/Catalog/Fills/Lockers/science.yml   |  1 -
 .../Prototypes/Catalog/Fills/Lockers/security.yml  |  5 -----
 .../Prototypes/Catalog/Fills/Lockers/service.yml   |  2 --
 5 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index 293e746112a..a55a0c2918f 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -17,13 +17,8 @@
       - id: HandheldGPSBasic
       - id: RadioHandheld
       - id: OreBag
-        prob: 0.5
       - id: Flare
-        prob: 0.3
-      - id: Flare
-        prob: 0.3
-      - id: Flare
-        prob: 0.3
+        amount: 3
 
 - type: entity
   id: LockerSalvageSpecialistFilled
@@ -39,10 +34,5 @@
       - id: HandheldGPSBasic
       - id: RadioHandheld
       - id: OreBag
-        prob: 0.5
-      - id: Flare
-        prob: 0.3
-      - id: Flare
-        prob: 0.3
       - id: Flare
-        prob: 0.3
+        amount: 3
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
index 705b0112196..cec466c9d03 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -112,8 +112,7 @@
     contents:
       - id: BoxSyringe
       - id: BoxBeaker
-      - id: BoxBeaker
-        prob: 0.3
+        amount: 2
       - id: BoxPillCanister
       - id: BoxBottle
       - id: ChemBag
@@ -121,7 +120,6 @@
       - id: ClothingHeadsetMedical
       - id: ClothingMaskSterile
       - id: HandLabeler
-        prob: 0.5
 
 - type: entity
   id: LockerParamedicFilled
@@ -141,4 +139,3 @@
       - id: ClothingHeadsetMedical
       - id: ClothingMaskSterile
       - id: MedkitFilled
-        prob: 0.3
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml
index 4f09061f9a6..237185dd15a 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/science.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/science.yml
@@ -12,4 +12,3 @@
       - id: AnomalyScanner
       - id: NodeScanner
       - id: NetworkConfigurator
-        prob: 0.5
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 160f0b34df5..fc8b26b0ff9 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -7,7 +7,6 @@
     contents:
       - id: FlashlightSeclite
       - id: WeaponDisabler
-        prob: 0.3
       - id: ClothingHeadHatWarden
       - id: ClothingHeadHatBeretWarden
       - id: ClothingBeltSecurityFilled
@@ -33,7 +32,6 @@
     contents:
       - id: FlashlightSeclite
       - id: WeaponDisabler
-        prob: 0.3
       - id: ClothingHeadHatWarden
       - id: ClothingHeadHatBeretWarden
       - id: ClothingBeltSecurityFilled
@@ -57,14 +55,12 @@
   - type: StorageFill
     contents:
       - id: FlashlightSeclite
-        prob: 0.8
       - id: ClothingUniformJumpsuitSecGrey
         prob: 0.3
       - id: ClothingHeadHelmetBasic
       - id: ClothingOuterArmorBasic
       - id: ClothingBeltSecurityFilled
       - id: Flash
-        prob: 0.5
       - id: ClothingEyesGlassesSecurity
       - id: ClothingHeadsetSecurity
       - id: ClothingHandsGlovesColorBlack
@@ -116,7 +112,6 @@
   - type: StorageFill
     contents:
       - id: ClothingEyesHudSecurity
-        prob: 0.3
       - id: ClothingHeadHatFedoraBrown
       - id: ClothingNeckTieDet
       - id: ClothingOuterVestDetective
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index e86c09de2ae..23b182148c0 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -82,7 +82,6 @@
   - type: StorageFill
     contents:
       - id: BriefcaseBrownFilled
-        prob: 0.80
       - id: ClothingOuterRobesJudge
 
 - type: entity
@@ -99,7 +98,6 @@
       - id: HydroponicsToolSpade
       - id: HydroponicsToolMiniHoe
       - id: RobustHarvestChemistryBottle
-        prob: 0.3
       - id: ClothingBeltPlant
       - id: PlantBag ##Some maps don't have nutrivend
       - id: BoxMouthSwab