diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index 44f601f6a3..1800038c33 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -67,6 +67,7 @@ datum/shuttle_controller captain_announce("The shuttle has been recalled.") setdirection(-1) online = 1 + alert = 0 // set alert back to 0 after an admin recall return // returns the time (in seconds) before shuttle arrival diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 7f1dbc9f31..85f2582f90 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -314,8 +314,10 @@ if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles. if(emergency_shuttle.direction == 2) //Shuttle is going to centcomm, not recalled dat += "The station has been evacuated.
" - if(emergency_shuttle.direction == 1 && emergency_shuttle.timeleft() < 300) //Shuttle is past the point of no recall + if(emergency_shuttle.direction == 1 && emergency_shuttle.timeleft() < 300 && emergency_shuttle.alert == 0) // Emergency shuttle is past the point of no recall dat += "The station is currently undergoing evacuation procedures.
" + if(emergency_shuttle.direction == 1 && emergency_shuttle.alert == 1) // Crew transfer initiated + dat += "The station is currently undergoing crew transfer procedures.
" dat += "Choose from the following open positions:
" for(var/datum/job/job in job_master.occupations)