cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 15:47:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed some now obsoleted code

Browse Source 
Fixed an edge case
This commit is contained in:
Incoming
2015-01-21 23:28:48 -05:00
parent d7bca48557
commit f6380f385e
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/shuttles.dm
-1
View File
@@ -16,7 +16,6 @@ var/datum/subsystem/shuttle/SSshuttle
var/emergencyEscapeTime = 1200 //time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds)
var/area/emergencyLastCallLoc
var/emergencyNoEscape
var/emergencyFakeRecall
//supply shuttle stuff
var/obj/docking_port/mobile/supply/supply
code/controllers/subsystem/shuttles/emergency.dm
+2 -5
View File
@@ -77,10 +77,7 @@
mode = SHUTTLE_IDLE
timer = 0
if(SHUTTLE_CALL)
if(time_left < SSshuttle.emergencyFakeRecall * SSshuttle.emergencyCallTime) //recall due to fake recalls
cancel()
SSshuttle.emergencyFakeRecall = 0
else if(time_left <= 0)
if(time_left <= 0)
//move emergency shuttle to station
if(dock(SSshuttle.getDock("emergency_home")))
setTimer(20)
@@ -90,7 +87,7 @@
send2irc("Server", "The Emergency Shuttle has docked with the station.")
priority_announce("The Emergency Shuttle has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority")
if(SHUTTLE_DOCKED)
if(time_left == 0 && SSshuttle.emergencyNoEscape)
if(time_left <= 0 && SSshuttle.emergencyNoEscape)
priority_announce("Hostile enviroment detected. Departure has been postponed indefinitely pending conflict resolution.", null, 'sound/misc/notice1.ogg', "Priority")
mode = SHUTTLE_STRANDED
if(time_left <= 0 && !SSshuttle.emergencyNoEscape)