From 97b3d8451c651f1ddf6d318025411a03e0d63a49 Mon Sep 17 00:00:00 2001
From: Regalis
Date: Wed, 20 Jan 2016 23:31:37 +0200
Subject: [PATCH] - Larger icon for gap/ladder waypoints - Creature-sub
collision damage improvements (takes velocity of the limb into account) -
In-sub particles move with the sub - Fixed artifacts spawning to non-pickable
positions - Fixed ItemInventories not being drawn if the item is in a subslot
- CauseOfDeath = Drowning if the character is in water while running out of
oxy - Some more deconstructable items
---
Subsurface/Barotrauma.csproj | 1 -
Subsurface/Content/Items/Clothes/clothes.xml | 5 +++
.../Content/Items/Fabricators/materials.xml | 2 +-
Subsurface/Content/Items/Weapons/weapons.xml | 17 +++++++++
.../AI/Objectives/AIObjectiveCombat.cs | 4 +--
.../AI/Objectives/AIObjectiveGoTo.cs | 9 +++--
Subsurface/Source/Characters/Character.cs | 2 +-
Subsurface/Source/GameSession/CrewManager.cs | 1 +
.../GameSession/GameModes/SinglePlayerMode.cs | 4 +++
Subsurface/Source/GameSession/ShiftSummary.cs | 2 +-
Subsurface/Source/Items/CharacterInventory.cs | 2 +-
Subsurface/Source/Items/Inventory.cs | 12 +++----
Subsurface/Source/Items/Item.cs | 12 +++++--
Subsurface/Source/Map/Gap.cs | 8 ++---
Subsurface/Source/Map/Submarine.cs | 4 ++-
Subsurface/Source/Map/SubmarineBody.cs | 34 +++++++++++-------
Subsurface/Source/Map/WayPoint.cs | 4 ++-
Subsurface/Source/Particles/Particle.cs | 20 ++++++++---
Subsurface_Solution.v12.suo | Bin 821248 -> 856576 bytes
19 files changed, 104 insertions(+), 39 deletions(-)
diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj
index 0df081dfa..9b73026a4 100644
--- a/Subsurface/Barotrauma.csproj
+++ b/Subsurface/Barotrauma.csproj
@@ -114,7 +114,6 @@
-
diff --git a/Subsurface/Content/Items/Clothes/clothes.xml b/Subsurface/Content/Items/Clothes/clothes.xml
index abb23988d..8e6a536b8 100644
--- a/Subsurface/Content/Items/Clothes/clothes.xml
+++ b/Subsurface/Content/Items/Clothes/clothes.xml
@@ -81,6 +81,11 @@
tags="smallitem"
description="While the helmet won't offer adequate protection against most of the inhabitants of the subsurface ocean, it can be extremely useful if there are traitors on board.">
+
+
+
+
+
diff --git a/Subsurface/Content/Items/Fabricators/materials.xml b/Subsurface/Content/Items/Fabricators/materials.xml
index 023f9eb70..68c315c4f 100644
--- a/Subsurface/Content/Items/Fabricators/materials.xml
+++ b/Subsurface/Content/Items/Fabricators/materials.xml
@@ -52,7 +52,7 @@
category="Material"
Tags="smallitem"
pickdistance="150"
- spritecolor="1.0,1.0,1.0,0.9"
+ spritecolor="0.9,0.9,1.0,0.9"
canbepicked="true"
price="50">
diff --git a/Subsurface/Content/Items/Weapons/weapons.xml b/Subsurface/Content/Items/Weapons/weapons.xml
index 8383f4073..173fdc52d 100644
--- a/Subsurface/Content/Items/Weapons/weapons.xml
+++ b/Subsurface/Content/Items/Weapons/weapons.xml
@@ -79,6 +79,11 @@
price="100"
description="If verbal orders are insufficient, a high-voltage shock from a Stun Baton may be enough to beat an unruly crew member into submission.">
+
+
+
+
+