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 @@ - + diff --git a/Subsurface/Content/Items/Tools/tools.xml b/Subsurface/Content/Items/Tools/tools.xml index be03cf31b..0c2a1c926 100644 --- a/Subsurface/Content/Items/Tools/tools.xml +++ b/Subsurface/Content/Items/Tools/tools.xml @@ -14,6 +14,7 @@ + @@ -66,6 +67,7 @@ + diff --git a/Subsurface/Content/Items/Weapons/weapons.xml b/Subsurface/Content/Items/Weapons/weapons.xml index eae49fe00..b3b9450b4 100644 --- a/Subsurface/Content/Items/Weapons/weapons.xml +++ b/Subsurface/Content/Items/Weapons/weapons.xml @@ -31,6 +31,7 @@ + diff --git a/Subsurface/Content/Map/StructurePrefabs.xml b/Subsurface/Content/Map/StructurePrefabs.xml index 5850dcba4..df604cedb 100644 --- a/Subsurface/Content/Map/StructurePrefabs.xml +++ b/Subsurface/Content/Map/StructurePrefabs.xml @@ -33,6 +33,9 @@ + + @@ -45,15 +48,15 @@ - - - @@ -88,7 +91,13 @@ - + + + + highlightText; - - //public List HighlightText - //{ - // get { return highlightText;} - - //} - public Item(ItemPrefab itemPrefab, Vector2 position, Submarine submarine) : this(new Rectangle((int)position.X, (int)position.Y, (int)itemPrefab.sprite.size.X, (int)itemPrefab.sprite.size.Y), itemPrefab, submarine) { diff --git a/Subsurface/Source/Map/WayPoint.cs b/Subsurface/Source/Map/WayPoint.cs index 1d78cd8de..48d89e3f7 100644 --- a/Subsurface/Source/Map/WayPoint.cs +++ b/Subsurface/Source/Map/WayPoint.cs @@ -216,6 +216,8 @@ namespace Barotrauma textBox.Text = text; textBox.Color = Color.Green; + textBox.Deselect(); + return true; } @@ -230,6 +232,8 @@ namespace Barotrauma textBox.Text = (assignedJob == null) ? "None" : assignedJob.Name; } + textBox.Deselect(); + return true; } @@ -267,14 +271,14 @@ namespace Barotrauma y = 40+20; - new GUITextBlock(new Rectangle(0, y, 100, 20), "ID Card tags:", Color.Transparent, Color.Black, Alignment.TopLeft, null, editingHUD); + new GUITextBlock(new Rectangle(0, y, 100, 20), "ID Card tags:", Color.Transparent, Color.White, Alignment.TopLeft, null, editingHUD); GUITextBox propertyBox = new GUITextBox(new Rectangle(100, y, 200, 20), GUI.Style, editingHUD); propertyBox.Text = string.Join(", ", idCardTags); propertyBox.OnEnterPressed = EnterIDCardTags; propertyBox.OnTextChanged = TextBoxChanged; y = y + 30; - new GUITextBlock(new Rectangle(0, y, 100, 20), "Assigned job:", Color.Transparent, Color.Black, Alignment.TopLeft, null, editingHUD); + new GUITextBlock(new Rectangle(0, y, 100, 20), "Assigned job:", Color.Transparent, Color.White, Alignment.TopLeft, null, editingHUD); propertyBox = new GUITextBox(new Rectangle(100, y, 200, 20), GUI.Style, editingHUD); propertyBox.Text = (assignedJob == null) ? "None" : assignedJob.Name; diff --git a/Subsurface/Source/Sprite.cs b/Subsurface/Source/Sprite.cs index 23cb095f5..7ef5f62d8 100644 --- a/Subsurface/Source/Sprite.cs +++ b/Subsurface/Source/Sprite.cs @@ -213,6 +213,8 @@ namespace Barotrauma // } //} + if (texture == null) return; + spriteBatch.Draw(texture, pos + offset, sourceRect, color, rotation + rotate, origin, scale, spriteEffect, depth == null ? this.depth : (float)depth); } diff --git a/Subsurface/Submarines/Aegir Mark II.sub b/Subsurface/Submarines/Aegir Mark II.sub index ac543a322..c46c86926 100644 Binary files a/Subsurface/Submarines/Aegir Mark II.sub and b/Subsurface/Submarines/Aegir Mark II.sub differ diff --git a/Subsurface/Submarines/Nehalennia.sub b/Subsurface/Submarines/Nehalennia.sub index 1298ea34e..cf7d2c975 100644 Binary files a/Subsurface/Submarines/Nehalennia.sub and b/Subsurface/Submarines/Nehalennia.sub differ diff --git a/Subsurface/Submarines/Vellamo.sub b/Subsurface/Submarines/Vellamo.sub index 5ad754f77..13766211b 100644 Binary files a/Subsurface/Submarines/Vellamo.sub and b/Subsurface/Submarines/Vellamo.sub differ