shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dust.dm

Browse Source
This commit is contained in:
LetterJay
2017-11-12 08:11:41 -06:00
committed by GitHub
parent 475e604892
commit 3ae0051dc7
1 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/dust.dm
+1 -33
View File
@@ -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)
spawn_meteors(10, GLOB.meteorsC)