From 0d35bb684e941eb579d3e256b57562c0a7d8ebc8 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 28 Jan 2024 06:04:52 +0100 Subject: [PATCH] [MIRROR] Emergency shuttle console only works on the shuttle (#26264) * Emergency shuttle console only works on the shuttle (#81123) ## About The Pull Request Fixes https://github.com/tgstation/tgstation/issues/79067 where you can hijack the shuttle without actually being on the shuttle. ## Changelog :cl: LT3 fix: Emergency shuttle console now only works while on the emergency shuttle /:cl: * Emergency shuttle console only works on the shuttle --------- Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> --- code/modules/shuttle/emergency.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 73de05a8f37..f9c445e3fa7 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -88,6 +88,11 @@ if(!isliving(usr)) return + var/area/my_area = get_area(src) + if(!istype(my_area, /area/shuttle/escape)) + say("Error - Network connectivity: Console has lost connection to the shuttle.") + return + var/mob/living/user = usr . = FALSE @@ -206,6 +211,10 @@ if(HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)) to_chat(user, span_warning("You need your hands free before you can manipulate [src].")) return + var/area/my_area = get_area(src) + if(!istype(my_area, /area/shuttle/escape)) + say("Error - Network connectivity: Console has lost connection to the shuttle.") + return if(!user?.mind?.get_hijack_speed()) to_chat(user, span_warning("You manage to open a user-mode shell on [src], and hundreds of lines of debugging output fly through your vision. It is probably best to leave this alone.")) return