add structural damage taken to a lot of prototypes (#30790)

* fix * add structural damage taken to a lot of other things * do requested changes * how did this happen
2024-09-04 17:37:06 +04:00
parent 7ce7b9e236
commit f0d3b684d1
91 changed files with 175 additions and 170 deletions
--- a/Resources/Prototypes/Damage/modifier_sets.yml
+++ b/Resources/Prototypes/Damage/modifier_sets.yml
@@ -5,6 +5,7 @@
    Slash: 0.5
    Piercing: 0.7
    Shock: 1.2
+    Structural: 0.5
  flatReductions:
    Blunt: 5
    Heat: 5
@@ -66,6 +67,7 @@
    Piercing: 0.7
    Shock: 2
    Heat: 3
+    Structural: 0.5

 # Like metallic, but without flat reduction so it can be damaged with fists.
 - type: damageModifierSet
@@ -98,6 +100,7 @@
    Piercing: 2.0
    Heat: 0.5
    Shock: 0
+    Structural: 0.25
  flatReductions:
    Blunt: 5

@@ -138,6 +141,7 @@
    Slash: 2.0
    Piercing: 1.0
    Heat: 2.0
+    Structural: 0.5
  flatReductions:
    Blunt: 5

--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -168,7 +168,7 @@
    replacementTiles:
    - FloorMetalFoam
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml
@@ -57,7 +57,7 @@
        layer:
        - WallLayer
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: MeleeSound
    soundGroups:
--- a/Resources/Prototypes/Entities/Objects/Decoration/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/mining.yml
@@ -1,7 +1,7 @@
 - type: entity
  id: WoodenSign
  name: wooden sign
-  description: He's pointing somewhere. 
+  description: He's pointing somewhere.
  components:
  - type: Clickable
  - type: InteractionOutline
@@ -18,7 +18,7 @@
          bounds: "-0.35,-0.4,0.35,0.4"
        density: 100
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: MeleeSound
    soundGroups:
@@ -66,7 +66,7 @@
    sprite: Objects/Decoration/mines.rsi
    state: support
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: Physics
    bodyType: Static
@@ -141,7 +141,7 @@
    sprite: Objects/Decoration/mines.rsi
    state: support_wall
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: Physics
    bodyType: Static
@@ -189,4 +189,4 @@
        spawn:
          Log:
            min: 1
-            max: 3
+            max: 3
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -219,7 +219,7 @@
        startingItem: PowerCellMedium
  - type: Anchorable
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
@@ -249,7 +249,7 @@
    state: floodlight_broken
  - type: Anchorable
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
@@ -20,7 +20,7 @@
        layer:
        - WallLayer
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Inflatable
  - type: Destructible
    thresholds:
@@ -68,7 +68,7 @@
    closeSound:
      path: /Audio/Misc/zip.ogg
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Inflatable
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
@@ -26,7 +26,7 @@
      loot:
        All: SpaceshroomGather
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Wood
    - type: Destructible
      thresholds:
--- a/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
@@ -30,7 +30,7 @@
    - sprite: Structures/catwalk.rsi
      state: catwalk_preview
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml
@@ -44,7 +44,7 @@
    lockTime: 5
    unlockTime: 5
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/artifact_equipment.yml
@@ -54,8 +54,8 @@
    - type: PlaceableSurface
      isPlaceable: false
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallicStrong
    - type: Destructible
      thresholds:
        - trigger:
@@ -91,7 +91,7 @@
          enum.PaperLabelVisuals.Layer:
            True: { offset: "0.0,0.3125" }
            False: { offset: "0.0,0.0" }
-            
+
    - type: LockVisuals
    - type: ItemSlots
    - type: ContainerContainer
--- a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
@@ -15,7 +15,7 @@
    energy: 3
    color: "#FFC90C"
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml
@@ -38,7 +38,7 @@
      energy: 3
      color: "#52ff39"
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Glass
    - type: Destructible
      thresholds:
--- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml
@@ -36,7 +36,7 @@
  - type: Appearance
  - type: Damageable
    damageContainer: Inorganic
-    damageModifierSet: Wood  
+    damageModifierSet: Wood
  - type: Destructible
    thresholds:
    - trigger:
@@ -52,7 +52,7 @@
            max: 2
  - type: WallMount
    arc: 360
-        
+
 - type: entity
  id: HospitalCurtains
  parent: BaseCurtains
--- a/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml
@@ -19,7 +19,7 @@
    autoRot: true
    offset: "0, 0.6"
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml
@@ -35,7 +35,7 @@
    energy: 3
    color: "#FF6F00"
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/mannequin.yml
@@ -38,7 +38,8 @@
    graph: Mannequin
    node: mannequin
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
+    damageModifierSet: Wood
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml
@@ -7,7 +7,7 @@
  components:
    - type: Anchorable
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -35,7 +35,7 @@
  - type: Anchorable
  - type: Pullable
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
@@ -28,8 +28,8 @@
    anchored: true
    noRot: true
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: RCDDeconstructable
    cost: 6
    delay: 8
@@ -46,4 +46,4 @@
    graph: Airlock
    node: assembly
  placement:
-    mode: SnapgridCenter
+    mode: SnapgridCenter
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -17,8 +17,8 @@
    - type: DeviceNetworkRequiresPower
    - type: InteractionOutline
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallicStrong
    - type: RCDDeconstructable
      cost: 4
      delay: 6
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
@@ -23,12 +23,12 @@
    node: frame1
  - type: InteractionOutline
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: RCDDeconstructable
    cost: 4
    delay: 6
-    fx: EffectRCDDeconstruct6    
+    fx: EffectRCDDeconstruct6
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -41,7 +41,7 @@
  - type: Appearance
  - type: Airtight
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: RCDDeconstructable
    cost: 6
@@ -100,7 +100,7 @@
    closeSound:
      path: /Audio/Effects/door_close.ogg
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: Destructible
    thresholds:
@@ -149,8 +149,8 @@
    - state: closed
      map: ["enum.DoorVisualLayers.Base"]
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
@@ -39,8 +39,8 @@
    time: 2
  - type: Airtight
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: RCDDeconstructable
    cost: 6
    delay: 8
@@ -99,8 +99,8 @@
    noRot: false
  - type: Rotatable
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: RCDDeconstructable
    cost: 6
    delay: 8
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
@@ -66,8 +66,8 @@
    state: assembly
  - type: InteractionOutline
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -64,7 +64,7 @@
    resistance: 2
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StrongMetallic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -212,7 +212,7 @@
    - board
  - type: InteractionOutline
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
@@ -24,7 +24,7 @@
  - type: Pullable
  - type: Rotatable
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: RCDDeconstructable
    cost: 6
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -64,7 +64,7 @@
    lastSignals:
      DoorStatus: false
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Glass
  - type: ExaminableDamage
    messages: WindowMessages
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
@@ -6,7 +6,7 @@
  abstract: true
  components:
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: PlaceableSurface
  - type: Fixtures
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -22,7 +22,7 @@
        layer:
        - TableLayer
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: IconSmooth
    key: state
@@ -79,7 +79,7 @@
        layer:
        - TableLayer
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: IconSmooth
    key: state
@@ -122,7 +122,7 @@
    sprite: Structures/Furniture/Tables/frame.rsi
    state: full
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: IconSmooth
    key: state
@@ -166,7 +166,7 @@
  - type: Icon
    sprite: Structures/Furniture/Tables/generic.rsi
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
@@ -414,7 +414,7 @@
  - type: Icon
    sprite: Structures/Furniture/Tables/brass.rsi
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
@@ -443,7 +443,7 @@
  - type: Construction
    graph: Table
    node: TableBrass
-    
+
 - type: entity
  id: TableWood
  parent: TableBase
@@ -604,7 +604,7 @@
    thresholds:
    - trigger:
        !type:DamageTrigger
-        damage: 25 
+        damage: 25
      behaviors:
      - !type:PlaySoundBehavior
        sound:
@@ -677,7 +677,7 @@
  - type: Construction
    graph: Table
    node: TableFancyRed
-    
+
 - type: entity
  id: TableFancyPurple
  parent: TableFancyBase
@@ -690,7 +690,7 @@
  - type: Construction
    graph: Table
    node: TableFancyPurple
-    
+
 - type: entity
  id: TableFancyPink
  parent: TableFancyBase
@@ -703,7 +703,7 @@
  - type: Construction
    graph: Table
    node: TableFancyPink
-    
+
 - type: entity
  id: TableFancyGreen
  parent: TableFancyBase
@@ -712,11 +712,11 @@
  - type: Sprite
    sprite: Structures/Furniture/Tables/Fancy/green.rsi
  - type: Icon
-    sprite: Structures/Furniture/Tables/Fancy/green.rsi  
+    sprite: Structures/Furniture/Tables/Fancy/green.rsi
  - type: Construction
    graph: Table
    node: TableFancyGreen
-    
+
 - type: entity
  id: TableFancyOrange
  parent: TableFancyBase
@@ -729,7 +729,7 @@
  - type: Construction
    graph: Table
    node: TableFancyOrange
-    
+
 - type: entity
  id: TableFancyWhite
  parent: TableFancyBase
@@ -782,7 +782,7 @@
    sprite: Structures/Furniture/Tables/counterwood.rsi
    state: full
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: Destructible
    thresholds:
@@ -825,7 +825,7 @@
    sprite: Structures/Furniture/Tables/countermetal.rsi
    state: full
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml
@@ -9,8 +9,8 @@
  - type: Transform
  - type: Prayable
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: Wood
  - type: PlaceableSurface
  - type: Fixtures
    fixtures:
--- a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml
@@ -17,7 +17,7 @@
    fillBaseName: book
  - type: Damageable
    damageModifierSet: Wood
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
@@ -9,7 +9,7 @@
    state: dresser
  - type: Damageable
    damageModifierSet: Wood
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
@@ -35,7 +35,7 @@
      stash: !type:ContainerSlot {}
  - type: Pullable
  - type: Damageable
-    damageContainer: Inorganic # The pot. Not the plant. Or is it plastic?
+    damageContainer: StructuralInorganic # The pot. Not the plant. Or is it plastic?
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
@@ -115,4 +115,4 @@
          damage: 60
        behaviors:
          - !type:DoActsBehavior
-            acts: [ "Destruction" ]
+            acts: [ "Destruction" ]
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -560,8 +560,8 @@
    energy: 1.6
    color: "#3c5eb5"
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong

 - type: entity
  parent: ComputerComms
@@ -816,8 +816,8 @@
    speechVerb: Robotic
    speechSounds: Pai
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: GuideHelp
    guides:
    - Cloning
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml
@@ -25,7 +25,7 @@
  - type: Sprite
    drawdepth: Objects
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Electronic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
@@ -54,8 +54,8 @@
    boardName: wires-board-name-cryopod
    layoutId: CryoPod
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
@@ -22,8 +22,8 @@
        layer:
        - MachineLayer
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
@@ -31,7 +31,7 @@
    containers:
      - clonepod-bodyContainer
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: StrongMetallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
@@ -80,8 +80,8 @@
    containers:
     - entity_storage
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
@@ -37,7 +37,7 @@
        machine_board: !type:Container
        machine_parts: !type:Container
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
@@ -92,7 +92,7 @@
        - machine_board
        - machine_parts
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
@@ -141,7 +141,7 @@
      graph: Machine
      node: destroyedMachineFrame
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
--- a/Resources/Prototypes/Entities/Structures/Machines/jukebox.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/jukebox.yml
@@ -29,7 +29,7 @@
        enum.JukeboxUiKey.Key:
          type: JukeboxBoundUserInterface
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -51,7 +51,7 @@
      machine_board: !type:Container
      machine_parts: !type:Container
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: StrongMetallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
@@ -84,7 +84,7 @@
        sound:
          collection: MetalBreak
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: DamageOnHighSpeedImpact
    damage:
--- a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
@@ -10,7 +10,7 @@
    - type: WirelessNetworkConnection
      range: 200
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Metallic
    - type: Rotatable
      rotateWhileAnchored: true
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -12,7 +12,7 @@
  - type: Transform
    anchored: true
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: SubFloorHide
  - type: CollideOnAnchor
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
@@ -67,7 +67,7 @@
  - type: Machine
    board: PortableScrubberMachineCircuitBoard
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
@@ -154,7 +154,7 @@
    temperatureTolerance: 0.2
    atmospheric: true
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml
@@ -29,7 +29,7 @@
      graph: DisposalMachine
      node: frame
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -29,7 +29,7 @@
    anchored: true
  - type: Anchorable
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -53,8 +53,8 @@
        !type:CableDeviceNode
        nodeGroupID: MVPower
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
@@ -29,8 +29,8 @@
        layer:
        - WallLayer
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: Destructible
    thresholds:
    - trigger:
@@ -153,8 +153,8 @@
        layer:
        - WallLayer
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -52,7 +52,7 @@
  - type: Anchorable
  - type: Pullable
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: PacifismDangerousAttack
  - type: Destructible
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -49,7 +49,7 @@
    onBump: false
    requirePower: true
    highVoltageNode: output
-  - type: RequireProjectileTarget 
+  - type: RequireProjectileTarget

 - type: entity
  id: SolarPanel
@@ -62,7 +62,7 @@
    supplyRampRate: 500
  - type: SolarPanel
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
@@ -91,7 +91,7 @@
  - type: Sprite
    state: broken
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
@@ -142,7 +142,7 @@
    anchored: true
    noRot: true
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
@@ -158,7 +158,7 @@
    graph: SolarPanel
    node: solarassembly
    defaultTarget: solarpanel
-  - type: RequireProjectileTarget 
+  - type: RequireProjectileTarget

 - type: entity
  id: SolarTracker
@@ -188,8 +188,8 @@
    anchored: true
    noRot: true
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -203,4 +203,4 @@
  - type: Construction
    graph: SolarPanel
    node: solartracker
-  - type: RequireProjectileTarget 
+  - type: RequireProjectileTarget
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -105,8 +105,8 @@
  - type: WiresPanel
  - type: WiresVisuals
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: Destructible
    thresholds:
    - trigger:
@@ -167,8 +167,8 @@
    node: apcFrame
  - type: WallMount
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
@@ -15,12 +15,12 @@
    - type: Transform
      anchored: true
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Metallic
    - type: RCDDeconstructable
      cost: 2
      delay: 0
-      fx: EffectRCDConstruct0  
+      fx: EffectRCDConstruct0
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -78,8 +78,8 @@
      highVoltageNode: input
      mediumVoltageNode: output
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: StrongMetallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallicStrong
    - type: BatterySensor
    - type: DeviceNetwork
      deviceNetId: AtmosDevices
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -52,8 +52,8 @@
    supplyRampTolerance: 5000
    supplyRampRate: 1000
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: PacifismDangerousAttack
  - type: Destructible
    thresholds:
@@ -183,8 +183,8 @@
    supplyRampTolerance: 5000
    supplyRampRate: 1000
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: PacifismDangerousAttack
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
@@ -32,7 +32,7 @@
        layer:
        - MachineLayer
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Electronic
  - type: Transform
    anchored: true
@@ -291,7 +291,7 @@
    containers:
      ballistic-ammo: !type:Container
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml
@@ -40,7 +40,7 @@
      powerLoad: 1500
    - type: ExtensionCableReceiver
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Electronic
    - type: Destructible
      thresholds:
@@ -193,7 +193,7 @@
        - !type:ChangeConstructionNodeBehavior
          node: machineFrame
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Electronic
  - type: StaticPrice
    price: 2000
--- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml
@@ -41,8 +41,8 @@
    - type: DrainableSolution
      solution: drainBuffer
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml
@@ -26,7 +26,7 @@
      - state: wardingtower-unshaded
        shader: unshaded
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Physics
    bodyType: Static
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -145,7 +145,7 @@
      entity_storage: !type:Container
        ents: []
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
@@ -259,7 +259,7 @@
    placeCentered: true
    isPlaceable: false
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
@@ -40,7 +40,7 @@
    containers:
      storagebase: !type:Container
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
@@ -69,7 +69,7 @@
    damageOverlay:
      sprite: Structures/Storage/glassbox.rsi
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Glass
  - type: MeleeSound
    soundGroups:
--- a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml
@@ -9,7 +9,7 @@
  - type: Anchorable
  - type: InteractionOutline
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
@@ -31,7 +31,7 @@
        layer:
        - TableLayer
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
@@ -88,7 +88,7 @@
    graph: AirAlarm
    node: air_alarm
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
@@ -31,7 +31,7 @@
          components:
          - Defibrillator
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
@@ -32,7 +32,7 @@
            components:
            - SpraySafety
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
@@ -81,7 +81,7 @@
    graph: FireAlarm
    node: fire_alarm
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
@@ -8,7 +8,7 @@
    mode: SnapgridCenter
  components:
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Glass
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
@@ -78,8 +78,8 @@
    graph: Intercom
    node: intercom
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml
@@ -60,7 +60,7 @@
          - WallLayer
  - type: WallMount
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
@@ -23,7 +23,7 @@
    anchored: true
  - type: Damageable
    damageModifierSet: Wood
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
@@ -20,7 +20,7 @@
  - type: Transform
  - type: Damageable
    damageModifierSet: Wood
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
  - type: Destructible
    thresholds:
    - trigger:
@@ -119,7 +119,7 @@
    state: base
  - type: Damageable
    damageModifierSet: Metallic
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
  - type: Destructible
    thresholds:
    - trigger:
@@ -154,7 +154,7 @@
    state: base
  - type: Damageable
    damageModifierSet: Glass
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml
@@ -16,7 +16,7 @@
      layers:
        - state: station_map_broken
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
@@ -48,7 +48,7 @@
    alwaysRandomize: true
    layoutId: SurveillanceCamera
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Sprite
    drawdepth: WallMountedItems
@@ -233,7 +233,7 @@
    - type: Transform
      anchored: true
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Metallic
    - type: Sprite
      drawdepth: WallMountedItems
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
@@ -18,7 +18,7 @@
  - type: Transform
    anchored: true
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -648,7 +648,7 @@
        tags:
          - Pickaxe
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
@@ -18,7 +18,7 @@
  - type: Transform
    anchored: true
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: FlimsyMetallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml
@@ -21,7 +21,7 @@
  - type: Transform
    anchored: true
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: RCDDeconstructable
    cost: 2
--- a/Resources/Prototypes/Entities/Structures/Walls/girders.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/girders.yml
@@ -28,8 +28,8 @@
    sprite: Structures/Walls/solid.rsi
    state: wall_girder
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -12,7 +12,7 @@
    - type: RCDDeconstructable
      cost: 6
      delay: 4
-      fx: EffectRCDDeconstruct4  
+      fx: EffectRCDDeconstruct4
    - type: CanBuildWindowOnTop
    - type: Sprite
      drawdepth: Walls
@@ -134,7 +134,7 @@
      bodyType: Static
      canCollide: false
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: FlimsyMetallic
    - type: Destructible
      thresholds:
@@ -233,4 +233,4 @@
    - type: Construction
      graph: GrilleDiagonal
      node: clockworkGrilleDiagonal
-      
+
--- a/Resources/Prototypes/Entities/Structures/Walls/railing.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
@@ -15,7 +15,7 @@
  - type: InteractionOutline
  - type: Repairable
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: FlimsyMetallic
  - type: Climbable
  - type: Construction
@@ -171,7 +171,7 @@
        acts: [ "Destruction" ]
  - type: Construction
    node: railingCornerSmall
-    
+
 - type: entity
  parent: BaseRailing
  id: RailingRound
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -819,7 +819,7 @@
    sprite: Structures/Walls/shuttle_diagonal.rsi
    state: state0
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: StructuralMetallic
  - type: Physics
    bodyType: Static
--- a/Resources/Prototypes/Entities/Structures/Windows/window.yml
+++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml
@@ -146,7 +146,7 @@
        - GlassLayer
  - type: Repairable
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Glass
  - type: ExaminableDamage
    messages: WindowMessages
--- a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
+++ b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml
@@ -30,8 +30,8 @@
      map: [ "enum.CargoTelepadLayers.Beam" ]
      shader: unshaded
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: DeviceNetwork
    deviceNetId: Wireless
    receiveFrequencyId: BasicDevice
--- a/Resources/Prototypes/Entities/Structures/catwalk.yml
+++ b/Resources/Prototypes/Entities/Structures/catwalk.yml
@@ -30,7 +30,7 @@
    graph: Catwalk
    node: Catwalk
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
@@ -54,4 +54,4 @@
  - type: RCDDeconstructable
    cost: 2
    delay: 2
-    fx: EffectRCDDeconstruct2  
+    fx: EffectRCDDeconstruct2
--- a/Resources/Prototypes/Entities/Structures/conveyor.yml
+++ b/Resources/Prototypes/Entities/Structures/conveyor.yml
@@ -52,7 +52,7 @@
    graph: ConveyorGraph
    node: entity
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/meat_spike.yml
+++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml
@@ -13,7 +13,7 @@
    - state: spike
      map: ["base"]
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/stairs.yml
+++ b/Resources/Prototypes/Entities/Structures/stairs.yml
@@ -14,7 +14,7 @@
  - type: Transform
    anchored: true
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
@@ -59,7 +59,7 @@
 - type: entity
  id: StairStageWhite
  parent: Stairs
-  suffix: White, stage 
+  suffix: White, stage
  components:
  - type: Sprite
    sprite: Structures/stairs.rsi