From 2eeaf5efcd7cd7eb46758a468a7251dd519296d4 Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Wed, 20 Dec 2023 20:03:06 -0700
Subject: [PATCH] Structural Balancing Pass (#22790)

* new structural type

* riveted wall stronk

* balance structural items
---
 Resources/Prototypes/Damage/modifier_sets.yml       | 13 ++++++++++++-
 .../Entities/Objects/Weapons/Melee/mining.yml       |  1 +
 .../Entities/Objects/Weapons/Melee/pickaxe.yml      |  4 ++--
 .../Closets/Lockers/base_structurelockers.yml       |  4 ++--
 .../Structures/Storage/Closets/Lockers/lockers.yml  |  2 +-
 .../Storage/Crates/base_structurecrates.yml         |  2 +-
 .../Entities/Structures/Walls/asteroid.yml          |  2 +-
 .../Prototypes/Entities/Structures/Walls/walls.yml  |  6 ++++++
 8 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml
index b316469721..26904bc276 100644
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -10,7 +10,7 @@
     Heat: 5
 
 - type: damageModifierSet
-  id: StructuralMetallic
+  id: StructuralMetallicStrong
   coefficients:
     Shock: 1.2
   flatReductions:
@@ -20,6 +20,17 @@
     Heat: 25
     Structural: 40
 
+- type: damageModifierSet
+  id: StructuralMetallic
+  coefficients:
+    Shock: 1.2
+  flatReductions:
+    Blunt: 10
+    Slash: 10
+    Piercing: 10
+    Heat: 10
+    Structural: 20
+
 - type: damageModifierSet
   id: PerforatedMetallic
   coefficients:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index ec4cd929d9..33ff95bf3a 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -54,6 +54,7 @@
       types:
         Blunt: 2.5
         Slash: 2.5
+        Structural: 10
   - type: GunRequiresWield
   - type: Item
     size: Ginormous
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
index 265e05061a..28a4cfbf4b 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -22,7 +22,7 @@
       groups:
         Brute: 10
       types:
-        Structural: 10
+        Structural: 25
   - type: Item
     size: Normal
     shape:
@@ -51,4 +51,4 @@
       groups:
         Brute: 10
       types:
-        Structural: 10
+        Structural: 20
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
index 1b5bf42923..34f4db1ede 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -50,8 +50,8 @@
   abstract: true
   components:
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
index 769296b817..45d8a52a0e 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -21,7 +21,7 @@
 # Cargo
 - type: entity
   id: LockerQuarterMaster
-  parent: LockerBase
+  parent: LockerBaseSecure
   name: quartermaster's locker
   components:
   - type: Appearance
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 4a101aab73..8b0f4c26e0 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -38,7 +38,7 @@
   - type: PlaceableSurface
     isPlaceable: false # defaults to closed.
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Metallic
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index 4dbc096a2f..091daade43 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -31,7 +31,7 @@
       - map: [ "enum.EdgeLayer.West" ]
         state: rock_asteroid_west
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Metallic
   - type: Destructible
     thresholds:
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 7df55f3113..2aea34170f 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -502,6 +502,9 @@
   - type: Construction
     graph: Girder
     node: reinforcedWall
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
   - type: Destructible
     thresholds:
     - trigger:
@@ -557,6 +560,9 @@
     sprite: Structures/Walls/riveted.rsi
   - type: Icon
     sprite: Structures/Walls/riveted.rsi
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
   - type: Destructible
     thresholds:
     - trigger:
-- 
2.51.2