From 84061be0c35e89a92b2489779ea61b1639b181ff Mon Sep 17 00:00:00 2001 From: adamsong Date: Tue, 20 Feb 2024 08:57:34 -0500 Subject: [PATCH] Fix shuttle issues --- code/controllers/subsystem/shuttle.dm | 2 +- code/modules/events/shuttle_catastrophe.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 667491c24048..156b929bae0b 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -1052,7 +1052,7 @@ SUBSYSTEM_DEF(shuttle) else if(S) . = TRUE // If successful, returns the mobile docking port - var/obj/docking_port/mobile/mdp = action_load(S) + var/obj/docking_port/mobile/mdp = action_load(S, replace = TRUE) if(mdp) user.forceMove(get_turf(mdp)) message_admins("[key_name_admin(usr)] loaded [mdp] with the shuttle manipulator.") diff --git a/code/modules/events/shuttle_catastrophe.dm b/code/modules/events/shuttle_catastrophe.dm index 7fa850c78943..4ed74ae0b931 100644 --- a/code/modules/events/shuttle_catastrophe.dm +++ b/code/modules/events/shuttle_catastrophe.dm @@ -37,5 +37,5 @@ SSshuttle.load_template(new_shuttle) SSshuttle.existing_shuttle = SSshuttle.emergency SSshuttle.emergency.name = new_shuttle.name - SSshuttle.action_load(new_shuttle) + SSshuttle.action_load(new_shuttle, replace = TRUE) log_game("Shuttle Catastrophe set a new shuttle, [new_shuttle.name].")