From a0090f16fc4099e2133d6e978437ce13928dd294 Mon Sep 17 00:00:00 2001
From: Unknown <RedKerensky@Gmail.com>
Date: Tue, 17 Sep 2019 14:56:15 -0400
Subject: [PATCH] Moves Planet definition to code

---
 .../gamemaster/actions/planet_weather_change.dm        |  8 +++++++-
 .../modules/planet/virgo3b_vr.dm                       |  9 +--------
 maps/tether/tether.dm                                  |  1 -
 maps/tether/tether_defines.dm                          | 10 ++++++++++
 vorestation.dme                                        |  1 +
 5 files changed, 19 insertions(+), 10 deletions(-)
 rename maps/tether/tether_virgo3b.dm => code/modules/planet/virgo3b_vr.dm (98%)

diff --git a/code/modules/gamemaster/actions/planet_weather_change.dm b/code/modules/gamemaster/actions/planet_weather_change.dm
index e0f2e754e99..27583a9a6a2 100644
--- a/code/modules/gamemaster/actions/planet_weather_change.dm
+++ b/code/modules/gamemaster/actions/planet_weather_change.dm
@@ -5,7 +5,13 @@
 	reusable = TRUE
 	var/datum/planet/target_planet
 
-	var/list/banned_weathers = list() //VOREStation Temp Edit
+	var/list/banned_weathers = list(
+		//VOREStation Edit - Virgo 3B Weather,
+		/datum/weather/virgo3b/ash_storm,
+		/datum/weather/virgo3b/emberfall,
+		/datum/weather/virgo3b/blood_moon,
+		/datum/weather/virgo3b/fallout)
+		//VOREStation Edit End
 	var/list/possible_weathers = list()
 
 /datum/gm_action/planet_weather_shift/set_up()
diff --git a/maps/tether/tether_virgo3b.dm b/code/modules/planet/virgo3b_vr.dm
similarity index 98%
rename from maps/tether/tether_virgo3b.dm
rename to code/modules/planet/virgo3b_vr.dm
index 882e701abdf..1248fb40be3 100644
--- a/maps/tether/tether_virgo3b.dm
+++ b/code/modules/planet/virgo3b_vr.dm
@@ -9,14 +9,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null
 	amounts of both oxygen and nitrogen. Fortunately, the oxygen is not enough to be combustible in any meaningful way, however \
 	the phoron is desirable by many corporations, including NanoTrasen."
 	current_time = new /datum/time/virgo3b()
-	expected_z_levels = list(
-						Z_LEVEL_SURFACE_LOW,
-						Z_LEVEL_SURFACE_MID,
-						Z_LEVEL_SURFACE_HIGH,
-						Z_LEVEL_SURFACE_MINE,
-						Z_LEVEL_SOLARS,
-						Z_LEVEL_PLAINS
-						)
+//	expected_z_levels = list(1) // This is defined elsewhere.
 	planetary_wall_type = /turf/unsimulated/wall/planetary/virgo3b
 
 /datum/planet/virgo3b/New()
diff --git a/maps/tether/tether.dm b/maps/tether/tether.dm
index 9fc90e12c28..aa79d8ea388 100644
--- a/maps/tether/tether.dm
+++ b/maps/tether/tether.dm
@@ -9,7 +9,6 @@
 	#include "tether_shuttle_defs.dm"
 	#include "tether_shuttles.dm"
 	#include "tether_telecomms.dm"
-	#include "tether_virgo3b.dm"
 
 	#include "tether-01-surface1.dmm"
 	#include "tether-02-surface2.dmm"
diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm
index 121c8efaa08..26fc2030df5 100644
--- a/maps/tether/tether_defines.dm
+++ b/maps/tether/tether_defines.dm
@@ -179,6 +179,16 @@
 
 	return 1
 
+/datum/planet/virgo3b
+	expected_z_levels = list(
+		Z_LEVEL_SURFACE_LOW,
+		Z_LEVEL_SURFACE_MID,
+		Z_LEVEL_SURFACE_HIGH,
+		Z_LEVEL_SURFACE_MINE,
+		Z_LEVEL_SOLARS,
+		Z_LEVEL_PLAINS
+	)
+
 // Short range computers see only the six main levels, others can see the surrounding surface levels.
 /datum/map/tether/get_map_levels(var/srcz, var/long_range = TRUE)
 	if (long_range && (srcz in map_levels))
diff --git a/vorestation.dme b/vorestation.dme
index d5dc93f7e0f..f5e93292a1d 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2715,6 +2715,7 @@
 #include "code\modules\persistence\persistence.dm"
 #include "code\modules\planet\planet.dm"
 #include "code\modules\planet\time.dm"
+#include "code\modules\planet\virgo3b_vr.dm"
 #include "code\modules\planet\weather.dm"
 #include "code\modules\power\apc.dm"
 #include "code\modules\power\apc_vr.dm"