From c8597f76be68fd2e5a0779903950c91e47f3ad0f Mon Sep 17 00:00:00 2001
From: Regalis
Date: Sat, 26 Mar 2016 23:25:04 +0200
Subject: [PATCH] - added med bays to the vanilla subs - some new wall prefabs
- medical item statuseffect tweaking - fixed textBoxes not being deselected
in waypoint editing hud after applying the changes
---
.../Content/Items/Fabricators/fabricators.xml | 6 +-
.../Content/Items/Fabricators/materials.xml | 5 ++
Subsurface/Content/Items/Medical/medical.xml | 52 ++++++++++++------
Subsurface/Content/Items/Tools/tools.xml | 2 +
Subsurface/Content/Items/Weapons/weapons.xml | 1 +
Subsurface/Content/Map/StructurePrefabs.xml | 17 ++++--
Subsurface/Content/Map/testroom.png | Bin 979927 -> 1084739 bytes
Subsurface/Source/Items/Item.cs | 8 ---
Subsurface/Source/Map/WayPoint.cs | 8 ++-
Subsurface/Source/Sprite.cs | 2 +
Subsurface/Submarines/Aegir Mark II.sub | Bin 15380 -> 15889 bytes
Subsurface/Submarines/Nehalennia.sub | Bin 12598 -> 13678 bytes
Subsurface/Submarines/Vellamo.sub | Bin 12912 -> 14325 bytes
13 files changed, 67 insertions(+), 34 deletions(-)
diff --git a/Subsurface/Content/Items/Fabricators/fabricators.xml b/Subsurface/Content/Items/Fabricators/fabricators.xml
index 0bbd0675a..f7e3824f1 100644
--- a/Subsurface/Content/Items/Fabricators/fabricators.xml
+++ b/Subsurface/Content/Items/Fabricators/fabricators.xml
@@ -15,15 +15,15 @@
-
+
-
+
-
+
diff --git a/Subsurface/Content/Items/Fabricators/materials.xml b/Subsurface/Content/Items/Fabricators/materials.xml
index ff83dba03..44e167ed8 100644
--- a/Subsurface/Content/Items/Fabricators/materials.xml
+++ b/Subsurface/Content/Items/Fabricators/materials.xml
@@ -8,6 +8,11 @@
canbepicked="true"
price="50">
+
+
+
+
+
diff --git a/Subsurface/Content/Items/Medical/medical.xml b/Subsurface/Content/Items/Medical/medical.xml
index 21662e6e8..b88b8c654 100644
--- a/Subsurface/Content/Items/Medical/medical.xml
+++ b/Subsurface/Content/Items/Medical/medical.xml
@@ -42,8 +42,7 @@
-
-
+
@@ -70,7 +69,7 @@
-
+
@@ -98,9 +97,14 @@
+
+
+
+
+
-
+
@@ -112,6 +116,7 @@
spritecolor="0.5,0.5,1.0,1.0"
Tags="smallitem,chem"
pickdistance="150"
+ canuseonself="true"
description="Most commonly used for treating oxygen deprivation.">
@@ -119,26 +124,32 @@
-
+
-
+ name="Fibrinozine"
+ category="Material"
+ spritecolor="0.6,0.4,0.2,1.0"
+ Tags="smallitem,chem"
+ pickdistance="150"
+ canuseonself="true"
+ description="A hemostatic agent that slows down bleeding.">
+
+
+
+
+
-
+
@@ -150,14 +161,20 @@
spritecolor="0.8,0.0,0.0,1.0"
Tags="smallitem,chem"
pickdistance="150"
+ canuseonself="true"
description="Highly effective at treating various types of physical trauma.">
+
+
+
+
+
-
+
@@ -176,7 +193,7 @@
-
+
@@ -194,7 +211,7 @@
-
+
@@ -209,7 +226,8 @@
pickdistance="150">
-
+
+
@@ -217,7 +235,7 @@