From bd1fdbb91cd950f3a44710e41a427cf4df045ce1 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sun, 21 Nov 2021 14:47:32 -0800 Subject: [PATCH 1/2] Initialize engine_loader landmark immediately --- code/modules/shieldgen/directional_shield.dm | 2 +- maps/submaps/engine_submaps/engine.dm | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/shieldgen/directional_shield.dm b/code/modules/shieldgen/directional_shield.dm index 2677a565365..209dc9ca9a4 100644 --- a/code/modules/shieldgen/directional_shield.dm +++ b/code/modules/shieldgen/directional_shield.dm @@ -103,7 +103,7 @@ if(always_on) create_shields() GLOB.moved_event.register(src, src, .proc/moved_event) - ..() + return ..() /obj/item/shield_projector/Destroy() destroy_shields() diff --git a/maps/submaps/engine_submaps/engine.dm b/maps/submaps/engine_submaps/engine.dm index 74db547fb2c..403ec453740 100644 --- a/maps/submaps/engine_submaps/engine.dm +++ b/maps/submaps/engine_submaps/engine.dm @@ -3,7 +3,12 @@ name = "Engine Loader" var/clean_turfs // A list of lists, where each list is (x, ) +<<<<<<< HEAD /obj/effect/landmark/engine_loader/New() +======= +INITIALIZE_IMMEDIATE(/obj/effect/landmark/engine_loader) +/obj/effect/landmark/engine_loader/Initialize() +>>>>>>> 2d43d031101... Merge pull request #8354 from Atermonera/fix_engineload if(SSmapping.engine_loader) warning("Duplicate engine_loader landmarks: [log_info_line(src)] and [log_info_line(SSmapping.engine_loader)]") delete_me = TRUE From 9ff6c8ec8964638d358b07e37c518ede87d57b1c Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Sun, 13 Feb 2022 14:51:07 +0000 Subject: [PATCH 2/2] Update engine.dm --- maps/submaps/engine_submaps/engine.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/maps/submaps/engine_submaps/engine.dm b/maps/submaps/engine_submaps/engine.dm index 403ec453740..63a0552c6d1 100644 --- a/maps/submaps/engine_submaps/engine.dm +++ b/maps/submaps/engine_submaps/engine.dm @@ -3,12 +3,10 @@ name = "Engine Loader" var/clean_turfs // A list of lists, where each list is (x, ) -<<<<<<< HEAD /obj/effect/landmark/engine_loader/New() -======= INITIALIZE_IMMEDIATE(/obj/effect/landmark/engine_loader) + /obj/effect/landmark/engine_loader/Initialize() ->>>>>>> 2d43d031101... Merge pull request #8354 from Atermonera/fix_engineload if(SSmapping.engine_loader) warning("Duplicate engine_loader landmarks: [log_info_line(src)] and [log_info_line(SSmapping.engine_loader)]") delete_me = TRUE