cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #7010

Browse Source 
Escape pods were never converted to shuttles but still use hyperspace causing issues.
This commit is contained in:
clusterfack
2015-12-14 02:35:44 -06:00
parent 9fdaeed0dd
commit 08999ab537
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/controllers/shuttle_controller.dm
View File

@@ -75,7 +75,7 @@ datum/shuttle_controller/proc/recall()
if(timeleft >= 600)
return
captain_announce("The emergency shuttle has been recalled.")
to_chat(world, sound('sound/AI/shuttlerecalled.ogg'))
to_chat(world, sound('sound/AI/shuttlerecalled.ogg'))
setdirection(-1)
online = 1
for(var/area/A in areas)
@@ -244,11 +244,11 @@ datum/shuttle_controller/emergency_shuttle/process()
settimeleft(SHUTTLELEAVETIME)
send2mainirc("The Emergency Shuttle has docked with the station.")
captain_announce("The Emergency Shuttle has docked with the station. You have [round(timeleft()/60,1)] minutes to board the Emergency Shuttle.")
to_chat(world, sound('sound/AI/shuttledock.ogg'))
to_chat(world, sound('sound/AI/shuttledock.ogg'))
if(universe.name == "Hell Rising")
to_chat(world, "___________________________________________________________________")
to_chat(world, "<span class='sinister' style='font-size:3'> A vile force of darkness is making its way toward the escape shuttle.</span>")
to_chat(world, "___________________________________________________________________")
to_chat(world, "<span class='sinister' style='font-size:3'> A vile force of darkness is making its way toward the escape shuttle.</span>")
return 1