Makes more stuff destructible/breakable (#4081)

Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs

@@ -1,4 +1,4 @@
-using Content.Client.Sound;
+using Content.Client.Sound;
 using Content.Shared.Kitchen.Components;
 using Content.Shared.Power;
 using Content.Shared.Sound;
@@ -25,6 +25,11 @@ namespace Content.Client.Kitchen.Visualizers
             }
             switch (state)
             {
+                case MicrowaveVisualState.Broken:
+                    sprite.LayerSetState(MicrowaveVisualizerLayers.BaseUnlit, "mwb");
+                    loopingSoundComponent?.StopAllSounds();
+                    break;
+
                 case MicrowaveVisualState.Idle:
                     sprite.LayerSetState(MicrowaveVisualizerLayers.Base, "mw");
                     sprite.LayerSetState(MicrowaveVisualizerLayers.BaseUnlit, "mw_unlit");

Content.Server/Kitchen/Components/MicrowaveComponent.cs

@@ -11,6 +11,7 @@ using Content.Server.Items;
 using Content.Server.Notification;
 using Content.Server.Power.Components;
 using Content.Server.UserInterface;
+using Content.Shared.Acts;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
 using Content.Shared.Chemistry;
@@ -37,7 +38,7 @@ namespace Content.Server.Kitchen.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
-    public class MicrowaveComponent : SharedMicrowaveComponent, IActivate, IInteractUsing, ISolutionChange, ISuicideAct
+    public class MicrowaveComponent : SharedMicrowaveComponent, IActivate, IInteractUsing, ISolutionChange, ISuicideAct, IBreakAct
     {
         [Dependency] private readonly RecipeManager _recipeManager = default!;
 
@@ -56,6 +57,7 @@ namespace Content.Server.Kitchen.Components
 
 [ViewVariables]
         private bool _busy = false;
+        private bool _broken;
 
         /// <summary>
         /// This is a fixed offset of 5.
@@ -160,6 +162,17 @@ namespace Content.Server.Kitchen.Components
                 _uiDirty = true;
             }
 
+            if (_busy && _broken)
+            {
+                SetAppearance(MicrowaveVisualState.Broken);
+                //we broke while we were cooking/busy!
+                _lostPower = true;
+                VaporizeReagents();
+                EjectSolids();
+                _busy = false;
+                _uiDirty = true;
+            }
+
             if (_uiDirty && Owner.TryGetComponent(out SolutionContainerComponent? solution))
             {
                 UserInterface?.SetState(new MicrowaveUpdateUserInterfaceState
@@ -176,12 +189,24 @@ namespace Content.Server.Kitchen.Components
 
         private void SetAppearance(MicrowaveVisualState state)
         {
+            var finalState = state;
+            if (_broken)
+            {
+                finalState = MicrowaveVisualState.Broken;
+            }
+
             if (Owner.TryGetComponent(out AppearanceComponent? appearance))
             {
-                appearance.SetData(PowerDeviceVisuals.VisualState, state);
+                appearance.SetData(PowerDeviceVisuals.VisualState, finalState);
             }
         }
 
+        public void OnBreak(BreakageEventArgs eventArgs)
+        {
+            _broken = true;
+            SetAppearance(MicrowaveVisualState.Broken);
+        }
+
         void IActivate.Activate(ActivateEventArgs eventArgs)
         {
             if (!eventArgs.User.TryGetComponent(out ActorComponent? actor) || !Powered)
@@ -201,6 +226,12 @@ namespace Content.Server.Kitchen.Components
                 return false;
             }
 
+            if (_broken)
+            {
+                Owner.PopupMessage(eventArgs.User, Loc.GetString("It's broken!"));
+                return false;
+            }
+
             var itemEntity = eventArgs.User.GetComponent<HandsComponent>().GetActiveHand?.Owner;
 
             if (itemEntity == null)

Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs

@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System;
 using Content.Shared.Chemistry.Solution;
 using Content.Shared.NetIDs;
@@ -89,7 +89,8 @@ namespace Content.Shared.Kitchen.Components
     public enum MicrowaveVisualState
     {
         Idle,
-        Cooking
+        Cooking,
+        Broken
     }
 
     [NetSerializable, Serializable]

Resources/Prototypes/Entities/Constructible/Furniture/potted_plants.yml

@@ -24,6 +24,17 @@
   - type: SecretStash
     secretPartName: the plant
   - type: Pullable
+  - type: Damageable
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound: /Audio/Effects/plant_rustle.ogg
 
 - type: entity
   id: PottedPlantRandom

Resources/Prototypes/Entities/Constructible/Power/seed_extractor.yml

@@ -1,28 +1,26 @@
 - type: entity
   id: SeedExtractor
   name: seed extractor
+  parent: BaseMachinePowered
   description: Extracts seeds from produce.
-  placement:
-    mode: SnapgridCenter
   components:
-    - type: Clickable
+  - type: Sprite
-    - type: InteractionOutline
+    sprite: Constructible/Hydroponics/machines.rsi
-    - type: Sprite
+    layers:
-      sprite: Constructible/Hydroponics/machines.rsi
+    - state: seedextractor-off
-      state: seedextractor
+    - state: seedextractor-unlit
-    - type: Physics
+      shader: unshaded
-      bodyType: Static
+    netsync: false
-      fixtures:
+  - type: Physics
-      - shape:
+    bodyType: Static
-          !type:PhysShapeAabb
+    fixtures:
-            bounds: "-0.4,-0.25,0.4,0.25"
+    - shape:
-        mass: 25
+        !type:PhysShapeAabb
-        layer:
+          bounds: "-0.4,-0.25,0.4,0.25"
-          - Opaque
+      mass: 25
-          - Impassable
+      layer:
-          - MobImpassable
+      - MobMask
-          - VaultImpassable
+      - Opaque
-    - type: SnapGrid
+      mask:
-    - type: Anchorable
+      - MobMask
-    - type: SeedExtractor
+  - type: SeedExtractor
-    - type: PowerReceiver

Resources/Prototypes/Entities/Constructible/Specific/Dispensers/reagent_dispenser_base.yml

@@ -14,17 +14,13 @@
           bounds: "-0.3,-0.4,0.3,0.4"
       mass: 25
       mask:
-      - Impassable
+        - Impassable
-      - MobImpassable
+        - VaultImpassable
-      - VaultImpassable
+        - SmallImpassable
-      - SmallImpassable
       layer:
-      - Opaque
+        - Opaque
-      - Impassable
+        - MobImpassable
-      - MobImpassable
+        - SmallImpassable
-      - VaultImpassable
-  - type: SnapGrid
-  - type: ReagentDispenser
   - type: PowerReceiver
   - type: UserInterface
     interfaces:
@@ -33,3 +29,15 @@
   - type: LoopingSound
   - type: Anchorable
   - type: Pullable
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound: /Audio/Effects/metalbreak.ogg

Resources/Prototypes/Entities/Constructible/Specific/Kitchen/meat_spike.yml

@@ -11,14 +11,22 @@
     sprite: Constructible/Misc/kitchen.rsi
     state: spike
   - type: Damageable
+    resistances: metallicResistances
   - type: Destructible
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 50
+        damage: 100
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound: /Audio/Effects/metalbreak.ogg
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
   - type: KitchenSpike
   - type: Anchorable
   - type: Pullable

Resources/Prototypes/Entities/Constructible/Specific/Kitchen/microwave.yml

@@ -40,3 +40,13 @@
       shader: unshaded
       map: ["enum.MicrowaveVisualizerLayers.BaseUnlit"]
   - type: PowerReceiver
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Breakage"]

Resources/Prototypes/Entities/Constructible/Specific/Kitchen/reagent_grinder.yml

@@ -33,3 +33,15 @@
     sprite: Constructible/Power/juicer.rsi
     state: juicer0
     drawdepth: Items
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound: /Audio/Effects/metalbreak.ogg

Resources/Prototypes/Entities/Constructible/Specific/Research/research.yml

@@ -24,6 +24,23 @@
   - type: PowerReceiver
     powerLoad: 200
     priority: Low
+  - type: Damageable
+    resistances: metallicResistances
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound: /Audio/Effects/metalbreak.ogg
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 2
 
 - type: entity
   id: BaseResearchAndDevelopmentPointSource
@@ -61,3 +78,18 @@
     visuals:
     - type: PowerDeviceVisualizer
   - type: PowerReceiver
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound: /Audio/Effects/metalbreak.ogg
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1

Resources/Prototypes/Entities/Constructible/Specific/chem_master.yml

@@ -53,9 +53,10 @@
 - type: entity
   id: chem_master_broken
   parent: BaseConstructibleDynamic
-  name: ChemMaster 4000 [Broken]
+  name: ChemMaster 4000
   description: "An industrial grade chemical manipulator with pill and bottle production included. It's broken."
   abstract: true
+  suffix: Broken
   components:
   - type: Sprite
     sprite: Constructible/Power/mixer.rsi

Resources/Prototypes/Entities/Constructible/Storage/Closets/closet.yml

@@ -41,10 +41,17 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 100
+        damage: 150
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound: /Audio/Effects/metalbreak.ogg
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 1
   - type: Appearance
     visuals:
     - type: StorageVisualizer

Resources/Prototypes/Entities/Constructible/Storage/Closets/closet_secure.yml

@@ -18,3 +18,18 @@
     - state: welded
       visible: false
       map: ["enum.StorageVisualLayers.Welded"]
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound: /Audio/Effects/metalbreak.ogg
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 2

Resources/Prototypes/Entities/Constructible/base_machine.yml

@@ -27,6 +27,8 @@
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound: /Audio/Effects/metalbreak.ogg
         
 - type: entity
   abstract: true
@@ -34,4 +36,3 @@
   id: BaseMachinePowered
   components:
   - type: PowerReceiver
-

Resources/Textures/Constructible/Hydroponics/machines.rsi/meta.json

@@ -22,6 +22,24 @@
         ]
       ]
     },
+    {
+      "name": "seedextractor-unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "seedextractor-off"
+    },
     {
       "name": "spawner"
     },