From c26cef89c6bfc3761a7302e047c0cb6eb4f8a633 Mon Sep 17 00:00:00 2001 From: Alex Noir Date: Thu, 21 Dec 2017 23:03:25 +0300 Subject: [PATCH] Fixed DelayedEffect applying when dropped from hands Amanitin is now craftable from Erythrozine, Flash Powder and Sulphuric Acid with 60 medical skill Diving Mask and Diving Suit are now craftable Diving Suit is now deconstructable Fixed buttons yielding different materials on deconstruction --- .../BarotraumaShared/Content/Items/Button/button.xml | 4 ++-- .../Content/Items/Diving/divinggear.xml | 8 ++++++++ .../Content/Items/Fabricators/fabricators.xml | 10 ++++++++++ .../BarotraumaShared/Content/Items/Jobgear/misc.xml | 10 ++++++++++ .../BarotraumaShared/Content/Items/Weapons/weapons.xml | 2 +- .../Source/Characters/DelayedEffect.cs | 2 +- 6 files changed, 32 insertions(+), 4 deletions(-) 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 @@ - + @@ -43,7 +43,7 @@ - + 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."> + + + + + + + + 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 @@ + + + + + + @@ -145,6 +151,10 @@ + + + + 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 @@ + + + + @@ -53,6 +57,12 @@ + + + + + + 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 @@ - + 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 targets) { - if (this.type != type) return; + if (this.type != type || !HasRequiredItems(entity)) return; DelayedListElement element = new DelayedListElement(); element.Parent = this; element.StartTimer = delay;