cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes escape shuttle requiring authorization after countdown has finished

Browse Source
This commit is contained in:
mwerezak
2014-06-28 23:34:31 -04:00
parent b8fb66380b
commit abc54987b4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/modules/shuttles/shuttle_emergency.dm
View File

@@ -38,8 +38,8 @@
if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console
var/obj/machinery/computer/shuttle_control/emergency/C = user
if (!C.has_authorization())
return
if (emergency_shuttle.waiting_to_leave() && !C.has_authorization())
return //need authorization to launch early
if (emergency_shuttle.autopilot)
emergency_shuttle.autopilot = 0
@@ -52,8 +52,8 @@
if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console
var/obj/machinery/computer/shuttle_control/emergency/C = user
if (!C.has_authorization())
return
if (emergency_shuttle.waiting_to_leave() && !C.has_authorization())
return //need authorization to launch early
if (emergency_shuttle.autopilot)
emergency_shuttle.autopilot = 0
@@ -66,7 +66,7 @@
if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console
var/obj/machinery/computer/shuttle_control/emergency/C = user
if (!C.has_authorization())
if (emergency_shuttle.waiting_to_leave() && !C.has_authorization())
return
if (emergency_shuttle.autopilot)
@@ -186,9 +186,9 @@
"has_docking" = shuttle.docking_controller? 1 : 0,
"docking_status" = shuttle.docking_controller? shuttle.docking_controller.get_docking_status() : null,
"docking_override" = shuttle.docking_controller? shuttle.docking_controller.override_enabled : null,
"can_launch" = shuttle.can_launch() && has_auth,
"can_cancel" = shuttle.can_cancel() && has_auth,
"can_force" = shuttle.can_force() && has_auth,
"can_launch" = shuttle.can_launch() && (!emergency_shuttle.waiting_to_leave() || has_auth),
"can_cancel" = shuttle.can_cancel() && (!emergency_shuttle.waiting_to_leave() || has_auth),
"can_force" = shuttle.can_force() && (!emergency_shuttle.waiting_to_leave() || has_auth),
"auth_list" = auth_list,
"has_auth" = has_auth,
"user" = debug? user : null,