diff --git a/code/game/machinery/cloning.dm.rej b/code/game/machinery/cloning.dm.rej
new file mode 100644
index 0000000000..853da3a505
--- /dev/null
+++ b/code/game/machinery/cloning.dm.rej
@@ -0,0 +1,10 @@
+diff a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm	(rejected hunks)
+@@ -130,7 +130,7 @@
+ 	// We want to simulate the clone not being in contact with
+ 	// the atmosphere, so we'll put them in a constant pressure
+ 	// nitrogen. They'll breathe through the chemicals we pump into them.
+-	var/global/datum/gas_mixture/immutable/cloner/GM //global so that there's only one instance made for all cloning pods
++	var/static/datum/gas_mixture/immutable/cloner/GM //global so that there's only one instance made for all cloning pods
+ 	if(!GM)
+ 		GM = new
+ 	return GM
diff --git a/code/game/turfs/space/space.dm.rej b/code/game/turfs/space/space.dm.rej
new file mode 100644
index 0000000000..95ff55fee0
--- /dev/null
+++ b/code/game/turfs/space/space.dm.rej
@@ -0,0 +1,17 @@
+diff a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm	(rejected hunks)
+@@ -12,7 +12,7 @@
+ 	var/destination_x
+ 	var/destination_y
+ 
+-	var/global/datum/gas_mixture/space/space_gas = new
++	var/global/datum/gas_mixture/immutable/space/space_gas = new
+ 	plane = PLANE_SPACE
+ 	light_power = 0.25
+ 	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+@@ -210,4 +210,4 @@
+ 			to_chat(user, "<span class='notice'>You build a floor.</span>")
+ 			ChangeTurf(/turf/open/floor/plating)
+ 			return TRUE
+-	return FALSE
+\ No newline at end of file
++	return FALSE
diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm.rej b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm.rej
new file mode 100644
index 0000000000..fba8a80227
--- /dev/null
+++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm.rej
@@ -0,0 +1,14 @@
+diff a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm	(rejected hunks)
+@@ -322,10 +322,10 @@
+ 
+ 	for(var/t in turf_list)
+ 		var/turf/open/T = t
+-		if (space_is_all_consuming && !space_in_group && istype(T.air, /datum/gas_mixture/space))
++		if (space_is_all_consuming && !space_in_group && istype(T.air, /datum/gas_mixture/immutable/space))
+ 			space_in_group = 1
+ 			qdel(A)
+-			A = new/datum/gas_mixture/space()
++			A = new/datum/gas_mixture/immutable/space()
+ 		A.merge(T.air)
+ 
+ 	for(var/id in A_gases)
diff --git a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm.rej b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm.rej
new file mode 100644
index 0000000000..52e3b38223
--- /dev/null
+++ b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm.rej
@@ -0,0 +1,28 @@
+diff a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm	(rejected hunks)
+@@ -12,6 +12,9 @@
+ 	..()
+ 	reset_gas_mix()
+ 
++/datum/gas_mixture/immutable/garbage_collect()
++	reset_gas_mix()
++
+ /datum/gas_mixture/immutable/archive()
+ 	return 1 //nothing changes, so we do nothing and the archive is successful
+ 
+@@ -63,3 +66,16 @@
+ 
+ /datum/gas_mixture/immutable/space/remove_ratio()
+ 	return copy() //we're always empty, so we can just return a copy.
++
++
++//used by cloners
++/datum/gas_mixture/immutable/cloner
++	initial_temperature = T20C
++
++/datum/gas_mixture/immutable/cloner/reset_gas_mix()
++	assert_gas("n2")
++	gases["n2"][MOLES] = MOLES_O2STANDARD + MOLES_N2STANDARD
++	..()
++
++/datum/gas_mixture/immutable/cloner/heat_capacity()
++	return (MOLES_O2STANDARD + MOLES_N2STANDARD)*20 //specific heat of nitrogen is 20
diff --git a/code/modules/atmospherics/gasmixtures/space_mixture.dm b/code/modules/atmospherics/gasmixtures/space_mixture.dm
deleted file mode 100644
index 5b590e4626..0000000000
--- a/code/modules/atmospherics/gasmixtures/space_mixture.dm
+++ /dev/null
@@ -1,58 +0,0 @@
-//"immutable" gas mixture used for space calculations
-//it can be changed, but any changes will ultimately be undone before they can have any effect
-
-/datum/gas_mixture/space
-
-/datum/gas_mixture/space/New()
-	..()
-	temperature = TCMB
-	temperature_archived = TCMB
-
-/datum/gas_mixture/space/garbage_collect()
-	gases.Cut() //clever way of ensuring we always are empty.
-
-/datum/gas_mixture/space/archive()
-	return 1 //nothing changes, so we do nothing and the archive is successful
-
-/datum/gas_mixture/space/merge()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/space/heat_capacity()
-	. = 7000
-
-/datum/gas_mixture/space/heat_capacity_archived()
-	. = heat_capacity()
-
-/datum/gas_mixture/space/remove()
-	return copy() //we're immutable, so we can just return a copy.
-
-/datum/gas_mixture/space/remove_ratio()
-	return copy() //we're immutable, so we can just return a copy.
-
-/datum/gas_mixture/space/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
-	. = ..(sharer, 0)
-	temperature = TCMB
-	gases.Cut()
-
-/datum/gas_mixture/space/after_share()
-	temperature = TCMB
-	gases.Cut()
-
-/datum/gas_mixture/space/react()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/space/copy()
-	return new /datum/gas_mixture/space //we're immutable, so we can just return a new instance.
-
-/datum/gas_mixture/space/copy_from()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/space/copy_from_turf()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/space/parse_gas_string()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/space/temperature_share(datum/gas_mixture/sharer, conduction_coefficient, sharer_temperature, sharer_heat_capacity)
-	. = ..()
-	temperature = TCMB
diff --git a/tgstation.dme b/tgstation.dme
index c4f4e2e1ed..140bd78f79 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1066,7 +1066,6 @@
 #include "code\modules\atmospherics\gasmixtures\gas_types.dm"
 #include "code\modules\atmospherics\gasmixtures\immutable_mixtures.dm"
 #include "code\modules\atmospherics\gasmixtures\reactions.dm"
-#include "code\modules\atmospherics\gasmixtures\space_mixture.dm"
 #include "code\modules\atmospherics\machinery\airalarm.dm"
 #include "code\modules\atmospherics\machinery\atmosmachinery.dm"
 #include "code\modules\atmospherics\machinery\datum_pipeline.dm"
diff --git a/tgstation.dme.rej b/tgstation.dme.rej
new file mode 100644
index 0000000000..08cf36e21d
--- /dev/null
+++ b/tgstation.dme.rej
@@ -0,0 +1,11 @@
+diff a/tgstation.dme b/tgstation.dme	(rejected hunks)
+@@ -1030,8 +1030,8 @@
+ #include "code\modules\atmospherics\environmental\LINDA_turf_tile.dm"
+ #include "code\modules\atmospherics\gasmixtures\gas_mixture.dm"
+ #include "code\modules\atmospherics\gasmixtures\gas_types.dm"
++#include "code\modules\atmospherics\gasmixtures\immutable_mixtures.dm"
+ #include "code\modules\atmospherics\gasmixtures\reactions.dm"
+-#include "code\modules\atmospherics\gasmixtures\space_mixture.dm"
+ #include "code\modules\atmospherics\machinery\airalarm.dm"
+ #include "code\modules\atmospherics\machinery\atmosmachinery.dm"
+ #include "code\modules\atmospherics\machinery\datum_pipeline.dm"