From a58f2c81e907f154e6269370daa508986c6ce767 Mon Sep 17 00:00:00 2001 From: warriorstar-orion Date: Sun, 22 Sep 2024 09:55:34 -0400 Subject: [PATCH 1/3] refactor/ci: enforce mapload in Initialize args --- code/_onclick/hud/picture_in_picture.dm | 2 +- code/_onclick/hud/plane_master.dm | 4 ++-- code/datums/status_effects/debuffs.dm | 2 +- .../miniantags/abduction/abduction_gear.dm | 2 +- .../miniantags/abduction/machinery/console.dm | 2 +- code/game/gamemodes/nuclear/nuclearbomb.dm | 6 +++--- code/game/gamemodes/wizard/magic_tarot.dm | 2 +- code/game/machinery/autolathe.dm | 8 ++++---- .../machinery/computer/atmos_controllers.dm | 2 +- code/game/machinery/computer/camera_console.dm | 4 ++-- code/game/machinery/computer/computer.dm | 2 +- .../game/machinery/computer/crew_monitoring.dm | 4 ++-- .../game/machinery/computer/medical_records.dm | 2 +- .../game/machinery/computer/message_monitor.dm | 2 +- code/game/machinery/doors/airlock.dm | 2 +- code/game/machinery/doors/airlock_types.dm | 10 +++++----- code/game/machinery/dye_generator.dm | 2 +- code/game/machinery/flasher.dm | 2 +- code/game/machinery/floodlight.dm | 2 +- code/game/machinery/shieldgen.dm | 2 +- code/game/machinery/status_display.dm | 2 +- code/game/machinery/suit_storage_unit.dm | 2 +- code/game/machinery/teleporter.dm | 2 +- code/game/machinery/turret_control.dm | 2 +- code/game/mecha/mech_bay.dm | 2 +- code/game/mecha/mecha.dm | 2 +- .../objects/effects/decals/Cleanable/fuel.dm | 2 +- .../decals/Cleanable/misc_cleanables.dm | 2 +- .../effects/effect_system/effects_foam.dm | 2 +- .../effects/spawners/airlock_spawner.dm | 2 +- .../effects/spawners/random/misc_spawners.dm | 2 +- .../objects/effects/spawners/random_barrier.dm | 2 +- .../objects/items/devices/chameleonproj.dm | 2 +- code/game/objects/items/devices/flashlight.dm | 10 +++++----- .../game/objects/items/devices/radio/beacon.dm | 2 +- .../items/devices/radio/encryptionkey.dm | 2 +- .../objects/items/devices/radio/headset.dm | 2 +- .../objects/items/devices/radio/intercom.dm | 2 +- .../objects/items/stacks/sheets/sheet_types.dm | 2 +- code/game/objects/items/theft_items.dm | 4 ++-- code/game/objects/items/weapons/RCD.dm | 10 +++++----- code/game/objects/items/weapons/clown_items.dm | 2 +- code/game/objects/items/weapons/manuals.dm | 4 ++-- code/game/objects/items/weapons/shards.dm | 2 +- code/game/objects/structures/aliens.dm | 2 +- code/game/objects/structures/fence.dm | 4 ++-- code/game/objects/structures/inflatable.dm | 2 +- .../objects/structures/lavaland/billboard.dm | 2 +- code/game/objects/structures/mineral_doors.dm | 4 ++-- .../game/objects/structures/misc_structures.dm | 2 +- code/game/objects/structures/morgue.dm | 2 +- code/game/objects/structures/plasma_geyser.dm | 2 +- code/game/objects/structures/plasticflaps.dm | 2 +- code/game/objects/structures/safe.dm | 2 +- code/game/objects/structures/tables_racks.dm | 4 ++-- code/game/turfs/simulated/floor/chasm.dm | 4 ++-- code/game/turfs/simulated/floor/light_floor.dm | 2 +- code/game/turfs/simulated/walls_misc.dm | 2 +- .../traitor/contractor/items/contractor_kit.dm | 2 +- code/modules/assembly/signaler.dm | 2 +- code/modules/awaymissions/loot.dm | 2 +- .../mission_code/ruins/oldstation.dm | 2 +- .../mission_code/ruins/telecomns.dm | 4 ++-- code/modules/awaymissions/mob_spawn.dm | 10 +++++----- code/modules/clothing/glasses/tajblind.dm | 18 +++++++++--------- code/modules/clothing/gloves/boxing_gloves.dm | 2 +- code/modules/clothing/masks/gasmask.dm | 2 +- code/modules/clothing/shoes/magboots.dm | 2 +- .../clothing/spacesuits/ert_hardsuits.dm | 2 +- code/modules/clothing/under/jobs/civilian.dm | 2 +- .../economy_machinery/account_terminal.dm | 2 +- code/modules/hydroponics/fermenting_barrel.dm | 2 +- code/modules/hydroponics/grown/random_seeds.dm | 2 +- .../instruments/objs/items/instrument_items.dm | 6 +++--- code/modules/library/book.dm | 2 +- code/modules/library/library_equipment.dm | 8 ++++---- code/modules/martial_arts/bearserk.dm | 2 +- code/modules/martial_arts/judo.dm | 2 +- code/modules/martial_arts/krav_maga.dm | 2 +- code/modules/martial_arts/martial.dm | 2 +- .../modules/mining/equipment/mining_charges.dm | 2 +- code/modules/mining/equipment/survival_pod.dm | 2 +- .../mining/equipment/wormhole_jaunter.dm | 2 +- code/modules/mining/fulton.dm | 2 +- code/modules/mining/laborcamp/laborshuttle.dm | 2 +- .../mining/lavaland/loot/colossus_loot.dm | 2 +- .../mining/lavaland/loot/tendril_loot.dm | 4 ++-- code/modules/mob/living/living.dm | 2 +- .../simple_animal/friendly/farm_animals.dm | 2 +- .../simple_animal/friendly/nian_caterpillar.dm | 2 +- .../mob/living/simple_animal/hostile/carp.dm | 2 +- .../simple_animal/hostile/gorilla/gorilla.dm | 2 +- code/modules/mod/modules/modules_general.dm | 2 +- .../particle_accelerator/particle.dm | 2 +- code/modules/power/generators/solar.dm | 2 +- code/modules/power/generators/turbine.dm | 2 +- .../projectiles/ammunition/energy_lens.dm | 2 +- code/modules/projectiles/guns/syringe_gun.dm | 2 +- .../chemistry/machinery/chem_dispenser.dm | 2 +- .../reagents/reagent_containers/iv_bag.dm | 2 +- code/modules/research/research.dm | 2 +- .../modules/research/rnd_network_controller.dm | 2 +- .../ruins/lavalandruin_code/ash_walker_den.dm | 2 +- .../ruins/lavalandruin_code/dead_ratvar.dm | 4 ++-- .../ruins/lavalandruin_code/sin_ruins.dm | 2 +- .../ruins/objects_and_mobs/necropolis_gate.dm | 6 +++--- code/modules/shuttle/emergency.dm | 2 +- code/modules/shuttle/navigation_computer.dm | 2 +- code/modules/shuttle/supply.dm | 2 +- code/modules/station_goals/bsa.dm | 2 +- code/modules/surgery/organs/augments_arms.dm | 2 +- tools/ci/check_grep2.py | 11 +++++++++++ 112 files changed, 170 insertions(+), 159 deletions(-) diff --git a/code/_onclick/hud/picture_in_picture.dm b/code/_onclick/hud/picture_in_picture.dm index aae4ce37001c..7562b3c1b569 100644 --- a/code/_onclick/hud/picture_in_picture.dm +++ b/code/_onclick/hud/picture_in_picture.dm @@ -14,7 +14,7 @@ var/mutable_appearance/standard_background var/const/max_dimensions = 10 -/atom/movable/screen/movable/pic_in_pic/Initialize() +/atom/movable/screen/movable/pic_in_pic/Initialize(mapload) . = ..() make_backgrounds() diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm index 4ac17efb7f98..e18e7d7fcc6a 100644 --- a/code/_onclick/hud/plane_master.dm +++ b/code/_onclick/hud/plane_master.dm @@ -47,7 +47,7 @@ mymob.overlay_fullscreen("lighting_backdrop_lit", /atom/movable/screen/fullscreen/stretch/lighting_backdrop/lit) mymob.overlay_fullscreen("lighting_backdrop_unlit", /atom/movable/screen/fullscreen/stretch/lighting_backdrop/unlit) -/atom/movable/screen/plane_master/lighting/Initialize() +/atom/movable/screen/plane_master/lighting/Initialize(mapload) . = ..() add_filter("emissives", 1, alpha_mask_filter(render_source = EMISSIVE_RENDER_TARGET, flags = MASK_INVERSE)) @@ -73,7 +73,7 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT render_target = EMISSIVE_RENDER_TARGET -/atom/movable/screen/plane_master/emissive/Initialize() +/atom/movable/screen/plane_master/emissive/Initialize(mapload) . = ..() add_filter("em_block_masking", 1, color_matrix_filter(GLOB.em_mask_matrix)) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index cfaa60634104..6286b221eb79 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -1346,7 +1346,7 @@ icon_state = "rift" color = "red" -/obj/effect/bubblegum_warning/Initialize() +/obj/effect/bubblegum_warning/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(slap_someone)), 2.5 SECONDS) //A chance to run away diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index bf8474adca71..b0b534bbfc4f 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -425,7 +425,7 @@ CONTENTS: item_state = "abductor_headset" ks2type = /obj/item/encryptionkey/heads/captain -/obj/item/radio/headset/abductor/Initialize() +/obj/item/radio/headset/abductor/Initialize(mapload) . = ..() make_syndie() // Why the hell is this a proc why cant it just be a subtype diff --git a/code/game/gamemodes/miniantags/abduction/machinery/console.dm b/code/game/gamemodes/miniantags/abduction/machinery/console.dm index be975ef273bf..db6453bcb7f9 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/console.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/console.dm @@ -28,7 +28,7 @@ var/obj/machinery/computer/camera_advanced/abductor/camera var/list/datum/icon_snapshot/disguises = list() -/obj/machinery/abductor/console/Initialize() +/obj/machinery/abductor/console/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 4eb06a9325fd..419f8c27fd7c 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -71,7 +71,7 @@ GLOBAL_VAR(bomb_set) extended = FALSE anchored = FALSE -/obj/machinery/nuclearbomb/Initialize() +/obj/machinery/nuclearbomb/Initialize(mapload) . = ..() r_code = rand(10000, 99999) // Creates a random code upon object spawn. wires = new/datum/wires/nuclearbomb(src) @@ -87,7 +87,7 @@ GLOBAL_VAR(bomb_set) radio.follow_target = src radio.config(list("Special Ops" = 0)) -/obj/machinery/nuclearbomb/syndicate/Initialize() +/obj/machinery/nuclearbomb/syndicate/Initialize(mapload) . = ..() wires.labelled = FALSE ADD_TRAIT(src, TRAIT_OBSCURED_WIRES, ROUNDSTART_TRAIT) @@ -793,7 +793,7 @@ GLOBAL_VAR(bomb_set) training = TRUE sprite_prefix = "t_" -/obj/machinery/nuclearbomb/training/Initialize() +/obj/machinery/nuclearbomb/training/Initialize(mapload) . = ..() r_code = 11111 //Uuh.. one! diff --git a/code/game/gamemodes/wizard/magic_tarot.dm b/code/game/gamemodes/wizard/magic_tarot.dm index 1bf82da346d1..1a884eece7cd 100644 --- a/code/game/gamemodes/wizard/magic_tarot.dm +++ b/code/game/gamemodes/wizard/magic_tarot.dm @@ -249,7 +249,7 @@ pixel_y = 20 duration = 1.5 SECONDS -/obj/effect/temp_visual/tarot_preview/Initialize(atom/mapload, new_icon_state) +/obj/effect/temp_visual/tarot_preview/Initialize(mapload, new_icon_state) . = ..() if(new_icon_state) icon_state = "tarot_[new_icon_state]" diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 96c54e3e9474..fd66ded6c348 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -38,7 +38,7 @@ var/list/categories = list("Tools", "Electronics", "Construction", "Communication", "Security", "Machinery", "Medical", "Miscellaneous", "Dinnerware", "Imported") var/board_type = /obj/item/circuitboard/autolathe -/obj/machinery/autolathe/Initialize() +/obj/machinery/autolathe/Initialize(mapload) . = ..() AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS), _show_on_examine=TRUE, _after_insert=CALLBACK(src, PROC_REF(AfterMaterialInsert))) component_parts = list() @@ -56,7 +56,7 @@ files = new /datum/research/autolathe(src) matching_designs = list() -/obj/machinery/autolathe/upgraded/Initialize() +/obj/machinery/autolathe/upgraded/Initialize(mapload) . = ..() component_parts = list() component_parts += new board_type(null) @@ -67,7 +67,7 @@ component_parts += new /obj/item/stack/sheet/glass(null) RefreshParts() -/obj/machinery/autolathe/upgraded/gamma/Initialize() +/obj/machinery/autolathe/upgraded/gamma/Initialize(mapload) . = ..() files = new /datum/research/autolathe/gamma(src) adjust_hacked(TRUE) @@ -522,7 +522,7 @@ name = "syndicate autolathe" board_type = /obj/item/circuitboard/autolathe/syndi -/obj/machinery/autolathe/syndicate/Initialize() +/obj/machinery/autolathe/syndicate/Initialize(mapload) . = ..() files = new /datum/research/autolathe/syndicate(src) diff --git a/code/game/machinery/computer/atmos_controllers.dm b/code/game/machinery/computer/atmos_controllers.dm index cb1d2638e43f..475fcf5b4b21 100644 --- a/code/game/machinery/computer/atmos_controllers.dm +++ b/code/game/machinery/computer/atmos_controllers.dm @@ -123,7 +123,7 @@ GLOBAL_LIST_EMPTY(gas_sensors) /// List of sensor names to cache lists used in the display TGUI var/tmp/list/sensor_name_data_map = list() -/obj/machinery/computer/general_air_control/Initialize() +/obj/machinery/computer/general_air_control/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD // Do all our work in here diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm index bc7f2429707c..b1844037c144 100644 --- a/code/game/machinery/computer/camera_console.dm +++ b/code/game/machinery/computer/camera_console.dm @@ -29,7 +29,7 @@ /obj/machinery/computer/security/ui_host() return parent ? parent : src -/obj/machinery/computer/security/Initialize() +/obj/machinery/computer/security/Initialize(mapload) . = ..() // Initialize map objects map_name = "camera_console_[UID()]_map" @@ -230,7 +230,7 @@ /// Used to detect how many video cameras are active var/feeds_on = 0 -/obj/machinery/computer/security/telescreen/entertainment/Initialize() +/obj/machinery/computer/security/telescreen/entertainment/Initialize(mapload) . = ..() set_light(1, LIGHTING_MINIMUM_POWER) //so byond doesnt cull, and we get an emissive appearance diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 374f3e9cefb6..73cf72137944 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -19,7 +19,7 @@ /// Are we forcing the icon to be represented in a no-power state? var/force_no_power_icon_state = FALSE -/obj/machinery/computer/Initialize() +/obj/machinery/computer/Initialize(mapload) . = ..() power_change() update_icon() diff --git a/code/game/machinery/computer/crew_monitoring.dm b/code/game/machinery/computer/crew_monitoring.dm index 17f19ffa65cb..d0c747c58bed 100644 --- a/code/game/machinery/computer/crew_monitoring.dm +++ b/code/game/machinery/computer/crew_monitoring.dm @@ -9,7 +9,7 @@ circuit = /obj/item/circuitboard/crew var/datum/ui_module/crew_monitor/crew_monitor -/obj/machinery/computer/crew/Initialize() +/obj/machinery/computer/crew/Initialize(mapload) . = ..() crew_monitor = new(src) @@ -39,6 +39,6 @@ name = "advanced crew monitoring computer" desc = "Used to monitor active health sensors built into most of the crew's uniforms across multiple sectors." -/obj/machinery/computer/crew/advanced/Initialize() +/obj/machinery/computer/crew/advanced/Initialize(mapload) . = ..() crew_monitor.is_advanced = TRUE diff --git a/code/game/machinery/computer/medical_records.dm b/code/game/machinery/computer/medical_records.dm index a57bc83ff48a..e3772b0a7910 100644 --- a/code/game/machinery/computer/medical_records.dm +++ b/code/game/machinery/computer/medical_records.dm @@ -27,7 +27,7 @@ light_color = LIGHT_COLOR_DARKBLUE -/obj/machinery/computer/med_data/Initialize() +/obj/machinery/computer/med_data/Initialize(mapload) . = ..() field_edit_questions = list( // General diff --git a/code/game/machinery/computer/message_monitor.dm b/code/game/machinery/computer/message_monitor.dm index 0ff58f33386c..fd66ec23513b 100644 --- a/code/game/machinery/computer/message_monitor.dm +++ b/code/game/machinery/computer/message_monitor.dm @@ -29,7 +29,7 @@ light_color = LIGHT_COLOR_DARKGREEN -/obj/machinery/computer/message_monitor/Initialize() +/obj/machinery/computer/message_monitor/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD // Give the message server time to initialize diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index a260b16f531a..8d859f887e3f 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -124,7 +124,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays) return TRUE return FALSE -/obj/machinery/door/airlock/Initialize() +/obj/machinery/door/airlock/Initialize(mapload) . = ..() /* About the new airlock wires panel: diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 6ebb3b387c45..3fe27af11574 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -333,7 +333,7 @@ glass = TRUE opacity = FALSE -/obj/machinery/door/airlock/centcom/glass/Initialize() +/obj/machinery/door/airlock/centcom/glass/Initialize(mapload) . = ..() update_icon() @@ -519,7 +519,7 @@ /// Inner airlock material (Glass, plasteel) var/stealth_airlock_material = null -/obj/machinery/door/airlock/cult/Initialize() +/obj/machinery/door/airlock/cult/Initialize(mapload) . = ..() icon = GET_CULT_DATA(airlock_runed_icon_file, initial(icon)) overlays_file = GET_CULT_DATA(airlock_runed_overlays_file, initial(overlays_file)) @@ -584,7 +584,7 @@ glass = TRUE opacity = FALSE -/obj/machinery/door/airlock/cult/glass/Initialize() +/obj/machinery/door/airlock/cult/glass/Initialize(mapload) . = ..() update_icon() @@ -597,7 +597,7 @@ assemblytype = /obj/structure/door_assembly/door_assembly_cult/unruned openingoverlaytype = /obj/effect/temp_visual/cult/door/unruned -/obj/machinery/door/airlock/cult/unruned/Initialize() +/obj/machinery/door/airlock/cult/unruned/Initialize(mapload) . = ..() icon = GET_CULT_DATA(airlock_unruned_icon_file, initial(icon)) overlays_file = GET_CULT_DATA(airlock_unruned_overlays_file, initial(overlays_file)) @@ -610,7 +610,7 @@ glass = TRUE opacity = FALSE -/obj/machinery/door/airlock/cult/unruned/glass/Initialize() +/obj/machinery/door/airlock/cult/unruned/glass/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/machinery/dye_generator.dm b/code/game/machinery/dye_generator.dm index 3a6e2c2c86f7..29cff395050e 100644 --- a/code/game/machinery/dye_generator.dm +++ b/code/game/machinery/dye_generator.dm @@ -8,7 +8,7 @@ idle_power_consumption = 40 var/dye_color = "#FFFFFF" -/obj/machinery/dye_generator/Initialize() +/obj/machinery/dye_generator/Initialize(mapload) . = ..() power_change() diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index b997c99a49ae..69f22c6d0f16 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -16,7 +16,7 @@ var/base_state = "mflash" anchored = TRUE -/obj/machinery/flasher/Initialize() +/obj/machinery/flasher/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index ac9571a6dd0d..e0c6d035b556 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -18,7 +18,7 @@ /obj/machinery/floodlight/get_cell() return cell -/obj/machinery/floodlight/Initialize() +/obj/machinery/floodlight/Initialize(mapload) . = ..() cell = new(src) mapVarInit() diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 5c266789a88a..c38b77c6fb7d 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -79,7 +79,7 @@ /// The rune that created the shield itself. Used to delete the rune when the shield is destroyed. var/obj/effect/rune/parent_rune -/obj/machinery/shield/cult/barrier/Initialize() +/obj/machinery/shield/cult/barrier/Initialize(mapload) . = ..() invisibility = INVISIBILITY_MAXIMUM diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index da1a037a0f01..0235e45ea642 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -33,7 +33,7 @@ GLOBAL_LIST_EMPTY(status_displays) var/index1 var/index2 -/obj/machinery/status_display/Initialize() +/obj/machinery/status_display/Initialize(mapload) . = ..() GLOB.status_displays |= src update_icon(UPDATE_OVERLAYS) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 6a3d980797d9..f76972c82f0e 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -244,7 +244,7 @@ helmet_type = /obj/item/clothing/head/radiation storage_type = /obj/item/geiger_counter -/obj/machinery/suit_storage_unit/Initialize() +/obj/machinery/suit_storage_unit/Initialize(mapload) . = ..() component_parts = list() diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 3baacc328778..48f918f54a10 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -29,7 +29,7 @@ /// When the teleporter is upgraded, it can lock onto beacons directly, rather than turfs. This is the variable for it. var/advanced_beacon_locking = FALSE -/obj/machinery/computer/teleporter/Initialize() +/obj/machinery/computer/teleporter/Initialize(mapload) . = ..() link_power_station() update_icon() diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index 0641f41f2369..c299244991ea 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -67,7 +67,7 @@ A.turret_controls -= src return ..() -/obj/machinery/turretid/Initialize() +/obj/machinery/turretid/Initialize(mapload) . = ..() if(!control_area) control_area = get_area(src) diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index be9227943b51..304e45e8d1dc 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -209,7 +209,7 @@ ) return data -/obj/machinery/computer/mech_bay_power_console/Initialize() +/obj/machinery/computer/mech_bay_power_console/Initialize(mapload) reconnect() update_icon() return ..() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 813b9983e04f..25bfdd7545b6 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -127,7 +127,7 @@ hud_possible = list (DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_TRACK_HUD) -/obj/mecha/Initialize() +/obj/mecha/Initialize(mapload) . = ..() icon_state += "-open" add_radio() diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm index f4ccb3151cbf..c8cfcae0e648 100644 --- a/code/game/objects/effects/decals/Cleanable/fuel.dm +++ b/code/game/objects/effects/decals/Cleanable/fuel.dm @@ -38,7 +38,7 @@ icon_state = "mustard" anchored = FALSE -/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/Initialize(newLoc, amt = 1, d = 0) +/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel/Initialize(mapload, newLoc, amt = 1, d = 0) dir = d //Setting this direction means you won't get torched by your own flamethrower. . = ..() diff --git a/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm b/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm index 9019d1393558..7ff65230575a 100644 --- a/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm +++ b/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm @@ -50,7 +50,7 @@ canSmoothWith = list(SMOOTH_GROUP_CLEANABLE_DIRT, SMOOTH_GROUP_WALLS) mouse_opacity = FALSE -/obj/effect/decal/cleanable/dirt/Initialize() +/obj/effect/decal/cleanable/dirt/Initialize(mapload) . = ..() QUEUE_SMOOTH_NEIGHBORS(src) if(smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK)) diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 5a550c677d4f..0c5f9c2e8b23 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -252,7 +252,7 @@ max_integrity = 20 var/metal = METAL_FOAM_ALUMINUM -/obj/structure/foamedmetal/Initialize() +/obj/structure/foamedmetal/Initialize(mapload) . = ..() recalculate_atmos_connectivity() diff --git a/code/game/objects/effects/spawners/airlock_spawner.dm b/code/game/objects/effects/spawners/airlock_spawner.dm index cfeea9b4448e..0e8fe6d902bf 100644 --- a/code/game/objects/effects/spawners/airlock_spawner.dm +++ b/code/game/objects/effects/spawners/airlock_spawner.dm @@ -38,7 +38,7 @@ This spawner places pipe leading up to the interior door, you will need to finis var/one_door_interior //For square airlocks, if you set this then a) only one door will spawn, and b) you can choose if the door should go opposite to how it normally goes. Please use the define var/one_door_exterior //See above -/obj/effect/spawner/airlock/Initialize() +/obj/effect/spawner/airlock/Initialize(mapload) ..() forceMove(locate(x + 1, y + 1, z)) //Needs to move because our icon_state implies we are one turf to the northeast, when we're not opposite_interior_direction = turn(interior_direction, 180) //Do it this way (instead of setting it directly) to avoid code mishaps diff --git a/code/game/objects/effects/spawners/random/misc_spawners.dm b/code/game/objects/effects/spawners/random/misc_spawners.dm index 7d4467767c23..439851b6870c 100644 --- a/code/game/objects/effects/spawners/random/misc_spawners.dm +++ b/code/game/objects/effects/spawners/random/misc_spawners.dm @@ -7,7 +7,7 @@ /obj/item/dice/d12, ) -/obj/effect/spawner/random/dice/Initialize() +/obj/effect/spawner/random/dice/Initialize(mapload) . = ..() spawn_loot_count = rand(1, 2) diff --git a/code/game/objects/effects/spawners/random_barrier.dm b/code/game/objects/effects/spawners/random_barrier.dm index 385b0c38ace4..c54aeabb3a57 100644 --- a/code/game/objects/effects/spawners/random_barrier.dm +++ b/code/game/objects/effects/spawners/random_barrier.dm @@ -13,7 +13,7 @@ // This needs to come before the initialization wave because // the thing it creates might need to be initialized too -/obj/effect/spawner/random_barrier/Initialize() +/obj/effect/spawner/random_barrier/Initialize(mapload) . = ..() var/turf/T = get_turf(src) if(!T) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 673140791c39..f204e8499d1a 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -101,7 +101,7 @@ var/can_move = TRUE var/obj/item/chameleon/master = null -/obj/effect/dummy/chameleon/Initialize() +/obj/effect/dummy/chameleon/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_EFFECT_CAN_TELEPORT, ROUNDSTART_TRAIT) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 8ac39ab3c0ed..fb45bcd6c8c4 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -13,7 +13,7 @@ var/brightness_on = 4 //luminosity when on var/togglesound = 'sound/weapons/empty.ogg' -/obj/item/flashlight/Initialize() +/obj/item/flashlight/Initialize(mapload) . = ..() update_brightness() @@ -228,14 +228,14 @@ /obj/item/flashlight/flare/used -/obj/item/flashlight/flare/used/Initialize() +/obj/item/flashlight/flare/used/Initialize(mapload) . = ..() // fuel gets set on New which is annoying so these can't just be vars fuel = 0 on = 0 update_icon() -/obj/item/flashlight/flare/glowstick/used/Initialize() +/obj/item/flashlight/flare/glowstick/used/Initialize(mapload) . = ..() // fuel gets set on New which is annoying so these can't just be vars fuel = 0 @@ -268,7 +268,7 @@ fuel_upp = 2000 blocks_emissive = FALSE -/obj/item/flashlight/flare/glowstick/Initialize() +/obj/item/flashlight/flare/glowstick/Initialize(mapload) . = ..() light_color = color @@ -315,7 +315,7 @@ icon_state = "random_glowstick" color = null -/obj/item/flashlight/flare/glowstick/random/Initialize() +/obj/item/flashlight/flare/glowstick/random/Initialize(mapload) . = ..() var/T = pick(typesof(/obj/item/flashlight/flare/glowstick) - /obj/item/flashlight/flare/glowstick/random - /obj/item/flashlight/flare/glowstick/emergency) new T(loc) diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 498e3c41aba1..8cdebbb96a50 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -16,7 +16,7 @@ var/area_bypass = FALSE var/cc_beacon = FALSE //set if allowed to teleport to even if on zlevel2 -/obj/item/beacon/Initialize() +/obj/item/beacon/Initialize(mapload) . = ..() GLOB.beacons |= src diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 84e2a15ba1a5..d99d5cb4af75 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -23,7 +23,7 @@ var/fake_name = "Agent ALERT_A_CODER" var/static/list/fakename_list -/obj/item/encryptionkey/syndicate/Initialize() +/obj/item/encryptionkey/syndicate/Initialize(mapload) if(!LAZYLEN(fakename_list)) fakename_list = GLOB.html_colors.Copy() . = ..() diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 642e3f497f2c..46497fb61a3b 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -90,7 +90,7 @@ instant = TRUE freqlock = TRUE -/obj/item/radio/headset/alt/deathsquad/Initialize() +/obj/item/radio/headset/alt/deathsquad/Initialize(mapload) . = ..() set_frequency(DTH_FREQ) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index f2eb9da50073..4479fe1d71e0 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -67,7 +67,7 @@ GLOB.global_intercoms.Add(src) update_icon(UPDATE_ICON_STATE | UPDATE_OVERLAYS) -/obj/item/radio/intercom/Initialize() +/obj/item/radio/intercom/Initialize(mapload) . = ..() if(!custom_name) name = "station intercom (General)" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index def83cd1a56f..337a341fdd0b 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -531,7 +531,7 @@ GLOBAL_LIST_INIT(soil_recipes, list ( resistance_flags = FIRE_PROOF merge_type = /obj/item/stack/sheet/soil -/obj/item/stack/sheet/soil/Initialize(loc, amt) +/obj/item/stack/sheet/soil/Initialize(mapload, loc, amt) recipes = GLOB.soil_recipes return ..() diff --git a/code/game/objects/items/theft_items.dm b/code/game/objects/items/theft_items.dm index 2f01761618cd..213f59ff20f1 100644 --- a/code/game/objects/items/theft_items.dm +++ b/code/game/objects/items/theft_items.dm @@ -15,7 +15,7 @@ var/cooldown = 0 var/pulseicon = "plutonium_core_pulse" -/obj/item/nuke_core/Initialize() +/obj/item/nuke_core/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) @@ -328,7 +328,7 @@ usesound = 'sound/weapons/bladeslice.ogg' var/uses_left -/obj/item/scalpel/supermatter/Initialize() +/obj/item/scalpel/supermatter/Initialize(mapload) . = ..() uses_left = rand(2, 4) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 2431ae640c0a..d7ea80dd794b 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -269,7 +269,7 @@ /// The list of potential RCD actions. var/static/list/possible_actions -/obj/item/rcd/Initialize() +/obj/item/rcd/Initialize(mapload) . = ..() if(!length(possible_actions)) possible_actions = list() @@ -358,13 +358,13 @@ user.visible_message("[user] puts the barrel of [src] into [user.p_their()] mouth and pulls the trigger. It looks like [user.p_theyre()] trying to commit suicide!") if(!afterattack(suicide_tile, user, TRUE)) - flags &= ~NODROP + flags &= ~NODROP return SHAME user.visible_message("[user] explodes as [src] builds a structure inside [user.p_them()]!") - flags &= ~NODROP + flags &= ~NODROP user.gib() - return OBLITERATION - + return OBLITERATION + /** * Creates and returns a base64 icon of the given `airlock_type`. * diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 8d98b7fcdf22..392ff0f398a8 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -23,7 +23,7 @@ throw_range = 15 attack_verb = list("HONKED") -/obj/item/bikehorn/Initialize() +/obj/item/bikehorn/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, honk_sounds, 50, falloff_exponent = 20) //die off quick please diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 239833432627..c0d9d2bab514 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -834,7 +834,7 @@ ///The Article title of the wiki page being opened in the