cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-13 03:02:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop singularities from consuming themselves (#58987)

Browse Source 
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:
Mothblocks
2021-05-14 20:12:46 -07:00
committed by GitHub
parent 8d1c6c9bca
commit bcaaa65e6a
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/components/singularity.dm
View File

@@ -130,6 +130,10 @@
return COMPONENT_CANCEL_BLOB_ACT return COMPONENT_CANCEL_BLOB_ACT
/datum/component/singularity/proc/consume(datum/source, atom/thing) /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) consume_callback?.Invoke(thing, src)
/datum/component/singularity/proc/consume_attack(datum/source, mob/user) /datum/component/singularity/proc/consume_attack(datum/source, mob/user)

1
code/modules/power/singularity/singularity.dm
View File

@@ -410,6 +410,7 @@
/obj/singularity/singularity_act() /obj/singularity/singularity_act()
var/gain = (energy/2) var/gain = (energy/2)
var/dist = max((current_size - 2),1) 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)) explosion(src, devastation_range = (dist), heavy_impact_range = (dist*2), light_impact_range = (dist*4))
qdel(src) qdel(src)
return gain return gain