diff --git a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems
index 0f3ac76c9..5a76b4df1 100644
--- a/Barotrauma/BarotraumaShared/BarotraumaShared.projitems
+++ b/Barotrauma/BarotraumaShared/BarotraumaShared.projitems
@@ -1021,6 +1021,9 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
index e90a36068..9ccb70b2f 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml
@@ -40,13 +40,16 @@
+
+
+
-
+
@@ -96,6 +99,7 @@
+
diff --git a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml
index 229e9bce8..5a2d67126 100644
--- a/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml
+++ b/Barotrauma/BarotraumaShared/Content/Items/Medical/medical.xml
@@ -25,6 +25,15 @@
+
+
+
+
+
+
+
+
+
-
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 0.0f)
{
diff --git a/Barotrauma/BarotraumaShared/Source/DebugConsole.cs b/Barotrauma/BarotraumaShared/Source/DebugConsole.cs
index 15b2e7ffa..6c86da3b1 100644
--- a/Barotrauma/BarotraumaShared/Source/DebugConsole.cs
+++ b/Barotrauma/BarotraumaShared/Source/DebugConsole.cs
@@ -114,6 +114,17 @@ namespace Barotrauma
NewMessage("The code words are: " + traitorManager.codeWords + ", response: " + traitorManager.codeResponse + ".", Color.Cyan);
}));
+ commands.Add(new Command("itemlist", "itemlist: List all the item prefabs available for spawning.", (string[] args) =>
+ {
+ NewMessage("***************", Color.Cyan);
+ foreach (ItemPrefab itemPrefab in MapEntityPrefab.List)
+ {
+
+ NewMessage("- " + itemPrefab.Name, Color.Cyan);
+ }
+ NewMessage("***************", Color.Cyan);
+ }));
+
commands.Add(new Command("createfilelist", "", (string[] args) =>
{
UpdaterUtil.SaveFileList("filelist.xml");
diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Projectile.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Projectile.cs
index 16e8b97a7..6eb8cd2ab 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Projectile.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Projectile.cs
@@ -237,6 +237,7 @@ namespace Barotrauma.Items.Components
}
AttackResult attackResult = new AttackResult();
+ Character character = null;
if (attack != null)
{
var submarine = target.Body.UserData as Submarine;
@@ -248,11 +249,13 @@ namespace Barotrauma.Items.Components
return true;
}
- Limb limb;
+ Limb limb = target.Body.UserData as Limb;
Structure structure;
- if ((limb = (target.Body.UserData as Limb)) != null)
+ if (limb != null)
{
attackResult = attack.DoDamageToLimb(User, limb, item.WorldPosition, 1.0f);
+ if (limb.character != null)
+ character = limb.character;
}
else if ((structure = (target.Body.UserData as Structure)) != null)
{
@@ -260,8 +263,8 @@ namespace Barotrauma.Items.Components
}
}
- ApplyStatusEffects(ActionType.OnUse, 1.0f);
- ApplyStatusEffects(ActionType.OnImpact, 1.0f);
+ ApplyStatusEffects(ActionType.OnUse, 1.0f, character);
+ ApplyStatusEffects(ActionType.OnImpact, 1.0f, character);
IsActive = false;
@@ -306,7 +309,7 @@ namespace Barotrauma.Items.Components
{
contained.SetTransform(item.SimPosition, contained.body.Rotation);
}
- contained.Condition = 0.0f;
+ //contained.Condition = 0.0f; //Let the freaking .xml handle it jeez
}
}