cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-21 04:07:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Particle accelerator sleep() removal + outdated callback fix (#7790)

Browse Source
This commit is contained in:
Raeschen
2024-02-19 21:01:05 +01:00
committed by GitHub
parent 559f60b0dd
commit 55f28158c4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/particle_accelerator/particle.dm
+3 -2
View File
@@ -99,5 +99,6 @@
if(movement_range <= 0)
qdel(src)
else
sleep(lag)
move(lag)
//sleep(lag) //ChompEDIT
//move(lag) //ChompEDIT
addtimer(CALLBACK(src, PROC_REF(move), lag), lag) //ChompEDIT
code/modules/telesci/hyper_pad_ch.dm
+3 -3
View File
@@ -109,10 +109,10 @@
return
playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, 1)
teleporting = 1
addtimer(CALLBACK(src, .proc/doteleport, user), teleport_speed)
addtimer(CALLBACK(src, PROC_REF(doteleport), user), teleport_speed)
var/speed = teleport_speed/8
for(var/obj/machinery/hyperpad/P in linked)
addtimer(CALLBACK(src, .proc/animate_discharge, P), speed)
addtimer(CALLBACK(src, PROC_REF(animate_discharge), P), speed)
speed += teleport_speed/8
/obj/machinery/hyperpad/centre/proc/animate_discharge(var/obj/machinery/hyperpad/Pad)
@@ -171,7 +171,7 @@
color_overlay.color = newcolor
var/timer = teleport_cooldown/8
for(var/obj/machinery/hyperpad/P in linked)
addtimer(CALLBACK(src, .proc/animate_charge, P, color_overlay), timer)
addtimer(CALLBACK(src, PROC_REF(animate_charge), P, color_overlay), timer)
timer += teleport_cooldown/8
/obj/machinery/hyperpad/centre/proc/animate_charge(var/obj/machinery/hyperpad/Pad, var/mutable_appearance/color)