[MIRROR] supermatter anomaly generation can no longer be used to get anomaly cores (#223)

* supermatter anomaly generation can no longer be used to get anomaly cores (#52732)

* fix

* webedit moment yes i'm testing this pr shhhh you didn't see that failed compile

* haha what if i tested my code?

* supermatter anomaly generation can no longer be used to get anomaly cores

Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-08-07 01:39:04 +01:00
committed by GitHub
co-authored by silicons
parent 899abe161b
commit c3745f1679
2 changed files with 15 additions and 6 deletions
+12 -3
View File
@@ -17,7 +17,10 @@
var/countdown_colour
var/obj/effect/countdown/anomaly/countdown
/obj/effect/anomaly/Initialize(mapload, new_lifespan)
/// Do we drop a core when we're neutralized?
var/drops_core = TRUE
/obj/effect/anomaly/Initialize(mapload, new_lifespan, drops_core = TRUE)
. = ..()
GLOB.poi_list |= src
START_PROCESSING(SSobj, src)
@@ -26,6 +29,8 @@
if (!impact_area)
return INITIALIZE_HINT_QDEL
src.drops_core = drops_core
aSignal = new aSignal(src)
aSignal.code = rand(1,100)
aSignal.anomaly_type = type
@@ -54,6 +59,8 @@
GLOB.poi_list.Remove(src)
STOP_PROCESSING(SSobj, src)
qdel(countdown)
if(aSignal)
QDEL_NULL(aSignal)
return ..()
/obj/effect/anomaly/proc/anomalyEffect()
@@ -70,8 +77,10 @@
/obj/effect/anomaly/proc/anomalyNeutralize()
new /obj/effect/particle_effect/smoke/bad(loc)
for(var/atom/movable/O in src)
O.forceMove(drop_location())
if(drops_core)
aSignal.forceMove(drop_location())
aSignal = null
// else, anomaly core gets deleted by qdel(src).
qdel(src)