cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 18:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Crash to timers and INFINITY check to beams. (#33219)

Browse Source 
* beams

* timers

* >= instead of !=

* whooops
This commit is contained in:
jammer312
2017-12-03 21:44:58 +03:00
committed by CitadelStationBot
parent 6217206bae
commit b1e15a0da2
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/controllers/subsystem/timer.dm
View File

@@ -357,6 +357,9 @@ SUBSYSTEM_DEF(timer)
wait = max(wait, 0)
if(wait >= INFINITY)
CRASH("Attempted to create timer with INFINITY delay")
var/hash
if (flags & TIMER_UNIQUE)

1
code/datums/beam.dm
View File

@@ -29,6 +29,7 @@
icon = beam_icon
icon_state = beam_icon_state
beam_type = btype
if(time < INFINITY)
addtimer(CALLBACK(src,.proc/End), time)
/datum/beam/proc/Start()