From a3ac1d26d75284bcbc0f0725796b3ac61302f43f Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Fri, 3 Jan 2025 11:06:49 -0700 Subject: [PATCH] [MIRROR] bunch of inits without return and a few easy new to init (#9773) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- .../components/binary_devices/pipeturbine.dm | 4 +- code/_helpers/unsorted.dm | 4 +- code/_onclick/hud/popups_vr.dm | 6 +- .../emergency_shuttle_controller.dm | 4 +- code/defines/obj/weapon.dm | 1 + code/game/gamemodes/cult/cult_structures.dm | 1 + code/game/gamemodes/events/black_hole.dm | 97 +++++++++++-------- .../technomancer/spells/insert/insert.dm | 4 +- .../technomancer/spells/modifier/modifier.dm | 6 +- .../technomancer/spells/phase_shift.dm | 8 +- .../technomancer/spells/spawner/darkness.dm | 6 +- .../technomancer/spells/spawner/destablize.dm | 6 +- .../technomancer/spells/spawner/pulsar.dm | 5 +- code/game/machinery/Beacon.dm | 6 +- code/game/machinery/CableLayer.dm | 6 +- code/game/machinery/adv_med.dm | 4 +- code/game/machinery/ai_slipper.dm | 4 +- code/game/machinery/airconditioner_vr.dm | 4 +- code/game/machinery/bioprinter.dm | 2 +- code/game/machinery/bomb_tester_vr.dm | 4 +- code/game/machinery/camera/camera.dm | 2 +- code/game/machinery/cloning.dm | 4 +- code/game/machinery/igniter.dm | 7 +- code/game/machinery/mass_driver.dm | 2 +- code/game/machinery/navbeacon.dm | 8 +- .../temporary_visuals/miscellaneous.dm | 1 + code/game/objects/items/contraband.dm | 2 +- code/game/objects/items/paintkit.dm | 1 + code/game/objects/items/weapons/manuals_vr.dm | 34 +++---- .../objects/structures/ghost_pods/event_vr.dm | 4 +- code/game/objects/structures/simple_doors.dm | 24 ++--- .../stool_bed_chair_nest/chairs_vr.dm | 92 +++++++++--------- .../overmap_renamer/debrisfield_renamer.dm | 2 +- code/modules/clothing/head/fishing.dm | 3 +- .../clothing/spacesuits/void/ert_vr.dm | 10 +- code/modules/economy/vending_refills.dm | 2 +- code/modules/food/food/cans.dm | 8 +- code/modules/mining/abandonedcrates_vr.dm | 2 +- .../species/station/protean_vr/protean_rig.dm | 1 + .../species/station/traits_vr/weaver_objs.dm | 4 +- .../mob/living/silicon/robot/component.dm | 1 + .../simple_mob/subtypes/vore/bigdragon.dm | 2 +- .../simple_mob/subtypes/vore/leopardmander.dm | 2 +- code/modules/power/cable.dm | 27 +++--- code/modules/projectiles/ammunition/rounds.dm | 2 +- code/modules/random_map/automata/diona.dm | 2 +- .../reagents/reagent_containers/syringes.dm | 2 +- code/modules/vehicles/bike.dm | 8 +- code/modules/vehicles/boat.dm | 28 +++--- code/modules/vehicles/cargo_train.dm | 4 +- code/modules/vehicles/construction.dm | 4 +- code/modules/vehicles/vehicle.dm | 3 +- .../vore/fluffstuff/custom_boxes_vr.dm | 12 +-- .../vore/fluffstuff/custom_clothes_vr.dm | 4 +- .../vore/fluffstuff/custom_implants_vr.dm | 20 ++-- .../vore/fluffstuff/custom_items_vr.dm | 28 +++--- .../vore/fluffstuff/custom_mecha_vr.dm | 6 +- code/modules/vore/resizing/sizegun_vr.dm | 4 +- .../xenoarcheaology/artifacts/autocloner.dm | 4 +- .../xenoarcheaology/artifacts/crystal.dm | 4 +- code/modules/xenoarcheaology/boulder.dm | 3 +- code/modules/xenoarcheaology/sampling.dm | 3 +- code/modules/xenobio/items/extracts_vr.dm | 4 +- code/modules/xenobio/items/slime_objects.dm | 6 +- maps/expedition_vr/beach/_beach.dm | 12 +-- maps/gateway_archive_vr/labyrinth.dm | 5 +- maps/gateway_archive_vr/wildwest.dm | 3 +- maps/redgate/fantasy_items.dm | 10 +- .../underdark_pois/underdark_things.dm | 2 +- maps/tether/tether_things.dm | 28 +++--- maps/tether/tether_turfs.dm | 4 +- 71 files changed, 330 insertions(+), 312 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm index df55d47a9f..a79d3b65da 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm @@ -18,8 +18,8 @@ var/datum/pipe_network/network1 var/datum/pipe_network/network2 -/obj/machinery/atmospherics/pipeturbine/New() - ..() +/obj/machinery/atmospherics/pipeturbine/Initialize(mapload, newdir) + . = ..() air_in.volume = 200 air_out.volume = 800 volume_ratio = air_in.volume / (air_in.volume + air_out.volume) diff --git a/code/_helpers/unsorted.dm b/code/_helpers/unsorted.dm index cdca88b151..27af473db4 100644 --- a/code/_helpers/unsorted.dm +++ b/code/_helpers/unsorted.dm @@ -1278,8 +1278,8 @@ var/mob/dview/dview_mob = new color = origin.color set_light(origin.light_range, origin.light_power, origin.light_color) -/mob/dview/New() - ..() +/mob/dview/Initialize() + . = ..() // We don't want to be in any mob lists; we're a dummy not a mob. mob_list -= src if(stat == DEAD) diff --git a/code/_onclick/hud/popups_vr.dm b/code/_onclick/hud/popups_vr.dm index 20dc1963da..260ea2b87b 100644 --- a/code/_onclick/hud/popups_vr.dm +++ b/code/_onclick/hud/popups_vr.dm @@ -66,6 +66,6 @@ close_button_y_start = 86 close_button_y_end = 94 -/obj/screen/popup/default/New() - ..() - icon_state = "popup[rand(1,10)]" \ No newline at end of file +/obj/screen/popup/default/Initialize(mapload) + icon_state = "popup[rand(1,10)]" + . = ..() diff --git a/code/controllers/emergency_shuttle_controller.dm b/code/controllers/emergency_shuttle_controller.dm index 4b596cc091..830a87be32 100644 --- a/code/controllers/emergency_shuttle_controller.dm +++ b/code/controllers/emergency_shuttle_controller.dm @@ -251,8 +251,8 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle = new layer = TURF_LAYER plane = TURF_PLANE -/obj/effect/bgstar/New() - ..() +/obj/effect/bgstar/Initialize() + . = ..() pixel_x += rand(-2,30) pixel_y += rand(-2,30) var/starnum = pick("1", "1", "1", "2", "3", "4") diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 445c8116a2..c213b386c7 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -45,6 +45,7 @@ /obj/item/soap/Initialize() if(randomize && prob(square_chance)) icon_state = "[icon_state]-alt" + . = ..() /obj/item/soap/nanotrasen desc = "A NanoTrasen-brand bar of soap. Smells of phoron, a years-old marketing gimmick." diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 73429d697b..56fcbd1d80 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -154,6 +154,7 @@ return /obj/effect/gateway/active/Initialize() + . = ..() addtimer(CALLBACK(src, PROC_REF(spawn_and_qdel)), rand(30, 60) SECONDS) /obj/effect/gateway/active/proc/spawn_and_qdel() diff --git a/code/game/gamemodes/events/black_hole.dm b/code/game/gamemodes/events/black_hole.dm index 44f6df7005..f378a197f8 100644 --- a/code/game/gamemodes/events/black_hole.dm +++ b/code/game/gamemodes/events/black_hole.dm @@ -8,55 +8,70 @@ density = FALSE anchored = TRUE -/obj/effect/bhole/New() - spawn(4) - controller() +/obj/effect/bhole/Initialize() + . = ..() + addtimer(CALLBACK(src, PROC_REF(controller)), 0.4 SECONDS, TIMER_DELETE_ME) /obj/effect/bhole/proc/controller() - while(src) + if(!isturf(loc)) + qdel(src) + return - if(!isturf(loc)) - qdel(src) - return + //DESTROYING STUFF AT THE EPICENTER + for(var/mob/living/M in orange(1,src)) + qdel(M) + for(var/obj/O in orange(1,src)) + qdel(O) + var/base_turf = get_base_turf_by_area(src) + for(var/turf/simulated/ST in orange(1,src)) + if(ST.type == base_turf) + continue + ST.ChangeTurf(base_turf) + addtimer(CALLBACK(src, PROC_REF(pull_1)), 0.6 SECONDS, TIMER_DELETE_ME) - //DESTROYING STUFF AT THE EPICENTER - for(var/mob/living/M in orange(1,src)) - qdel(M) - for(var/obj/O in orange(1,src)) - qdel(O) - var/base_turf = get_base_turf_by_area(src) - for(var/turf/simulated/ST in orange(1,src)) - if(ST.type == base_turf) - continue - ST.ChangeTurf(base_turf) +/obj/effect/bhole/proc/pull_1() + grav(10, 4, 10, 0) + addtimer(CALLBACK(src, PROC_REF(pull_2)), 0.6 SECONDS, TIMER_DELETE_ME) - sleep(6) - grav(10, 4, 10, 0 ) - sleep(6) - grav( 8, 4, 10, 0 ) - sleep(6) - grav( 9, 4, 10, 0 ) - sleep(6) - grav( 7, 3, 40, 1 ) - sleep(6) - grav( 5, 3, 40, 1 ) - sleep(6) - grav( 6, 3, 40, 1 ) - sleep(6) - grav( 4, 2, 50, 6 ) - sleep(6) - grav( 3, 2, 50, 6 ) - sleep(6) - grav( 2, 2, 75,25 ) - sleep(6) +/obj/effect/bhole/proc/pull_2() + grav(8, 4, 10, 0) + addtimer(CALLBACK(src, PROC_REF(pull_3)), 0.6 SECONDS, TIMER_DELETE_ME) +/obj/effect/bhole/proc/pull_3() + grav(9, 4, 10, 0) + addtimer(CALLBACK(src, PROC_REF(pull_4)), 0.6 SECONDS, TIMER_DELETE_ME) +/obj/effect/bhole/proc/pull_4() + grav(7, 3, 40, 1) + addtimer(CALLBACK(src, PROC_REF(pull_5)), 0.6 SECONDS, TIMER_DELETE_ME) - //MOVEMENT - if( prob(50) ) - src.anchored = FALSE - step(src,pick(alldirs)) - src.anchored = TRUE +/obj/effect/bhole/proc/pull_5() + grav(5, 3, 40, 1) + addtimer(CALLBACK(src, PROC_REF(pull_6)), 0.6 SECONDS, TIMER_DELETE_ME) + +/obj/effect/bhole/proc/pull_6() + grav(6, 3, 40, 1) + addtimer(CALLBACK(src, PROC_REF(pull_7)), 0.6 SECONDS, TIMER_DELETE_ME) + +/obj/effect/bhole/proc/pull_7() + grav(4, 2, 50, 6) + addtimer(CALLBACK(src, PROC_REF(pull_8)), 0.6 SECONDS, TIMER_DELETE_ME) + +/obj/effect/bhole/proc/pull_8() + grav(3, 2, 50, 6) + addtimer(CALLBACK(src, PROC_REF(pull_9)), 0.6 SECONDS, TIMER_DELETE_ME) + +/obj/effect/bhole/proc/pull_9() + grav(2, 2, 75,25) + addtimer(CALLBACK(src, PROC_REF(move)), 0.6 SECONDS, TIMER_DELETE_ME) + +/obj/effect/bhole/proc/move() + //MOVEMENT + if(prob(50)) + anchored = FALSE + step(src, pick(alldirs)) + anchored = TRUE + controller() /obj/effect/bhole/proc/grav(var/r, var/ex_act_force, var/pull_chance, var/turf_removal_chance) if(!isturf(loc)) //blackhole cannot be contained inside anything. Weird stuff might happen diff --git a/code/game/gamemodes/technomancer/spells/insert/insert.dm b/code/game/gamemodes/technomancer/spells/insert/insert.dm index d882d624b2..f7399234fb 100644 --- a/code/game/gamemodes/technomancer/spells/insert/insert.dm +++ b/code/game/gamemodes/technomancer/spells/insert/insert.dm @@ -11,8 +11,8 @@ var/obj/item/inserted_spell/inserting = null var/allow_stacking = 0 -/obj/item/spell/insert/New() - ..() +/obj/item/spell/insert/Initialize() + . = ..() set_light(spell_light_range, spell_light_intensity, l_color = light_color) /obj/item/inserted_spell diff --git a/code/game/gamemodes/technomancer/spells/modifier/modifier.dm b/code/game/gamemodes/technomancer/spells/modifier/modifier.dm index cca02c4ae3..73ef8b5b68 100644 --- a/code/game/gamemodes/technomancer/spells/modifier/modifier.dm +++ b/code/game/gamemodes/technomancer/spells/modifier/modifier.dm @@ -9,8 +9,8 @@ var/spell_light_intensity = 2 var/spell_light_range = 3 -/obj/item/spell/modifier/New() - ..() +/obj/item/spell/modifier/Initialize() + . = ..() set_light(spell_light_range, spell_light_intensity, l_color = light_color) /obj/item/spell/modifier/on_melee_cast(atom/hit_atom, mob/user) @@ -38,4 +38,4 @@ // Technomancer specific subtype which keeps track of spell power and gets targeted specificially by Dispel. /datum/modifier/technomancer - var/spell_power = null // Set by on_add_modifier. \ No newline at end of file + var/spell_power = null // Set by on_add_modifier. diff --git a/code/game/gamemodes/technomancer/spells/phase_shift.dm b/code/game/gamemodes/technomancer/spells/phase_shift.dm index e8a39c144b..7811569615 100644 --- a/code/game/gamemodes/technomancer/spells/phase_shift.dm +++ b/code/game/gamemodes/technomancer/spells/phase_shift.dm @@ -15,8 +15,8 @@ cast_methods = CAST_USE aspect = ASPECT_TELE -/obj/item/spell/phase_shift/New() - ..() +/obj/item/spell/phase_shift/Initialize() + . = ..() set_light(3, 2, l_color = "#FA58F4") /obj/effect/phase_shift @@ -28,8 +28,8 @@ /obj/effect/phase_shift/ex_act() return -/obj/effect/phase_shift/New() - ..() +/obj/effect/phase_shift/Initialize() + . = ..() set_light(3, 5, l_color = "#FA58F4") START_PROCESSING(SSobj, src) diff --git a/code/game/gamemodes/technomancer/spells/spawner/darkness.dm b/code/game/gamemodes/technomancer/spells/spawner/darkness.dm index 0d7d820423..7748470f6f 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/darkness.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/darkness.dm @@ -18,8 +18,8 @@ adjust_instability(4) ..() -/obj/item/spell/spawner/darkness/New() - ..() +/obj/item/spell/spawner/darkness/Initialize() + . = ..() set_light(6, -20, l_color = "#FFFFFF") /obj/effect/temporary_effect/darkness @@ -28,4 +28,4 @@ invisibility = 101 light_range = 6 light_power = -20 - light_on = TRUE \ No newline at end of file + light_on = TRUE diff --git a/code/game/gamemodes/technomancer/spells/spawner/destablize.dm b/code/game/gamemodes/technomancer/spells/spawner/destablize.dm index d491ce60fa..aae1443614 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/destablize.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/destablize.dm @@ -14,8 +14,8 @@ aspect = ASPECT_UNSTABLE spawner_type = /obj/effect/temporary_effect/destablize -/obj/item/spell/spawner/destablize/New() - ..() +/obj/item/spell/spawner/destablize/Initialize() + . = ..() set_light(3, 2, l_color = "#C26DDE") /obj/item/spell/spawner/destablize/on_ranged_cast(atom/hit_atom, mob/user) @@ -51,4 +51,4 @@ var/outgoing_instability = instability_power * ( 1 / (radius**2) ) L.receive_radiated_instability(outgoing_instability) pulses_remaining-- - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/game/gamemodes/technomancer/spells/spawner/pulsar.dm b/code/game/gamemodes/technomancer/spells/spawner/pulsar.dm index 91d05ed3d0..e67687aa05 100644 --- a/code/game/gamemodes/technomancer/spells/spawner/pulsar.dm +++ b/code/game/gamemodes/technomancer/spells/spawner/pulsar.dm @@ -13,8 +13,8 @@ aspect = ASPECT_EMP spawner_type = /obj/effect/temporary_effect/pulse/pulsar -/obj/item/spell/spawner/pulsar/New() - ..() +/obj/item/spell/spawner/pulsar/Initialize() + . = ..() set_light(3, 2, l_color = "#2ECCFA") /obj/item/spell/spawner/pulsar/on_ranged_cast(atom/hit_atom, mob/user) @@ -44,7 +44,6 @@ . = ..() /obj/effect/temporary_effect/pulse/proc/pulse_loop() - set waitfor = FALSE if(pulses_remaining > 0) pulsetimer = addtimer(CALLBACK(src, PROC_REF(pulse_loop)), pulse_delay, TIMER_STOPPABLE) diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index fbb71dc9f0..6f8ec101af 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -10,8 +10,8 @@ idle_power_usage = 0 var/obj/item/radio/beacon/Beacon -/obj/machinery/bluespace_beacon/New() - ..() +/obj/machinery/bluespace_beacon/Initialize(mapload) + . = ..() var/turf/T = src.loc Beacon = new /obj/item/radio/beacon Beacon.invisibility = INVISIBILITY_MAXIMUM @@ -48,4 +48,4 @@ if(Beacon.loc != src.loc) Beacon.loc = src.loc - update_icon() \ No newline at end of file + update_icon() diff --git a/code/game/machinery/CableLayer.dm b/code/game/machinery/CableLayer.dm index e13944eb9a..aedbb035f3 100644 --- a/code/game/machinery/CableLayer.dm +++ b/code/game/machinery/CableLayer.dm @@ -8,9 +8,9 @@ var/max_cable = 100 var/on = 0 -/obj/machinery/cablelayer/New() - cable = new(src, 100) - ..() +/obj/machinery/cablelayer/Initialize() + cable = new(src, max_cable) + . = ..() /obj/machinery/cablelayer/Moved(atom/old_loc, direction, forced = FALSE) . = ..() diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 9535ddac85..9f7fbe5441 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -565,8 +565,8 @@ circuit = /obj/item/circuitboard/scanner_console var/printing = null -/obj/machinery/body_scanconsole/New() - ..() +/obj/machinery/body_scanconsole/Initialize(mapload) + . = ..() findscanner() /obj/machinery/body_scanconsole/Destroy() diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index afbe5c334d..d307576da2 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -14,8 +14,8 @@ var/cooldown_on = 0 req_access = list(access_ai_upload) -/obj/machinery/ai_slipper/New() - ..() +/obj/machinery/ai_slipper/Initialize(mapload) + . = ..() update_icon() /obj/machinery/ai_slipper/power_change() diff --git a/code/game/machinery/airconditioner_vr.dm b/code/game/machinery/airconditioner_vr.dm index 9385e408b2..62926eb9e9 100644 --- a/code/game/machinery/airconditioner_vr.dm +++ b/code/game/machinery/airconditioner_vr.dm @@ -20,8 +20,8 @@ var/target_temp = T20C var/mode = MODE_IDLE -/obj/machinery/power/thermoregulator/New() - ..() +/obj/machinery/power/thermoregulator/Initialize(mapload) + . = ..() default_apply_parts() /obj/machinery/power/thermoregulator/examine(mob/user) diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index f8762b5496..ea3e4d5c02 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -339,7 +339,7 @@ var/matter_amount_per_sheet = 10 var/matter_type = MAT_STEEL -/obj/machinery/organ_printer/robot/full/New() +/obj/machinery/organ_printer/robot/full/Initialize() . = ..() stored_matter = max_stored_matter diff --git a/code/game/machinery/bomb_tester_vr.dm b/code/game/machinery/bomb_tester_vr.dm index 6e59c56844..baa6c6633a 100644 --- a/code/game/machinery/bomb_tester_vr.dm +++ b/code/game/machinery/bomb_tester_vr.dm @@ -32,8 +32,8 @@ var/datum/gas_mixture/faketank var/faketank_integrity -/obj/machinery/bomb_tester/New() - ..() +/obj/machinery/bomb_tester/Initialize(mapload) + . = ..() default_apply_parts() RefreshParts() faketank = new diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index c15e5e37c3..7749875c53 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -185,7 +185,7 @@ else assembly.state = 1 to_chat(user, span_notice("You cut \the [src] free from the wall.")) - new /obj/item/stack/cable_coil(src.loc, length=2) + new /obj/item/stack/cable_coil(src.loc, 2) assembly = null //so qdel doesn't eat it. qdel(src) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index ac0d7bc590..a4c0aeaf7a 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -456,8 +456,8 @@ icon_state = "pod_g" -/obj/machinery/clonepod/full/New() - ..() +/obj/machinery/clonepod/full/Initialize() + . = ..() for(var/i = 1 to container_limit) containers += new /obj/item/reagent_containers/glass/bottle/biomass(src) diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 4f45449a16..2e7a4e7aa4 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -30,9 +30,9 @@ location.hotspot_expose(1000,500,1) return 1 -/obj/machinery/igniter/New() - ..() +/obj/machinery/igniter/Initialize(mapload) icon_state = "igniter[on]" + . = ..() /obj/machinery/igniter/power_change() ..() @@ -58,9 +58,6 @@ idle_power_usage = 2 active_power_usage = 4 -/obj/machinery/sparker/New() - ..() - /obj/machinery/sparker/power_change() ..() if(!(stat & NOPOWER) && disable == 0) diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index a344167c4a..2bdae67c85 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -16,7 +16,7 @@ var/id = 1.0 var/drive_range = 50 //this is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess. -/obj/machinery/mass_driver/New() +/obj/machinery/mass_driver/Initialize(mapload) . = ..() default_apply_parts() diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index fa4b720467..0523b47f9f 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -18,8 +18,8 @@ var/global/list/navbeacons = list() // no I don't like putting this in, but it w var/list/codes = list() // assoc. list of transponder codes req_access = list(access_engine) -/obj/machinery/navbeacon/New() - ..() +/obj/machinery/navbeacon/Initialize(mapload) + . = ..() set_codes_from_txt(codes_txt) if(freq) warning("[src] at [x],[y],[z] has deprecated var freq=[freq]. Replace it with proper type.") @@ -237,6 +237,6 @@ Transponder Codes: