diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/depthcharge.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/depthcharge.xml index ed8ac06ac..587261e4f 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/depthcharge.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/depthcharge.xml @@ -9,11 +9,12 @@ - - + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml index 473711a84..2abec9bbe 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml @@ -10,7 +10,8 @@ - (); float availablePower = 0.0f; @@ -180,7 +186,7 @@ namespace Barotrauma.Items.Components battery.Item.CreateServerEvent(battery); } } - + Launch(projectiles[0].Item, character); if (character != null) @@ -413,6 +419,12 @@ namespace Barotrauma.Items.Components break; case "trigger_in": item.Use((float)Timing.Step, sender); + //triggering the Use method through item.Use will fail if the item is not characterusable and the signal was sent by a character + //so lets do it manually + if (!characterUsable && sender != null) + { + TryLaunch(sender); + } break; } }