Refactors radiation (#2009)

* Work on refactoring radiation. * mmmm grayons * fixes * Now you can specify whether the pulse will decay or not * whoops * Move IRadiationAct to shared, make DamageableComponent implement it instead and add metallic resistances to walls * General improvements, send draw and decay with state. Rename DPS to RadsPerSecond * E N T I T Y C O O R D I N A T E S * Entity coordinates goood * Remove unused using statements * resistances: metallicResistances * - type: Breakable moment Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-09-21 01:49:40 +02:00
parent 2927ab5cd1
commit 6ec2939f15
37 changed files with 250 additions and 123 deletions
--- a/Content.Client/GameObjects/Components/StationEvents/RadiationPulseComponent.cs
+++ b/Content.Client/GameObjects/Components/StationEvents/RadiationPulseComponent.cs
@@ -6,19 +6,35 @@ using Robust.Shared.GameObjects;
 namespace Content.Client.GameObjects.Components.StationEvents
 {
    [RegisterComponent]
+    [ComponentReference(typeof(SharedRadiationPulseComponent))]
    public sealed class RadiationPulseComponent : SharedRadiationPulseComponent
    {
-        public TimeSpan EndTime { get; private set; }
+        private bool _draw;
+        private bool _decay;
+        private float _radsPerSecond;
+        private float _range;
+        private TimeSpan _endTime;
+
+        public override float RadsPerSecond => _radsPerSecond;
+        public override float Range => _range;
+        public override TimeSpan EndTime => _endTime;
+        public override bool Draw => _draw;
+        public override bool Decay => _decay;

        public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
        {
            base.HandleComponentState(curState, nextState);
-            if (!(curState is RadiationPulseMessage state))
+
+            if (!(curState is RadiationPulseState state))
            {
                return;
            }

-            EndTime = state.EndTime;
+            _radsPerSecond = state.RadsPerSecond;
+            _range = state.Range;
+            _draw = state.Draw;
+            _decay = state.Decay;
+            _endTime = state.EndTime;
        }
    }
 }
--- a/Content.Client/StationEvents/RadiationPulseOverlay.cs
+++ b/Content.Client/StationEvents/RadiationPulseOverlay.cs
@@ -134,17 +134,16 @@ namespace Content.Client.StationEvents
            {
                foreach (var pulse in radiationPulses)
                {
-                    if (grid.Index != pulse.Owner.Transform.GridID) continue;
+                    if (!pulse.Draw || grid.Index != pulse.Owner.Transform.GridID) continue;

                    // TODO: Check if viewport intersects circle
                    var circlePosition = _eyeManager.WorldToScreen(pulse.Owner.Transform.WorldPosition);
-                    var comp = (RadiationPulseComponent) pulse;

                    // change to worldhandle when implemented
                    screenHandle.DrawCircle(
                        circlePosition,
-                        comp.Range * 64,
-                        GetColor(pulse.Owner, elapsedTime, comp.EndTime));
+                        pulse.Range * 64,
+                        GetColor(pulse.Owner, pulse.Decay ? elapsedTime : 0, pulse.EndTime));
                }
            }
        }
