diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index 8fbed1f0b0f..79de45c3248 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -67,7 +67,7 @@ SUBSYSTEM_DEF(air)
 	setup_allturfs()
 	setup_atmos_machinery(GLOB.machines)
 	setup_pipenets(GLOB.machines)
-	..()
+	return ..()
 
 
 /datum/controller/subsystem/air/fire(resumed = 0)
diff --git a/code/controllers/subsystem/alarm.dm b/code/controllers/subsystem/alarm.dm
index 94955842381..90e3ff960f1 100644
--- a/code/controllers/subsystem/alarm.dm
+++ b/code/controllers/subsystem/alarm.dm
@@ -11,8 +11,8 @@ SUBSYSTEM_DEF(alarms)
 
 /datum/controller/subsystem/alarms/Initialize(start_timeofday)
 	all_handlers = list(SSalarms.atmosphere_alarm, SSalarms.burglar_alarm, SSalarms.camera_alarm, SSalarms.fire_alarm, SSalarms.motion_alarm, SSalarms.power_alarm)
-	..()
-	
+	return ..()
+
 /datum/controller/subsystem/alarms/fire()
 	for(var/datum/alarm_handler/AH in all_handlers)
 		AH.process()
diff --git a/code/controllers/subsystem/assets.dm b/code/controllers/subsystem/assets.dm
index 1423c6cf9bd..cd531db614a 100644
--- a/code/controllers/subsystem/assets.dm
+++ b/code/controllers/subsystem/assets.dm
@@ -14,4 +14,4 @@ SUBSYSTEM_DEF(assets)
 
 	for(var/client/C in GLOB.clients)
 		addtimer(CALLBACK(GLOBAL_PROC, .proc/getFilesSlow, C, preload, FALSE), 10)
-	..()
\ No newline at end of file
+	return ..()
\ No newline at end of file
diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm
index a0b2d49d958..cbe8806fc15 100644
--- a/code/controllers/subsystem/atoms.dm
+++ b/code/controllers/subsystem/atoms.dm
@@ -19,6 +19,7 @@ SUBSYSTEM_DEF(atoms)
 	setupgenetics()
 	initialized = INITIALIZATION_INNEW_MAPLOAD
 	InitializeAtoms()
+	return ..()
 
 
 
diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm
index 7d0b20b129d..95553ab0d7e 100644
--- a/code/controllers/subsystem/events.dm
+++ b/code/controllers/subsystem/events.dm
@@ -4,7 +4,7 @@ SUBSYSTEM_DEF(events)
 	runlevels = RUNLEVEL_GAME
 	// Report events at the end of the rouund
 	var/report_at_round_end = 0
-	
+
     // UI vars
 	var/window_x = 700
 	var/window_y = 600
@@ -13,7 +13,7 @@ SUBSYSTEM_DEF(events)
 	var/row_options1 = " width='85px'"
 	var/row_options2 = " width='260px'"
 	var/row_options3 = " width='150px'"
-	
+
     // Event vars
 	var/datum/event_container/selected_event_container = null
 	var/list/active_events = list()
@@ -29,7 +29,7 @@ SUBSYSTEM_DEF(events)
 
 /datum/controller/subsystem/events/Initialize()
 	allEvents = subtypesof(/datum/event)
-	..()
+	return ..()
 
 /datum/controller/subsystem/events/fire()
 	for(var/datum/event/E in active_events)
diff --git a/code/controllers/subsystem/holiday.dm b/code/controllers/subsystem/holiday.dm
index a5eb957a80f..be9d6d4fc7d 100644
--- a/code/controllers/subsystem/holiday.dm
+++ b/code/controllers/subsystem/holiday.dm
@@ -28,4 +28,4 @@ SUBSYSTEM_DEF(holiday)
 				if(prob(H.eventChance))
 					H.handle_event()
 
-	..()
\ No newline at end of file
+	return ..()
\ No newline at end of file
diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm
index 65260e5af55..531b6af2e78 100644
--- a/code/controllers/subsystem/icon_smooth.dm
+++ b/code/controllers/subsystem/icon_smooth.dm
@@ -29,4 +29,4 @@ SUBSYSTEM_DEF(icon_smooth)
 		smooth_icon(A)
 		CHECK_TICK
 
-	..()
+	return ..()
diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm
index 3639db6bbd2..ccd83640aa6 100644
--- a/code/controllers/subsystem/jobs.dm
+++ b/code/controllers/subsystem/jobs.dm
@@ -17,7 +17,7 @@ SUBSYSTEM_DEF(jobs)
 	if(!occupations.len)
 		SetupOccupations()
 	LoadJobs("config/jobs.txt")
-	..()
+	return ..()
 
 /datum/controller/subsystem/jobs/proc/SetupOccupations(var/list/faction = list("Station"))
 	occupations = list()
diff --git a/code/controllers/subsystem/machinery.dm b/code/controllers/subsystem/machinery.dm
index af6898c39bd..7038ad4db4f 100644
--- a/code/controllers/subsystem/machinery.dm
+++ b/code/controllers/subsystem/machinery.dm
@@ -17,7 +17,7 @@ SUBSYSTEM_DEF(machines)
 /datum/controller/subsystem/machines/Initialize()
 	makepowernets()
 	fire()
-	..()
+	return ..()
 
 /datum/controller/subsystem/machines/proc/makepowernets()
 	for(var/datum/powernet/PN in powernets)
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 43c2f406365..d08fba5ff4f 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -28,7 +28,7 @@ SUBSYSTEM_DEF(mapping)
 	// Populate mining Z-level hidden rooms
 	for(var/i=0, i<max_secret_rooms, i++)
 		make_mining_asteroid_secret()
-	..()
+	return ..()
 
 /datum/controller/subsystem/mapping/Recover()
-	flags |= SS_NO_INIT 
\ No newline at end of file
+	flags |= SS_NO_INIT
\ No newline at end of file
diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm
index 3619fca430f..4b898df0f11 100644
--- a/code/controllers/subsystem/weather.dm
+++ b/code/controllers/subsystem/weather.dm
@@ -45,7 +45,7 @@ SUBSYSTEM_DEF(weather)
 			for(var/z in levels_by_trait(target_trait))
 				LAZYINITLIST(eligible_zlevels["[z]"])
 				eligible_zlevels["[z]"][W] = probability
-	..()
+	return ..()
 
 /datum/controller/subsystem/weather/proc/run_weather(datum/weather/weather_datum_type, z_levels)
 	if(istext(weather_datum_type))