From 1be11114c5a4f2ab39c4ac63e41da6a61f926584 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 12 Nov 2017 08:10:48 -0600 Subject: [PATCH] Update anomaly_bluespace.dm --- code/modules/events/anomaly_bluespace.dm | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/code/modules/events/anomaly_bluespace.dm b/code/modules/events/anomaly_bluespace.dm index 912c21ca1a..d3f829011e 100644 --- a/code/modules/events/anomaly_bluespace.dm +++ b/code/modules/events/anomaly_bluespace.dm @@ -1,24 +1,3 @@ -<<<<<<< HEAD -/datum/round_event_control/anomaly/anomaly_bluespace - name = "Anomaly: Bluespace" - typepath = /datum/round_event/anomaly/anomaly_bluespace - max_occurrences = 1 - weight = 5 - -/datum/round_event/anomaly/anomaly_bluespace - startWhen = 3 - announceWhen = 10 - - -/datum/round_event/anomaly/anomaly_bluespace/announce() - priority_announce("Unstable bluespace anomaly detected on long range scanners. Expected location: [impact_area.name].", "Anomaly Alert") - - -/datum/round_event/anomaly/anomaly_bluespace/start() - var/turf/T = safepick(get_area_turfs(impact_area)) - if(T) - newAnomaly = new /obj/effect/anomaly/bluespace(T) -======= /datum/round_event_control/anomaly/anomaly_bluespace name = "Anomaly: Bluespace" typepath = /datum/round_event/anomaly/anomaly_bluespace @@ -38,4 +17,3 @@ var/turf/T = safepick(get_area_turfs(impact_area)) if(T) newAnomaly = new /obj/effect/anomaly/bluespace(T) ->>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559)