--- a/Content.Server/GameObjects/Components/StationEvents/RadiationPulseComponent.cs
+++ b/Content.Server/GameObjects/Components/StationEvents/RadiationPulseComponent.cs
@@ -8,58 +8,116 @@ using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
-using Robust.Shared.Timers;

 namespace Content.Server.GameObjects.Components.StationEvents
 {
    [RegisterComponent]
+    [ComponentReference(typeof(SharedRadiationPulseComponent))]
    public sealed class RadiationPulseComponent : SharedRadiationPulseComponent
    {
        [Dependency] private readonly IGameTiming _gameTiming = default!;
        [Dependency] private readonly IRobustRandom _random = default!;

-        private const float MinPulseLifespan = 0.8f;
-        private const float MaxPulseLifespan = 2.5f;
-
-        public float DPS => _dps;
-        private float _dps;
-
+        private float _duration;
+        private float _radsPerSecond;
+        private float _range;
        private TimeSpan _endTime;
+        private bool _draw;
+        private bool _decay;
+
+        /// <summary>
+        ///     Whether the entity will delete itself after a certain duration defined by
+        ///     <see cref="MinPulseLifespan"/> and <see cref="MaxPulseLifespan"/>
+        /// </summary>
+        public override bool Decay
+        {
+            get => _decay;
+            set
+            {
+                _decay = value;
+                Dirty();
+            }
+        }
+
+        public float MinPulseLifespan { get; set; }
+
+        public float MaxPulseLifespan { get; set; }
+
+        public override float RadsPerSecond
+        {
+            get => _radsPerSecond;
+            set
+            {
+                _radsPerSecond = value;
+                Dirty();
+            }
+        }
+
+        public string Sound { get; set; }
+
+        public override float Range
+        {
+            get => _range;
+            set
+            {
+                _range = value;
+                Dirty();
+            }
+        }
+
+        public override bool Draw
+        {
+            get => _draw;
+            set
+            {
+                _draw = value;
+                Dirty();
+            }
+        }
+
+        public override TimeSpan EndTime => _endTime;

        public override void ExposeData(ObjectSerializer serializer)
        {
            base.ExposeData(serializer);
-            serializer.DataField(ref _dps, "dps", 40.0f);
+            serializer.DataField(this, x => x.RadsPerSecond, "dps", 40.0f);
+            serializer.DataField(this, x => x.Sound, "sound", "/Audio/Weapons/Guns/Gunshots/laser3.ogg");
+            serializer.DataField(this, x => x.Range, "range", 5.0f);
+            serializer.DataField(this, x => x.Draw, "draw", true);
+            serializer.DataField(this, x => x.Decay, "decay", true);
+            serializer.DataField(this, x => x.MaxPulseLifespan, "maxPulseLifespan", 2.5f);
+            serializer.DataField(this, x => x.MinPulseLifespan, "minPulseLifespan", 0.8f);
        }

-        public override void Initialize()
+        public void DoPulse()
+        {
+            if (Decay)
            {
-            base.Initialize();
-
                var currentTime = _gameTiming.CurTime;
-            var duration  =
-                TimeSpan.FromSeconds(
-                    _random.NextFloat() * (MaxPulseLifespan - MinPulseLifespan) +
-                    MinPulseLifespan);
-
-            _endTime = currentTime + duration;
-
-            Timer.Spawn(duration,
-                () =>
-            {
-                if (!Owner.Deleted)
-                {
-                    Owner.Delete();
+                _duration = _random.NextFloat() * (MaxPulseLifespan - MinPulseLifespan) + MinPulseLifespan;
+                _endTime = currentTime + TimeSpan.FromSeconds(_duration);
            }
-            });

-            EntitySystem.Get<AudioSystem>().PlayAtCoords("/Audio/Weapons/Guns/Gunshots/laser3.ogg", Owner.Transform.Coordinates);
+            if(!string.IsNullOrEmpty(Sound))
+                EntitySystem.Get<AudioSystem>().PlayAtCoords(Sound, Owner.Transform.Coordinates);
+
            Dirty();
        }

        public override ComponentState GetComponentState()
        {
-            return new RadiationPulseMessage(_endTime);
+            return new RadiationPulseState(_radsPerSecond, _range, Draw, Decay, _endTime);
+        }
+
+        public void Update(float frameTime)
+        {
+            if (!Decay || Owner.Deleted)
+                return;
+
+            if(_duration <= 0f)
+                Owner.Delete();
+
+            _duration -= frameTime;
        }
    }
 }
--- a/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs
@@ -1,87 +1,56 @@
-using System.Collections.Generic;
 using Content.Server.GameObjects.Components.StationEvents;
-using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Interfaces.GameObjects.Components;
 using JetBrains.Annotations;
-using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.Map;

 namespace Content.Server.GameObjects.EntitySystems.StationEvents
 {
    [UsedImplicitly]
    public sealed class RadiationPulseSystem : EntitySystem
    {
-        // Rather than stuffing around with collidables and checking entities on initialize etc. we'll just tick over
-        // for each entity in range. Seemed easier than checking entities on spawn, then checking collidables, etc.
-        // Especially considering each pulse is a big chonker, + no circle hitboxes yet.
+        private const string RadiationPrototype = "RadiationPulse";

-        private TypeEntityQuery _speciesQuery;
-
-        /// <summary>
-        ///     Damage works with ints so we'll just accumulate damage and once we hit this threshold we'll apply it.
-        /// </summary>
-        /// This also server to stop spamming the damagethreshold with 1 damage continuously.
-        private const int DamageThreshold = 10;
-
-        private Dictionary<IEntity, float> _accumulatedDamage = new Dictionary<IEntity, float>();
-
-        public override void Initialize()
+        public IEntity RadiationPulse(EntityCoordinates coordinates, float range, int dps, bool decay = true, float minPulseLifespan = 0.8f, float maxPulseLifespan = 2.5f, string sound = null)
        {
-            base.Initialize();
-            _speciesQuery = new TypeEntityQuery(typeof(ISharedBodyManagerComponent));
+            var radiationEntity = EntityManager.SpawnEntity(RadiationPrototype, coordinates);
+            var radiation = radiationEntity.GetComponent<RadiationPulseComponent>();
+
+            radiation.Range = range;
+            radiation.RadsPerSecond = dps;
+            radiation.Draw = false;
+            radiation.Decay = decay;
+            radiation.MinPulseLifespan = minPulseLifespan;
+            radiation.MaxPulseLifespan = maxPulseLifespan;
+            radiation.Sound = sound;
+
+            radiation.DoPulse();
+
+            return radiationEntity;
        }

        public override void Update(float frameTime)
        {
            base.Update(frameTime);
-            var anyPulses = false;

            foreach (var comp in ComponentManager.EntityQuery<RadiationPulseComponent>())
            {
-                anyPulses = true;
+                comp.Update(frameTime);
+                var ent = comp.Owner;

-                foreach (var species in EntityManager.GetEntities(_speciesQuery))
+                if (ent.Deleted) continue;
+
+                foreach (var entity in EntityManager.GetEntitiesInRange(ent.Transform.Coordinates, comp.Range, true))
                {
-                    // Work out if we're in range and accumulate more damage
-                    // If we've hit the DamageThreshold we'll also apply that damage to the mob
-                    // If we're really lagging server can apply multiples of the DamageThreshold at once
-                    if (species.Transform.MapID != comp.Owner.Transform.MapID) continue;
+                    if (entity.Deleted) continue;

-                    if ((species.Transform.WorldPosition - comp.Owner.Transform.WorldPosition).Length > comp.Range)
+                    foreach (var radiation in entity.GetAllComponents<IRadiationAct>())
                    {
-                        continue;
-                    }
-
-                    var totalDamage = frameTime * comp.DPS;
-
-                    if (!_accumulatedDamage.TryGetValue(species, out var accumulatedSpecies))
-                    {
-                        _accumulatedDamage[species] = 0.0f;
-                    }
-
-                    totalDamage += accumulatedSpecies;
-                    _accumulatedDamage[species] = totalDamage;
-
-                    if (totalDamage < DamageThreshold) continue;
-                    if (!species.TryGetComponent(out DamageableComponent damageableComponent)) continue;
-
-                    var damageMultiple = (int) (totalDamage / DamageThreshold);
-                    _accumulatedDamage[species] = totalDamage % DamageThreshold;
-
-                    damageableComponent.ChangeDamage(DamageType.Heat, damageMultiple * DamageThreshold, false, comp.Owner);
+                        radiation.RadiationAct(frameTime, comp);
                    }
                }
-
-            if (anyPulses)
-            {
-                return;
            }
-
-            // probably don't need to worry about clearing this at roundreset unless you have a radiation pulse at roundstart
-            // (which is currently not possible)
-            _accumulatedDamage.Clear();
        }
    }
 }
--- a/Content.Server/StationEvents/RadiationStorm.cs
+++ b/Content.Server/StationEvents/RadiationStorm.cs
@@ -1,4 +1,5 @@
 using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.GameObjects.Components.StationEvents;
 using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.Utility;
 using JetBrains.Annotations;
@@ -114,7 +115,8 @@ namespace Content.Server.StationEvents

        private void SpawnPulse(IMapGrid mapGrid)
        {
-            _entityManager.SpawnEntity("RadiationPulse", FindRandomGrid(mapGrid));
+            var pulse = _entityManager.SpawnEntity("RadiationPulse", FindRandomGrid(mapGrid));
+            pulse.GetComponent<RadiationPulseComponent>().DoPulse();
            _timeUntilPulse = _robustRandom.NextFloat() * (MaxPulseDelay - MinPulseDelay) + MinPulseDelay;
            _pulsesRemaining -= 1;
        }
--- a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs
+++ b/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using Content.Shared.Damage;
 using Content.Shared.Damage.DamageContainer;
 using Content.Shared.Damage.ResistanceSet;
+using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
@@ -19,7 +20,7 @@ namespace Content.Shared.GameObjects.Components.Damage
    /// </summary>
    [RegisterComponent]
    [ComponentReference(typeof(IDamageableComponent))]
-    public class DamageableComponent : Component, IDamageableComponent
+    public class DamageableComponent : Component, IDamageableComponent, IRadiationAct
    {
        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;

@@ -388,5 +389,12 @@ namespace Content.Shared.GameObjects.Components.Damage

            Dirty();
        }
+
+        public void RadiationAct(float frameTime, SharedRadiationPulseComponent radiation)
+        {
+            var totalDamage = Math.Max((int)(frameTime * radiation.RadsPerSecond), 1);
+
+            ChangeDamage(DamageType.Radiation, totalDamage, false, radiation.Owner);
+        }
    }
 }
