diff --git a/Resources/Prototypes/Entities/Objects/Decoration/mining.yml b/Resources/Prototypes/Entities/Objects/Decoration/mining.yml index fb5afcd3f5..6dc7eef80c 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/mining.yml @@ -1,7 +1,7 @@ - type: entity id: WoodenSign name: wooden sign - description: He's pointing somewhere. + description: He's pointing somewhere. components: - type: Clickable - type: InteractionOutline @@ -18,7 +18,7 @@ bounds: "-0.35,-0.4,0.35,0.4" density: 100 - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: MeleeSound soundGroups: @@ -60,7 +60,7 @@ sprite: Objects/Decoration/mines.rsi state: support - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Physics bodyType: Static @@ -128,7 +128,7 @@ sprite: Objects/Decoration/mines.rsi state: support_wall - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Physics bodyType: Static @@ -176,4 +176,4 @@ spawn: Log: min: 1 - max: 3 \ No newline at end of file + max: 3 diff --git a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml index d11aa714cb..be732c17af 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml @@ -20,7 +20,7 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Inflatable - type: Destructible thresholds: @@ -68,7 +68,7 @@ closeSound: path: /Audio/Misc/zip.ogg - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Inflatable - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml index 22aef79340..4e20d764d4 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml @@ -14,7 +14,7 @@ energy: 3 color: "#FFC90C" - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml b/Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml index 15897201b2..2c5040da98 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml @@ -18,7 +18,7 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml index c1a01c423b..3e5f9ca18a 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/crystals.yml @@ -38,7 +38,7 @@ energy: 3 color: "#52ff39" - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml index 5e9bbb3c83..16640dc4fd 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/curtains.yml @@ -38,7 +38,7 @@ path: /Audio/Effects/curtain_openclose.ogg - type: Appearance - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Construction graph: Curtains diff --git a/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml b/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml index 6ce4326831..b2806b93c9 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml @@ -19,7 +19,7 @@ autoRot: true offset: "0, 0.6" - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml index 3446c4980b..637400adc4 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml @@ -35,8 +35,8 @@ energy: 3 color: "#FF6F00" - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml index 53cc75faa6..f80dd063ea 100644 --- a/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml +++ b/Resources/Prototypes/Entities/Structures/Decoration/showcase.yml @@ -7,8 +7,8 @@ components: - type: Anchorable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml index adb410562e..e30fcef0dd 100644 --- a/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml +++ b/Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml @@ -35,8 +35,8 @@ - type: Anchorable - type: Pullable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml index fcdb0d2dea..17b770faec 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml @@ -28,8 +28,8 @@ anchored: true noRot: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -42,4 +42,4 @@ graph: Airlock node: assembly placement: - mode: SnapgridCenter \ No newline at end of file + mode: SnapgridCenter diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml index 034d5fdcfa..258d785c31 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: StrongMetallic + damageModifierSet: StructuralMetallicStrong - 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 cead7f3141..4c19dc57ca 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml @@ -17,8 +17,8 @@ - type: DeviceNetworkRequiresPower - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -108,7 +108,7 @@ - type: AccessReader access: [ [ "Engineering" ] ] - type: ReflectAspectMark - + - type: entity id: Firelock parent: BaseFirelock diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml index 8cf75e89e1..46a174d244 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 @@ -23,8 +23,8 @@ node: frame1 - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml index dfe4f39ece..8970e54f5a 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml @@ -42,8 +42,8 @@ - type: Airtight fixVacuum: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -95,7 +95,7 @@ closeSound: path: /Audio/Effects/door_close.ogg - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: @@ -144,8 +144,8 @@ - state: closed map: ["enum.DoorVisualLayers.Base"] - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml index 154467213a..5f81434e54 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml @@ -40,8 +40,8 @@ - type: Airtight fixVacuum: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -95,8 +95,8 @@ noRot: false - type: Rotatable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml index 97f3c1b9e3..c4060c2095 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BlastDoor parent: BaseShutter name: blast door @@ -26,7 +26,7 @@ resistance: 8 - type: Damageable damageContainer: StructuralInorganic - damageModifierSet: StrongMetallic + damageModifierSet: StructuralMetallicStrong - type: ContainerFill containers: board: [ DoorElectronics ] @@ -65,8 +65,8 @@ state: assembly - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml index ac5becdc38..ba1640dc20 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: StrongMetallic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: @@ -208,8 +208,8 @@ - board - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml index a86c7a44b9..b7bf63c93c 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! @@ -24,8 +24,8 @@ - type: Pullable - type: Rotatable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - 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 8a7e069da1..20b3ab6360 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 0feaf81a6c..a70d738b7e 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 c1b0cf0423..ac0d44b5d9 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml @@ -6,8 +6,8 @@ abstract: true components: - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: PlaceableSurface - type: Fixtures fixtures: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml index 5425e9b240..6bd8c953c7 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml @@ -22,8 +22,8 @@ layer: - TableLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: IconSmooth key: state base: state_ @@ -79,7 +79,7 @@ layer: - TableLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: IconSmooth key: state @@ -122,8 +122,8 @@ sprite: Structures/Furniture/Tables/frame.rsi state: full - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: IconSmooth key: state base: state_ @@ -166,8 +166,8 @@ - type: Icon sprite: Structures/Furniture/Tables/generic.rsi - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -596,7 +596,7 @@ sprite: Structures/Furniture/Tables/counterwood.rsi state: full - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: @@ -639,8 +639,8 @@ sprite: Structures/Furniture/Tables/countermetal.rsi state: full - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml index 24578668a0..382aa477db 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml @@ -9,8 +9,8 @@ - type: Transform - type: Prayable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: PlaceableSurface - type: Fixtures fixtures: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml index 02fe3e97e5..36920f5dcc 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml @@ -36,8 +36,8 @@ - type: PlaceableSurface placeCentered: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml index 24d9b8d070..cc91686c9a 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/bookshelf.yml @@ -17,7 +17,7 @@ fillBaseName: book - type: Damageable damageModifierSet: Wood - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml index fa6a00623b..359dffba0f 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml @@ -18,7 +18,7 @@ canCollide: false - type: Fixtures - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: @@ -134,7 +134,7 @@ canCollide: false - type: Fixtures - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index abf63e3970..1791a09f6b 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -34,8 +34,8 @@ buckleOffset: "0,-0.05" - type: Pullable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml index ada913c0e9..68b94ef03b 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -9,7 +9,7 @@ state: dresser - type: Damageable damageModifierSet: Wood - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml index 53d268facf..2d0c59672d 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml @@ -32,7 +32,7 @@ stash: !type:ContainerSlot {} - type: Pullable - type: Damageable - damageContainer: Inorganic # The pot. Not the plant. Or is it plastic? + damageContainer: StructuralInorganic # The pot. Not the plant. Or is it plastic? - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/sink.yml b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml index 22f0e2dc2a..7784bc139e 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/sink.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/sink.yml @@ -40,8 +40,8 @@ - type: DumpableSolution solution: drainBuffer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml index d2a5853fcb..1ac47624ee 100644 --- a/Resources/Prototypes/Entities/Structures/Holographic/projections.yml +++ b/Resources/Prototypes/Entities/Structures/Holographic/projections.yml @@ -16,7 +16,7 @@ - type: TimedDespawn lifetime: 90 - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index 9eebe0b6e8..b467f10c7f 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -35,8 +35,8 @@ softness: 1 offset: "0, -0.5" - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -235,7 +235,7 @@ softness: 1.1 enabled: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index 8541412c25..16ce332b42 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml @@ -17,8 +17,8 @@ - MidImpassable - LowImpassable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 92f9787eb9..8f15113a34 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -556,8 +556,8 @@ - key: enum.BodyScannerConsoleUIKey.Key type: BodyScannerConsoleBoundUserInterface - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong # WD end - type: entity @@ -595,8 +595,8 @@ energy: 1.6 color: "#3c5eb5" - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: entity parent: ComputerComms @@ -847,8 +847,8 @@ speechVerb: Robotic speechSounds: Pai - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: GuideHelp guides: - Cloning diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml index 08e3173334..4ddabbd1e2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml @@ -25,7 +25,7 @@ - type: Sprite drawdepth: Objects - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Electronic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml index f150a3f63b..a842183198 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml @@ -54,8 +54,8 @@ boardName: wires-board-name-cryopod layoutId: CryoPod - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml index 7861b52b65..f321c2afb0 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml @@ -22,8 +22,8 @@ layer: - MachineLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml index 5d9ab0dd7e..da902dce29 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml @@ -31,8 +31,8 @@ containers: - clonepod-bodyContainer - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml index 9f09e49059..a46f53f09e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml @@ -80,8 +80,8 @@ containers: - entity_storage - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/frame.yml index 3b3f0402aa..9d5a8c3885 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/frame.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/frame.yml @@ -37,8 +37,8 @@ machine_board: !type:Container machine_parts: !type:Container - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -92,8 +92,8 @@ - machine_board - machine_parts - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -141,8 +141,8 @@ graph: Machine node: destroyedMachineFrame - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml index 6f05baee94..9dab23a3b4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml @@ -51,8 +51,8 @@ machine_board: !type:Container machine_parts: !type:Container - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml index 5a62b74ac0..fd0707ec3c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml @@ -84,8 +84,8 @@ sound: collection: MetalBreak - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: DamageOnHighSpeedImpact damage: types: diff --git a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml index 5f7182f7dd..b29be996d3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml @@ -21,8 +21,8 @@ powerLoad: 1000 - type: ExtensionCableReceiver - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml index d69eb96f62..7afcb5904c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml @@ -10,8 +10,8 @@ - type: WirelessNetworkConnection range: 200 - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Rotatable rotateWhileAnchored: true - type: Fixtures diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml index 2231fc4ddc..3aa9079206 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml @@ -14,8 +14,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml index e5b77095b0..eef6707458 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml @@ -12,8 +12,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: SubFloorHide - type: CollideOnAnchor - type: PipeAppearance diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml index e3ae06fa50..17c15178f7 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml @@ -71,8 +71,8 @@ - type: Machine board: PortableScrubberMachineCircuitBoard - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: 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 6f3d0705cb..5bc0f54d93 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 @@ -29,8 +29,8 @@ graph: DisposalMachine node: frame - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - 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 ba09ca1805..1b82bf794d 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml @@ -36,8 +36,8 @@ anchored: true - type: Anchorable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml index 52698f62cc..a48e2221c3 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml @@ -53,8 +53,8 @@ !type:CableDeviceNode nodeGroupID: MVPower - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml index 023d2f129a..b4b0b97f37 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml @@ -29,8 +29,8 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -145,8 +145,8 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml index 4948231b90..7cf59f8b44 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml @@ -52,8 +52,8 @@ - type: Anchorable - type: Pullable - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: PacifismDangerousAttack - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml index 069ea4d827..8de95276b0 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml @@ -61,8 +61,8 @@ supplyRampRate: 500 - type: SolarPanel - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -90,8 +90,8 @@ - type: Sprite state: broken - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -141,8 +141,8 @@ anchored: true noRot: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -186,8 +186,8 @@ anchored: true noRot: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml index beb5f31d62..9ed61ea810 100644 --- a/Resources/Prototypes/Entities/Structures/Power/apc.yml +++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml @@ -102,8 +102,8 @@ layoutId: APC - type: WiresVisuals - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: Destructible thresholds: - trigger: @@ -171,8 +171,8 @@ node: apcFrame - type: WallMount - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml index da724014dc..600b97a976 100644 --- a/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml @@ -15,8 +15,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml index 60b41d53be..536f857c19 100644 --- a/Resources/Prototypes/Entities/Structures/Power/cables.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml @@ -27,8 +27,8 @@ "/Audio/Weapons/smash.ogg" # WD edit sounds start - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/debug_power.yml b/Resources/Prototypes/Entities/Structures/Power/debug_power.yml index a102516ce6..41e9efd5fc 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 @@ -44,8 +44,8 @@ - type: PowerConsumer drawRate: 50 - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Power/smes.yml b/Resources/Prototypes/Entities/Structures/Power/smes.yml index c2170a127a..02c4a0899b 100644 --- a/Resources/Prototypes/Entities/Structures/Power/smes.yml +++ b/Resources/Prototypes/Entities/Structures/Power/smes.yml @@ -81,8 +81,8 @@ highVoltageNode: input mediumVoltageNode: output - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: BatterySensor - type: DeviceNetwork deviceNetId: AtmosDevices diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml index 94de12be18..0e642be6ea 100644 --- a/Resources/Prototypes/Entities/Structures/Power/substation.yml +++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml @@ -52,8 +52,8 @@ supplyRampTolerance: 5000 supplyRampRate: 1000 - type: Damageable - damageContainer: Inorganic - damageModifierSet: StrongMetallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong - type: PacifismDangerousAttack - type: Destructible thresholds: @@ -185,8 +185,8 @@ supplyRampTolerance: 5000 supplyRampRate: 1000 - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: PacifismDangerousAttack - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml index 50f15a5c89..d2478b5977 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml @@ -30,7 +30,7 @@ layer: - MachineLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Electronic - type: Transform anchored: true @@ -287,8 +287,8 @@ containers: ballistic-ammo: !type:Container - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml index f87be42659..fa8b382ade 100644 --- a/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml @@ -40,7 +40,7 @@ powerLoad: 1500 - type: ExtensionCableReceiver - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Electronic - type: Destructible thresholds: @@ -193,7 +193,7 @@ - !type:ChangeConstructionNodeBehavior node: machineFrame - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Electronic - type: StaticPrice price: 2000 diff --git a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml index 8dd154af4b..da480ee1ab 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml @@ -8,8 +8,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Specific/dragon.yml b/Resources/Prototypes/Entities/Structures/Specific/dragon.yml index 8a7f13d1a4..a705f09a91 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/dragon.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/dragon.yml @@ -32,8 +32,8 @@ # only show after making the announcement at 50% enabled: false - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml index 0fcca0c1d5..7b9be555a5 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/xeno.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/xeno.yml @@ -26,8 +26,8 @@ - state: wardingtower-unshaded shader: unshaded - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Physics bodyType: Static - type: Fixtures diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml index 7659fceef8..1bc7e871fe 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml @@ -62,8 +62,8 @@ acts: [ "Destruction" ] - !type:DumpCanisterBehavior - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Physics bodyType: Dynamic - type: Fixtures @@ -1274,8 +1274,8 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: InteractionOutline - type: Sprite sprite: Structures/Storage/canister.rsi diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml index 46ec7cbf6a..b4c2bd55c9 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/base_structureclosets.yml @@ -145,8 +145,8 @@ entity_storage: !type:Container ents: [] - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -254,8 +254,8 @@ placeCentered: true isPlaceable: false - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml index acf4fd2149..8df34a7b3d 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: Metallic + damageModifierSet: StructuralMetallic - 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 01bacf11fb..b77eeb3355 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml @@ -21,8 +21,8 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml index d341c017a7..981c5f7e85 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml @@ -44,8 +44,8 @@ containers: storagebase: !type:Container - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -133,8 +133,8 @@ containers: storagebase: !type:Container - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml index bdb02d2bc3..d78d8c2344 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml @@ -11,7 +11,7 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: MeleeSound soundGroups: diff --git a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml index d1e0478880..eda36f355b 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml @@ -72,8 +72,8 @@ - type: StaticPrice price: 200 - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -162,8 +162,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml index 961d7854c0..430501d3ab 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/ore_box.yml @@ -9,7 +9,7 @@ - type: Anchorable - type: InteractionOutline - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Wood - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml index 79a1e35799..f57ade99ad 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml @@ -31,8 +31,8 @@ layer: - MachineLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml index 10b136c093..4d355d6af0 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml @@ -26,8 +26,8 @@ shape: !type:PhysShapeAabb {} - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml index 76555e9602..3c7c649359 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml @@ -95,8 +95,8 @@ "/Audio/Weapons/smash.ogg" # WD edit sounds end - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml index 24e5cfda2a..10b4c7b017 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/bell.yml @@ -33,7 +33,7 @@ bodyType: Static - type: Fixtures - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/defib_cabinet.yml index 517d2d697d..9c920365f4 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. @@ -35,8 +35,8 @@ containers: ItemCabinet: !type:ContainerSlot - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - 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 a0775641ef..118126a66a 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/extinguisher_cabinet.yml @@ -35,8 +35,8 @@ containers: ItemCabinet: !type:ContainerSlot - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml index 05988fbc21..1e2409b925 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fire_alarm.yml @@ -81,8 +81,8 @@ graph: FireAlarm node: fire_alarm - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml index 070c6e526d..72ec944d25 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml @@ -4,7 +4,7 @@ description: There is a small label that reads "For Emergency use only" along with details for safe use of the axe. As if. components: - type: Damageable # adding destructible causes the entity inside to be deleted when the cabinet is destroyed :( - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: MeleeSound soundGroups: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml index 47d125023c..3d1b122dcf 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/intercom.yml @@ -73,8 +73,8 @@ graph: Intercom node: intercom - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml index 5b8e4a32f4..1d074d839d 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/monitors_televisions.yml @@ -59,8 +59,8 @@ - WallLayer - type: WallMount - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/noticeboard.yml index 4a442d0542..b46ad56f82 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? @@ -20,7 +20,7 @@ anchored: true - type: Damageable damageModifierSet: Wood - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml index 94bc33a210..1a0750c531 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/station_map.yml @@ -16,7 +16,7 @@ layers: - state: station_map_broken - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml index ce3417cc50..b2afee2444 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/surveillance_camera.yml @@ -25,8 +25,8 @@ alwaysRandomize: true layoutId: SurveillanceCamera - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Sprite drawdepth: WallMountedItems sprite: Structures/Wallmounts/camera.rsi @@ -210,8 +210,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Sprite drawdepth: WallMountedItems sprite: Structures/Wallmounts/camera.rsi diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml index 36ecad003a..67b5adbf9a 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml @@ -11,8 +11,8 @@ path: "/Audio/Weapons/smash.ogg" - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -104,8 +104,8 @@ ports: - Pressed - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml index c8778aea50..1df43be52c 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml @@ -18,8 +18,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index ca5eda6792..97d7e96891 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -364,8 +364,8 @@ tags: - Pickaxe - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml index 88d2f272c0..984ec626ab 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/fence_metal.yml @@ -21,7 +21,7 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Walls/girders.yml b/Resources/Prototypes/Entities/Structures/Walls/girders.yml index f500c1e498..7d6f6125aa 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/girders.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/girders.yml @@ -28,8 +28,8 @@ sprite: Structures/Walls/solid.rsi state: wall_girder - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml index 61b0b64f31..07ba72c589 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml @@ -32,7 +32,7 @@ node: grille deconstructionTarget: start - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: PerforatedMetallic - type: PowerConsumer showInMonitor: false @@ -114,7 +114,7 @@ bodyType: Static canCollide: false - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: @@ -160,4 +160,4 @@ - WallLayer - type: Construction graph: GrilleDiagonal - node: grilleDiagonal \ No newline at end of file + node: grilleDiagonal diff --git a/Resources/Prototypes/Entities/Structures/Walls/railing.yml b/Resources/Prototypes/Entities/Structures/Walls/railing.yml index 95d16742d5..3152374e46 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/railing.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/railing.yml @@ -27,7 +27,7 @@ - type: InteractionOutline - type: Repairable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: @@ -96,7 +96,7 @@ - type: InteractionOutline - type: Repairable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: @@ -156,7 +156,7 @@ - type: InteractionOutline - type: Repairable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: @@ -231,7 +231,7 @@ - type: InteractionOutline - type: Repairable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: FlimsyMetallic - type: Destructible thresholds: diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 2bf601c75e..ece31ec918 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -747,7 +747,7 @@ sprite: Structures/Walls/shuttle_diagonal.rsi state: state0 - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: StructuralMetallic - type: Physics bodyType: Static diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml index 8330d71b01..835d5e46be 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/window.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml @@ -133,7 +133,7 @@ - GlassLayer - type: Repairable - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: ExaminableDamage messages: WindowMessages diff --git a/Resources/Prototypes/Entities/Structures/cargo_telepad.yml b/Resources/Prototypes/Entities/Structures/cargo_telepad.yml index d395235a53..566b553e22 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 @@ -30,8 +30,8 @@ map: [ "enum.CargoTelepadLayers.Beam" ] shader: unshaded - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: DeviceNetwork deviceNetId: Wireless receiveFrequencyId: BasicDevice diff --git a/Resources/Prototypes/Entities/Structures/catwalk.yml b/Resources/Prototypes/Entities/Structures/catwalk.yml index c727c24952..14ced18771 100644 --- a/Resources/Prototypes/Entities/Structures/catwalk.yml +++ b/Resources/Prototypes/Entities/Structures/catwalk.yml @@ -30,8 +30,8 @@ graph: Catwalk node: Catwalk - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml index 990da6fbc0..c741a0309f 100644 --- a/Resources/Prototypes/Entities/Structures/conveyor.yml +++ b/Resources/Prototypes/Entities/Structures/conveyor.yml @@ -59,8 +59,8 @@ graph: ConveyorGraph node: entity - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/meat_spike.yml b/Resources/Prototypes/Entities/Structures/meat_spike.yml index 086066f5c2..b009a257e0 100644 --- a/Resources/Prototypes/Entities/Structures/meat_spike.yml +++ b/Resources/Prototypes/Entities/Structures/meat_spike.yml @@ -13,8 +13,8 @@ - state: spike map: ["base"] - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/plastic_flaps.yml b/Resources/Prototypes/Entities/Structures/plastic_flaps.yml index 1d3efbdaef..712e0916d4 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: Metallic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/soil.yml b/Resources/Prototypes/Entities/Structures/soil.yml index c5c8f2e61f..1bf8c03640 100644 --- a/Resources/Prototypes/Entities/Structures/soil.yml +++ b/Resources/Prototypes/Entities/Structures/soil.yml @@ -21,8 +21,8 @@ layer: - FullTileMask - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/Entities/Structures/stairs.yml b/Resources/Prototypes/Entities/Structures/stairs.yml index f2e1ae62fa..c7e990afd1 100644 --- a/Resources/Prototypes/Entities/Structures/stairs.yml +++ b/Resources/Prototypes/Entities/Structures/stairs.yml @@ -13,8 +13,8 @@ - type: Transform anchored: true - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -43,4 +43,4 @@ - type: Sprite sprite: Structures/stairs.rsi state: stairs_stage - drawdepth: FloorTiles \ No newline at end of file + drawdepth: FloorTiles diff --git a/Resources/Prototypes/Entities/Tiles/bananium.yml b/Resources/Prototypes/Entities/Tiles/bananium.yml index 7f3334fdb8..e808ba311a 100644 --- a/Resources/Prototypes/Entities/Tiles/bananium.yml +++ b/Resources/Prototypes/Entities/Tiles/bananium.yml @@ -22,8 +22,8 @@ graph: FloorBananium node: BananiumFloor - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - 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 26e50e6564..f87aaff20a 100644 --- a/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml +++ b/Resources/Prototypes/White/Entities/Structures/Wallmounts/consoles.yml @@ -1,4 +1,4 @@ -# Base structure +# Base structure - type: entity id: BaseStructureWallMountConsole parent: BaseStructure @@ -29,8 +29,8 @@ - type: Sprite drawdepth: Objects - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/White/Structures/Machines/atm.yml b/Resources/Prototypes/White/Structures/Machines/atm.yml index 0c83671e71..0482a38d1b 100644 --- a/Resources/Prototypes/White/Structures/Machines/atm.yml +++ b/Resources/Prototypes/White/Structures/Machines/atm.yml @@ -46,8 +46,8 @@ sound: path: /Audio/Ambience/Objects/vending_machine_hum.ogg - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/White/Structures/Windows/paper.yml b/Resources/Prototypes/White/Structures/Windows/paper.yml index 12da8ec076..4df348afde 100644 --- a/Resources/Prototypes/White/Structures/Windows/paper.yml +++ b/Resources/Prototypes/White/Structures/Windows/paper.yml @@ -34,7 +34,7 @@ layer: - GlassLayer - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: Destructible thresholds: diff --git a/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml b/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml index c4f1f47faf..ff772fa561 100644 --- a/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml +++ b/Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml @@ -30,7 +30,7 @@ - type: PylonVisuals - type: InteractionOutline - type: Damageable - damageContainer: Inorganic + damageContainer: StructuralInorganic damageModifierSet: Glass - type: Destructible thresholds: @@ -100,8 +100,8 @@ map: [ "enum.CultCraftStructureVisualsLayers.Activated" ] - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -159,8 +159,8 @@ map: [ "enum.CultCraftStructureVisualsLayers.Activated" ] - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: @@ -217,8 +217,8 @@ map: [ "enum.CultCraftStructureVisualsLayers.Activated" ] - type: InteractionOutline - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - 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 7bafba4f94..11d1bfdc28 100644 --- a/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml +++ b/Resources/Prototypes/_White/Entities/Cult/Effects/shield.yml @@ -25,8 +25,8 @@ layer: - WallLayer - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - 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 a5ff612833..85244ec319 100644 --- a/Resources/Prototypes/_White/Entities/Cult/other_structures.yml +++ b/Resources/Prototypes/_White/Entities/Cult/other_structures.yml @@ -78,8 +78,8 @@ sprite: /Textures/White/Cult/Structures/cult_girder.rsi state: cultgirder - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallic - type: Destructible thresholds: - trigger: