From 3ae0051dc7ae0e33f4172a669388e16adf81b373 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 12 Nov 2017 08:11:41 -0600 Subject: [PATCH] Update dust.dm --- code/modules/events/dust.dm | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index 075f96e916..978f62d85a 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -1,34 +1,3 @@ -<<<<<<< HEAD -/datum/round_event_control/space_dust - name = "Minor Space Dust" - typepath = /datum/round_event/space_dust - weight = 200 - max_occurrences = 1000 - earliest_start = 0 - alertadmins = 0 - -/datum/round_event/space_dust - startWhen = 1 - endWhen = 2 - announceWhen = 0 - -/datum/round_event/space_dust/start() - spawn_meteors(1, GLOB.meteorsC) - -/datum/round_event_control/sandstorm - name = "Sandstorm" - typepath = /datum/round_event/sandstorm - weight = 0 - max_occurrences = 0 - earliest_start = 0 - -/datum/round_event/sandstorm - startWhen = 1 - endWhen = 150 // ~5 min - announceWhen = 0 - -/datum/round_event/sandstorm/tick() -======= /datum/round_event_control/space_dust name = "Minor Space Dust" typepath = /datum/round_event/space_dust @@ -59,5 +28,4 @@ fakeable = FALSE /datum/round_event/sandstorm/tick() ->>>>>>> 3093d86... Makes false alarm use more explicit in event code. (#32559) - spawn_meteors(10, GLOB.meteorsC) \ No newline at end of file + spawn_meteors(10, GLOB.meteorsC)