stasis bed and microwave qol(#21572)

diff --git a/Content.Server/Construction/Components/MachineFrameComponent.cs b/Content.Server/Construction/Components/MachineFrameComponent.cs
index 16aba3bd1731f2b64320cc6aea94ef44f678033c..75cc486f24083e063dc8faaee3b40767eeb3c2e7 100644 (file)
--- a/Content.Server/Construction/Components/MachineFrameComponent.cs
+++ b/Content.Server/Construction/Components/MachineFrameComponent.cs
@@ -44,9 +44,4 @@ namespace Content.Server.Construction.Components
         [ViewVariables]
         public Container PartContainer = default!;
     }
-
-    [DataDefinition]
-    public sealed partial class MachineDeconstructedEvent : EntityEventArgs
-    {
-    }
 }

diff --git a/Content.Server/Containers/EmptyOnMachineDeconstructSystem.cs b/Content.Server/Containers/EmptyOnMachineDeconstructSystem.cs
index c0cae8fdf7cc8cbc19c2a281e6383ac37e368888..77563dd31c238e571af4cb635b3751499c089cd4 100644 (file)
--- a/Content.Server/Containers/EmptyOnMachineDeconstructSystem.cs
+++ b/Content.Server/Containers/EmptyOnMachineDeconstructSystem.cs
@@ -1,4 +1,4 @@
-using Content.Server.Construction.Components;
+using Content.Shared.Construction;
 using Content.Shared.Containers.ItemSlots;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;

diff --git a/Content.Server/Materials/MaterialStorageSystem.cs b/Content.Server/Materials/MaterialStorageSystem.cs
index b3626774c83eabb7d1a8453b43437249f1f04c79..f485c4af3caff68da8f6aa983e88ac8e1f05c308 100644 (file)
--- a/Content.Server/Materials/MaterialStorageSystem.cs
+++ b/Content.Server/Materials/MaterialStorageSystem.cs
@@ -4,8 +4,8 @@ using Content.Shared.Materials;
 using Content.Shared.Popups;
 using Content.Shared.Stacks;
 using Content.Server.Power.Components;
-using Content.Server.Construction.Components;
 using Content.Server.Stack;
+using Content.Shared.Construction;
 using Content.Shared.Database;
 using JetBrains.Annotations;
 using Robust.Shared.Map;

diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Strap.cs b/Content.Shared/Buckle/SharedBuckleSystem.Strap.cs
index 8616546480bbbc8798b2b920b8130518adf9063a..7c449a5d8bf754644f25e2fd5ed8d6e98a8e4945 100644 (file)
--- a/Content.Shared/Buckle/SharedBuckleSystem.Strap.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.Strap.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Shared.Buckle.Components;
+using Content.Shared.Construction;
 using Content.Shared.Destructible;
 using Content.Shared.DragDrop;
 using Content.Shared.Foldable;
@@ -31,6 +32,7 @@ public abstract partial class SharedBuckleSystem
         SubscribeLocalEvent<StrapComponent, FoldAttemptEvent>(OnAttemptFold);
 
         SubscribeLocalEvent<StrapComponent, MoveEvent>(OnStrapMoveEvent);
+        SubscribeLocalEvent<StrapComponent, MachineDeconstructedEvent>((_, c, _) => StrapRemoveAll(c));
     }
 
     private void OnStrapStartup(EntityUid uid, StrapComponent component, ComponentStartup args)

diff --git a/Content.Shared/Construction/MachineDeconstructedEvent.cs b/Content.Shared/Construction/MachineDeconstructedEvent.cs
new file mode 100644 (file)
index 0000000..1f65e79
--- /dev/null
+++ b/Content.Shared/Construction/MachineDeconstructedEvent.cs
@@ -0,0 +1,6 @@
+namespace Content.Shared.Construction;
+
+[DataDefinition]
+public sealed partial class MachineDeconstructedEvent : EntityEventArgs
+{
+}

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
index 2aed92bc28e8aafefaff26cb741e966a725f6410..8e7c3aeb27426d3118dc725a2a8bdf4c0bfb5543 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -755,17 +755,10 @@
       prototype: StasisBed
       requirements:
         Capacitor: 1
+        Manipulator: 1
       materialRequirements:
         Cable: 3
-      tagRequirements:
-        Pipe:
-          Amount: 1
-          DefaultPrototype: GasPipeStraight
-          ExamineName: Pipe
-        Cryobeaker:
-          Amount: 2
-          DefaultPrototype: CryostasisBeaker
-          ExamineName: Cryostasis Beaker
+        Steel: 2
 
 - type: entity
   id: MaterialReclaimerMachineCircuitboard

diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
index 0a1a6f431f1a4b3e7c3dd85941238f0629df25b3..586b4b0af00f3fd58ffb54c5d7fadf7f440e6535 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml
@@ -91,6 +91,9 @@
       microwave_entity_container: !type:Container
       machine_board: !type:Container
       machine_parts: !type:Container
+  - type: EmptyOnMachineDeconstruct
+    containers:
+    - microwave_entity_container
   - type: GuideHelp
     guides:
     - Chef