From 2b6e23bd551909b6f512a9402df502f0bf5c3784 Mon Sep 17 00:00:00 2001
From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com>
Date: Thu, 24 Sep 2020 16:01:13 +0100
Subject: [PATCH 1/9] Add more gas to the fuel depot

fixes https://github.com/VOREStation/VOREStation/issues/8830
---
 maps/expedition_vr/space/_fueldepot.dm | 8 +++++++-
 maps/expedition_vr/space/fueldepot.dmm | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/maps/expedition_vr/space/_fueldepot.dm b/maps/expedition_vr/space/_fueldepot.dm
index 4ec3236dd08..1f3241aee7a 100644
--- a/maps/expedition_vr/space/_fueldepot.dm
+++ b/maps/expedition_vr/space/_fueldepot.dm
@@ -35,4 +35,10 @@
 /turf/simulated/floor/tiled/techmaint/airless
 	oxygen = 0
 	nitrogen = 0
-	temperature = TCMB
\ No newline at end of file
+	temperature = TCMB
+	
+/obj/machinery/atmospherics/pipe/tank/phoron/full
+	start_pressure = 15000
+
+/obj/machinery/atmospherics/pipe/tank/air/full
+	start_pressure = 15000
diff --git a/maps/expedition_vr/space/fueldepot.dmm b/maps/expedition_vr/space/fueldepot.dmm
index 86e6cee6c0f..381d0515744 100644
--- a/maps/expedition_vr/space/fueldepot.dmm
+++ b/maps/expedition_vr/space/fueldepot.dmm
@@ -644,7 +644,7 @@
 /turf/simulated/shuttle/plating/airless,
 /area/tether_away/fueldepot)
 "bo" = (
-/obj/machinery/atmospherics/pipe/tank/phoron,
+/obj/machinery/atmospherics/pipe/tank/phoron/full,
 /obj/effect/floor_decal/industrial/outline/red,
 /turf/simulated/floor/tiled/techmaint/airless,
 /area/tether_away/fueldepot)
