Fixes the latejoin message about the evacuation shuttle showing on incorrect times.

This commit is contained in:
Aranclanos
2015-09-01 15:38:56 -03:00
parent 8ed0d42f52
commit 7daee1797b
2 changed files with 12 additions and 10 deletions
+11 -9
View File
@@ -128,21 +128,23 @@ var/datum/subsystem/shuttle/SSshuttle
return
/datum/subsystem/shuttle/proc/cancelEvac(mob/user)
if(canRecall())
emergency.cancel(get_area(user))
log_game("[key_name(user)] has recalled the shuttle.")
message_admins("[key_name_admin(user)] has recalled the shuttle.")
return 1
/datum/subsystem/shuttle/proc/canRecall()
if(emergency.mode != SHUTTLE_CALL)
return
if(ticker.mode.name == "meteor")
return
if((seclevel2num(get_security_level()) == SEC_LEVEL_RED))
if(seclevel2num(get_security_level()) == SEC_LEVEL_RED)
if(emergency.timeLeft(1) < emergencyCallTime * 0.25)
return
else if(emergency.timeLeft(1) < emergencyCallTime * 0.5)
return
emergency.cancel(get_area(user))
log_game("[key_name(user)] has recalled the shuttle.")
message_admins("[key_name_admin(user)] has recalled the shuttle.")
else
if(emergency.timeLeft(1) < emergencyCallTime * 0.5)
return
return 1
/datum/subsystem/shuttle/proc/autoEvac()
+1 -1
View File
@@ -318,7 +318,7 @@
if(SHUTTLE_ESCAPE)
dat += "<div class='notice red'>The station has been evacuated.</div><br>"
if(SHUTTLE_CALL)
if(SSshuttle.emergency.timeLeft() < 0.5 * initial(SSshuttle.emergencyCallTime)) //Shuttle is past the point of no recall
if(!SSshuttle.canRecall())
dat += "<div class='notice red'>The station is currently undergoing evacuation procedures.</div><br>"
var/available_job_count = 0