From 40d2a68f56ec59cccc316bb5a909cbbcbb7ba5ca Mon Sep 17 00:00:00 2001 From: Francesco Date: Sat, 1 Sep 2018 04:01:46 +0200 Subject: [PATCH] Make a lot of subsystems' Initialize return ..() (#39955) Subsystem Initialize has a return value, this makes all the subsystems actually return it, too. --- code/controllers/subsystem/air.dm | 2 +- code/controllers/subsystem/disease.dm | 2 +- code/controllers/subsystem/events.dm | 2 +- code/controllers/subsystem/icon_smooth.dm | 2 +- code/controllers/subsystem/job.dm | 2 +- code/controllers/subsystem/lighting.dm | 4 ++-- code/controllers/subsystem/machines.dm | 2 +- code/controllers/subsystem/mapping.dm | 2 +- code/controllers/subsystem/medals.dm | 2 +- code/controllers/subsystem/minimap.dm | 2 +- code/controllers/subsystem/overlays.dm | 2 +- code/controllers/subsystem/persistence.dm | 2 +- code/controllers/subsystem/processing/quirks.dm | 2 +- code/controllers/subsystem/server_maint.dm | 2 +- code/controllers/subsystem/shuttle.dm | 2 +- code/controllers/subsystem/ticker.dm | 2 +- code/controllers/subsystem/weather.dm | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 6f1d4bfd7d2..2a1c34e1d63 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -69,7 +69,7 @@ SUBSYSTEM_DEF(air) setup_atmos_machinery() setup_pipenets() gas_reactions = init_gas_reactions() - ..() + return ..() /datum/controller/subsystem/air/fire(resumed = 0) diff --git a/code/controllers/subsystem/disease.dm b/code/controllers/subsystem/disease.dm index 48676bc51ef..9be1d8d90c0 100644 --- a/code/controllers/subsystem/disease.dm +++ b/code/controllers/subsystem/disease.dm @@ -17,7 +17,7 @@ SUBSYSTEM_DEF(disease) for(var/common_disease_type in all_common_diseases) var/datum/disease/prototype = new common_disease_type() archive_diseases[prototype.GetDiseaseID()] = prototype - ..() + return ..() /datum/controller/subsystem/disease/stat_entry(msg) ..("P:[active_diseases.len]") diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index ffc934c0611..abc46cba252 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -22,7 +22,7 @@ SUBSYSTEM_DEF(events) control += E //add it to the list of all events (controls) reschedule() getHoliday() - ..() + return ..() /datum/controller/subsystem/events/fire(resumed = 0) diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm index 1c8d94826d1..6f4040299ae 100644 --- a/code/controllers/subsystem/icon_smooth.dm +++ b/code/controllers/subsystem/icon_smooth.dm @@ -39,4 +39,4 @@ SUBSYSTEM_DEF(icon_smooth) smooth_icon(A) CHECK_TICK - ..() + return ..() diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index fb6db0d7b5a..77c642b70c0 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -21,7 +21,7 @@ SUBSYSTEM_DEF(job) LoadJobs() generate_selectable_species() set_overflow_role(CONFIG_GET(string/overflow_job)) - ..() + return ..() /datum/controller/subsystem/job/proc/set_overflow_role(new_overflow_role) var/datum/job/new_overflow = GetJob(new_overflow_role) diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index 6c5721531d3..12b467b624c 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -22,10 +22,10 @@ SUBSYSTEM_DEF(lighting) create_all_lighting_objects() initialized = TRUE - + fire(FALSE, TRUE) - ..() + return ..() /datum/controller/subsystem/lighting/fire(resumed, init_tick_checks) MC_SPLIT_TICK_INIT(3) diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm index 6d5d64fe6c5..c4b09d1b874 100644 --- a/code/controllers/subsystem/machines.dm +++ b/code/controllers/subsystem/machines.dm @@ -9,7 +9,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 8633104ecd6..3a25d889e0b 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -93,7 +93,7 @@ SUBSYSTEM_DEF(mapping) setup_map_transitions() generate_station_area_list() initialize_reserved_level() - ..() + return ..() /* Nuke threats, for making the blue tiles on the station go RED Used by the AI doomsday and the self destruct nuke. diff --git a/code/controllers/subsystem/medals.dm b/code/controllers/subsystem/medals.dm index 6dafb2c3cb9..21ab27492b6 100644 --- a/code/controllers/subsystem/medals.dm +++ b/code/controllers/subsystem/medals.dm @@ -6,7 +6,7 @@ SUBSYSTEM_DEF(medals) /datum/controller/subsystem/medals/Initialize(timeofday) if(CONFIG_GET(string/medal_hub_address) && CONFIG_GET(string/medal_hub_password)) hub_enabled = TRUE - ..() + return ..() /datum/controller/subsystem/medals/proc/UnlockMedal(medal, client/player) set waitfor = FALSE diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm index 6f835d082fe..e8c40448dda 100644 --- a/code/controllers/subsystem/minimap.dm +++ b/code/controllers/subsystem/minimap.dm @@ -38,7 +38,7 @@ SUBSYSTEM_DEF(minimap) to_chat(world, "No cached minimaps detected. Backup files loaded.") for(var/z in z_levels) register_asset("minimap_[z].png", fcopy_rsc(map_path(z,fileloc))) - ..() + return ..() /datum/controller/subsystem/minimap/proc/check_files(backup) // If the backup argument is true, looks in the icons folder. If false looks in the data folder. for(var/z in z_levels) diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm index 1a7bd43fd2c..20eb2af001e 100644 --- a/code/controllers/subsystem/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -19,7 +19,7 @@ SUBSYSTEM_DEF(overlays) /datum/controller/subsystem/overlays/Initialize() initialized = TRUE fire(mc_check = FALSE) - ..() + return ..() /datum/controller/subsystem/overlays/stat_entry() diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index 0e92d56240a..978eedb62f2 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -28,7 +28,7 @@ SUBSYSTEM_DEF(persistence) LoadPhotoPersistence() if(CONFIG_GET(flag/use_antag_rep)) LoadAntagReputation() - ..() + return ..() /datum/controller/subsystem/persistence/proc/LoadSatchels() var/placed_satchel = 0 diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index cec8b2832b2..a6c86a35763 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -15,7 +15,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks) /datum/controller/subsystem/processing/quirks/Initialize(timeofday) if(!quirks.len) SetupQuirks() - ..() + return ..() /datum/controller/subsystem/processing/quirks/proc/SetupQuirks() for(var/V in subtypesof(/datum/quirk)) diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index dd45f9146f2..7abb873b9cc 100644 --- a/code/controllers/subsystem/server_maint.dm +++ b/code/controllers/subsystem/server_maint.dm @@ -12,7 +12,7 @@ SUBSYSTEM_DEF(server_maint) /datum/controller/subsystem/server_maint/Initialize(timeofday) if (CONFIG_GET(flag/hub)) world.update_hub_visibility(TRUE) - ..() + return ..() /datum/controller/subsystem/server_maint/fire(resumed = FALSE) if(!resumed) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 4821a5f66f1..8f84dcc5966 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -72,7 +72,7 @@ SUBSYSTEM_DEF(shuttle) WARNING("No /obj/docking_port/mobile/emergency/backup placed on the map!") if(!supply) WARNING("No /obj/docking_port/mobile/supply placed on the map!") - ..() + return ..() /datum/controller/subsystem/shuttle/proc/initial_load() if(!istype(manipulator)) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 5d9fa19e280..756aaf210c4 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -128,12 +128,12 @@ SUBSYSTEM_DEF(ticker) if(!GLOB.syndicate_code_response) GLOB.syndicate_code_response = generate_code_phrase() - ..() start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10) if(CONFIG_GET(flag/randomize_shift_time)) gametime_offset = rand(0, 23) HOURS else if(CONFIG_GET(flag/shift_time_realtime)) gametime_offset = world.timeofday + return ..() /datum/controller/subsystem/ticker/fire() switch(current_state) diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index 0d5a68f0270..2391b4c839c 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -45,7 +45,7 @@ SUBSYSTEM_DEF(weather) for(var/z in SSmapping.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))