--- a/Content.Shared/GameObjects/Components/SharedRadiationStorm.cs
+++ b/Content.Shared/GameObjects/Components/SharedRadiationStorm.cs
@@ -9,29 +9,37 @@ namespace Content.Shared.GameObjects.Components
        public override string Name => "RadiationPulse";
        public override uint? NetID => ContentNetIDs.RADIATION_PULSE;

+        public virtual float RadsPerSecond { get; set; }
+
        /// <summary>
        /// Radius of the pulse from its position
        /// </summary>
-        public float Range => _range;
-        private float _range;
+        public virtual float Range { get; set; }

-        public override void ExposeData(ObjectSerializer serializer)
-        {
-            base.ExposeData(serializer);
-            serializer.DataField(ref _range, "range", 5.0f);
-        }
+        public virtual bool Decay { get; set; }
+        public virtual bool Draw { get; set; }
+
+        public virtual TimeSpan EndTime { get; }
    }

    /// <summary>
    /// For syncing the pulse's lifespan between client and server for the overlay
    /// </summary>
    [Serializable, NetSerializable]
-    public sealed class RadiationPulseMessage : ComponentState
+    public class RadiationPulseState : ComponentState
    {
-        public TimeSpan EndTime { get; }
+        public readonly float RadsPerSecond;
+        public readonly float Range;
+        public readonly bool Draw;
+        public readonly bool Decay;
+        public readonly TimeSpan EndTime;

-        public RadiationPulseMessage(TimeSpan endTime) : base(ContentNetIDs.RADIATION_PULSE)
+        public RadiationPulseState(float radsPerSecond, float range, bool draw, bool decay, TimeSpan endTime) : base(ContentNetIDs.RADIATION_PULSE)
        {
+            RadsPerSecond = radsPerSecond;
+            Range = range;
+            Draw = draw;
+            Decay = decay;
            EndTime = endTime;
        }
    }
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRadiationAct.cs
+++ b/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRadiationAct.cs
@@ -0,0 +1,10 @@
+using Content.Shared.GameObjects.Components;
+using Robust.Shared.Interfaces.GameObjects;
+
+namespace Content.Shared.Interfaces.GameObjects.Components
+{
+    public interface IRadiationAct : IComponent
+    {
+        void RadiationAct(float frameTime, SharedRadiationPulseComponent radiation);
+    }
+}
--- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_base.yml
@@ -61,6 +61,7 @@
    offset: Center
  - type: Destructible
    deadThreshold: 500
