From e5f60b29e1614b1617e9317dbc32e732d68b93b3 Mon Sep 17 00:00:00 2001 From: Alex Noir Date: Wed, 20 Dec 2017 20:44:21 +0300 Subject: [PATCH] tweaks and stuff --- .../Content/Items/Fabricators/fabricators.xml | 4 ---- .../Content/Items/Medical/medical.xml | 24 +++++++++---------- .../BarotraumaShared/Source/Items/Item.cs | 2 -- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml index 9ccb70b2f..b4138cfbe 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml @@ -143,10 +143,6 @@ - - - - diff --git a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml index 123d0f521..e22bf78c6 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml @@ -241,7 +241,7 @@ - + @@ -317,7 +317,7 @@ category="Material" spritecolor="0.0,0.0,0.0,1.0" Tags="smallitem,chem,medical" - description="An antiparasitic drug used in the treatment of husk parasite infections." + description="An antiparasitic drug used in the treatment of husk parasite infections. Might require higher dosage to cure the infection at later stages." price="300"> @@ -325,7 +325,7 @@ - + @@ -345,12 +345,12 @@ - + - + @@ -408,7 +408,7 @@ - + @@ -418,7 +418,7 @@ name="Uranium Powder" category="Material" spritecolor="0.2,0.35,0.06,1.0" - Tags="smallitem,chem,medical" + Tags="smallitem,chem,medical" price="50"> @@ -426,7 +426,7 @@ - + @@ -464,7 +464,7 @@ - + @@ -504,18 +504,18 @@ Tags="smallitem,chem,medical" description="A devious poison with a delayed effect."> - + - + - + diff --git a/Barotrauma/BarotraumaShared/Source/Items/Item.cs b/Barotrauma/BarotraumaShared/Source/Items/Item.cs index e6e6ef53d..42686c6fb 100644 --- a/Barotrauma/BarotraumaShared/Source/Items/Item.cs +++ b/Barotrauma/BarotraumaShared/Source/Items/Item.cs @@ -777,8 +777,6 @@ namespace Barotrauma private bool IsInWater() { - if (parentInventory != null && parentInventory.Owner != null) - FindHull(); if (CurrentHull == null) return true; float surfaceY = CurrentHull.Surface;