From 16273b0c4760570df3191b00e1b2d6c232a3e9cd Mon Sep 17 00:00:00 2001 From: alex-gh Date: Mon, 2 Dec 2013 12:08:22 +0100 Subject: [PATCH] Moved events endured counter --- code/modules/events/blob.dm | 1 - code/modules/events/carp_migration.dm | 2 +- code/modules/events/comms_blackout.dm | 1 - code/modules/events/communications_blackout.dm | 1 - code/modules/events/disease_outbreak.dm | 2 +- code/modules/events/electrical_storm.dm | 2 +- code/modules/events/event.dm | 1 + code/modules/events/grid_check.dm | 2 +- code/modules/events/infestation.dm | 2 +- code/modules/events/ion_storm.dm | 1 - code/modules/events/meteors.dm | 2 +- code/modules/events/money_hacker.dm | 2 +- code/modules/events/money_lotto.dm | 3 +-- code/modules/events/money_spam.dm | 2 +- code/modules/events/organ_failure.dm | 2 +- code/modules/events/prison_break.dm | 2 +- code/modules/events/radiation_storm.dm | 2 +- code/modules/events/rogue_drones.dm | 2 +- code/modules/events/sayuevents/meaty_ores.dm | 2 +- code/modules/events/sayuevents/spooky.dm | 2 +- code/modules/events/sayuevents/undead.dm | 1 - code/modules/events/sayuevents/weightless.dm | 2 +- code/modules/events/sayuevents/wormholes.dm | 2 +- code/modules/events/spontaneous_appendicitis.dm | 1 - code/modules/events/tear.dm | 2 +- code/modules/events/tgevents/alien_infestation.dm | 2 +- code/modules/events/tgevents/anomaly.dm | 2 +- code/modules/events/tgevents/anomaly_bluespace.dm | 2 +- code/modules/events/tgevents/anomaly_flux.dm | 2 +- code/modules/events/tgevents/anomaly_grav.dm | 2 +- code/modules/events/tgevents/anomaly_pyro.dm | 2 +- code/modules/events/tgevents/anomaly_vortex.dm | 2 +- code/modules/events/tgevents/brand_intelligence.dm | 2 +- code/modules/events/tgevents/dust.dm | 2 +- code/modules/events/tgevents/mass_hallucination.dm | 1 - code/modules/events/tgevents/spacevine.dm | 2 +- code/modules/events/tgevents/spider_infestation.dm | 2 +- code/modules/events/tgevents/vent_clog.dm | 2 +- code/modules/events/viral_infection.dm | 2 +- code/modules/events/viral_outbreak.dm | 2 +- code/modules/events/wallrot.dm | 2 +- 41 files changed, 34 insertions(+), 41 deletions(-) diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index 618074d9802..d7a4a492a5e 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -8,7 +8,6 @@ /datum/event/blob/announce() command_alert("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") world << sound('sound/AI/outbreak7.ogg') - score_eventsendured++ /datum/event/blob/start() var/turf/T = pick(blobstart) diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index 4424605c44d..e90e20c9f88 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -10,7 +10,7 @@ /datum/event/carp_migration/announce() command_alert("Unknown biological entities have been detected near [station_name()], please stand-by.", "Lifesign Alert") - score_eventsendured++ + /datum/event/carp_migration/start() for(var/obj/effect/landmark/C in landmarks_list) if(C.name == "carpspawn") diff --git a/code/modules/events/comms_blackout.dm b/code/modules/events/comms_blackout.dm index ea1d2d05f1b..0a1d5c351c7 100644 --- a/code/modules/events/comms_blackout.dm +++ b/code/modules/events/comms_blackout.dm @@ -10,4 +10,3 @@ A << "
" for(var/obj/machinery/telecomms/T in telecomms_list) T.emp_act(1) - score_eventsendured++ \ No newline at end of file diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index 3942fd952e5..acf891e3e40 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -18,4 +18,3 @@ /datum/event/communications_blackout/start() for(var/obj/machinery/telecomms/T in telecomms_list) T.emp_act(1) - score_eventsendured++ \ No newline at end of file diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 0687a557deb..fe6f56624f6 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -6,7 +6,7 @@ /datum/event/disease_outbreak/announce() command_alert("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") world << sound('sound/AI/outbreak7.ogg') - score_eventsendured++ + /datum/event/disease_outbreak/setup() announceWhen = rand(15, 30) diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index 390d5b7d787..dacaa09c47a 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -5,7 +5,7 @@ /datum/event/electrical_storm/announce() command_alert("An electrical storm has been detected in your area, please repair potential electronic overloads.", "Electrical Storm Alert") - score_eventsendured++ + /datum/event/electrical_storm/start() var/list/epicentreList = list() diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm index c4982352377..b34c9151ca9 100644 --- a/code/modules/events/event.dm +++ b/code/modules/events/event.dm @@ -78,6 +78,7 @@ /datum/event/New() setup() events.Add(src) + score_eventsendured++ /*if(oneShot) potentialRandomEvents.Remove(type)*/ ..() diff --git a/code/modules/events/grid_check.dm b/code/modules/events/grid_check.dm index 7242654d434..71d78d96e4a 100644 --- a/code/modules/events/grid_check.dm +++ b/code/modules/events/grid_check.dm @@ -11,6 +11,6 @@ command_alert("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Automated Grid Check") for(var/mob/M in player_list) M << sound('sound/AI/poweroff.ogg') - score_eventsendured++ + /datum/event/grid_check/end() power_restore() diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index b895f02d155..0c128914bbe 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -103,7 +103,7 @@ /datum/event/infestation/announce() command_alert("Bioscans indicate that [vermstring] have been breeding in [locstring]. Clear them out, before this starts to affect productivity.", "Vermin infestation") - score_eventsendured++ + #undef LOC_KITCHEN #undef LOC_ATMOS #undef LOC_INCIN diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 9161cd8ef98..adec23bed81 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -47,7 +47,6 @@ target << "\red You have detected a change in your laws information:" target << law target.add_ion_law(law) - score_eventsendured++ /datum/event/ionstorm/tick() if (botEmagChance && activeFor%20) diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm index b0fb59c6ed7..0f74d65b7d9 100644 --- a/code/modules/events/meteors.dm +++ b/code/modules/events/meteors.dm @@ -11,7 +11,7 @@ /datum/event/meteor_wave/announce() command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert") world << sound('sound/AI/meteors.ogg') - score_eventsendured++ + /datum/event/meteor_wave/tick() if(IsMultiple(activeFor, 3)) spawn_meteors(rand(2,5)) diff --git a/code/modules/events/money_hacker.dm b/code/modules/events/money_hacker.dm index 24876f30301..754ec0c6579 100644 --- a/code/modules/events/money_hacker.dm +++ b/code/modules/events/money_hacker.dm @@ -56,7 +56,7 @@ for (var/mob/O in hearers(5, Console.loc)) O.show_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [my_department]'")) Console.messages += "High Priority message from [my_department]
[sending]" - score_eventsendured++ + /datum/event/money_hacker/tick() if(world.time > time_start + time_duration) var/message diff --git a/code/modules/events/money_lotto.dm b/code/modules/events/money_lotto.dm index 4f05682d466..944086479ba 100644 --- a/code/modules/events/money_lotto.dm +++ b/code/modules/events/money_lotto.dm @@ -37,5 +37,4 @@ break for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) - NEWSCASTER.newsAlert("Tau Ceti Daily") - score_eventsendured++ \ No newline at end of file + NEWSCASTER.newsAlert("Tau Ceti Daily") \ No newline at end of file diff --git a/code/modules/events/money_spam.dm b/code/modules/events/money_spam.dm index 38feb0772af..17c312eea2c 100644 --- a/code/modules/events/money_spam.dm +++ b/code/modules/events/money_spam.dm @@ -9,7 +9,7 @@ if(MS.active) useMS = MS break - score_eventsendured++ + /datum/event/pda_spam/tick() if(!useMS || !useMS.active) useMS = null diff --git a/code/modules/events/organ_failure.dm b/code/modules/events/organ_failure.dm index 30527458718..ec834e52a2b 100644 --- a/code/modules/events/organ_failure.dm +++ b/code/modules/events/organ_failure.dm @@ -9,7 +9,7 @@ datum/event/organ_failure/setup() datum/event/organ_failure/announce() command_alert("Confirmed outbreak of level [rand(3,7)] biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") world << sound('sound/AI/outbreak5.ogg') - score_eventsendured++ + datum/event/organ_failure/start() var/list/candidates = list() //list of candidate keys for(var/mob/living/carbon/human/G in player_list) diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index a6e897bd642..37a457076a6 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -20,7 +20,7 @@ else world.log << "ERROR: Could not initate grey-tide. Unable find prison or brig area." kill() - score_eventsendured++ + /datum/event/prison_break/start() for(var/area/A in world) diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index c5312bc1b27..a288f61a0f9 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -13,7 +13,7 @@ /datum/event/radiation_storm/announce() // Don't do anything, we want to pack the announcement with the actual event - score_eventsendured++ + /datum/event/radiation_storm/proc/is_safe_zone(var/area/A) for(var/szt in safe_zones) if(istype(A, szt)) diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm index c0d0b00cd4c..f9b4778c43f 100644 --- a/code/modules/events/rogue_drones.dm +++ b/code/modules/events/rogue_drones.dm @@ -31,7 +31,7 @@ else msg = "Unidentified hackers have targetted a combat drone wing deployed from the NMV Icarus. If any are sighted in the area, approach with caution." command_alert(msg, "Rogue drone alert") - score_eventsendured++ + /datum/event/rogue_drone/tick() return diff --git a/code/modules/events/sayuevents/meaty_ores.dm b/code/modules/events/sayuevents/meaty_ores.dm index 4d50a59a7e1..a44708693ef 100644 --- a/code/modules/events/sayuevents/meaty_ores.dm +++ b/code/modules/events/sayuevents/meaty_ores.dm @@ -4,7 +4,7 @@ else command_alert("Meaty ores have been detected on collision course with the station.", "Meaty Ore Alert") world << sound('sound/AI/meteors.ogg') - score_eventsendured++ + /datum/event/dust/meaty/setup() qnty = rand(45,125) diff --git a/code/modules/events/sayuevents/spooky.dm b/code/modules/events/sayuevents/spooky.dm index 4eb1b6a7b45..4d0791054f1 100644 --- a/code/modules/events/sayuevents/spooky.dm +++ b/code/modules/events/sayuevents/spooky.dm @@ -7,7 +7,7 @@ /datum/event/ghosts/announce() command_alert("Unknown quasi-aetheric entities have been detected near [station_name()], please stand-by.", "Lifesign Alert?") - score_eventsendured++ + /datum/event/ghosts/start() var/p = 100 diff --git a/code/modules/events/sayuevents/undead.dm b/code/modules/events/sayuevents/undead.dm index 8fb2b04255a..a9fc2ff64eb 100644 --- a/code/modules/events/sayuevents/undead.dm +++ b/code/modules/events/sayuevents/undead.dm @@ -38,4 +38,3 @@ announce() for(var/mob/living/M in player_list) M << "You feel [pick("a chill","a deathly chill","the undead","dirty", "creeped out","afraid","fear")]!" - score_eventsendured++ \ No newline at end of file diff --git a/code/modules/events/sayuevents/weightless.dm b/code/modules/events/sayuevents/weightless.dm index 71e1166676e..4c7d5264c4c 100644 --- a/code/modules/events/sayuevents/weightless.dm +++ b/code/modules/events/sayuevents/weightless.dm @@ -8,7 +8,7 @@ /datum/event/weightless/announce() command_alert("Warning: Failsafes for the station's artificial gravity arrays have been triggered. Please be aware that if this problem recurs it may result in formation of gravitational anomalies. Nanotrasen wishes to remind you that the unauthorised formation of anomalies within Nanotrasen facilities is strictly prohibited by health and safety regulation [rand(99,9999)][pick("a","b","c")]:subclause[rand(1,20)][pick("a","b","c")].") - score_eventsendured++ + /datum/event/weightless/start() for(var/area/A in world) if (A.z != 1) continue //Don't turn off gravity on non-station z-levels. diff --git a/code/modules/events/sayuevents/wormholes.dm b/code/modules/events/sayuevents/wormholes.dm index 116b10aa609..e120d11630d 100644 --- a/code/modules/events/sayuevents/wormholes.dm +++ b/code/modules/events/sayuevents/wormholes.dm @@ -25,7 +25,7 @@ for(var/mob/M in player_list) if(!istype(M, /mob/new_player)) M << sound('sound/AI/spanomalies.ogg') - score_eventsendured++ + /datum/event/wormholes/tick() if(activeFor % shift_frequency == 0) for(var/obj/effect/portal/wormhole/O in wormholes) diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm index 03b11d96bdc..1bba7866bf2 100644 --- a/code/modules/events/spontaneous_appendicitis.dm +++ b/code/modules/events/spontaneous_appendicitis.dm @@ -11,4 +11,3 @@ D.affected_mob = H H.viruses += D break - score_eventsendured++ \ No newline at end of file diff --git a/code/modules/events/tear.dm b/code/modules/events/tear.dm index 45ac0a2de0d..eb2f984d68f 100644 --- a/code/modules/events/tear.dm +++ b/code/modules/events/tear.dm @@ -6,7 +6,7 @@ /datum/event/tear/announce() command_alert("A tear in the fabric of space and time has opened. Expected location: [impact_area.name].", "Anomaly Alert") - score_eventsendured++ + /datum/event/tear/start() var/turf/T = pick(get_area_turfs(impact_area)) diff --git a/code/modules/events/tgevents/alien_infestation.dm b/code/modules/events/tgevents/alien_infestation.dm index 14c4f92c8cd..322c7feaad1 100644 --- a/code/modules/events/tgevents/alien_infestation.dm +++ b/code/modules/events/tgevents/alien_infestation.dm @@ -17,7 +17,7 @@ if(successSpawn) command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") world << sound('sound/AI/aliens.ogg') - score_eventsendured++ + /datum/event/alien_infestation/start() var/list/vents = list() diff --git a/code/modules/events/tgevents/anomaly.dm b/code/modules/events/tgevents/anomaly.dm index 3e19744d519..7a1dc46162f 100644 --- a/code/modules/events/tgevents/anomaly.dm +++ b/code/modules/events/tgevents/anomaly.dm @@ -9,7 +9,7 @@ /datum/event/anomaly/announce() command_alert("Localized hyper-energetic flux wave detected on long range scanners. Expected location of impact: [impact_area.name].", "Anomaly Alert") - score_eventsendured++ + /datum/event/anomaly/start() var/turf/T = pick(get_area_turfs(impact_area)) if(T) diff --git a/code/modules/events/tgevents/anomaly_bluespace.dm b/code/modules/events/tgevents/anomaly_bluespace.dm index 0c4a5834678..02a6d9e50a4 100644 --- a/code/modules/events/tgevents/anomaly_bluespace.dm +++ b/code/modules/events/tgevents/anomaly_bluespace.dm @@ -6,7 +6,7 @@ /datum/event/anomaly/anomaly_bluespace/announce() command_alert("Unstable bluespace anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") - score_eventsendured++ + /datum/event/anomaly/anomaly_bluespace/start() var/turf/T = pick(get_area_turfs(impact_area)) diff --git a/code/modules/events/tgevents/anomaly_flux.dm b/code/modules/events/tgevents/anomaly_flux.dm index 9d0fafac421..98436df39b8 100644 --- a/code/modules/events/tgevents/anomaly_flux.dm +++ b/code/modules/events/tgevents/anomaly_flux.dm @@ -8,7 +8,7 @@ /datum/event/anomaly/anomaly_flux/announce() command_alert("Localized hyper-energetic flux wave detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") - score_eventsendured++ + /datum/event/anomaly/anomaly_flux/start() var/turf/T = pick(get_area_turfs(impact_area)) diff --git a/code/modules/events/tgevents/anomaly_grav.dm b/code/modules/events/tgevents/anomaly_grav.dm index 7c426f9961b..d65a0a30a18 100644 --- a/code/modules/events/tgevents/anomaly_grav.dm +++ b/code/modules/events/tgevents/anomaly_grav.dm @@ -8,7 +8,7 @@ /datum/event/anomaly/anomaly_grav/announce() command_alert("Gravitational anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") - score_eventsendured++ + /datum/event/anomaly/anomaly_grav/start() var/turf/T = pick(get_area_turfs(impact_area)) if(T) diff --git a/code/modules/events/tgevents/anomaly_pyro.dm b/code/modules/events/tgevents/anomaly_pyro.dm index 73eabebf76d..8829f7ab94b 100644 --- a/code/modules/events/tgevents/anomaly_pyro.dm +++ b/code/modules/events/tgevents/anomaly_pyro.dm @@ -8,7 +8,7 @@ /datum/event/anomaly/anomaly_pyro/announce() command_alert("Atmospheric anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") - score_eventsendured++ + /datum/event/anomaly/anomaly_pyro/start() var/turf/T = pick(get_area_turfs(impact_area)) if(T) diff --git a/code/modules/events/tgevents/anomaly_vortex.dm b/code/modules/events/tgevents/anomaly_vortex.dm index 4a7905c892f..6042d88e409 100644 --- a/code/modules/events/tgevents/anomaly_vortex.dm +++ b/code/modules/events/tgevents/anomaly_vortex.dm @@ -8,7 +8,7 @@ /datum/event/anomaly/anomaly_vortex/announce() command_alert("Localized high-intensity vortex anomaly detected on long range scanners. Expected location: [impact_area.name]", "Anomaly Alert") - score_eventsendured++ + /datum/event/anomaly/anomaly_vortex/start() var/turf/T = pick(get_area_turfs(impact_area)) if(T) diff --git a/code/modules/events/tgevents/brand_intelligence.dm b/code/modules/events/tgevents/brand_intelligence.dm index a04bece16e0..3ea5d415d85 100644 --- a/code/modules/events/tgevents/brand_intelligence.dm +++ b/code/modules/events/tgevents/brand_intelligence.dm @@ -9,7 +9,7 @@ /datum/event/brand_intelligence/announce() command_alert("Rampant brand intelligence has been detected aboard [station_name()], please stand-by. The origin is believed to be \a [originMachine.name].", "Machine Learning Alert") - score_eventsendured++ + /datum/event/brand_intelligence/start() for(var/obj/machinery/vending/V in machines) diff --git a/code/modules/events/tgevents/dust.dm b/code/modules/events/tgevents/dust.dm index 2d976b5883c..44b22f68cc0 100644 --- a/code/modules/events/tgevents/dust.dm +++ b/code/modules/events/tgevents/dust.dm @@ -9,7 +9,7 @@ /datum/event/dust/start() while(qnty-- > 0) new /obj/effect/space_dust/weak() - score_eventsendured++ + /obj/effect/space_dust name = "Space Dust" diff --git a/code/modules/events/tgevents/mass_hallucination.dm b/code/modules/events/tgevents/mass_hallucination.dm index 71da8c96ef8..357cd6fcdc4 100644 --- a/code/modules/events/tgevents/mass_hallucination.dm +++ b/code/modules/events/tgevents/mass_hallucination.dm @@ -1,4 +1,3 @@ /datum/event/mass_hallucination/start() for(var/mob/living/carbon/C in living_mob_list) C.hallucination += rand(20, 50) - score_eventsendured++ \ No newline at end of file diff --git a/code/modules/events/tgevents/spacevine.dm b/code/modules/events/tgevents/spacevine.dm index 9396ab42d13..afc0f7ee5c8 100644 --- a/code/modules/events/tgevents/spacevine.dm +++ b/code/modules/events/tgevents/spacevine.dm @@ -18,7 +18,7 @@ var/turf/simulated/floor/T = pick(turfs) spawn(0) new/obj/effect/spacevine_controller(T) //spawn a controller at turf spacevines_spawned = 1 - score_eventsendured++ + diff --git a/code/modules/events/tgevents/spider_infestation.dm b/code/modules/events/tgevents/spider_infestation.dm index a1b954b116c..72384669a81 100644 --- a/code/modules/events/tgevents/spider_infestation.dm +++ b/code/modules/events/tgevents/spider_infestation.dm @@ -14,7 +14,7 @@ /datum/event/spider_infestation/announce() command_alert("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert") world << sound('sound/AI/aliens.ogg') - score_eventsendured++ + /datum/event/spider_infestation/start() var/list/vents = list() diff --git a/code/modules/events/tgevents/vent_clog.dm b/code/modules/events/tgevents/vent_clog.dm index acf7590e1b0..0102169142d 100755 --- a/code/modules/events/tgevents/vent_clog.dm +++ b/code/modules/events/tgevents/vent_clog.dm @@ -8,7 +8,7 @@ /datum/event/vent_clog/announce() command_alert("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert") - score_eventsendured++ + /datum/event/vent_clog/setup() endWhen = rand(25, 100) diff --git a/code/modules/events/viral_infection.dm b/code/modules/events/viral_infection.dm index 9a66ee2f6b0..b7add26ef28 100644 --- a/code/modules/events/viral_infection.dm +++ b/code/modules/events/viral_infection.dm @@ -10,7 +10,7 @@ datum/event/viral_infection/setup() datum/event/viral_infection/announce() command_alert("Confirmed outbreak of level five biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") world << sound('sound/AI/outbreak5.ogg') - score_eventsendured++ + datum/event/viral_infection/start() var/list/candidates = list() //list of candidate keys for(var/mob/living/carbon/human/G in player_list) diff --git a/code/modules/events/viral_outbreak.dm b/code/modules/events/viral_outbreak.dm index 197a7088071..708b6c203c2 100644 --- a/code/modules/events/viral_outbreak.dm +++ b/code/modules/events/viral_outbreak.dm @@ -10,7 +10,7 @@ datum/event/viral_outbreak/setup() datum/event/viral_outbreak/announce() command_alert("Confirmed outbreak of level 7 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") world << sound('sound/AI/outbreak7.ogg') - score_eventsendured++ + datum/event/viral_outbreak/start() var/list/candidates = list() //list of candidate keys for(var/mob/living/carbon/human/G in player_list) diff --git a/code/modules/events/wallrot.dm b/code/modules/events/wallrot.dm index 8d87331c860..13da0842b02 100644 --- a/code/modules/events/wallrot.dm +++ b/code/modules/events/wallrot.dm @@ -11,7 +11,7 @@ datum/event/wallrot/setup() datum/event/wallrot/announce() command_alert("Harmful fungi detected on station. Station structures may be contaminated.", "Biohazard Alert") - score_eventsendured++ + datum/event/wallrot/start() spawn() var/turf/center = null