- fix: Structural damage fix. (#215)

2024-03-21 04:54:26 +09:00
parent bbbfca161b
commit 4a06c1509a
109 changed files with 264 additions and 264 deletions
--- 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:
@@ -60,7 +60,7 @@
    sprite: Objects/Decoration/mines.rsi
    state: support
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: Physics
    bodyType: Static
@@ -128,7 +128,7 @@
    sprite: Objects/Decoration/mines.rsi
    state: support_wall
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: Physics
    bodyType: Static
@@ -176,4 +176,4 @@
        spawn:
          Log:
            min: 1
-            max: 3
+            max: 3
--- 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/Structures/Decoration/bonfire.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml
@@ -14,7 +14,7 @@
    energy: 3
    color: "#FFC90C"
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml
@@ -18,7 +18,7 @@
  - type: Transform
    anchored: true
  - 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
@@ -38,7 +38,7 @@
      path: /Audio/Effects/curtain_openclose.ogg
  - type: Appearance
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: Construction
    graph: Curtains
--- 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,8 +35,8 @@
    energy: 3
    color: "#FF6F00"
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml
@@ -7,8 +7,8 @@
  components:
    - type: Anchorable
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -35,8 +35,8 @@
  - type: Anchorable
  - type: Pullable
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- 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: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -42,4 +42,4 @@
    graph: Airlock
    node: assembly
  placement:
-    mode: SnapgridCenter
+    mode: SnapgridCenter
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -111,7 +111,7 @@
  - type: Occluder
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StrongMetallic
+    damageModifierSet: StructuralMetallicStrong
  - type: Destructible
    thresholds:
    - trigger:
--- 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: StructuralMetallic
    - type: Destructible
      thresholds:
      - trigger:
@@ -108,7 +108,7 @@
    - type: AccessReader
      access: [ [ "Engineering" ] ]
    - type: ReflectAspectMark
-      
+
 - type: entity
  id: Firelock
  parent: BaseFirelock
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: FirelockFrame
  parent: BaseStructureDynamic
  name: firelock frame
@@ -23,8 +23,8 @@
    node: frame1
  - type: InteractionOutline
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -42,8 +42,8 @@
  - type: Airtight
    fixVacuum: true
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -95,7 +95,7 @@
    closeSound:
      path: /Audio/Effects/door_close.ogg
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: Destructible
    thresholds:
@@ -144,8 +144,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
@@ -40,8 +40,8 @@
  - type: Airtight
    fixVacuum: true
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -95,8 +95,8 @@
    noRot: false
  - type: Rotatable
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: BlastDoor
  parent: BaseShutter
  name: blast door
@@ -26,7 +26,7 @@
    resistance: 8
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StrongMetallic
+    damageModifierSet: StructuralMetallicStrong
  - type: ContainerFill
    containers:
      board: [ DoorElectronics ]
@@ -65,8 +65,8 @@
    state: assembly
  - type: InteractionOutline
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml
@@ -66,7 +66,7 @@
    resistance: 2
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StrongMetallic
+    damageModifierSet: StructuralMetallicStrong
  - type: Destructible
    thresholds:
    - trigger:
@@ -208,8 +208,8 @@
    - board
  - type: InteractionOutline
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: WindoorAssembly
  name: windoor assembly
  description: It opens, it closes, and you can see through it!
@@ -24,8 +24,8 @@
  - type: Pullable
  - type: Rotatable
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: BaseWindoor
  parent: BaseStructure
  abstract: true
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: Windoor
  parent: BaseWindoor
  name: windoor
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml
@@ -6,8 +6,8 @@
  abstract: true
  components:
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: PlaceableSurface
  - type: Fixtures
    fixtures:
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -22,8 +22,8 @@
        layer:
        - TableLayer
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: IconSmooth
    key: state
    base: state_
@@ -79,7 +79,7 @@
        layer:
        - TableLayer
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: IconSmooth
    key: state
@@ -122,8 +122,8 @@
    sprite: Structures/Furniture/Tables/frame.rsi
    state: full
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: IconSmooth
    key: state
    base: state_
@@ -166,8 +166,8 @@
  - type: Icon
    sprite: Structures/Furniture/Tables/generic.rsi
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -596,7 +596,7 @@
    sprite: Structures/Furniture/Tables/counterwood.rsi
    state: full
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Wood
  - type: Destructible
    thresholds:
@@ -639,8 +639,8 @@
    sprite: Structures/Furniture/Tables/countermetal.rsi
    state: full
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- 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: StructuralMetallic
  - type: PlaceableSurface
  - type: Fixtures
    fixtures:
--- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
@@ -36,8 +36,8 @@
  - type: PlaceableSurface
    placeCentered: true
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- 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/carpets.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
@@ -18,7 +18,7 @@
    canCollide: false
  - type: Fixtures
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
  - type: Destructible
    thresholds:
      - trigger:
@@ -134,7 +134,7 @@
    canCollide: false
  - type: Fixtures
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -34,8 +34,8 @@
    buckleOffset: "0,-0.05"
  - type: Pullable
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - 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
@@ -32,7 +32,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/Furniture/sink.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
@@ -40,8 +40,8 @@
  - type: DumpableSolution
    solution: drainBuffer
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
+++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml
@@ -16,7 +16,7 @@
  - type: TimedDespawn
    lifetime: 90
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -35,8 +35,8 @@
    softness: 1
    offset: "0, -0.5"
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -235,7 +235,7 @@
      softness: 1.1
      enabled: true
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
    - type: Destructible
      thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
@@ -17,8 +17,8 @@
        - MidImpassable
        - LowImpassable
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -556,8 +556,8 @@
      - key: enum.BodyScannerConsoleUIKey.Key
        type: BodyScannerConsoleBoundUserInterface
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
 # WD end

 - type: entity
@@ -595,8 +595,8 @@
    energy: 1.6
    color: "#3c5eb5"
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong

 - type: entity
  parent: ComputerComms
@@ -847,8 +847,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,8 +31,8 @@
    containers:
      - clonepod-bodyContainer
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: Destructible
    thresholds:
    - trigger:
--- 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,8 +37,8 @@
        machine_board: !type:Container
        machine_parts: !type:Container
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Destructible
      thresholds:
      - trigger:
@@ -92,8 +92,8 @@
        - machine_board
        - machine_parts
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Destructible
      thresholds:
      - trigger:
@@ -141,8 +141,8 @@
      graph: Machine
      node: destroyedMachineFrame
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Destructible
      thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -51,8 +51,8 @@
      machine_board: !type:Container
      machine_parts: !type:Container
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
@@ -84,8 +84,8 @@
        sound:
          collection: MetalBreak
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: DamageOnHighSpeedImpact
    damage:
      types:
--- a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
@@ -21,8 +21,8 @@
    powerLoad: 1000
  - type: ExtensionCableReceiver
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
@@ -10,8 +10,8 @@
    - type: WirelessNetworkConnection
      range: 200
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Rotatable
      rotateWhileAnchored: true
    - type: Fixtures
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
@@ -14,8 +14,8 @@
    - type: Transform
      anchored: true
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -12,8 +12,8 @@
  - type: Transform
    anchored: true
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: SubFloorHide
  - type: CollideOnAnchor
  - type: PipeAppearance
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
@@ -71,8 +71,8 @@
  - type: Machine
    board: PortableScrubberMachineCircuitBoard
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
      - trigger:
--- 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,8 +29,8 @@
      graph: DisposalMachine
      node: frame
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -36,8 +36,8 @@
    anchored: true
  - type: Anchorable
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- 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: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -145,8 +145,8 @@
        layer:
        - WallLayer
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -52,8 +52,8 @@
  - type: Anchorable
  - type: Pullable
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: PacifismDangerousAttack
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -61,8 +61,8 @@
    supplyRampRate: 500
  - type: SolarPanel
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -90,8 +90,8 @@
  - type: Sprite
    state: broken
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -141,8 +141,8 @@
    anchored: true
    noRot: true
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -186,8 +186,8 @@
    anchored: true
    noRot: true
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -102,8 +102,8 @@
    layoutId: APC
  - type: WiresVisuals
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
  - type: Destructible
    thresholds:
    - trigger:
@@ -171,8 +171,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,8 +15,8 @@
    - type: Transform
      anchored: true
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -27,8 +27,8 @@
          "/Audio/Weapons/smash.ogg"
  # WD edit sounds start
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: DebugGenerator
  parent: BaseGenerator
  suffix: DEBUG
@@ -44,8 +44,8 @@
  - type: PowerConsumer
    drawRate: 50
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -81,8 +81,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:
@@ -185,8 +185,8 @@
    supplyRampTolerance: 5000
    supplyRampRate: 1000
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: PacifismDangerousAttack
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
@@ -30,7 +30,7 @@
        layer:
        - MachineLayer
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Electronic
  - type: Transform
    anchored: true
@@ -287,8 +287,8 @@
    containers:
      ballistic-ammo: !type:Container
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- 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/Atmospherics/sensor.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
@@ -8,8 +8,8 @@
    - type: Transform
      anchored: true
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Destructible
      thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Specific/dragon.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/dragon.yml
@@ -32,8 +32,8 @@
    # only show after making the announcement at 50%
    enabled: false
  - 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,8 +26,8 @@
      - state: wardingtower-unshaded
        shader: unshaded
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Physics
    bodyType: Static
  - type: Fixtures
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -62,8 +62,8 @@
              acts: [ "Destruction" ]
            - !type:DumpCanisterBehavior
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Physics
      bodyType: Dynamic
    - type: Fixtures
@@ -1274,8 +1274,8 @@
        - !type:DoActsBehavior
          acts: [ "Destruction" ]
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: InteractionOutline
    - type: Sprite
      sprite: Structures/Storage/canister.rsi
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml
@@ -145,8 +145,8 @@
      entity_storage: !type:Container
        ents: []
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -254,8 +254,8 @@
    placeCentered: true
    isPlaceable: false
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -39,7 +39,7 @@
    isPlaceable: false # defaults to closed.
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
@@ -21,8 +21,8 @@
        layer:
        - WallLayer
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
@@ -44,8 +44,8 @@
    containers:
      storagebase: !type:Container
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -133,8 +133,8 @@
    containers:
      storagebase: !type:Container
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml
@@ -11,7 +11,7 @@
  - type: Transform
    anchored: true
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Glass
  - type: MeleeSound
    soundGroups:
--- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
@@ -72,8 +72,8 @@
  - type: StaticPrice
    price: 200
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -162,8 +162,8 @@
  - type: Transform
    anchored: true
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- 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,8 +31,8 @@
        layer:
        - MachineLayer
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
@@ -26,8 +26,8 @@
        shape:
          !type:PhysShapeAabb {}
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
@@ -95,8 +95,8 @@
          "/Audio/Weapons/smash.ogg"
  # WD edit sounds end
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml
@@ -33,7 +33,7 @@
    bodyType: Static
  - type: Fixtures
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: DefibrillatorCabinet
  name: defibrillator cabinet
  description: A small wall mounted cabinet designed to hold a defibrillator.
@@ -35,8 +35,8 @@
      containers:
        ItemCabinet: !type:ContainerSlot
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
@@ -35,8 +35,8 @@
      containers:
        ItemCabinet: !type:ContainerSlot
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
@@ -81,8 +81,8 @@
    graph: FireAlarm
    node: fire_alarm
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
@@ -4,7 +4,7 @@
  description: There is a small label that reads "For Emergency use only" along with details for safe use of the axe. As if.
  components:
  - type: Damageable # adding destructible causes the entity inside to be deleted when the cabinet is destroyed :(
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Glass
  - type: MeleeSound
    soundGroups:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
@@ -73,8 +73,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
@@ -59,8 +59,8 @@
          - WallLayer
  - type: WallMount
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: NoticeBoard
  name: notice board
  description: Is there a job for a witcher?
@@ -20,7 +20,7 @@
    anchored: true
  - type: Damageable
    damageModifierSet: Wood
-    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
@@ -25,8 +25,8 @@
    alwaysRandomize: true
    layoutId: SurveillanceCamera
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Sprite
    drawdepth: WallMountedItems
    sprite: Structures/Wallmounts/camera.rsi
@@ -210,8 +210,8 @@
    - type: Transform
      anchored: true
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Sprite
      drawdepth: WallMountedItems
      sprite: Structures/Wallmounts/camera.rsi
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -11,8 +11,8 @@
          path:
            "/Audio/Weapons/smash.ogg"
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Destructible
      thresholds:
        - trigger:
@@ -104,8 +104,8 @@
    ports:
      - Pressed
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
@@ -18,8 +18,8 @@
  - type: Transform
    anchored: true
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -364,8 +364,8 @@
        tags:
          - Pickaxe
    - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml
@@ -21,7 +21,7 @@
  - type: Transform
    anchored: true
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: FlimsyMetallic
  - type: Destructible
    thresholds:
--- 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
@@ -32,7 +32,7 @@
      node: grille
      deconstructionTarget: start
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: PerforatedMetallic
    - type: PowerConsumer
      showInMonitor: false
@@ -114,7 +114,7 @@
      bodyType: Static
      canCollide: false
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: FlimsyMetallic
    - type: Destructible
      thresholds:
@@ -160,4 +160,4 @@
          - WallLayer
    - type: Construction
      graph: GrilleDiagonal
-      node: grilleDiagonal
+      node: grilleDiagonal
--- a/Resources/Prototypes/Entities/Structures/Walls/railing.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/railing.yml
@@ -27,7 +27,7 @@
  - type: InteractionOutline
  - type: Repairable
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: FlimsyMetallic
  - type: Destructible
    thresholds:
@@ -96,7 +96,7 @@
  - type: InteractionOutline
  - type: Repairable
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: FlimsyMetallic
  - type: Destructible
    thresholds:
@@ -156,7 +156,7 @@
  - type: InteractionOutline
  - type: Repairable
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: FlimsyMetallic
  - type: Destructible
    thresholds:
@@ -231,7 +231,7 @@
  - type: InteractionOutline
  - type: Repairable
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: FlimsyMetallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -747,7 +747,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
@@ -133,7 +133,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
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: CargoTelepad
  parent: [ BaseMachinePowered, ConstructibleMachine ]
  name: cargo telepad
@@ -30,8 +30,8 @@
      map: [ "enum.CargoTelepadLayers.Beam" ]
      shader: unshaded
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: DeviceNetwork
    deviceNetId: Wireless
    receiveFrequencyId: BasicDevice
--- a/Resources/Prototypes/Entities/Structures/catwalk.yml
+++ b/Resources/Prototypes/Entities/Structures/catwalk.yml
@@ -30,8 +30,8 @@
    graph: Catwalk
    node: Catwalk
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/conveyor.yml
+++ b/Resources/Prototypes/Entities/Structures/conveyor.yml
@@ -59,8 +59,8 @@
    graph: ConveyorGraph
    node: entity
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/meat_spike.yml
+++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml
@@ -13,8 +13,8 @@
    - state: spike
      map: ["base"]
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
+++ b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml
@@ -28,7 +28,7 @@
        - MidImpassable
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: Metallic
+    damageModifierSet: StructuralMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Show More
+++ b/Show More