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

Update anomaly_flux.dm

Browse Source
This commit is contained in:
LetterJay
2017-11-12 08:10:56 -06:00
committed by GitHub
parent 1be11114c5
commit 3b6e596a45
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/anomaly_flux.dm
-23
View File
@@ -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)