From 0dda35454b5f9c25fe8f734ca3f75e7d53b6e252 Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Sun, 11 Jun 2017 00:08:21 -0400
Subject: [PATCH] Tank sprite changes

Updates to Paradise oxygen tank sprites, and fixes the engineer survival box to have goggles!
---
 .../objects/items/weapons/storage/boxes.dm    |   5 +-
 .../items/weapons/tanks/tank_types_vr.dm      |  82 +++++++++++++++++-
 icons/obj/tank_vr.dmi                         | Bin 531 -> 2009 bytes
 3 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index c224b38a09..ae74bf8ea5 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -75,13 +75,14 @@
 	..()
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/weapon/tank/emergency/phoron_double(src)
-//End Edit
+	new /obj/item/clothing/glasses/goggles(src)
 
 /obj/item/weapon/storage/box/engineer/New()
 	..()
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/weapon/tank/emergency/oxygen/engi(src)
-
+	new /obj/item/clothing/glasses/goggles(src)
+//VOREStation Edit End
 /obj/item/weapon/storage/box/gloves
 	name = "box of latex gloves"
 	desc = "Contains white gloves."
diff --git a/code/game/objects/items/weapons/tanks/tank_types_vr.dm b/code/game/objects/items/weapons/tanks/tank_types_vr.dm
index 3f9b611a9f..4d63805768 100644
--- a/code/game/objects/items/weapons/tanks/tank_types_vr.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types_vr.dm
@@ -2,10 +2,88 @@
 	name = "double emergency phoron tank"
 	desc = "An emergency air tank hastily painted red."
 	icon = 'icons/obj/tank_vr.dmi'
-	icon_state = "emergency_double_nitrogen"
-	gauge_icon = "indicator_emergency_double"
+	icon_state = "emergency_double_vox"
+	gauge_icon = "indicator_double"
+	gauge_cap = 3
 	volume = 10
 
 /obj/item/weapon/tank/emergency/phoron_double/New()
 	..()
 	air_contents.adjust_gas("phoron", (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
+
+//New icons
+/obj/item/weapon/tank/oxygen
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "oxygen"
+	gauge_cap = 3
+	gauge_icon = "indicator_bigtank"
+// /obj/item/weapon/tank/oxygen/yellow
+// /obj/item/weapon/tank/oxygen/red
+
+/obj/item/weapon/tank/anesthetic
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "anesthetic"
+	gauge_cap = 3
+	gauge_icon = "indicator_bigtank"
+
+/obj/item/weapon/tank/air
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "oxygen"
+	gauge_cap = 3
+	gauge_icon = "indicator_bigtank"
+
+/obj/item/weapon/tank/phoron
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "phoron"
+
+/obj/item/weapon/tank/vox	//Can't be a child of phoron or the gas amount gets screwey.
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "plasma_fr"
+
+/obj/item/weapon/tank/emergency
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency"
+	gauge_icon = "indicator_smalltank"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/emergency/oxygen
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency"
+	gauge_icon = "indicator_smalltank"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/emergency/oxygen/engi
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency_engi"
+	gauge_icon = "indicator_engi"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/emergency/oxygen/double
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency_double"
+	gauge_icon = "indicator_double"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/emergency/nitrogen
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency_nitrogen"
+	gauge_icon = "indicator_smalltank"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/emergency/nitrogen/double
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency_double_vox"
+	gauge_icon = "indicator_double"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/emergency/phoron
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "emergency_p"
+	gauge_icon = "indicator_smalltank"
+	gauge_cap = 3
+
+/obj/item/weapon/tank/nitrogen
+	icon = 'icons/obj/tank_vr.dmi'
+	icon_state = "oxygen_fr"
+	gauge_icon = "indicator_bigtank"
+	gauge_cap = 3
diff --git a/icons/obj/tank_vr.dmi b/icons/obj/tank_vr.dmi
index e5337751671e7f816515b23fbd86a9ecbf821353..9e765a0dc18a46942ffb648d3ed75d9cab8843c9 100644
GIT binary patch
literal 2009
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

literal 531
zcmV+u0_^>XP)<h;3K|Lk000e1NJLTq003YB003YF0{{R35VmRy0000gP)t-sz`(#X
zG&D#^NHa4t$H>aF5ee!e9_mUn$H&V5001-p0RNc)|Nj90%x15BG)Vve00DGTPE!Ct
z=GbNc006goR9JLGWpiV4X>fFDZ*Bkpc$}q?%?iRW5QNXkQ-t<fB<au5i?m1&_7y^G
z)^?#yAdO1j-e|#t2nxCF4EqhkZpseLvF%uWYUvH!g4VD-D|eidJ8C}$QRI}2fWzoF
zv3TVnj0w!(1~C09wY{DvkOsZ8!AU65=$5b}D7iQ_!#2N3G#Y#5t&^V_Jc1S9*-&4@
zq}Hd+Gr|9f$|GtN5o{U3+VH>0D*f{cRaViIHC_Gs`U6Vlp>=(ofSdpT0MtoDK~z|U
zV_+Bsv;u-kN(u}hOe|0o6jU}g6eL~)1EZjdi=!YZjtXU9U=5(92G+CyhOkr;G=!z4
zvZkexU`1GYDr<V#Fw>xfrU0Ffu7L?HnPBjnAOJ2PB&dj@0G-dF0Rcp7Anc@>3ivgU
z>}i64<g~;Z8o&@5O1%0}FbYP&D4;nYR5YUV3DyVb%?d)ryU;4M;vPf6ZUP!GoUj{>
zzY5JsBzt-kjDk@x3PvCxxqd(^Y?;oW@$aJYF^Y4cGidy~==B4s8c251X#Ftc000IA
VJ1$N$$p-)c002ovPDHLkV1kY#-v$5x