This commit is contained in:
kevinz000
2020-05-10 12:33:56 -07:00
committed by GitHub
parent dd7db603d2
commit c2e689aec0
2 changed files with 6 additions and 8 deletions

View File

@@ -76,7 +76,9 @@ GLOBAL_LIST_EMPTY(explosions)
//I would make this not ex_act the thing that triggered the explosion,
//but everything that explodes gives us their loc or a get_turf()
//and somethings expect us to ex_act them so they can qdel()
stoplag() //tldr, let the calling proc call qdel(src) before we explode
//stoplag() //tldr, let the calling proc call qdel(src) before we explode
// no - use sleep. stoplag() results in quirky things like explosions taking too long to process and hanging mid-air for no reason.
sleep(0)
EX_PREPROCESS_EXIT_CHECK

View File

@@ -119,14 +119,13 @@
/obj/singularity/Bump(atom/A)
set waitfor = FALSE
consume(A)
return
/obj/singularity/Bumped(atom/movable/AM)
set waitfor = FALSE
consume(AM)
/obj/singularity/process()
if(current_size >= STAGE_TWO)
move()
@@ -268,6 +267,7 @@
/obj/singularity/proc/eat()
set waitfor = FALSE
for(var/tile in spiral_range_turfs(grav_pull, src))
var/turf/T = tile
if(!T || !isturf(loc))
@@ -284,8 +284,6 @@
else
consume(X)
CHECK_TICK
return
/obj/singularity/proc/consume(atom/A)
var/gain = A.singularity_act(current_size, src)
@@ -295,8 +293,6 @@
name = "supermatter-charged [initial(name)]"
consumedSupermatter = 1
set_light(10)
return
/obj/singularity/proc/move(force_move = 0)
if(!move_self)