Structural fix part 2 (#230)

* Revert "- fix: Structural damage fix. (#215)" This reverts commit 4a06c1509a. * - fix: Fix structural damage part 2. * - fix: Fix cult barrier not taking structural damage. * - tweak: Doors are harder to break. * - tweak: Blast doors are harder to break. * - tweak: Secret doors are harder to break.
2024-03-29 21:05:24 +09:00
parent d5acb523f5
commit 62a00000bf
86 changed files with 116 additions and 116 deletions
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -149,7 +149,7 @@
    anchored: true
  - type: Airtight
  - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml
@@ -21,7 +21,7 @@
          mask:
          - MobMask
    - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
--- a/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml
@@ -36,7 +36,7 @@
    color: "#FF6F00"
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml
@@ -8,7 +8,7 @@
    - type: Anchorable
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml
@@ -36,7 +36,7 @@
  - type: Pullable
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
@@ -29,7 +29,7 @@
    noRot: true
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- 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: StructuralMetallicStrong
+    damageModifierSet: StrongMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -18,7 +18,7 @@
    - type: InteractionOutline
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
      - trigger:
--- 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
@@ -24,7 +24,7 @@
  - type: InteractionOutline
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
@@ -96,7 +96,7 @@
  - type: Rotatable
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
@@ -66,7 +66,7 @@
  - type: InteractionOutline
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - 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: StructuralMetallicStrong
+    damageModifierSet: StrongMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -209,7 +209,7 @@
  - type: InteractionOutline
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - 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!
@@ -25,7 +25,7 @@
  - type: Rotatable
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - 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
@@ -7,7 +7,7 @@
  components:
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: PlaceableSurface
  - type: Fixtures
    fixtures:
--- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
@@ -23,7 +23,7 @@
        - TableLayer
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: IconSmooth
    key: state
    base: state_
@@ -123,7 +123,7 @@
    state: full
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: IconSmooth
    key: state
    base: state_
@@ -167,7 +167,7 @@
    sprite: Structures/Furniture/Tables/generic.rsi
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -640,7 +640,7 @@
    state: full
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml
@@ -10,7 +10,7 @@
  - type: Prayable
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: PlaceableSurface
  - type: Fixtures
    fixtures:
--- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
@@ -37,7 +37,7 @@
    placeCentered: true
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -35,7 +35,7 @@
  - type: Pullable
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml
@@ -41,7 +41,7 @@
    solution: drainBuffer
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
@@ -36,7 +36,7 @@
    offset: "0, -0.5"
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
+++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml
@@ -18,7 +18,7 @@
        - LowImpassable
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -557,7 +557,7 @@
        type: BodyScannerConsoleBoundUserInterface
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallicStrong
+    damageModifierSet: StrongMetallic
 # WD end

 - type: entity
@@ -596,7 +596,7 @@
    color: "#3c5eb5"
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallicStrong
+    damageModifierSet: StrongMetallic

 - type: entity
  parent: ComputerComms
@@ -848,7 +848,7 @@
    speechSounds: Pai
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallicStrong
+    damageModifierSet: StrongMetallic
  - type: GuideHelp
    guides:
    - Cloning
--- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml
@@ -55,7 +55,7 @@
    layoutId: CryoPod
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml
@@ -23,7 +23,7 @@
        - MachineLayer
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml
@@ -32,7 +32,7 @@
      - clonepod-bodyContainer
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallicStrong
+    damageModifierSet: StrongMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml
@@ -81,7 +81,7 @@
     - entity_storage
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallicStrong
+    damageModifierSet: StrongMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/frame.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml
@@ -38,7 +38,7 @@
        machine_parts: !type:Container
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
      - trigger:
@@ -93,7 +93,7 @@
        - machine_parts
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
      - trigger:
@@ -142,7 +142,7 @@
      node: destroyedMachineFrame
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml
@@ -52,7 +52,7 @@
      machine_parts: !type:Container
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallicStrong
+    damageModifierSet: StrongMetallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml
@@ -85,7 +85,7 @@
          collection: MetalBreak
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: DamageOnHighSpeedImpact
    damage:
      types:
--- a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml
@@ -22,7 +22,7 @@
  - type: ExtensionCableReceiver
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml
@@ -11,7 +11,7 @@
      range: 200
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Rotatable
      rotateWhileAnchored: true
    - type: Fixtures
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml
@@ -15,7 +15,7 @@
      anchored: true
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml
@@ -13,7 +13,7 @@
    anchored: true
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: SubFloorHide
  - type: CollideOnAnchor
  - type: PipeAppearance
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml
@@ -72,7 +72,7 @@
    board: PortableScrubberMachineCircuitBoard
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - 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
@@ -30,7 +30,7 @@
      node: frame
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -37,7 +37,7 @@
  - type: Anchorable
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -54,7 +54,7 @@
        nodeGroupID: MVPower
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallicStrong
+    damageModifierSet: StrongMetallic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml
@@ -30,7 +30,7 @@
        - WallLayer
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -146,7 +146,7 @@
        - WallLayer
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml
@@ -53,7 +53,7 @@
  - type: Pullable
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: PacifismDangerousAttack
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -62,7 +62,7 @@
  - type: SolarPanel
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -91,7 +91,7 @@
    state: broken
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -142,7 +142,7 @@
    noRot: true
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -187,7 +187,7 @@
    noRot: true
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -103,7 +103,7 @@
  - type: WiresVisuals
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallicStrong
+    damageModifierSet: StrongMetallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -172,7 +172,7 @@
  - type: WallMount
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
@@ -16,7 +16,7 @@
      anchored: true
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/cables.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml
@@ -28,7 +28,7 @@
  # WD edit sounds start
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - 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
@@ -45,7 +45,7 @@
    drawRate: 50
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Power/smes.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml
@@ -82,7 +82,7 @@
      mediumVoltageNode: output
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallicStrong
+      damageModifierSet: StrongMetallic
    - type: BatterySensor
    - type: DeviceNetwork
      deviceNetId: AtmosDevices
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -53,7 +53,7 @@
    supplyRampRate: 1000
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallicStrong
+    damageModifierSet: StrongMetallic
  - type: PacifismDangerousAttack
  - type: Destructible
    thresholds:
@@ -186,7 +186,7 @@
    supplyRampRate: 1000
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: PacifismDangerousAttack
  - type: Destructible
    thresholds:
--- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
+++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml
@@ -288,7 +288,7 @@
      ballistic-ammo: !type:Container
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
@@ -9,7 +9,7 @@
      anchored: true
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Specific/dragon.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/dragon.yml
@@ -33,7 +33,7 @@
    enabled: false
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml
@@ -27,7 +27,7 @@
        shader: unshaded
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - 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
@@ -63,7 +63,7 @@
            - !type:DumpCanisterBehavior
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Physics
      bodyType: Dynamic
    - type: Fixtures
@@ -1275,7 +1275,7 @@
          acts: [ "Destruction" ]
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - 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
@@ -146,7 +146,7 @@
        ents: []
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -255,7 +255,7 @@
    isPlaceable: false
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - 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: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
@@ -22,7 +22,7 @@
        - WallLayer
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml
@@ -45,7 +45,7 @@
      storagebase: !type:Container
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -134,7 +134,7 @@
      storagebase: !type:Container
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
@@ -72,7 +72,7 @@
    price: 200
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -162,7 +162,7 @@
    anchored: true
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
@@ -32,7 +32,7 @@
        - MachineLayer
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml
@@ -27,7 +27,7 @@
          !type:PhysShapeAabb {}
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
@@ -96,7 +96,7 @@
  # WD edit sounds end
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - 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.
@@ -36,7 +36,7 @@
        ItemCabinet: !type:ContainerSlot
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml
@@ -36,7 +36,7 @@
        ItemCabinet: !type:ContainerSlot
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml
@@ -82,7 +82,7 @@
    node: fire_alarm
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml
@@ -74,7 +74,7 @@
    node: intercom
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - 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 @@
  - type: WallMount
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - 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?
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml
@@ -26,7 +26,7 @@
    layoutId: SurveillanceCamera
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Sprite
    drawdepth: WallMountedItems
    sprite: Structures/Wallmounts/camera.rsi
@@ -211,7 +211,7 @@
      anchored: true
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - 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
@@ -12,7 +12,7 @@
            "/Audio/Weapons/smash.ogg"
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
        - trigger:
@@ -105,7 +105,7 @@
      - Pressed
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
@@ -19,7 +19,7 @@
    anchored: true
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -365,7 +365,7 @@
          - Pickaxe
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/Entities/Structures/Walls/girders.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/girders.yml
@@ -29,7 +29,7 @@
    state: wall_girder
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- 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
@@ -31,7 +31,7 @@
      shader: unshaded
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: DeviceNetwork
    deviceNetId: Wireless
    receiveFrequencyId: BasicDevice
--- a/Resources/Prototypes/Entities/Structures/catwalk.yml
+++ b/Resources/Prototypes/Entities/Structures/catwalk.yml
@@ -31,7 +31,7 @@
    node: Catwalk
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/conveyor.yml
+++ b/Resources/Prototypes/Entities/Structures/conveyor.yml
@@ -60,7 +60,7 @@
    node: entity
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/meat_spike.yml
+++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml
@@ -14,7 +14,7 @@
      map: ["base"]
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - 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: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/soil.yml
+++ b/Resources/Prototypes/Entities/Structures/soil.yml
@@ -22,7 +22,7 @@
        - FullTileMask
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Structures/stairs.yml
+++ b/Resources/Prototypes/Entities/Structures/stairs.yml
@@ -14,7 +14,7 @@
    anchored: true
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/Entities/Tiles/bananium.yml
+++ b/Resources/Prototypes/Entities/Tiles/bananium.yml
@@ -23,7 +23,7 @@
    node: BananiumFloor
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml
@@ -102,7 +102,7 @@
  - type: InteractionOutline
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -162,7 +162,7 @@
  - type: InteractionOutline
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
@@ -221,7 +221,7 @@
  - type: InteractionOutline
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml
@@ -26,7 +26,7 @@
            - WallLayer
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/_White/Entities/Cult/other_structures.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/other_structures.yml
@@ -93,7 +93,7 @@
      state: cultgirder
    - type: Damageable
      damageContainer: StructuralInorganic
-      damageModifierSet: StructuralMetallic
+      damageModifierSet: Metallic
    - type: Destructible
      thresholds:
        - trigger:
--- a/Resources/Prototypes/_White/Entities/Structures/Wallmounts/consoles.yml
+++ b/Resources/Prototypes/_White/Entities/Structures/Wallmounts/consoles.yml
@@ -30,7 +30,7 @@
    drawdepth: Objects
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger:
--- a/Resources/Prototypes/_White/Structures/Machines/atm.yml
+++ b/Resources/Prototypes/_White/Structures/Machines/atm.yml
@@ -47,7 +47,7 @@
      path: /Audio/Ambience/Objects/vending_machine_hum.ogg
  - type: Damageable
    damageContainer: StructuralInorganic
-    damageModifierSet: StructuralMetallic
+    damageModifierSet: Metallic
  - type: Destructible
    thresholds:
    - trigger: