Skip to content

Commit

Permalink
[MIRROR] Emergency shuttle console only works on the shuttle (#647)
Browse files Browse the repository at this point in the history
* Emergency shuttle console only works on the shuttle (#81123)

## About The Pull Request

Fixes tgstation/tgstation#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 <[email protected]>
  • Loading branch information
2 people authored and FFMirrorBot committed Jan 28, 2024
1 parent b1a7972 commit 4850c13
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions code/modules/shuttle/emergency.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4850c13

Please sign in to comment.