From 100d1176f8ff93bfae894c1f488e072f1a19cf91 Mon Sep 17 00:00:00 2001 From: Blue Date: Tue, 8 May 2018 01:36:01 +0200 Subject: [PATCH 1/3] Added oxygenite tank, ancient weapon changes + Oxygenite tank added (taken from BTE) + Ancient Weapon Now can use both the oxygenite shard and tank +Diving Suit/Mask Can no longer use the oxygenite shard (replaced with the tank) + Welding Tool / Plasma Cutter Oxygenite can be placed in but can't actually be used + Fabricator Oxygenite tank craftable --- .../Content/Items/Artifacts/artifacts.xml | 2 ++ .../Content/Items/Diving/divinggear.xml | 35 ++++++++++++++++--- .../Content/Items/Fabricators/fabricators.xml | 1 + .../Content/Items/Tools/tools.xml | 2 ++ 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml b/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml index b9dc385d5..49c989471 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Artifacts/artifacts.xml @@ -195,6 +195,8 @@ + + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml index ccff82db3..0602a9792 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml @@ -22,7 +22,32 @@ - + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -115,7 +140,7 @@ - + @@ -127,7 +152,7 @@ - + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml index 305c61450..3c9e13d69 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Fabricators/fabricators.xml @@ -109,6 +109,7 @@ + diff --git a/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml b/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml index 7450d476a..753ef6320 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml @@ -60,6 +60,7 @@ + @@ -112,6 +113,7 @@ + From 0c8f6edbcd17b24be8616ff592ff7a5eadda05ab Mon Sep 17 00:00:00 2001 From: Blue <15182031+BlueTheKing@users.noreply.github.com> Date: Tue, 8 May 2018 23:27:40 +0200 Subject: [PATCH 2/3] Diving gear changed a bit Both the diving suit and mask can use both the oxygenite shard and tank. The shard is a bit less effective than the tank though. I'm unable to get the plasma cutter to work though. :( --- .../Content/Items/Diving/divinggear.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml index 0602a9792..4d1b6b7e9 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Diving/divinggear.xml @@ -73,6 +73,9 @@ + + + @@ -81,6 +84,7 @@ + @@ -139,6 +143,9 @@ + + + @@ -152,6 +159,7 @@ + @@ -191,4 +199,4 @@ - \ No newline at end of file + From eb6bf563799da878b4c00defb23024e512ba0ab9 Mon Sep 17 00:00:00 2001 From: Blue <15182031+BlueTheKing@users.noreply.github.com> Date: Sat, 26 May 2018 19:02:45 +0200 Subject: [PATCH 3/3] Plasma cutter can now use the oxygenite tank --- Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml b/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml index 753ef6320..a3e8dc468 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Tools/tools.xml @@ -86,8 +86,9 @@ aimpos="50,0" handle1="-12,4"/> - + + @@ -333,4 +334,4 @@ - \ No newline at end of file +