+    resistances: metallicResistances
  placement:
    mode: SnapgridCenter

--- a/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/furniture.yml
@@ -19,6 +19,7 @@
  - type: Pullable
  - type: Destructible
    deadThreshold: 50
+    resistances: metallicResistances

 - type: entity
  name: bar stool
@@ -52,6 +53,7 @@
  - type: Pullable
  - type: Destructible
    deadThreshold: 50
+    resistances: metallicResistances

 - type: entity
  name: dark office chair
@@ -87,6 +89,7 @@
  - type: Pullable
  - type: Destructible
    deadThreshold: 50
+    resistances: metallicResistances

 - type: entity
  parent: Chair
@@ -135,5 +138,6 @@
    rotation: -90
  - type: Destructible
    deadThreshold: 75
+    resistances: metallicResistances
  placement:
    mode: SnapgridCenter
--- a/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/instruments.yml
@@ -19,6 +19,7 @@
     offset: Center
   - type: Destructible
     deadThreshold: 50
+     resistances: metallicResistances
   - type: UserInterface
     interfaces:
     - key: enum.InstrumentUiKey.Key
--- a/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/pilot_chair.yml
@@ -15,6 +15,7 @@
  - type: InteractionOutline
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
  - type: Physics
  - type: ShuttleController
  - type: Strap
--- a/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/pipes.yml
@@ -12,6 +12,7 @@
  - type: Sprite
  - type: Destructible
    thresholdvalue: 100
