diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleTests.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleTests.cs index 8a8767d6bd..3ff68a1361 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleTests.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleTests.cs @@ -29,15 +29,15 @@ namespace Content.IntegrationTests.Tests.Destructible - type: Destructible thresholds: 20: - TriggersOnce: false + triggersOnce: false 50: - Sound: /Audio/Effects/woodhit.ogg - Spawn: + sound: /Audio/Effects/woodhit.ogg + spawn: WoodPlank: - Min: 1 - Max: 1 - Acts: [""Breakage""] - TriggersOnce: false + min: 1 + max: 1 + acts: [""Breakage""] + triggersOnce: false - type: TestThresholdListener "; diff --git a/Content.Server/GameObjects/Components/Destructible/MinMax.cs b/Content.Server/GameObjects/Components/Destructible/MinMax.cs index f806cfa2ab..0a7fa87b4d 100644 --- a/Content.Server/GameObjects/Components/Destructible/MinMax.cs +++ b/Content.Server/GameObjects/Components/Destructible/MinMax.cs @@ -1,13 +1,21 @@ -using Robust.Shared.ViewVariables; +using Robust.Shared.Interfaces.Serialization; +using Robust.Shared.Serialization; +using Robust.Shared.ViewVariables; namespace Content.Server.GameObjects.Components.Destructible { - public struct MinMax + public struct MinMax : IExposeData { [ViewVariables] public int Min; [ViewVariables] public int Max; + + public void ExposeData(ObjectSerializer serializer) + { + serializer.DataField(ref Min, "min", 0); + serializer.DataField(ref Max, "max", 0); + } } } diff --git a/Content.Server/GameObjects/Components/Destructible/Threshold.cs b/Content.Server/GameObjects/Components/Destructible/Threshold.cs index 63d2e86c82..b03c6cd2c2 100644 --- a/Content.Server/GameObjects/Components/Destructible/Threshold.cs +++ b/Content.Server/GameObjects/Components/Destructible/Threshold.cs @@ -52,12 +52,12 @@ namespace Content.Server.GameObjects.Components.Destructible public void ExposeData(ObjectSerializer serializer) { - serializer.DataField(ref Spawn, "Spawn", null); - serializer.DataField(ref Sound, "Sound", string.Empty); - serializer.DataField(ref SoundCollection, "SoundCollection", string.Empty); - serializer.DataField(ref Acts, "Acts", 0, WithFormat.Flags()); - serializer.DataField(ref Triggered, "Triggered", false); - serializer.DataField(ref TriggersOnce, "TriggersOnce", false); + serializer.DataField(ref Spawn, "spawn", null); + serializer.DataField(ref Sound, "sound", string.Empty); + serializer.DataField(ref SoundCollection, "soundCollection", string.Empty); + serializer.DataField(ref Acts, "acts", 0, WithFormat.Flags()); + serializer.DataField(ref Triggered, "triggered", false); + serializer.DataField(ref TriggersOnce, "triggersOnce", false); } /// diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml index 07d9cea26b..ebbb78ee25 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml @@ -61,7 +61,7 @@ - type: Destructible thresholds: 500: - Acts: ["Destruction"] + acts: ["Destruction"] placement: mode: SnapgridCenter diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml b/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml index 06cac55925..f69842afd4 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/beds.yml @@ -32,6 +32,6 @@ - type: Destructible thresholds: 75: - Acts: ["Destruction"] + acts: ["Destruction"] placement: mode: SnapgridCenter diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml b/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml index b534409be3..9994ca8fbd 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/bookshelf.yml @@ -24,12 +24,12 @@ - type: Destructible thresholds: 30: - Sound: /Audio/Effects/woodhit.ogg - Spawn: + sound: /Audio/Effects/woodhit.ogg + spawn: WoodPlank: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: Occluder sizeX: 32 sizeY: 32 diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml b/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml index 28070ec478..f6a1d06dea 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/instruments.yml @@ -25,7 +25,7 @@ - type: Destructible thresholds: 50: - Acts: ["Destruction"] + acts: ["Destruction"] - type: UserInterface interfaces: - key: enum.InstrumentUiKey.Key diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml b/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml index 584491ded2..0ee346bd74 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/pilot_chair.yml @@ -16,7 +16,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: ShuttleController - type: Strap position: Stand diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml b/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml index fd6ccca4bd..86a9e86708 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/seats.yml @@ -35,7 +35,7 @@ - type: Destructible thresholds: 50: - Acts: ["Destruction"] + acts: ["Destruction"] - type: entity name: chair diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml b/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml index f7a3c6c3fc..42ea7246b6 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/storage.yml @@ -32,12 +32,12 @@ - type: Destructible thresholds: 30: - Sound: /Audio/Effects/metalbreak.ogg - Spawn: + sound: /Audio/Effects/metalbreak.ogg + spawn: SteelSheet1: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: entity id: Shelf @@ -73,9 +73,9 @@ - type: Destructible thresholds: 30: - Sound: /Audio/Effects/metalbreak.ogg - Spawn: + sound: /Audio/Effects/metalbreak.ogg + spawn: SteelSheet1: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] diff --git a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml index c58f0d4fc9..365320906c 100644 --- a/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml +++ b/Resources/Prototypes/Entities/Constructible/Furniture/tables.yml @@ -40,12 +40,12 @@ - type: Destructible thresholds: 15: - Sound: /Audio/Effects/metalbreak.ogg - Spawn: + sound: /Audio/Effects/metalbreak.ogg + spawn: SteelSheet1: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: entity id: TableFrame @@ -62,12 +62,12 @@ - type: Destructible thresholds: 1: - Sound: /Audio/Effects/metalbreak.ogg - Spawn: + sound: /Audio/Effects/metalbreak.ogg + spawn: SteelSheet1: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: Construction graph: Tables node: TableFrame @@ -87,12 +87,12 @@ - type: Destructible thresholds: 1: - Sound: /Audio/Effects/metalbreak.ogg - Spawn: + sound: /Audio/Effects/metalbreak.ogg + spawn: SteelSheet1: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: entity id: TableMetal @@ -109,12 +109,12 @@ - type: Destructible thresholds: 15: - Sound: /Audio/Effects/metalbreak.ogg - Spawn: + sound: /Audio/Effects/metalbreak.ogg + spawn: SteelSheet1: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: Construction graph: Tables node: MetalTable @@ -134,12 +134,12 @@ - type: Destructible thresholds: 75: - Sound: /Audio/Effects/metalbreak.ogg - Spawn: + sound: /Audio/Effects/metalbreak.ogg + spawn: SteelSheet1: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: Construction graph: Tables node: ReinforcedTable @@ -159,12 +159,12 @@ - type: Destructible thresholds: 5: - Sound: /Audio/Effects/glass_break2.ogg - Spawn: + sound: /Audio/Effects/glass_break2.ogg + spawn: ShardGlass: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: Construction graph: Tables node: GlassTable @@ -184,12 +184,12 @@ - type: Destructible thresholds: 20: - Sound: /Audio/Effects/glass_break2.ogg - Spawn: + sound: /Audio/Effects/glass_break2.ogg + spawn: ShardGlass: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: Construction graph: Tables node: RGlassTable @@ -209,12 +209,12 @@ - type: Destructible thresholds: 15: - Sound: /Audio/Effects/woodhit.ogg - Spawn: + sound: /Audio/Effects/woodhit.ogg + spawn: WoodPlank: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: Construction graph: Tables node: WoodTable @@ -234,12 +234,12 @@ - type: Destructible thresholds: 15: - Sound: /Audio/Effects/woodhit.ogg - Spawn: + sound: /Audio/Effects/woodhit.ogg + spawn: WoodPlank: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: Construction graph: Tables node: PokerTable @@ -259,8 +259,8 @@ - type: Destructible thresholds: 50: - Sound: /Audio/Effects/picaxe2.ogg - Acts: ["Destruction"] + sound: /Audio/Effects/picaxe2.ogg + acts: ["Destruction"] - type: entity id: TableDebug @@ -277,4 +277,4 @@ - type: Destructible thresholds: 1: - Acts: ["Destruction"] + acts: ["Destruction"] diff --git a/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml b/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml index 84223f0a92..9009cdcbda 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/gascanisterports.yml @@ -14,7 +14,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: GasCanisterPort - type: entity diff --git a/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml b/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml index fe78c0c765..90b2e9631c 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/gascanisters.yml @@ -14,7 +14,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: GasCanister - type: Anchorable - type: Pullable diff --git a/Resources/Prototypes/Entities/Constructible/Ground/kitchen.yml b/Resources/Prototypes/Entities/Constructible/Ground/kitchen.yml index b377c07d43..af0700707e 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/kitchen.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/kitchen.yml @@ -24,5 +24,5 @@ - type: Destructible thresholds: 50: - Acts: ["Destruction"] + acts: ["Destruction"] - type: KitchenSpike diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml b/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml index 070e975392..b9afde3f46 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml @@ -15,7 +15,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Sprite - type: Appearance visuals: diff --git a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml index 47cb7fda02..d40aab4b39 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml @@ -14,7 +14,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Sprite sprite: Constructible/Atmos/pump.rsi - type: Icon diff --git a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml b/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml index 004aef4827..b9eddc780d 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml @@ -24,7 +24,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: entity parent: ScrubberBase diff --git a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml b/Resources/Prototypes/Entities/Constructible/Ground/vents.yml index 64493d89a2..3a2797a12c 100644 --- a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml +++ b/Resources/Prototypes/Entities/Constructible/Ground/vents.yml @@ -24,7 +24,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: entity parent: VentBase diff --git a/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml b/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml index 80c1e75916..19cf39ba88 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml @@ -35,7 +35,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Appearance visuals: - type: CloningPodVisualizer diff --git a/Resources/Prototypes/Entities/Constructible/Power/computers.yml b/Resources/Prototypes/Entities/Constructible/Power/computers.yml index 12fef88d91..d6ef207860 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/computers.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/computers.yml @@ -99,7 +99,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: BreakableConstruction node: monitorBroken - type: Sprite diff --git a/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml b/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml index d81b620554..22f67230c8 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml @@ -32,7 +32,7 @@ - type: Destructible thresholds: 100: - Acts: ["Breakage"] + acts: ["Breakage"] - type: Anchorable - type: entity diff --git a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml b/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml index 558abd5a9d..79558407d9 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml @@ -36,7 +36,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Appearance visuals: - type: MedicalScannerVisualizer diff --git a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml index 94642be5fd..958c28d0e6 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml @@ -237,6 +237,6 @@ - type: Destructible thresholds: 100: - Acts: ["Breakage"] + acts: ["Breakage"] - type: Anchorable - type: Pullable diff --git a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml index 3fdd6bdd91..5cefa79338 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml @@ -33,7 +33,7 @@ - type: Destructible thresholds: 50: - Acts: ["Breakage"] + acts: ["Breakage"] - type: UserInterface interfaces: - key: enum.VendingMachineUiKey.Key diff --git a/Resources/Prototypes/Entities/Constructible/Power/wires.yml b/Resources/Prototypes/Entities/Constructible/Power/wires.yml index 19d8e4bf47..fc4e98d519 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/wires.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/wires.yml @@ -23,7 +23,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: SubFloorHide - type: entity @@ -52,11 +52,11 @@ - type: Destructible thresholds: 100: - Spawn: + spawn: HVWireStack1: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: entity parent: WireBase @@ -86,11 +86,11 @@ - type: Destructible thresholds: 100: - Spawn: + spawn: MVWireStack1: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: entity parent: WireBase @@ -122,8 +122,8 @@ - type: Destructible thresholds: 100: - Spawn: + spawn: ApcExtensionCableStack1: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/ame_controller.yml b/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/ame_controller.yml index 2ad2ea5523..12c047157e 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/ame_controller.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/ame_controller.yml @@ -26,7 +26,7 @@ - type: Destructible thresholds: 500: - Acts: ["Destruction"] + acts: ["Destruction"] - type: SnapGrid offset: Center - type: Anchorable diff --git a/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/ame_structure.yml b/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/ame_structure.yml index 5fcd251a0e..f7ef435d94 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/ame_structure.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/Engines/AME/ame_structure.yml @@ -26,11 +26,11 @@ - type: Destructible thresholds: 500: - Spawn: + spawn: AMEPart: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: SnapGrid offset: Center - type: Airtight diff --git a/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml b/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml index 7d1fe9fb29..16365995f2 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/cargo_telepad.yml @@ -22,7 +22,7 @@ - type: Destructible thresholds: 75: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Anchorable - type: Pullable - type: PowerReceiver diff --git a/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml b/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml index e5657d66e2..fc376d5ff1 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml @@ -36,11 +36,11 @@ - type: Destructible thresholds: 50: - Spawn: + spawn: chem_master_broken: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: UserInterface interfaces: - key: enum.ChemMasterUiKey.Key @@ -82,11 +82,11 @@ - type: Destructible thresholds: 25: - Spawn: + spawn: SteelSheet1: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: UserInterface interfaces: - key: enum.ChemMasterUiKey.Key diff --git a/Resources/Prototypes/Entities/Constructible/Specific/disposal.yml b/Resources/Prototypes/Entities/Constructible/Specific/disposal.yml index 6bc35ddb1b..d3a603a3ce 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/disposal.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/disposal.yml @@ -18,7 +18,7 @@ - type: Destructible thresholds: 100: - Acts: ["Breakage"] + acts: ["Breakage"] - type: Rotatable - type: Pullable @@ -150,7 +150,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Appearance visuals: - type: DisposalUnitVisualizer @@ -389,7 +389,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Appearance visuals: - type: DisposalUnitVisualizer diff --git a/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml b/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml index f23c9824c7..8517c6da06 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/gravity_generator.yml @@ -34,7 +34,7 @@ - type: Destructible thresholds: 150: - Acts: ["Breakage"] + acts: ["Breakage"] - type: GravityGenerator - type: UserInterface interfaces: diff --git a/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml b/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml index 46b857a9c6..d25bee0833 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml @@ -28,7 +28,7 @@ - type: Destructible thresholds: 50: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Sprite sprite: Constructible/Hydroponics/hydro_tools.rsi state: soil diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml index d84a4291c6..bebbb88213 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml @@ -43,7 +43,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Appearance visuals: - type: StorageVisualizer diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml b/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml index 412fc6f5d0..d897b4e9cb 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Crates/crate_base.yml @@ -40,7 +40,7 @@ - type: Destructible thresholds: 100: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Appearance visuals: - type: StorageVisualizer diff --git a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml index a1ceff4fa7..42ce928c1d 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/base_tank.yml @@ -28,7 +28,7 @@ - type: Destructible thresholds: 10: - Acts: ["Destruction"] + acts: ["Destruction"] - type: SolutionContainer maxVol: 1500 caps: RemoveFrom diff --git a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml b/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml index 633f67b1db..d818ed65a1 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml @@ -19,7 +19,7 @@ - type: Destructible thresholds: 100: - Acts: [ "Destruction" ] + acts: [ "Destruction" ] - type: Occluder sizeX: 32 sizeY: 32 diff --git a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml index 71e537adee..ed944c8b94 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml @@ -30,11 +30,11 @@ - type: Destructible thresholds: 50: - Spawn: + spawn: SteelSheet1: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: SnapGrid offset: Edge placement: diff --git a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml index ad40159923..52daca2104 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml @@ -41,7 +41,7 @@ - type: Destructible thresholds: 50: - Acts: [ "Destruction" ] + acts: [ "Destruction" ] - type: entity name: small light @@ -68,7 +68,7 @@ - type: Destructible thresholds: 25: - Acts: [ "Destruction" ] + acts: [ "Destruction" ] - type: entity name: unpowered small light @@ -87,4 +87,4 @@ - type: Destructible thresholds: 25: - Acts: [ "Destruction" ] + acts: [ "Destruction" ] diff --git a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml index c917dc6ba4..29a0fbbf45 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml @@ -30,7 +30,7 @@ - type: Destructible thresholds: 100: - Acts: [ "Destruction" ] + acts: [ "Destruction" ] - type: BreakableConstruction node: start - type: SnapGrid diff --git a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml index f5683c831a..88fbe58407 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml @@ -13,7 +13,7 @@ - type: Destructible thresholds: 5: - Acts: [ "Destruction" ] + acts: [ "Destruction" ] - type: Sprite drawdepth: WallTops sprite: Constructible/Misc/decals.rsi diff --git a/Resources/Prototypes/Entities/Constructible/Walls/walls.yml b/Resources/Prototypes/Entities/Constructible/Walls/walls.yml index 05b2794815..e6dbaeaf0a 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/walls.yml @@ -49,11 +49,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: [ "Destruction" ] + min: 1 + max: 1 + acts: [ "Destruction" ] - type: IconSmooth key: walls base: brick @@ -72,11 +72,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: clock @@ -95,11 +95,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: clown @@ -119,11 +119,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: cult @@ -142,11 +142,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: debug @@ -165,11 +165,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: diamond @@ -189,11 +189,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: gold @@ -212,11 +212,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: ice @@ -235,11 +235,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: metal @@ -258,11 +258,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: plasma @@ -281,11 +281,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: plastic @@ -309,7 +309,7 @@ - type: Destructible thresholds: 600: - Acts: ["Destruction"] + acts: ["Destruction"] - type: BreakableConstruction node: girder - type: ReinforcedWall @@ -335,11 +335,11 @@ - type: Destructible thresholds: 1000: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: riveted @@ -358,11 +358,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: [ "Destruction" ] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: sandstone @@ -381,11 +381,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: [ "Destruction" ] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: silver @@ -408,7 +408,7 @@ - type: Destructible thresholds: 300: - Acts: [ "Destruction" ] + acts: [ "Destruction" ] - type: BreakableConstruction node: girder destroySound: /Audio/Effects/metalbreak.ogg @@ -430,11 +430,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: [ "Destruction" ] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: uranium @@ -453,11 +453,11 @@ - type: Destructible thresholds: 300: - Spawn: + spawn: Girder: - Min: 1 - Max: 1 - Acts: [ "Destruction" ] + min: 1 + max: 1 + acts: ["Destruction"] - type: IconSmooth key: walls base: wood diff --git a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml index c499effc12..f34d535d3a 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml @@ -31,12 +31,12 @@ - type: Destructible thresholds: 15: - SoundCollection: WindowBreak - Spawn: + soundCollection: WindowBreak + spawn: ShardGlass: - Min: 1 - Max: 2 - Acts: ["Destruction"] + min: 1 + max: 2 + acts: ["Destruction"] - type: SnapGrid offset: Center - type: Airtight @@ -65,12 +65,12 @@ - type: Destructible thresholds: 75: - SoundCollection: WindowBreak - Spawn: + soundCollection: WindowBreak + spawn: ShardGlassReinforced: - Min: 1 - Max: 2 - Acts: ["Destruction"] + min: 1 + max: 2 + acts: ["Destruction"] - type: Window base: rwindow maxDamage: 75 @@ -93,12 +93,12 @@ - type: Destructible thresholds: 100: - SoundCollection: WindowBreak - Spawn: + soundCollection: WindowBreak + spawn: ShardGlassPhoron: - Min: 1 - Max: 2 - Acts: ["Destruction"] + min: 1 + max: 2 + acts: ["Destruction"] resistances: metallicResistances - type: Window base: pwindow diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index 279f3bde1a..64c5af5ec3 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml @@ -132,12 +132,12 @@ - type: Destructible thresholds: 10: - Sound: /Audio/Effects/glass_break1.ogg - Spawn: + sound: /Audio/Effects/glass_break1.ogg + spawn: FloodlightBroken: - Min: 1 - Max: 1 - Acts: ["Destruction"] + min: 1 + max: 1 + acts: ["Destruction"] - type: Appearance visuals: - type: FlashLightVisualizer @@ -157,12 +157,12 @@ - type: Destructible thresholds: 20: - Spawn: + spawn: SteelSheet1: - Min: 1 - Max: 1 - Sound: /Audio/Effects/metalbreak.ogg - Acts: ["Destruction"] + min: 1 + max: 1 + sound: /Audio/Effects/metalbreak.ogg + acts: ["Destruction"] - type: Physics shapes: - !type:PhysShapeAabb diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml index add77e2e91..5c4f59e934 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Explosives/grenades.yml @@ -22,7 +22,7 @@ - type: Destructible thresholds: 10: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Appearance visuals: - type: TimerTriggerVisualizer @@ -48,7 +48,7 @@ - type: Destructible thresholds: 10: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Appearance visuals: - type: TimerTriggerVisualizer @@ -78,7 +78,7 @@ - type: Destructible thresholds: 10: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Appearance visuals: - type: TimerTriggerVisualizer @@ -107,7 +107,7 @@ - type: Destructible thresholds: 50: - Acts: ["Destruction"] + acts: ["Destruction"] - type: Appearance visuals: - type: TimerTriggerVisualizer