@@ -1124,7 +1124,7 @@
 /turf/simulated/shuttle/plating/airless,
 /area/tether_away/fueldepot)
 "cn" = (
-/obj/machinery/atmospherics/pipe/tank/air{
+/obj/machinery/atmospherics/pipe/tank/air/full{
 	icon_state = "air_map";
 	dir = 1
 	},

From 8f86c8742cf7448d7a59b0a4e93ca5a933d5cb1f Mon Sep 17 00:00:00 2001
From: Zandario <zandarioh@gmail.com>
Date: Thu, 1 Oct 2020 21:00:47 -0500
Subject: [PATCH 2/9] No idea how much y'all use these but that's kinda a smol
 OOF

---
 .../mechanical/hivebot/ranged_damage_vr.dm       |   2 +-
 icons/turf/vore.dmi                              | Bin 7022 -> 0 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 icons/turf/vore.dmi

diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm
index 3ac368a7ee8..31c9cdf10fa 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm
@@ -1,4 +1,4 @@
-/datum/category_item/catalogue/technology/drone/hivebot/laser // Hivebot Scanner Data - This is for Laser Hivebots
+/datum/category_item/catalogue/technology/drone/hivebot/rapidfire // Hivebot Scanner Data - This is for Rapidfire Hivebots
 	name = "Drone - Rapidfire Hivebot"
 	desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \
 	rifle, built for high-rate fire. Other than that, it has similar yellowish color \
diff --git a/icons/turf/vore.dmi b/icons/turf/vore.dmi
deleted file mode 100644
index 8dc3a3e7f00093d3facc3b830ae4f69b8436a703..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7022
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
HxyStv34DfH


From 343b1740f7aa92f75489cf5e487497e401766f66 Mon Sep 17 00:00:00 2001
From: Zandario <zandarioh@gmail.com>
Date: Thu, 1 Oct 2020 21:10:10 -0500
Subject: [PATCH 3/9] Bruh, how did I miss this.

---
 icons/turf/vore.dmi | Bin 0 -> 7022 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 icons/turf/vore.dmi

diff --git a/icons/turf/vore.dmi b/icons/turf/vore.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..8dc3a3e7f00093d3facc3b830ae4f69b8436a703
GIT binary patch
literal 7022
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
HxyStv34DfH

literal 0
HcmV?d00001


From 91c132a6e25e3ee6f446a4e122fda75cdfb18fff Mon Sep 17 00:00:00 2001
From: Zandario <zandarioh@gmail.com>
Date: Thu, 1 Oct 2020 21:13:54 -0500
Subject: [PATCH 4/9] Actually logistics Hivebots were commented as Commander
 Hivebots too

---
 .../living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm
index 0003b781245..434ce659e85 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm
@@ -5,7 +5,7 @@
 	to the other hivebots. Other than that, it has similar yellowish color to regular hivebots."
 	value = CATALOGUER_REWARD_HARD
 
-/datum/category_item/catalogue/technology/drone/hivebot/logistics // Hivebot Scanner Data - This is for Commander Hivebots
+/datum/category_item/catalogue/technology/drone/hivebot/logistics // Hivebot Scanner Data - This is for Logistics Hivebots
 	name = "Drone - Logistics Hivebot"
 	desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \
 	ballistic weapon. It also appears to have supply deploying bays, and internal fabs to repair and buff their allies' special capabilities. \

From fa176c3b5c21fb4c6b0eb0e37160870892826b7f Mon Sep 17 00:00:00 2001
From: Verkister <superverkelian@hotmail.com>
Date: Fri, 2 Oct 2020 17:50:08 +0300
Subject: [PATCH 5/9] Couple taur fixes.

Fixes skunk being a wolf subtype and thus going for the wolf fitted taursuits (oops)
Also fixes the taur riding mechanics not allowing non-ridable "taur tails" (aka tails just using the subtype for wider sprites without actually being taurs) to ride.
---
 .../appearance/sprite_accessories_taur_vr.dm   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm
index 4257afa1d6a..afabd204c44 100644
--- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm
+++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm
@@ -68,8 +68,10 @@
 	var/mob/living/carbon/human/H = M
 
 	if(isTaurTail(H.tail_style))
-		to_chat(src,"<span class='warning'>Too many legs. TOO MANY LEGS!!</span>")
-		return FALSE
+		var/datum/sprite_accessory/tail/taur/ridertype = H.tail_style
+		if(ridertype.can_ride)
+			to_chat(src,"<span class='warning'>Too many legs. TOO MANY LEGS!!</span>")
+			return FALSE
 
 	. = ..()
 	if(.)
@@ -190,18 +192,18 @@
 	extra_overlay = "fatwolf_markings"
 	//icon_sprite_tag = "fatwolf2c"
 
-/datum/sprite_accessory/tail/taur/wolf/skunk
-	name = "Skunk (Taur)"
-	icon_state = "skunk_s"
-	extra_overlay = "skunk_markings"
-	icon_sprite_tag = "skunk"
-
 /datum/sprite_accessory/tail/taur/wolf/synthwolf
 	name = "SynthWolf dual-color (Taur)"
 	icon_state = "synthwolf_s"
 	extra_overlay = "synthwolf_markings"
 	//icon_sprite_tag = "synthwolf"
 
+/datum/sprite_accessory/tail/taur/skunk
+	name = "Skunk (Taur)"
+	icon_state = "skunk_s"
+	extra_overlay = "skunk_markings"
+	icon_sprite_tag = "skunk"
+
 /datum/sprite_accessory/tail/taur/naga
 	name = "Naga (Taur)"
 	icon_state = "naga_s"

From a00e979e1784e84d5a8dfe2d8991eff1adcb9ba6 Mon Sep 17 00:00:00 2001
From: Verkister <superverkelian@hotmail.com>
Date: Fri, 2 Oct 2020 17:56:42 +0300
Subject: [PATCH 6/9] haha me funney

---
 code/modules/vore/appearance/sprite_accessories_taur_vr.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm
index afabd204c44..a880c24fc45 100644
--- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm
+++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm
@@ -70,6 +70,9 @@
 	if(isTaurTail(H.tail_style))
 		var/datum/sprite_accessory/tail/taur/ridertype = H.tail_style
 		if(ridertype.can_ride)
+			if(istype(ridertype, /datum/sprite_accessory/tail/taur/naga) || istype(ridertype, /datum/sprite_accessory/tail/taur/slug))
+				to_chat(src,"<span class='warning'>Too many legs. TOO FEW LEGS!!</span>")
+				return FALSE
 			to_chat(src,"<span class='warning'>Too many legs. TOO MANY LEGS!!</span>")
 			return FALSE
 

From b1dd9b0531495ab4fa4dd32e2532e8929fced29a Mon Sep 17 00:00:00 2001
From: Verkister <superverkelian@hotmail.com>
Date: Fri, 2 Oct 2020 17:57:15 +0300
Subject: [PATCH 7/9] Update sprite_accessories_taur_vr.dm

---
 code/modules/vore/appearance/sprite_accessories_taur_vr.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm
index a880c24fc45..e2c3a86b9d5 100644
--- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm
+++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm
@@ -71,7 +71,7 @@
 		var/datum/sprite_accessory/tail/taur/ridertype = H.tail_style
 		if(ridertype.can_ride)
 			if(istype(ridertype, /datum/sprite_accessory/tail/taur/naga) || istype(ridertype, /datum/sprite_accessory/tail/taur/slug))
-				to_chat(src,"<span class='warning'>Too many legs. TOO FEW LEGS!!</span>")
+				to_chat(src,"<span class='warning'>Too few legs. TOO FEW LEGS!!</span>")
 				return FALSE
 			to_chat(src,"<span class='warning'>Too many legs. TOO MANY LEGS!!</span>")
 			return FALSE

From bd8e2402118889d2496fba633b26c9de454cec2d Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Sun, 4 Oct 2020 19:47:42 +1000
Subject: [PATCH 8/9] Standartizes gear_tweaks on _vr only items

---
 .../preference_setup/loadout/loadout_accessories_vr.dm      | 6 +++---
 .../preference_setup/loadout/loadout_fluffitems_vr.dm       | 2 +-
 .../client/preference_setup/loadout/loadout_gloves_vr.dm    | 4 ++--
 .../client/preference_setup/loadout/loadout_head_vr.dm      | 2 +-
 .../client/preference_setup/loadout/loadout_suit_vr.dm      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
index 858dfd48ceb..f76fd299ee6 100644
--- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
@@ -8,7 +8,7 @@
 
 /datum/gear/choker/New()
 	..()
-	gear_tweaks = list(gear_tweak_free_color_choice)
+	gear_tweaks = += gear_tweak_free_color_choice
 
 /datum/gear/collar
 	display_name = "collar, silver"
@@ -18,7 +18,7 @@
 
 /datum/gear/collar/New()
 	..()
-	gear_tweaks = list(gear_tweak_collar_tag)
+	gear_tweaks += gear_tweak_collar_tag
 
 /datum/gear/collar/golden
 	display_name = "collar, golden"
@@ -106,4 +106,4 @@
 
 /datum/gear/accessory/flops/New()
 	..()
-	gear_tweaks = list(gear_tweak_free_color_choice)
+	gear_tweaks += gear_tweak_free_color_choice
diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
index e56a150549f..bf0148f5104 100644
--- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
@@ -25,7 +25,7 @@
 
 /datum/gear/fluff/collar/New()
 	..()
-	gear_tweaks = list(gear_tweak_collar_tag)
+	gear_tweaks += gear_tweak_collar_tag
 
 //  0-9 CKEYS
 /datum/gear/fluff/malady_crop
diff --git a/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm b/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm
index c6c51f5bbd3..269f9e7aa90 100644
--- a/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_gloves_vr.dm
@@ -12,7 +12,7 @@
 
 /datum/gear/gloves/colored/New()
 	..()
-	gear_tweaks = list(gear_tweak_free_color_choice)
+	gear_tweaks += gear_tweak_free_color_choice
 
 
 /datum/gear/gloves/latex/colorable
@@ -21,7 +21,7 @@
 
 /datum/gear/gloves/latex/colorable/New()
 	..()
-	gear_tweaks = list(gear_tweak_free_color_choice)
+	gear_tweaks += gear_tweak_free_color_choice
 
 /datum/gear/gloves/siren
 	display_name = "gloves, Siren"
diff --git a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm
index 41214cbd67e..ce6ada61abf 100644
--- a/code/modules/client/preference_setup/loadout/loadout_head_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_head_vr.dm
@@ -12,7 +12,7 @@
 
 /datum/gear/head/headbando/New()
 	..()
-	gear_tweaks = list(gear_tweak_free_color_choice)
+	gear_tweaks += gear_tweak_free_color_choice
 
 //Detective alternative
 /datum/gear/head/detective_alt
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
index 3dc33eb9b36..b9cae2ddd01 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
@@ -16,7 +16,7 @@
 
 /datum/gear/suit/labcoat_colorable/New()
 	..()
-	gear_tweaks = list(gear_tweak_free_color_choice)
+	gear_tweaks += gear_tweak_free_color_choice
 
 /datum/gear/suit/jacket_modular
 	display_name = "jacket, modular"

From 7d1828f2b4791b46031cf65f68bffe32798c0a62 Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Sun, 4 Oct 2020 19:50:30 +1000
Subject: [PATCH 9/9] Fixes = typo

---
 .../client/preference_setup/loadout/loadout_accessories_vr.dm   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
index f76fd299ee6..6245e48d595 100644
--- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
@@ -8,7 +8,7 @@
 
 /datum/gear/choker/New()
 	..()
-	gear_tweaks = += gear_tweak_free_color_choice
+	gear_tweaks += gear_tweak_free_color_choice
 
 /datum/gear/collar
 	display_name = "collar, silver"