+    resistances: metallicResistances
  - type: Appearance
    visuals:
    - type: PipeVisualizer
--- a/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/pumps.yml
@@ -21,6 +21,7 @@
      pumpRSI: Constructible/Atmos/pressurepump.rsi
  - type: Destructible
    thresholdvalue: 100
+    resistances: metallicResistances

 - type: entity
  abstract: true
--- a/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/scrubbers.yml
@@ -23,6 +23,7 @@
      siphonRSI: Constructible/Atmos/scrubber.rsi
  - type: Destructible
    thresholdvalue: 100
+    resistances: metallicResistances

 - type: entity
  parent: ScrubberBase
--- a/Resources/Prototypes/Entities/Constructible/Ground/table.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/table.yml
@@ -25,6 +25,7 @@
  - type: Climbable
  - type: Destructible
    deadThreshold: 50
+    resistances: metallicResistances
    spawnOnDestroy: SteelSheet1

 - type: entity
@@ -54,4 +55,5 @@
  - type: Climbable
  - type: Destructible
    deadThreshold: 15
+    resistances: metallicResistances
    spawnOnDestroy: WoodPlank
--- a/Resources/Prototypes/Entities/Constructible/Ground/vents.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/vents.yml
@@ -22,6 +22,7 @@
    - type: VentVisualizer
      ventRSI: Constructible/Atmos/vent.rsi
  - type: Destructible
+    resistances: metallicResistances
    thresholdvalue: 100

 - type: entity
--- a/Resources/Prototypes/Entities/Constructible/Ground/wires.yml
+++ b/Resources/Prototypes/Entities/Constructible/Ground/wires.yml
@@ -18,6 +18,7 @@
    mode: CardinalFlags
  - type: Destructible
    thresholdvalue: 100
+    resistances: metallicResistances
  - type: SubFloorHide

 - type: entity
@@ -39,6 +40,7 @@
    wireDroppedOnCutPrototype: HVWireStack1
    wireType: HighVoltage
  - type: Destructible
+    resistances: metallicResistances
    spawnondestroy: HVWireStack1

 - type: entity
@@ -61,6 +63,7 @@
    wireDroppedOnCutPrototype: MVWireStack1
    wireType: MediumVoltage
  - type: Destructible
+    resistances: metallicResistances
    spawnondestroy: MVWireStack1

 - type: entity
@@ -85,4 +88,5 @@
    wireDroppedOnCutPrototype: ApcExtensionCableStack1
    wireType: Apc
  - type: Destructible
+    resistances: metallicResistances
    spawnondestroy: ApcExtensionCableStack1
--- a/Resources/Prototypes/Entities/Constructible/Power/AME/ame_controller.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/AME/ame_controller.yml
@@ -22,6 +22,7 @@
      - SmallImpassable
  - type: Destructible
    maxHP: 500
+    resistances: metallicResistances
  - type: SnapGrid
    offset: Center
  - type: Anchorable
--- a/Resources/Prototypes/Entities/Constructible/Power/AME/ame_structure.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/AME/ame_structure.yml
@@ -23,6 +23,7 @@
      - SmallImpassable
  - type: Destructible
    maxHP: 500
+    resistances: metallicResistances
    spawnondestroy: AMEPart
  - type: SnapGrid
    offset: Center
--- a/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/cloning_machine.yml
@@ -35,6 +35,7 @@
      cloningTime: 10.0
    - type: Destructible
      deadThreshold: 100
+      resistances: metallicResistances
    - type: Appearance
      visuals:
        - type: CloningPodVisualizer
--- a/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/debug_power.yml
@@ -30,6 +30,7 @@
    drawRate: 50
  - type: Breakable
    deadThreshold: 100
+    resistances: metallicResistances
  - type: Anchorable

 - type: entity
--- a/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/gravity_generator.yml
@@ -30,6 +30,7 @@
  - type: InteractionOutline
  - type: Breakable
    deadThreshold: 150
+    resistances: metallicResistances
  - type: GravityGenerator
  - type: UserInterface
    interfaces:
--- a/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/medical_scanner.yml
@@ -35,6 +35,7 @@
  - type: MedicalScanner
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
  - type: Appearance
    visuals:
    - type: MedicalScannerVisualizer
--- a/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/power_base.yml
@@ -188,3 +188,4 @@
    offset: Center
  - type: Breakable
    deadThreshold: 100
+    resistances: metallicResistances
--- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml
@@ -32,6 +32,7 @@
    offset: Center
  - type: Breakable
    deadThreshold: 50
