Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

This commit is contained in:
Ren Erthilo
2012-04-03 19:42:41 +01:00
18 changed files with 8764 additions and 8733 deletions
+1 -1
View File
@@ -95,7 +95,7 @@ datum/shuttle_controller
var/timeleft = timeleft()
if(timeleft > 1e5) // midnight rollover protection
timeleft = 0
if (sound_siren) //playing siren every 90 seconds
if (sound_siren && (direction == 1)) //playing siren every 90 seconds
sound_siren = 0
world << sound('siren.ogg')
spawn(900)