Merge pull request #777 from comma/master

Red lights and siren in hallways during evac
This commit is contained in:
Albert Iordache
2012-03-31 22:43:11 -07:00
3 changed files with 18 additions and 1 deletions
+18 -1
View File
@@ -20,7 +20,7 @@ datum/shuttle_controller
fake_recall = 0 //Used in rounds to prevent "ON NOES, IT MUST [INSERT ROUND] BECAUSE SHUTTLE CAN'T BE CALLED"
deny_shuttle = 0 //for admins not allowing it to be called.
departed = 0
sound_siren = 1 //if siren should go off
// call the shuttle
// if not called before, set the endtime to T+600 seconds
// otherwise if outgoing, switch to incoming
@@ -34,6 +34,13 @@ datum/shuttle_controller
else
settimeleft(SHUTTLEARRIVETIME*coeff)
online = 1
//turning on the red lights in hallways and siren
for(var/area/A in world)
if(istype(A, /area/hallway))
A.readyalert()
sound_siren = 1
proc/recall()
if(direction == 1)
@@ -45,6 +52,11 @@ datum/shuttle_controller
world << sound('shuttlerecalled.ogg')
setdirection(-1)
online = 1
//turning off the red lights in hallways and siren
for(var/area/A in world)
if(istype(A, /area/hallway))
A.readyreset()
sound_siren = 0
// returns the time (in seconds) before shuttle arrival
@@ -83,6 +95,11 @@ datum/shuttle_controller
var/timeleft = timeleft()
if(timeleft > 1e5) // midnight rollover protection
timeleft = 0
if (sound_siren) //playing siren every 90 seconds
sound_siren = 0
world << sound('siren.ogg')
spawn(900)
sound_siren = 1
switch(location)
if(0)
if(timeleft>timelimit)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.