mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-11 10:11:09 +00:00
Stop singularities from consuming themselves (#58987)
This bug was fixed by one of the connect_loc PRs, but this is still useful as it contains a CRASH for when it happens if this bug comes back again.
This commit is contained in:
@@ -130,6 +130,10 @@
|
||||
return COMPONENT_CANCEL_BLOB_ACT
|
||||
|
||||
/datum/component/singularity/proc/consume(datum/source, atom/thing)
|
||||
if (thing == parent)
|
||||
stack_trace("Singularity tried to consume itself.")
|
||||
return
|
||||
|
||||
consume_callback?.Invoke(thing, src)
|
||||
|
||||
/datum/component/singularity/proc/consume_attack(datum/source, mob/user)
|
||||
|
||||
@@ -410,6 +410,7 @@
|
||||
/obj/singularity/singularity_act()
|
||||
var/gain = (energy/2)
|
||||
var/dist = max((current_size - 2),1)
|
||||
investigate_log("has been destroyed by another singularity.", INVESTIGATE_SINGULO)
|
||||
explosion(src, devastation_range = (dist), heavy_impact_range = (dist*2), light_impact_range = (dist*4))
|
||||
qdel(src)
|
||||
return gain
|
||||
|
||||
Reference in New Issue
Block a user