diff --git a/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml b/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml
index 5def1564e..945031ae1 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml
@@ -10,7 +10,7 @@
     <Sprite texture ="button.png" sourcerect="0,0,24,27" depth="0.8"/>
 
     <Deconstruct time="10">
-      <Item name="Polycarbonate Bar"/>
+      <Item name="Steel Bar"/>
       <Item name="FPGA Circuit"/>
     </Deconstruct>
 
@@ -43,7 +43,7 @@
     <Sprite texture ="button.png" sourcerect="24,0,11,16" depth="0.79"/>
 
     <Deconstruct time="10">
-      <Item name="Polycarbonate Bar"/>
+      <Item name="Steel Bar"/>
       <Item name="FPGA Circuit"/>
     </Deconstruct>
 
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
index 9cbd1a043..747b3abde 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml
@@ -68,6 +68,14 @@
     fireproof="true"
     description="An atmospheric diving suit capable of withstanding the immense pressure under Europa's crust.">
 
+    <Deconstruct time="30">
+      <Item name="Steel Bar"/>
+      <Item name="Aluminium"/>
+      <Item name="Aluminium"/>
+      <Item name="Polycarbonate Bar"/>
+      <Item name="Polycarbonate Bar"/>
+    </Deconstruct>
+
     <Sprite texture ="DivingSuit.png" sourcerect="85,0,43,128" depth="0.55"/>
 
     <Body width="37" height="113" density="15"/>
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
index c0faaec02..ed7d3591c 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
@@ -33,6 +33,12 @@
       <fabricableitem name="Nuclear Shell" requireditems="Steel Bar, Steel Bar, Uranium Bar, Polycarbonate Bar" requiredtime="30">
         <RequiredSkill name="Construction" level="40"/>
       </fabricableitem>
+      <fabricableitem name="Diving Mask" requireditems="Polycarbonate Bar" requiredtime="20">
+        <RequiredSkill name="Construction" level="25"/>
+      </fabricableitem>
+      <fabricableitem name="Diving Suit" requireditems="Steel Bar, Aluminium, Aluminium, Polycarbonate Bar, Polycarbonate Bar" requiredtime="30">
+        <RequiredSkill name="Construction" level="40"/>
+      </fabricableitem>
 
       <fabricableitem name="Wire" requireditems="Copper Bar" requiredtime="5"/>
       
@@ -145,6 +151,10 @@
       <fabricableitem name="Calyxanide" requireditems="Velonaceps Calyx Eggs, Corrigodone" requiredtime="30">
         <RequiredSkill name="Medical" level="60"/>
       </fabricableitem>
+
+      <fabricableitem name="Amanitin" requireditems="Erythrozine, Flash Powder, Sulphuric Acid" requiredtime="30">
+        <RequiredSkill name="Medical" level="60"/>
+      </fabricableitem>
     </Fabricator>
 
     <ConnectionPanel selectkey="Action" canbeselected = "true">
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml
index cdb8cb115..bd07f13ec 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Jobgear/misc.xml
@@ -36,6 +36,10 @@
 
     <Body width="10" radius="10"  density="10"/>
 
+    <Deconstruct time="10">
+      <Item name="Bike Horn"/>
+    </Deconstruct>
+
     <Wearable limbtype="Head" slots="Any,Face">
       <sprite texture="clownmask.png" limb="Head" origin="0.5,0.5"/>
       <StatusEffect type="OnWearing" target="Character" HideFace="true"/>
@@ -53,6 +57,12 @@
 
     <Body width="53" height="18" density="30"/>
 
+    <Deconstruct time="40">
+      <Item name="Bike Horn"/>
+      <Item name="Bike Horn"/>
+      <Item name="Bike Horn"/>
+    </Deconstruct>
+
     <Wearable slots="Any,Torso+Legs">
       <sprite texture="clownshirt.png" limb="Torso" sourcerect="0,3,30,58" origin="0.5,0.48" depth="0.02"/>
 
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
index ea239b874..1719f6aa1 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/weapons.xml
@@ -223,7 +223,7 @@
     <Deconstruct time="10">
       <Item name="Steel Bar"/>
       <Item name="FPGA Circuit"/>
-      <Item name="Copper Bar"/>
+      <Item name="Sulphuric Acid"/>
     </Deconstruct>
     
     <Sprite texture="weapons.png" sourcerect="0,0,20,9" depth="0.8"/>
diff --git a/Barotrauma/BarotraumaShared/Source/Characters/DelayedEffect.cs b/Barotrauma/BarotraumaShared/Source/Characters/DelayedEffect.cs
index 1b5a90848..eb338478a 100644
--- a/Barotrauma/BarotraumaShared/Source/Characters/DelayedEffect.cs
+++ b/Barotrauma/BarotraumaShared/Source/Characters/DelayedEffect.cs
@@ -24,7 +24,7 @@ namespace Barotrauma
 
         public override void Apply(ActionType type, float deltaTime, Entity entity, List<ISerializableEntity> targets)
         {
-            if (this.type != type) return;
+            if (this.type != type || !HasRequiredItems(entity)) return;
             DelayedListElement element = new DelayedListElement();
             element.Parent = this;
             element.StartTimer = delay;
