diff --git a/code/controllers/subsystems/mapping_vr.dm b/code/controllers/subsystems/mapping_vr.dm index ef55dfaed9..de40d7675d 100644 --- a/code/controllers/subsystems/mapping_vr.dm +++ b/code/controllers/subsystems/mapping_vr.dm @@ -64,8 +64,8 @@ SUBSYSTEM_DEF(mapping) if(!istype(MT)) error("Lateload Z level \"[mapname]\" is not a valid map!") continue - MT.load_new_z(centered = FALSE, dont_init = TRUE) - //CHECK_TICK //Can't deal with this until SSAtoms + MT.load_new_z(centered = FALSE) + CHECK_TICK if(LAZYLEN(maybe_load)) var/picked = pick(maybe_load) @@ -81,7 +81,7 @@ SUBSYSTEM_DEF(mapping) if(!istype(MT)) error("Randompick Z level \"[map]\" is not a valid map!") else - MT.load_new_z(centered = FALSE, dont_init = TRUE) + MT.load_new_z(centered = FALSE) /datum/controller/subsystem/mapping/stat_entry(msg) if (!Debug2) diff --git a/code/game/area/Away Mission areas.dm b/code/game/area/Away Mission areas.dm index cdf1cfefa9..5d5f2c02d0 100644 --- a/code/game/area/Away Mission areas.dm +++ b/code/game/area/Away Mission areas.dm @@ -14,9 +14,8 @@ for(var/turf/unsimulated/floor/F in src) valid_spawn_turfs |= F -/area/awaymission/initialize() +/area/awaymission/LateInitialize() ..() - sleep(180) EvalValidSpawnTurfs() if(!valid_spawn_turfs.len) diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 47d302e7a8..8ffcb5cec4 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -46,7 +46,7 @@ // On initialization, copy our tracks from the global list /obj/machinery/media/jukebox/initialize() - ..() + . = ..() if(all_jukebox_tracks.len < 1) stat |= BROKEN // No tracks configured this round! return diff --git a/code/game/objects/structures/map_blocker_vr.dm b/code/game/objects/structures/map_blocker_vr.dm index d2fc9a64b7..03a5a874b8 100644 --- a/code/game/objects/structures/map_blocker_vr.dm +++ b/code/game/objects/structures/map_blocker_vr.dm @@ -9,10 +9,7 @@ density = 1 unacidable = 1 -/obj/effect/blocker/New() - icon = null // Make it disappear. - icon_state = null // Probably not nessicary. - /obj/effect/blocker/initialize() // For non-gateway maps. + . = ..() icon = null icon_state = null diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm index c8b771ab88..7480dce28a 100644 --- a/code/game/objects/structures/trash_pile.dm +++ b/code/game/objects/structures/trash_pile.dm @@ -29,7 +29,7 @@ var/global/list/allocated_gamma = list() /obj/structure/trash_pile/initialize() - ..() + . = ..() icon_state = pick( "pile1", "pile2", diff --git a/code/game/turfs/unsimulated/beach.dm b/code/game/turfs/unsimulated/beach.dm index c061d1bbf7..57dee24951 100644 --- a/code/game/turfs/unsimulated/beach.dm +++ b/code/game/turfs/unsimulated/beach.dm @@ -38,7 +38,7 @@ icon_state = "desert" /turf/simulated/floor/beach/sand/desert/initialize() - ..() + . = ..() if(prob(5)) icon_state = "desert[rand(0,4)]" diff --git a/code/modules/holomap/generate_holomap.dm b/code/modules/holomap/generate_holomap.dm index 38446ce07b..3db49243ab 100644 --- a/code/modules/holomap/generate_holomap.dm +++ b/code/modules/holomap/generate_holomap.dm @@ -54,7 +54,7 @@ var/global/list/extraMiniMaps = list() // TODO - Check - They had a delayed init perhaps? for (var/obj/machinery/station_map/S in station_holomaps) - S.initialize() + S.setup_holomap() // Generates the "base" holomap for one z-level, showing only the physical structure of walls and paths. /proc/generateHoloMinimap(var/zLevel = 1) diff --git a/code/modules/holomap/station_holomap.dm b/code/modules/holomap/station_holomap.dm index 2c2a0ad3e7..29dd5b5c6d 100644 --- a/code/modules/holomap/station_holomap.dm +++ b/code/modules/holomap/station_holomap.dm @@ -10,7 +10,7 @@ var/global/list/station_holomaps = list() use_power = 1 idle_power_usage = 10 active_power_usage = 500 - auto_init = 0 // We handle our own special initialization needs. // TODO - Make this not ~Leshana + //auto_init = 0 // We handle our own special initialization needs. // TODO - Make this not ~Leshana circuit = /obj/item/weapon/circuitboard/station_map // TODO - Port use_auto_lights from /vg - for now declare here @@ -36,17 +36,21 @@ var/global/list/station_holomaps = list() original_zLevel = loc.z station_holomaps += src flags |= ON_BORDER // Why? It doesn't help if its not density + +/obj/machinery/station_map/initialize() + . = ..() if(ticker && holomaps_initialized) spawn(1) // Tragically we need to spawn this in order to give the frame construcing us time to set pixel_x/y - initialize() + setup_holomap() /obj/machinery/station_map/Destroy() station_holomaps -= src stopWatching() holomap_datum = null - ..() + . = ..() -/obj/machinery/station_map/initialize() +/obj/machinery/station_map/proc/setup_holomap() + . = ..() bogus = FALSE var/turf/T = get_turf(src) original_zLevel = T.z diff --git a/code/modules/media/media_machinery.dm b/code/modules/media/media_machinery.dm index 42816ca51a..d12b91eb38 100644 --- a/code/modules/media/media_machinery.dm +++ b/code/modules/media/media_machinery.dm @@ -65,10 +65,10 @@ update_music() /obj/machinery/media/initialize() - ..() + . = ..() update_media_source() /obj/machinery/media/Destroy() disconnect_media_source() - ..() + . = ..() diff --git a/code/modules/resleeving/computers.dm b/code/modules/resleeving/computers.dm index 6fcef5739a..8ece411267 100644 --- a/code/modules/resleeving/computers.dm +++ b/code/modules/resleeving/computers.dm @@ -17,7 +17,7 @@ var/obj/item/weapon/disk/transcore/disk /obj/machinery/computer/transhuman/resleeving/initialize() - ..() + . = ..() updatemodules() /obj/machinery/computer/transhuman/resleeving/Destroy() diff --git a/code/modules/resleeving/designer.dm b/code/modules/resleeving/designer.dm index d0d8dbd99f..afe7c61cfc 100644 --- a/code/modules/resleeving/designer.dm +++ b/code/modules/resleeving/designer.dm @@ -17,9 +17,6 @@ var/mob/living/carbon/human/dummy/mannequin/mannequin = null var/obj/item/weapon/disk/body_record/disk = null -/obj/machinery/computer/transhuman/designer/initialize() - ..() - /obj/machinery/computer/transhuman/designer/Destroy() active_br = null preview_icon = null diff --git a/code/modules/rogueminer_vr/zone_console.dm b/code/modules/rogueminer_vr/zone_console.dm index 2073f92452..d5752f45b5 100644 --- a/code/modules/rogueminer_vr/zone_console.dm +++ b/code/modules/rogueminer_vr/zone_console.dm @@ -24,7 +24,7 @@ var/obj/machinery/computer/shuttle_control/belter/shuttle_control /obj/machinery/computer/roguezones/initialize() - ..() + . = ..() shuttle_control = locate(/obj/machinery/computer/shuttle_control/belter) /obj/machinery/computer/roguezones/attack_ai(mob/user as mob) diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 6f5706afcf..ed701aa9e0 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -45,7 +45,7 @@ user << "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots." /obj/machinery/computer/telescience/initialize() - ..() + . = ..() for(var/i = 1; i <= starting_crystals; i++) crystals += new /obj/item/weapon/ore/bluespace_crystal/artificial(src) // starting crystals diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm index d5ef4a3c7c..2d60f8fab3 100644 --- a/maps/tether/submaps/_tether_submaps.dm +++ b/maps/tether/submaps/_tether_submaps.dm @@ -36,7 +36,7 @@ if(istype(get_turf(src), /turf/simulated/floor)) src:target_z = z - qdel(src) + return INITIALIZE_HINT_QDEL /obj/effect/step_trigger/zlevel_fall/Trigger(var/atom/movable/A) //mostly from /obj/effect/step_trigger/teleporter/planetary_fall, step_triggers.dm L160 if(!src:target_z) diff --git a/maps/tether/submaps/beach/beach.dm b/maps/tether/submaps/beach/beach.dm index 867603e6df..9fe9072091 100644 --- a/maps/tether/submaps/beach/beach.dm +++ b/maps/tether/submaps/beach/beach.dm @@ -81,7 +81,8 @@ new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, z, world.maxx, world.maxy) new /datum/random_map/noise/ore/beachmine(null, 1, 1, z, 64, 64) - qdel(src) + initialized = TRUE + return INITIALIZE_HINT_QDEL // These are step-teleporters, for map edge transitions // This top one goes INTO the cave diff --git a/maps/tether/tether_phoronlock.dm b/maps/tether/tether_phoronlock.dm index 61206cbcf0..ed76bbdffb 100644 --- a/maps/tether/tether_phoronlock.dm +++ b/maps/tether/tether_phoronlock.dm @@ -51,7 +51,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior var/datum/radio_frequency/radio_connection /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/initialize() - ..() + . = ..() if(frequency) set_frequency(frequency) @@ -98,7 +98,7 @@ obj/machinery/airlock_sensor/phoron/airlock_exterior var/tag_scrubber /obj/machinery/embedded_controller/radio/airlock/phoron/initialize() - ..() + . = ..() program = new/datum/computer/file/embedded_program/airlock/phoron(src) //Advanced airlock controller for when you want a more versatile airlock controller - useful for turning simple access control rooms into airlocks diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index ad3f5479c6..e5110f0520 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -78,6 +78,7 @@ /obj/effect/step_trigger/teleporter/planetary_fall/virgo3b/initialize() planet = planet_virgo3b + . = ..() /obj/effect/step_trigger/lost_in_space var/deathmessage = "You drift off into space, floating alone in the void until your life support runs out." @@ -131,7 +132,7 @@ var/area/shock_area = /area/tether/surfacebase/tram /turf/simulated/floor/maglev/initialize() - ..() + . = ..() shock_area = locate(shock_area) // Walking on maglev tracks will shock you! Horray!