diff --git a/code/controllers/subsystems/air.dm b/code/controllers/subsystems/air.dm
index 316bacba7d..46e25dbf8a 100644
--- a/code/controllers/subsystems/air.dm
+++ b/code/controllers/subsystems/air.dm
@@ -63,7 +63,6 @@ Total Unsimulated Turfs: [world.maxx*world.maxy*world.maxz - simulated_turf_coun
log_debug("Active Edges on ZAS Startup\n" + edge_log.Join("\n"))
startup_active_edge_log = edge_log.Copy()
- ..()
/datum/controller/subsystem/air/fire(resumed, no_mc_tick)
var/timer
diff --git a/code/controllers/subsystems/alarm.dm b/code/controllers/subsystems/alarm.dm
index d3178ced98..81cf122bed 100644
--- a/code/controllers/subsystems/alarm.dm
+++ b/code/controllers/subsystems/alarm.dm
@@ -16,9 +16,8 @@ SUBSYSTEM_DEF(alarm)
var/tmp/list/currentrun = null
var/static/list/active_alarm_cache = list()
-/datum/controller/subsystem/alarm/Initialize()
+/datum/controller/subsystem/alarm/Initialize(timeofday)
all_handlers = list(atmosphere_alarm, camera_alarm, fire_alarm, motion_alarm, power_alarm)
- . = ..()
/datum/controller/subsystem/alarm/fire(resumed, no_mc_tick)
if(!resumed)
diff --git a/code/controllers/subsystems/antag.dm b/code/controllers/subsystems/antag.dm
index d24a2af4ac..7431955136 100644
--- a/code/controllers/subsystems/antag.dm
+++ b/code/controllers/subsystems/antag.dm
@@ -22,10 +22,7 @@ SUBSYSTEM_DEF(antags)
var/list/antag_datums = list()
var/list/antag_spawnpoints = list()
-/datum/controller/subsystem/antags/Initialize()
- . = ..()
-
- // Set up antagonists.
+/datum/controller/subsystem/antags/Initialize(timeofday)
for(var/antag_type in subtypesof(/datum/antagonist))
var/datum/antagonist/A = new antag_type
antag_datums[A.id] = A
diff --git a/code/controllers/subsystems/assets.dm b/code/controllers/subsystems/assets.dm
index 2041104a2b..dbc55dc751 100644
--- a/code/controllers/subsystems/assets.dm
+++ b/code/controllers/subsystems/assets.dm
@@ -16,4 +16,3 @@ SUBSYSTEM_DEF(assets)
for(var/client/C in GLOB.clients)
addtimer(CALLBACK(GLOBAL_PROC, .proc/getFilesSlow, C, preload, FALSE), 10)
- return ..()
\ No newline at end of file
diff --git a/code/controllers/subsystems/atoms.dm b/code/controllers/subsystems/atoms.dm
index f05ca1aec9..7a4baaf5ed 100644
--- a/code/controllers/subsystems/atoms.dm
+++ b/code/controllers/subsystems/atoms.dm
@@ -24,7 +24,6 @@ SUBSYSTEM_DEF(atoms)
setupgenetics() //to set the mutations' place in structural enzymes, so initializers know where to put mutations.
atom_init_stage = INITIALIZATION_INNEW_MAPLOAD
InitializeAtoms()
- return ..()
/datum/controller/subsystem/atoms/proc/InitializeAtoms(var/list/supplied_atoms)
diff --git a/code/controllers/subsystems/character_setup.dm b/code/controllers/subsystems/character_setup.dm
index b9d28d7112..60493353bb 100644
--- a/code/controllers/subsystems/character_setup.dm
+++ b/code/controllers/subsystems/character_setup.dm
@@ -11,18 +11,7 @@ SUBSYSTEM_DEF(character_setup)
var/list/newplayers_requiring_init = list()
var/list/save_queue = list()
-/*
-/datum/controller/subsystem/character_setup/Initialize()
- while(prefs_awaiting_setup.len)
- var/datum/preferences/prefs = prefs_awaiting_setup[prefs_awaiting_setup.len]
- prefs_awaiting_setup.len--
- prefs.setup()
- while(newplayers_requiring_init.len)
- var/mob/new_player/new_player = newplayers_requiring_init[newplayers_requiring_init.len]
- newplayers_requiring_init.len--
- new_player.deferred_login()
- . = ..()
-*/ //Might be useful if we ever switch to Bay prefs.
+
/datum/controller/subsystem/character_setup/fire(resumed, no_mc_tick)
while(save_queue.len)
var/datum/preferences/prefs = save_queue[save_queue.len]
diff --git a/code/controllers/subsystems/chat.dm b/code/controllers/subsystems/chat.dm
index 49e000e461..f14c14a54a 100644
--- a/code/controllers/subsystems/chat.dm
+++ b/code/controllers/subsystems/chat.dm
@@ -9,7 +9,6 @@ SUBSYSTEM_DEF(chat)
/datum/controller/subsystem/chat/Initialize(timeofday)
init_vchat()
- ..()
/datum/controller/subsystem/chat/fire(resumed, no_mc_tick)
var/list/msg_queue = src.msg_queue // Local variable for sanic speed.
diff --git a/code/controllers/subsystems/chemistry.dm b/code/controllers/subsystems/chemistry.dm
index 23c3cbbcc4..be234b2a1b 100644
--- a/code/controllers/subsystems/chemistry.dm
+++ b/code/controllers/subsystems/chemistry.dm
@@ -15,10 +15,9 @@ SUBSYSTEM_DEF(chemistry)
chemical_reactions = SSchemistry.chemical_reactions
chemical_reagents = SSchemistry.chemical_reagents
-/datum/controller/subsystem/chemistry/Initialize()
+/datum/controller/subsystem/chemistry/Initialize(timeofday)
initialize_chemical_reagents()
initialize_chemical_reactions()
- ..()
/datum/controller/subsystem/chemistry/stat_entry()
..("C: [chemical_reagents.len] | R: [chemical_reactions.len]")
diff --git a/code/controllers/subsystems/circuits.dm b/code/controllers/subsystems/circuits.dm
index 3381858760..87e5ba9ecc 100644
--- a/code/controllers/subsystems/circuits.dm
+++ b/code/controllers/subsystems/circuits.dm
@@ -19,7 +19,6 @@ SUBSYSTEM_DEF(circuit)
/datum/controller/subsystem/circuit/Initialize(timeofday)
circuits_init()
- return ..()
/datum/controller/subsystem/circuit/proc/circuits_init()
//Cached lists for free performance
diff --git a/code/controllers/subsystems/events.dm b/code/controllers/subsystems/events.dm
index 037f41fc6e..50fae383cf 100644
--- a/code/controllers/subsystems/events.dm
+++ b/code/controllers/subsystems/events.dm
@@ -12,7 +12,7 @@ SUBSYSTEM_DEF(events)
var/datum/event_meta/new_event = new
-/datum/controller/subsystem/events/Initialize()
+/datum/controller/subsystem/events/Initialize(timeofday)
allEvents = typesof(/datum/event) - /datum/event
event_containers = list(
EVENT_LEVEL_MUNDANE = new/datum/event_container/mundane,
@@ -21,7 +21,6 @@ SUBSYSTEM_DEF(events)
)
if(global.using_map.use_overmap)
GLOB.overmap_event_handler.create_events(global.using_map.overmap_z, global.using_map.overmap_size, global.using_map.overmap_event_areas)
- return ..()
/datum/controller/subsystem/events/fire(resumed, no_mc_tick)
if (!resumed)
diff --git a/code/controllers/subsystems/game_master.dm b/code/controllers/subsystems/game_master.dm
index b063e4b23d..ccfe988afd 100644
--- a/code/controllers/subsystems/game_master.dm
+++ b/code/controllers/subsystems/game_master.dm
@@ -23,7 +23,7 @@ SUBSYSTEM_DEF(game_master)
var/debug_messages = FALSE // If true, debug information is written to `log_debug()`.
-/datum/controller/subsystem/game_master/Initialize()
+/datum/controller/subsystem/game_master/Initialize(timeofday)
var/list/subtypes = subtypesof(/datum/event2/meta)
for(var/T in subtypes)
var/datum/event2/meta/M = new T()
@@ -36,8 +36,6 @@ SUBSYSTEM_DEF(game_master)
if(config && !config.enable_game_master)
can_fire = FALSE
- return ..()
-
/datum/controller/subsystem/game_master/fire(resumed, no_mc_tick)
adjust_staleness(1)
adjust_danger(-1)
diff --git a/code/controllers/subsystems/holomaps.dm b/code/controllers/subsystems/holomaps.dm
index 5fcca27480..bb8173aaa2 100644
--- a/code/controllers/subsystems/holomaps.dm
+++ b/code/controllers/subsystems/holomaps.dm
@@ -16,7 +16,6 @@ SUBSYSTEM_DEF(holomaps)
/datum/controller/subsystem/holomaps/Initialize(timeofday)
generateHoloMinimaps()
- . = ..()
/datum/controller/subsystem/holomaps/stat_entry(msg)
if (!Debug2)
diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm
index f265f39955..d051c9006c 100644
--- a/code/controllers/subsystems/job.dm
+++ b/code/controllers/subsystems/job.dm
@@ -16,7 +16,6 @@ SUBSYSTEM_DEF(job)
setup_departments()
if(!occupations.len)
setup_occupations()
- return ..()
/datum/controller/subsystem/job/proc/setup_occupations(faction = "Station")
occupations = list()
diff --git a/code/controllers/subsystems/lighting.dm b/code/controllers/subsystems/lighting.dm
index 294a0a3f77..84d00959e0 100644
--- a/code/controllers/subsystems/lighting.dm
+++ b/code/controllers/subsystems/lighting.dm
@@ -40,7 +40,6 @@ SUBSYSTEM_DEF(lighting)
internal_process_lights(FALSE, TRUE)
internal_process_corners(FALSE, TRUE)
internal_process_overlays(FALSE, TRUE)
- return ..()
/datum/controller/subsystem/lighting/fire(resumed, no_mc_tick)
var/timer
diff --git a/code/controllers/subsystems/machines.dm b/code/controllers/subsystems/machines.dm
index 35b6c49526..aca893ecde 100644
--- a/code/controllers/subsystems/machines.dm
+++ b/code/controllers/subsystems/machines.dm
@@ -37,7 +37,6 @@ SUBSYSTEM_DEF(machines)
admin_notice("Initializing atmos machinery.", R_DEBUG)
setup_atmos_machinery(global.machines)
fire()
- ..()
/datum/controller/subsystem/machines/fire(resumed, no_mc_tick)
var/timer = TICK_USAGE
diff --git a/code/controllers/subsystems/mapping.dm b/code/controllers/subsystems/mapping.dm
index cb686e5030..08e3060eee 100644
--- a/code/controllers/subsystems/mapping.dm
+++ b/code/controllers/subsystems/mapping.dm
@@ -46,7 +46,6 @@ SUBSYSTEM_DEF(mapping)
// Lateload Code related to Expedition areas.
// if(using_map)
// loadLateMaps()
- ..()
/datum/controller/subsystem/mapping/proc/log_mapload(msg)
to_world_log(" [name]: [msg]")
diff --git a/code/controllers/subsystems/nightshift.dm b/code/controllers/subsystems/nightshift.dm
index 7cbefe694a..e8c6f6c9f5 100644
--- a/code/controllers/subsystems/nightshift.dm
+++ b/code/controllers/subsystems/nightshift.dm
@@ -10,14 +10,9 @@ SUBSYSTEM_DEF(nightshift)
var/high_security_mode = FALSE
-/datum/controller/subsystem/nightshift/Initialize()
+/datum/controller/subsystem/nightshift/Initialize(timeofday)
if(!config.enable_night_shifts)
can_fire = FALSE
- /*
- if(config.randomize_shift_time)
- GLOB.gametime_offset = rand(0, 23) HOURS
- */
- return ..()
/datum/controller/subsystem/nightshift/fire(resumed, no_mc_tick)
if(round_duration_in_ds < nightshift_first_check)
diff --git a/code/controllers/subsystems/open_space.dm b/code/controllers/subsystems/open_space.dm
index f8883f9d64..9d9efa0a2c 100644
--- a/code/controllers/subsystems/open_space.dm
+++ b/code/controllers/subsystems/open_space.dm
@@ -20,7 +20,6 @@ SUBSYSTEM_DEF(open_space)
initialize_open_space()
// Pre-process open space turfs once before the round starts.
fire(FALSE, TRUE)
- return ..()
/datum/controller/subsystem/open_space/Recover()
flags |= SS_NO_INIT // Make extra sure we don't initialize twice.
diff --git a/code/controllers/subsystems/overlays.dm b/code/controllers/subsystems/overlays.dm
index ae6591a7ac..35dc2b52a6 100644
--- a/code/controllers/subsystems/overlays.dm
+++ b/code/controllers/subsystems/overlays.dm
@@ -20,9 +20,8 @@ var/global/image/appearance_bro = new() // Temporarily super-global because of B
queue = list()
stats = list()
-/datum/controller/subsystem/overlays/Initialize()
+/datum/controller/subsystem/overlays/Initialize(timeofday)
fire(FALSE, TRUE)
- ..()
/datum/controller/subsystem/overlays/stat_entry()
..("Ov:[length(queue)]")
diff --git a/code/controllers/subsystems/persistence.dm b/code/controllers/subsystems/persistence.dm
index 792bf63893..a11ed9adc4 100644
--- a/code/controllers/subsystems/persistence.dm
+++ b/code/controllers/subsystems/persistence.dm
@@ -5,8 +5,7 @@ SUBSYSTEM_DEF(persistence)
var/list/tracking_values = list()
var/list/persistence_datums = list()
-/datum/controller/subsystem/persistence/Initialize()
- . = ..()
+/datum/controller/subsystem/persistence/Initialize(timeofday)
for(var/thing in subtypesof(/datum/persistent))
var/datum/persistent/P = thing
if(initial(P.name))
diff --git a/code/controllers/subsystems/planets.dm b/code/controllers/subsystems/planets.dm
index 2be9ca9a26..9452469448 100644
--- a/code/controllers/subsystems/planets.dm
+++ b/code/controllers/subsystems/planets.dm
@@ -17,7 +17,6 @@ SUBSYSTEM_DEF(planets)
/datum/controller/subsystem/planets/Initialize(timeofday)
admin_notice("Initializing planetary weather.", R_DEBUG)
createPlanets()
- ..()
/datum/controller/subsystem/planets/proc/createPlanets()
var/list/planet_datums = using_map.planet_datums_to_make
diff --git a/code/controllers/subsystems/shuttles.dm b/code/controllers/subsystems/shuttles.dm
index 88f18e522a..e598632fea 100644
--- a/code/controllers/subsystems/shuttles.dm
+++ b/code/controllers/subsystems/shuttles.dm
@@ -49,7 +49,6 @@ SUBSYSTEM_DEF(shuttles)
LAZYDISTINCTADD(shuttles_to_initialize, shuttle_type)
block_init_queue = FALSE
process_init_queues()
- return ..()
/datum/controller/subsystem/shuttles/fire(resumed, no_mc_tick)
if (!resumed)
diff --git a/code/controllers/subsystems/skybox.dm b/code/controllers/subsystems/skybox.dm
index 81d3adf94c..1707f80052 100644
--- a/code/controllers/subsystems/skybox.dm
+++ b/code/controllers/subsystems/skybox.dm
@@ -62,8 +62,6 @@ SUBSYSTEM_DEF(skybox)
. = ..()
-/datum/controller/subsystem/skybox/Initialize()
- . = ..()
/datum/controller/subsystem/skybox/proc/get_skybox(z)
if(!skybox_cache["[z]"])
diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm
index 346896879a..3bd4ee66e5 100644
--- a/code/controllers/subsystems/supply.dm
+++ b/code/controllers/subsystems/supply.dm
@@ -4,7 +4,6 @@ SUBSYSTEM_DEF(supply)
name = "Supply"
wait = 20 SECONDS
priority = FIRE_PRIORITY_SUPPLY
- //Initializes at default time
flags = SS_NO_TICK_CHECK
//supply points
@@ -24,7 +23,7 @@ SUBSYSTEM_DEF(supply)
var/movetime = 1200
var/datum/shuttle/autodock/ferry/supply/shuttle
-/datum/controller/subsystem/supply/Initialize()
+/datum/controller/subsystem/supply/Initialize(timeofday)
ordernum = rand(1,9000)
// build master supply list
@@ -35,8 +34,6 @@ SUBSYSTEM_DEF(supply)
else
qdel(P)
- . = ..()
-
// Supply shuttle ticker - handles supply point regeneration. Just add points over time.
/datum/controller/subsystem/supply/fire(resumed, no_mc_tick)
points += points_per_process
diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index 8f36709e33..f4bab1ca53 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -50,7 +50,7 @@ var/global/datum/controller/subsystem/ticker/ticker
/datum/controller/subsystem/ticker/PreInit()
global.ticker = src // TODO - Remove this! Change everything to point at SSticker intead
-/datum/controller/subsystem/ticker/Initialize()
+/datum/controller/subsystem/ticker/Initialize(timeofday)
pregame_timeleft = config.pregame_time
send2mainirc("Server lobby is loaded and open at byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]")
SSwebhooks.send(
@@ -61,7 +61,6 @@ var/global/datum/controller/subsystem/ticker/ticker
)
)
GLOB.autospeaker = new (null, null, null, 1) //Set up Global Announcer
- return ..()
/datum/controller/subsystem/ticker/fire(resumed, no_mc_tick)
switch(current_state)
diff --git a/code/controllers/subsystems/webhooks.dm b/code/controllers/subsystems/webhooks.dm
index a309fbb3a0..00c990b2ee 100644
--- a/code/controllers/subsystems/webhooks.dm
+++ b/code/controllers/subsystems/webhooks.dm
@@ -4,9 +4,8 @@ SUBSYSTEM_DEF(webhooks)
flags = SS_NO_FIRE
var/list/webhook_decls = list()
-/datum/controller/subsystem/webhooks/Initialize()
+/datum/controller/subsystem/webhooks/Initialize(timeofday)
load_webhooks()
- . = ..()
/datum/controller/subsystem/webhooks/proc/load_webhooks()
diff --git a/code/controllers/subsystems/xenoarch.dm b/code/controllers/subsystems/xenoarch.dm
index 9851c69278..8c4fa99669 100644
--- a/code/controllers/subsystems/xenoarch.dm
+++ b/code/controllers/subsystems/xenoarch.dm
@@ -16,7 +16,6 @@ SUBSYSTEM_DEF(xenoarch)
/datum/controller/subsystem/xenoarch/Initialize(timeofday)
SetupXenoarch()
- ..()
/datum/controller/subsystem/xenoarch/Recover()
if (istype(SSxenoarch.artifact_spawning_turfs))