From a642a1c2987c9c6ce0fac948d952c93baee05eb6 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 3 Jan 2018 09:57:50 -0800 Subject: [PATCH 1/2] Merge pull request #34040 from AnturK/maraudercheck Fixes marauder ghostclick jump --- .../game/gamemodes/clock_cult/clock_items/construct_chassis.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm b/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm index 1b2b867aa5..c3888d6dae 100644 --- a/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm +++ b/code/game/gamemodes/clock_cult/clock_items/construct_chassis.dm @@ -40,6 +40,9 @@ if(!SSticker.mode) to_chat(user, "You cannot use that before the game has started.") return + if(QDELETED(src)) + to_chat(user, "You were too late! Better luck next time.") + return user.forceMove(get_turf(src)) //If we attack through the alert, jump to the chassis so we know what we're getting into if(alert(user, "Become a [construct_name]? You can no longer be cloned!", construct_name, "Yes", "Cancel") == "Cancel") return