From 7522e75d2077911bea90df72d4a44b4b504a4dd2 Mon Sep 17 00:00:00 2001 From: "Superxpdude@gmail.com" Date: Sun, 25 Sep 2011 16:00:55 +0000 Subject: [PATCH] Certain random events now have a random delay between when the event happens and when the announcement is given to the crew. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2271 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/gamemodes/events.dm | 21 ++++++++++++++------- code/game/gamemodes/events/miniblob.dm | 7 +++++-- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index aefc93b901e..4af6b866d42 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -216,8 +216,8 @@ break /proc/viral_outbreak(var/virus = null) - command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('outbreak7.ogg') +// command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") +// world << sound('outbreak7.ogg') var/virus_type if(!virus) virus_type = pick(/datum/disease/dnaspread,/datum/disease/flu,/datum/disease/cold,/datum/disease/brainrot,/datum/disease/magnitis,/datum/disease/pierrot_throat) @@ -270,10 +270,13 @@ D.affected_mob = H H.viruses += D break + spawn(rand(3000, 6000)) //Delayed announcements to keep the crew on their toes. + command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") + world << sound('outbreak7.ogg') /proc/alien_infestation() // -- TLE - command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") - world << sound('aliens.ogg') + //command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") + //world << sound('aliens.ogg') var/list/vents = list() for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in world) if(temp_vent.loc.z == 1 && !temp_vent.welded) @@ -289,6 +292,9 @@ new /obj/alien/egg (vent.loc) vents.Remove(vent) spawncount -= 1 + spawn(rand(3000, 6000)) //Delayed announcements to keep the crew on their toes. + command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") + world << sound('aliens.ogg') /proc/high_radiation_event() command_alert("High levels of radiation detected near the station. Please report to the Med-bay if you feel strange.", "Anomaly Alert") @@ -329,9 +335,10 @@ new /obj/critter/spesscarp(C.loc) else new /obj/critter/spesscarp/elite(C.loc) - sleep(100) - command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert") - world << sound('commandreport.ogg') + //sleep(100) + spawn(rand(3000, 6000)) //Delayed announcements to keep the crew on their toes. + command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert") + world << sound('commandreport.ogg') /proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights if(isEvent) diff --git a/code/game/gamemodes/events/miniblob.dm b/code/game/gamemodes/events/miniblob.dm index b2c3a6a65df..2d0af4ae143 100644 --- a/code/game/gamemodes/events/miniblob.dm +++ b/code/game/gamemodes/events/miniblob.dm @@ -1,6 +1,6 @@ /proc/mini_blob_event() - command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") - world << sound('outbreak5.ogg') + //command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") + //world << sound('outbreak5.ogg') var/turf/T = pick(blobstart) var/obj/blob/bl = new /obj/blob( T.loc, 30 ) spawn(0) @@ -15,6 +15,9 @@ dotheblobbaby() spawn(3000) blobevent = 0 + spawn(rand(3000, 6000)) //Delayed announcements to keep the crew on their toes. + command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") + world << sound('outbreak5.ogg') /proc/dotheblobbaby() if (blobevent)