From 6259794e8bf9ebd4d9bd4ddaa83e9149449d9084 Mon Sep 17 00:00:00 2001
From: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Date: Sat, 11 Dec 2021 23:08:51 +0000
Subject: [PATCH] Emergency kit & clothing tweaks (#5736)

---
 Resources/Prototypes/Catalog/Fills/Boxes/general.yml |  6 ++++--
 .../Prototypes/Catalog/Fills/Items/toolboxes.yml     |  4 +++-
 Resources/Prototypes/Catalog/Fills/Lockers/misc.yml  |  2 ++
 .../Entities/Clothing/OuterClothing/suits.yml        | 12 +++++++++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
index a99116b6a1..3fcd5d456d 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -95,6 +95,8 @@
       - id: ClothingMaskBreath
       - id: EmergencyOxygenTankFilled
       - id: EpinephrineMedipen
+      - id: Flare
+      - id: FoodSnackChocolate
   - type: Sprite
     layers:
       - state: box
@@ -102,8 +104,8 @@
   - type: Item
     size: 20
   - type: Storage
-    capacity: 20
-    size: 25
+    capacity: 30
+    size: 30
 
 - type: entity
   name: box of hugs
diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
index 4d367f3c09..ad7521cd07 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -12,7 +12,9 @@
         amount: 2
       - id: FoodSnackChocolate
       - id: FlashlightLantern
-        amount: 2
+        amount: 1
+      - id: FlashlightLantern
+        prob: 0.5
       - id: HarmonicaInstrument
         prob: 0.15
         orGroup: HarmonicaOrChocolate
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 0a789fc616..ce50114010 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -32,6 +32,8 @@
           prob: 0.6
         - id: ClothingOuterSuitFire
           prob: 0.75
+        - id: ClothingMaskGas
+          prob: 0.75
 
 - type: entity
   id: ClosetMaintenanceFilledRandom
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
index eb8c08c4df..0b89f54a16 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/suits.yml
@@ -26,6 +26,16 @@
     sprite: Clothing/OuterClothing/Suits/emergency.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/emergency.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.85
+    lowPressureMultiplier: 25
+  - type: TemperatureProtection
+    coefficient: 0.1
+  - type: Armor
+    modifiers:
+      coefficients:
+        Slash: 0.95
+        Heat: 0.85
 
 - type: entity
   parent: ClothingOuterBase
@@ -39,7 +49,7 @@
     highPressureMultiplier: 0.85
     lowPressureMultiplier: 25
   - type: TemperatureProtection
-    coefficient: 0.001
+    coefficient: 0.01
   - type: Clothing
     sprite: Clothing/OuterClothing/Suits/fire.rsi
   - type: Armor