From 62a00000bf461171d01e4a9829d8561c54a5e9c5 Mon Sep 17 00:00:00 2001 From: Aviu00 <93730715+Aviu00@users.noreply.github.com> Date: Fri, 29 Mar 2024 21:05:24 +0900 Subject: [PATCH] Structural fix part 2 (#230) * Revert "- fix: Structural damage fix. (#215)" This reverts commit 4a06c1509a45fc601f0ca669fb01cbe27f1b85f7. * - 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. --- .../Prototypes/Entities/Effects/chemistry_effects.yml | 2 +- .../Entities/Objects/Specific/Kitchen/foodcarts.yml | 2 +- .../Entities/Structures/Decoration/fireplace.yml | 2 +- .../Entities/Structures/Decoration/showcase.yml | 2 +- .../Structures/Dispensers/base_structuredispensers.yml | 2 +- .../Entities/Structures/Doors/Airlocks/base_assembly.yml | 4 ++-- .../Structures/Doors/Airlocks/base_structureairlocks.yml | 2 +- .../Entities/Structures/Doors/Firelocks/firelock.yml | 4 ++-- .../Entities/Structures/Doors/Firelocks/frame.yml | 4 ++-- .../Entities/Structures/Doors/SecretDoor/secret_door.yml | 2 +- .../Entities/Structures/Doors/Shutter/blast_door.yml | 2 +- .../Entities/Structures/Doors/Shutter/shutters.yml | 4 ++-- .../Entities/Structures/Doors/Windoors/assembly.yml | 4 ++-- .../Structures/Doors/Windoors/base_structurewindoors.yml | 2 +- .../Entities/Structures/Doors/Windoors/windoor.yml | 2 +- .../Structures/Furniture/Tables/base_structuretables.yml | 2 +- .../Entities/Structures/Furniture/Tables/tables.yml | 8 ++++---- .../Prototypes/Entities/Structures/Furniture/altar.yml | 2 +- .../Prototypes/Entities/Structures/Furniture/beds.yml | 2 +- .../Prototypes/Entities/Structures/Furniture/chairs.yml | 2 +- .../Prototypes/Entities/Structures/Furniture/sink.yml | 2 +- .../Entities/Structures/Lighting/base_lighting.yml | 2 +- .../Entities/Structures/Lighting/ground_lighting.yml | 2 +- .../Entities/Structures/Machines/Computers/computers.yml | 6 +++--- .../Entities/Structures/Machines/Medical/cryo_pod.yml | 2 +- .../Structures/Machines/base_structuremachines.yml | 2 +- .../Entities/Structures/Machines/cloning_machine.yml | 2 +- .../Entities/Structures/Machines/fatextractor.yml | 2 +- .../Prototypes/Entities/Structures/Machines/frame.yml | 6 +++--- .../Entities/Structures/Machines/medical_scanner.yml | 2 +- .../Entities/Structures/Machines/smartfridge.yml | 2 +- .../Prototypes/Entities/Structures/Machines/stasisbed.yml | 2 +- .../Structures/Machines/wireless_surveillance_camera.yml | 2 +- .../Entities/Structures/Piping/Atmospherics/miners.yml | 2 +- .../Entities/Structures/Piping/Atmospherics/pipes.yml | 2 +- .../Entities/Structures/Piping/Atmospherics/portable.yml | 2 +- .../Piping/Disposal/high_pressure_machine_frame.yml | 2 +- .../Entities/Structures/Piping/Disposal/pipes.yml | 2 +- .../Structures/Power/Generation/Singularity/emitter.yml | 2 +- .../Entities/Structures/Power/Generation/ame.yml | 4 ++-- .../Entities/Structures/Power/Generation/generators.yml | 2 +- .../Entities/Structures/Power/Generation/solar.yml | 8 ++++---- Resources/Prototypes/Entities/Structures/Power/apc.yml | 4 ++-- .../Entities/Structures/Power/cable_terminal.yml | 2 +- Resources/Prototypes/Entities/Structures/Power/cables.yml | 2 +- .../Prototypes/Entities/Structures/Power/debug_power.yml | 4 ++-- Resources/Prototypes/Entities/Structures/Power/smes.yml | 2 +- .../Prototypes/Entities/Structures/Power/substation.yml | 4 ++-- .../Prototypes/Entities/Structures/Shuttles/cannons.yml | 2 +- .../Entities/Structures/Specific/Atmospherics/sensor.yml | 2 +- .../Prototypes/Entities/Structures/Specific/dragon.yml | 2 +- .../Prototypes/Entities/Structures/Specific/xeno.yml | 2 +- .../Structures/Storage/Canisters/gas_canisters.yml | 4 ++-- .../Structures/Storage/Closets/base_structureclosets.yml | 4 ++-- .../Structures/Storage/Crates/base_structurecrates.yml | 2 +- .../Structures/Storage/Tanks/base_structuretanks.yml | 2 +- .../Entities/Structures/Storage/filing_cabinets.yml | 4 ++-- .../Prototypes/Entities/Structures/Storage/morgue.yml | 4 ++-- .../Prototypes/Entities/Structures/Storage/storage.yml | 2 +- .../Structures/Wallmounts/Signs/base_structuresigns.yml | 2 +- .../Entities/Structures/Wallmounts/air_alarm.yml | 2 +- .../Entities/Structures/Wallmounts/defib_cabinet.yml | 4 ++-- .../Structures/Wallmounts/extinguisher_cabinet.yml | 2 +- .../Entities/Structures/Wallmounts/fire_alarm.yml | 2 +- .../Entities/Structures/Wallmounts/intercom.yml | 2 +- .../Structures/Wallmounts/monitors_televisions.yml | 2 +- .../Entities/Structures/Wallmounts/noticeboard.yml | 2 +- .../Structures/Wallmounts/surveillance_camera.yml | 4 ++-- .../Prototypes/Entities/Structures/Wallmounts/switch.yml | 4 ++-- .../Entities/Structures/Wallmounts/walldispenser.yml | 2 +- .../Prototypes/Entities/Structures/Walls/asteroid.yml | 2 +- .../Prototypes/Entities/Structures/Walls/girders.yml | 2 +- Resources/Prototypes/Entities/Structures/Walls/grille.yml | 2 +- .../Prototypes/Entities/Structures/cargo_telepad.yml | 4 ++-- Resources/Prototypes/Entities/Structures/catwalk.yml | 2 +- Resources/Prototypes/Entities/Structures/conveyor.yml | 2 +- Resources/Prototypes/Entities/Structures/meat_spike.yml | 2 +- .../Prototypes/Entities/Structures/plastic_flaps.yml | 2 +- Resources/Prototypes/Entities/Structures/soil.yml | 2 +- Resources/Prototypes/Entities/Structures/stairs.yml | 4 ++-- Resources/Prototypes/Entities/Tiles/bananium.yml | 2 +- .../_White/Entities/Cult/Altars/cult_altars.yml | 6 +++--- .../Prototypes/_White/Entities/Cult/Effects/shield.yml | 2 +- .../Prototypes/_White/Entities/Cult/other_structures.yml | 2 +- .../_White/Entities/Structures/Wallmounts/consoles.yml | 2 +- Resources/Prototypes/_White/Structures/Machines/atm.yml | 2 +- 86 files changed, 116 insertions(+), 116 deletions(-) diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml index fe9175e2d9..fb0c0df809 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml b/Resources/Prototypes/Entities/Objects/Specific/Kitchen/foodcarts.yml index 0894d6a754..b9265b5b96 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml index 637400adc4..acedcb6976 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml index f80dd063ea..0805ad1e9d 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml index e30fcef0dd..4f57d1479e 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml index 17b770faec..f8ce1d973a 100644 --- 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: @@ -42,4 +42,4 @@ graph: Airlock node: assembly placement: - mode: SnapgridCenter + mode: SnapgridCenter \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml index 258d785c31..034d5fdcfa 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml index 4c19dc57ca..71075d7a0c 100644 --- 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: @@ -108,7 +108,7 @@ - type: AccessReader access: [ [ "Engineering" ] ] - type: ReflectAspectMark - + - type: entity id: Firelock parent: BaseFirelock diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml index 46a174d244..5404257a10 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml index 5f81434e54..697a6c39ba 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml index c4060c2095..0bc0295013 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml index ba1640dc20..a6b0aac7c4 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml index b7bf63c93c..3212aaffb8 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml index 20b3ab6360..8a7e069da1 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index a70d738b7e..0feaf81a6c 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml index ac0d44b5d9..2862980dad 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index 6bd8c953c7..bb90327747 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml index 382aa477db..52fe3face6 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml index 36920f5dcc..9c04da9788 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index 1791a09f6b..c343b69e1d 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/sink.yml b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml index 7784bc139e..7099ae306b 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index b467f10c7f..54a0a5a7ed 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index 16ce332b42..3a921130af 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 8f15113a34..48d2560e07 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml index a842183198..bcb55f70eb 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml index f321c2afb0..95cd098735 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml index da902dce29..8e46996a40 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml index a46f53f09e..1522b1975c 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Machines/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/frame.yml index 9d5a8c3885..dd1475ad70 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml index 9dab23a3b4..5699bd82ff 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml index fd0707ec3c..2d391d8690 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml index b29be996d3..ca4cda8659 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml index 7afcb5904c..32f05b2ac8 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml index 3aa9079206..cdca12cce8 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml index eef6707458..34c0415f6c 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml index 17c15178f7..cdc9164b8b 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml index 5bc0f54d93..6eb90bcb7c 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml index 1b82bf794d..7831146338 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml index a48e2221c3..473e41b3e6 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml index b4b0b97f37..2fcadf7ef4 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml index 7cf59f8b44..1b14c58c8c 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml index 8de95276b0..4f87ca8335 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml index 9ed61ea810..639133e7d9 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml index 600b97a976..35a0325160 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml index 536f857c19..d073572b19 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml index 41e9efd5fc..ff49efc2da 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml index 02c4a0899b..e9898c881f 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml index 0e642be6ea..e46b06ffe1 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml index d2478b5977..0d5df4a8b0 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml index da480ee1ab..0cf2d8c0f6 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Specific/dragon.yml b/Resources/Prototypes/Entities/Structures/Specific/dragon.yml index a705f09a91..d2152f3958 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml index 7b9be555a5..da8560d70a 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index 1bc7e871fe..bea65669c3 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml index b4c2bd55c9..ecba48b1ed 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml index 8df34a7b3d..acf4fd2149 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml index b77eeb3355..e1a41b03d4 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml index 981c5f7e85..685fbff13c 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml index 25ea39e0e1..894f13d096 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml index f57ade99ad..047cd26d99 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml index 4d355d6af0..b96cc98370 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml index 3c7c649359..c6f9e8524f 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml index 9c920365f4..2028559544 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml index 118126a66a..408a341d1c 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml index 1e2409b925..2281d1f2b2 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml index 3d1b122dcf..9df4a9b0d1 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml index 1d074d839d..634d5ac3fe 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml index b46ad56f82..a9a55de7b8 100644 --- 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? diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml index b2afee2444..9b837e64a1 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml index 67b5adbf9a..a6f8481fe0 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml index 1df43be52c..45315d2a01 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index 97d7e96891..2f8b7c35ce 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Walls/girders.yml b/Resources/Prototypes/Entities/Structures/Walls/girders.yml index 7d6f6125aa..bb4cf00e36 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml index 07ba72c589..f75da1fe54 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml @@ -160,4 +160,4 @@ - WallLayer - type: Construction graph: GrilleDiagonal - node: grilleDiagonal + node: grilleDiagonal \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml index 566b553e22..e143e80880 100644 --- 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 diff --git a/Resources/Prototypes/Entities/Structures/catwalk.yml b/Resources/Prototypes/Entities/Structures/catwalk.yml index 14ced18771..f7fe0bce4d 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml index c741a0309f..8f33f93fc9 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/meat_spike.yml b/Resources/Prototypes/Entities/Structures/meat_spike.yml index b009a257e0..16aa0f4210 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml index 712e0916d4..1d3efbdaef 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/soil.yml b/Resources/Prototypes/Entities/Structures/soil.yml index 1bf8c03640..9325332934 100644 --- 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: diff --git a/Resources/Prototypes/Entities/Structures/stairs.yml b/Resources/Prototypes/Entities/Structures/stairs.yml index c7e990afd1..0b893f7f45 100644 --- 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: @@ -43,4 +43,4 @@ - type: Sprite sprite: Structures/stairs.rsi state: stairs_stage - drawdepth: FloorTiles + drawdepth: FloorTiles \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Tiles/bananium.yml b/Resources/Prototypes/Entities/Tiles/bananium.yml index e808ba311a..82ccb5a1ff 100644 --- 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: diff --git a/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml b/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml index 7498ec6ef5..21bd42b022 100644 --- 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: diff --git a/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml b/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml index 11d1bfdc28..b493f35b58 100644 --- 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: diff --git a/Resources/Prototypes/_White/Entities/Cult/other_structures.yml b/Resources/Prototypes/_White/Entities/Cult/other_structures.yml index 78a1a35f5d..e0c34eef09 100644 --- 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: diff --git a/Resources/Prototypes/_White/Entities/Structures/Wallmounts/consoles.yml b/Resources/Prototypes/_White/Entities/Structures/Wallmounts/consoles.yml index f87aaff20a..ec9cff9a9a 100644 --- 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: diff --git a/Resources/Prototypes/_White/Structures/Machines/atm.yml b/Resources/Prototypes/_White/Structures/Machines/atm.yml index 0482a38d1b..befce4fdb3 100644 --- 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: