From 3b6e596a455c25a171ebaab566df5e6a76499605 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 12 Nov 2017 08:10:56 -0600 Subject: [PATCH] Update anomaly_flux.dm --- code/modules/events/anomaly_flux.dm | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/code/modules/events/anomaly_flux.dm b/code/modules/events/anomaly_flux.dm index c736bb93fa..30ae7e47af 100644 --- a/code/modules/events/anomaly_flux.dm +++ b/code/modules/events/anomaly_flux.dm @@ -1,25 +1,3 @@ -<<<<<<< HEAD -/datum/round_event_control/anomaly/anomaly_flux - name = "Anomaly: Hyper-Energetic Flux" - typepath = /datum/round_event/anomaly/anomaly_flux - - min_players = 10 - max_occurrences = 5 - weight = 20 - -/datum/round_event/anomaly/anomaly_flux - startWhen = 10 - announceWhen = 3 - -/datum/round_event/anomaly/anomaly_flux/announce() - priority_announce("Localized hyper-energetic flux wave detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") - - -/datum/round_event/anomaly/anomaly_flux/start() - var/turf/T = safepick(get_area_turfs(impact_area)) - if(T) - newAnomaly = new /obj/effect/anomaly/flux(T) -======= /datum/round_event_control/anomaly/anomaly_flux name = "Anomaly: Hyper-Energetic Flux" typepath = /datum/round_event/anomaly/anomaly_flux @@ -40,4 +18,3 @@ var/turf/T = safepick(get_area_turfs(impact_area)) if(T) newAnomaly = new /obj/effect/anomaly/flux(T) ->>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559)