i'm salty (#12181)
This commit is contained in:
@@ -76,7 +76,9 @@ GLOBAL_LIST_EMPTY(explosions)
|
|||||||
//I would make this not ex_act the thing that triggered the explosion,
|
//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()
|
//but everything that explodes gives us their loc or a get_turf()
|
||||||
//and somethings expect us to ex_act them so they can qdel()
|
//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
|
EX_PREPROCESS_EXIT_CHECK
|
||||||
|
|
||||||
|
|||||||
@@ -119,14 +119,13 @@
|
|||||||
|
|
||||||
|
|
||||||
/obj/singularity/Bump(atom/A)
|
/obj/singularity/Bump(atom/A)
|
||||||
|
set waitfor = FALSE
|
||||||
consume(A)
|
consume(A)
|
||||||
return
|
|
||||||
|
|
||||||
|
|
||||||
/obj/singularity/Bumped(atom/movable/AM)
|
/obj/singularity/Bumped(atom/movable/AM)
|
||||||
|
set waitfor = FALSE
|
||||||
consume(AM)
|
consume(AM)
|
||||||
|
|
||||||
|
|
||||||
/obj/singularity/process()
|
/obj/singularity/process()
|
||||||
if(current_size >= STAGE_TWO)
|
if(current_size >= STAGE_TWO)
|
||||||
move()
|
move()
|
||||||
@@ -268,6 +267,7 @@
|
|||||||
|
|
||||||
|
|
||||||
/obj/singularity/proc/eat()
|
/obj/singularity/proc/eat()
|
||||||
|
set waitfor = FALSE
|
||||||
for(var/tile in spiral_range_turfs(grav_pull, src))
|
for(var/tile in spiral_range_turfs(grav_pull, src))
|
||||||
var/turf/T = tile
|
var/turf/T = tile
|
||||||
if(!T || !isturf(loc))
|
if(!T || !isturf(loc))
|
||||||
@@ -284,8 +284,6 @@
|
|||||||
else
|
else
|
||||||
consume(X)
|
consume(X)
|
||||||
CHECK_TICK
|
CHECK_TICK
|
||||||
return
|
|
||||||
|
|
||||||
|
|
||||||
/obj/singularity/proc/consume(atom/A)
|
/obj/singularity/proc/consume(atom/A)
|
||||||
var/gain = A.singularity_act(current_size, src)
|
var/gain = A.singularity_act(current_size, src)
|
||||||
@@ -295,8 +293,6 @@
|
|||||||
name = "supermatter-charged [initial(name)]"
|
name = "supermatter-charged [initial(name)]"
|
||||||
consumedSupermatter = 1
|
consumedSupermatter = 1
|
||||||
set_light(10)
|
set_light(10)
|
||||||
return
|
|
||||||
|
|
||||||
|
|
||||||
/obj/singularity/proc/move(force_move = 0)
|
/obj/singularity/proc/move(force_move = 0)
|
||||||
if(!move_self)
|
if(!move_self)
|
||||||
|
|||||||
Reference in New Issue
Block a user