diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index 3ce50737474..ae19d317f01 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -179,9 +179,12 @@ var/datum/subsystem/air/SSair
 		z_start = z_level
 		z_finish = z_level
 
-	var/turf/open/space/S = /turf/open/space
-	var/list/turfs_to_init = block(locate(1, 1, z_start), locate(world.maxx, world.maxy, z_finish)) - S.space_turfs
+	var/list/turfs_to_init = block(locate(1, 1, z_start), locate(world.maxx, world.maxy, z_finish)) - space_turfs
 
+	for(var/turf/open/space in turfs_to_init)
+		world << "there's a space turf the -= didn't work dunc"
+		break
+	world << "if nothing else showed up then we gucci"
 	for(var/thing in turfs_to_init)
 		var/turf/t = thing
 		t.CalculateAdjacentTurfs()
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 33d894008f3..b042ffea4ed 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -118,7 +118,7 @@
 	material = null
 	climbable = TRUE
 	smooth = SMOOTH_TRUE
-	canSmoothWith = list(/obj/structure/barricade/sandbags, /turf/simulated/wall, /turf/simulated/wall/r_wall, /obj/structure/falsewall, /obj/structure/falsewall/reinforced, /turf/simulated/wall/rust, /turf/simulated/wall/r_wall/rust, /obj/structure/barricade/security)
+	canSmoothWith = list(/obj/structure/barricade/sandbags, /turf/closed/wall, /turf/closed/wall/r_wall, /obj/structure/falsewall, /obj/structure/falsewall/reinforced, /turf/closed/wall/rust, /turf/closed/wall/r_wall/rust, /obj/structure/barricade/security)
 
 
 /obj/structure/barricade/security
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index d145fa1b915..086a55be2cb 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -12,7 +12,8 @@
 	var/destination_y
 
 	var/global/datum/gas_mixture/space/space_gas = new
-	var/global/list/turf/open/space/space_turfs = list()
+
+var/global/list/turf/open/space/space_turfs = list() //i hate everything
 
 /turf/open/space/New()
 	update_icon()
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 44f2a487173..342635e82dd 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -971,11 +971,11 @@
 //For use with material scanners
 /proc/mineral_scan_pulse_material(list/mobs, turf/T, range = world.view)
 	var/list/minerals = list()
-	for(var/turf/simulated/mineral/M in range(range, T))
+	for(var/turf/closed/mineral/M in range(range, T))
 		if(M.scan_state)
 			minerals += M
 	if(minerals.len)
-		for(var/turf/simulated/mineral/M in minerals)
+		for(var/turf/closed/mineral/M in minerals)
 			var/obj/effect/overlay/temp/mining_overlay/C = PoolOrNew(/obj/effect/overlay/temp/mining_overlay, M)
 			C.icon_state = M.scan_state
 
diff --git a/tgstation.dme b/tgstation.dme
index ab0e006ed86..56c7529a01b 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -975,6 +975,7 @@
 #include "code\modules\detectivework\footprints_and_rag.dm"
 #include "code\modules\detectivework\scanner.dm"
 #include "code\modules\emoji\emoji_parse.dm"
+#include "code\modules\events\_event.dm"
 #include "code\modules\events\abductor.dm"
 #include "code\modules\events\alien_infestation.dm"
 #include "code\modules\events\anomaly.dm"
@@ -991,7 +992,6 @@
 #include "code\modules\events\disease_outbreak.dm"
 #include "code\modules\events\dust.dm"
 #include "code\modules\events\electrical_storm.dm"
-#include "code\modules\events\event.dm"
 #include "code\modules\events\false_alarm.dm"
 #include "code\modules\events\immovable_rod.dm"
 #include "code\modules\events\ion_storm.dm"