diff --git a/baystation12.dme b/baystation12.dme
index 2be9c4ad28c..e1580bc2795 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -49,6 +49,7 @@
 #include "code\_onclick\hud\robot.dm"
 #include "code\_onclick\hud\screen_objects.dm"
 #include "code\ATMOSPHERICS\atmospherics.dm"
+#include "code\ATMOSPHERICS\chiller.dm"
 #include "code\ATMOSPHERICS\datum_pipe_network.dm"
 #include "code\ATMOSPHERICS\datum_pipeline.dm"
 #include "code\ATMOSPHERICS\he_pipes.dm"
@@ -71,6 +72,7 @@
 #include "code\ATMOSPHERICS\components\unary\heat_source.dm"
 #include "code\ATMOSPHERICS\components\unary\outlet_injector.dm"
 #include "code\ATMOSPHERICS\components\unary\oxygen_generator.dm"
+#include "code\ATMOSPHERICS\components\unary\thermal_plate.dm"
 #include "code\ATMOSPHERICS\components\unary\unary_base.dm"
 #include "code\ATMOSPHERICS\components\unary\vent_pump.dm"
 #include "code\ATMOSPHERICS\components\unary\vent_scrubber.dm"
diff --git a/code/game/gamemodes/vox/heist/heist.dm b/code/game/gamemodes/vox/heist/heist.dm
index baae4c5edac..00b9b919859 100644
--- a/code/game/gamemodes/vox/heist/heist.dm
+++ b/code/game/gamemodes/vox/heist/heist.dm
@@ -235,4 +235,12 @@ VOX HEIST ROUNDTYPE
 /datum/game_mode/vox/heist/check_finished()
 	if (!(is_vox_crew_alive()) || (vox_shuttle_location && (vox_shuttle_location == "start")))
 		return 1
-	return ..()
\ No newline at end of file
+	return ..()
+
+/datum/game_mode/vox/heist/proc/is_vox_crew_alive()
+
+	for(var/datum/mind/raider in raiders)
+		if(raider.current)
+			if(istype(raider.current,/mob/living/carbon/human) && raider.current.stat != 2)
+				return 1
+	return 0
\ No newline at end of file
diff --git a/code/game/gamemodes/vox/trade/trade.dm b/code/game/gamemodes/vox/trade/trade.dm
index da5eeec9c85..906636471bf 100644
--- a/code/game/gamemodes/vox/trade/trade.dm
+++ b/code/game/gamemodes/vox/trade/trade.dm
@@ -211,4 +211,12 @@ VOX TRADE ROUNDTYPE
 /datum/game_mode/vox/trade/check_finished()
 	if (!(is_vox_crew_alive()) || (vox_shuttle_location && (vox_shuttle_location == "start")))
 		return 1
-	return ..()
\ No newline at end of file
+	return ..()
+
+/datum/game_mode/vox/trade/proc/is_vox_crew_alive()
+
+	for(var/datum/mind/trader in traders)
+		if(trader.current)
+			if(istype(trader.current,/mob/living/carbon/human) && trader.current.stat != 2)
+				return 1
+	return 0
\ No newline at end of file
diff --git a/code/game/gamemodes/vox/vox.dm b/code/game/gamemodes/vox/vox.dm
index 40042e98ac9..243b7b73ab7 100644
--- a/code/game/gamemodes/vox/vox.dm
+++ b/code/game/gamemodes/vox/vox.dm
@@ -18,16 +18,6 @@ var/global/vox_kills = 0 //Used to check the Inviolate.
 			return 0
 	return 1
 
-/datum/game_mode/vox/proc/is_vox_crew_alive()
-
-	for(var/datum/mind/raider in raiders)
-		if(raider.current)
-			if(istype(raider.current,/mob/living/carbon/human) && raider.current.stat != 2)
-				return 1
-	return 0
-
-
-
 //Vox global objectives.
 
 datum/objective/vox