+    resistances: metallicResistances
  - type: UserInterface
    interfaces:
    - key: enum.VendingMachineUiKey.Key
--- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml
@@ -43,6 +43,7 @@
  - type: PlaceableSurface
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
  - type: Appearance
    visuals:
    - type: StorageVisualizer
--- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/storage_tank.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/storage_tank.yml
@@ -27,6 +27,7 @@
    Anchored: false
  - type: Destructible
    deadThreshold: 10
+    resistances: metallicResistances
  - type: SolutionContainer
    maxVol: 1500
    caps: RemoveFrom
--- a/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/crate_base.yml
@@ -38,6 +38,8 @@
  - type: PlaceableSurface
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
+
  - type: Appearance
    visuals:
    - type: StorageVisualizer
--- a/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/asteroid.yml
@@ -18,6 +18,7 @@
      layer: [MobMask]
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
  - type: Occluder
    sizeX: 32
    sizeY: 32
--- a/Resources/Prototypes/Entities/Constructible/Walls/girder.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/girder.yml
@@ -16,6 +16,7 @@
      layer: [MobMask, Opaque]
  - type: Destructible
    deadThreshold: 50
+    resistances: metallicResistances
    spawnOnDestroy: SteelSheet1
  - type: SnapGrid
    offset: Edge
--- a/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/lighting.yml
@@ -40,6 +40,7 @@
  - type: PowerReceiver
  - type: Destructible
    deadThreshold: 50
+    resistances: metallicResistances

 - type: entity
  name: small light
@@ -61,3 +62,4 @@
  - type: PowerReceiver
  - type: Destructible
    deadThreshold: 25
+    resistances: metallicResistances
--- a/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/low_wall.yml
@@ -26,6 +26,7 @@
      - SmallImpassable
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
  - type: SnapGrid
    offset: Center
  - type: Climbable
--- a/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/signs.yml
@@ -10,6 +10,7 @@
    - !type:PhysShapeAabb
  - type: Destructible
    thresholdvalue: 5
+    resistances: metallicResistances
  - type: Sprite
    drawdepth: WallTops
    sprite: Constructible/Misc/decals.rsi
--- a/Resources/Prototypes/Entities/Constructible/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/walls.yml
@@ -28,6 +28,7 @@
  - type: Destructible
    deadThreshold: 500
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: Occluder
    sizeX: 32
    sizeY: 32
@@ -51,6 +52,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: brick
@@ -67,6 +69,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: clock
@@ -83,6 +86,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: clown
@@ -100,6 +104,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: cult
@@ -116,6 +121,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: debug
@@ -132,6 +138,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: diamond
@@ -149,6 +156,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: gold
@@ -165,6 +173,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: ice
@@ -181,6 +190,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: metal
@@ -197,6 +207,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: plasma
@@ -213,6 +224,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: plastic
@@ -231,6 +243,7 @@
  - type: Destructible
    deadThreshold: 600
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: ReinforcedWall
    key: walls
    base: solid
@@ -249,6 +262,7 @@
  - type: Destructible
    deadThreshold: 1000
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: riveted
@@ -265,6 +279,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: sandstone
@@ -281,6 +296,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: silver
@@ -299,6 +315,7 @@
    deadThreshold: 300
    spawnOnDestroy: Girder
    destroySound: /Audio/Effects/metalbreak.ogg
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: solid
@@ -315,6 +332,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: uranium
@@ -331,6 +349,7 @@
  - type: Destructible
    deadThreshold: 300
    spawnOnDestroy: Girder
+    resistances: metallicResistances
  - type: IconSmooth
    key: walls
    base: wood
--- a/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
+++ b/Resources/Prototypes/Entities/Constructible/Walls/windows.yml
@@ -29,6 +29,7 @@
      - SmallImpassable
  - type: Destructible
    deadThreshold: 100
+    resistances: metallicResistances
  - type: SnapGrid
    offset: Center
  - type: Airtight
--- a/Resources/Prototypes/Entities/Constructible/disposal.yml
+++ b/Resources/Prototypes/Entities/Constructible/disposal.yml
@@ -14,6 +14,7 @@
    offset: Center
  - type: Anchorable
  - type: Breakable
+    resistances: metallicResistances
  - type: Rotatable
  - type: Pullable

@@ -139,6 +140,7 @@
  - type: Anchorable
  - type: Destructible
    thresholdvalue: 100
+    resistances: metallicResistances
  - type: Appearance
    visuals:
    - type: DisposalUnitVisualizer