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 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update timer.dm

Browse Source
This commit is contained in:
LetterJay
2018-01-23 08:49:47 -06:00
committed by GitHub
parent 3a11b4f068
commit e672ff43ea
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -353,9 +353,6 @@ SUBSYSTEM_DEF(timer)
/proc/addtimer(datum/callback/callback, wait, flags)
if (!callback)
<<<<<<< HEAD
return
=======
CRASH("addtimer called without a callback")
if (wait < 0)
@@ -364,7 +361,6 @@ SUBSYSTEM_DEF(timer)
//alot of things add short timers on themselves in their destroy, we ignore those cases
if (wait >= 1 && callback && callback.object && callback.object != GLOBAL_PROC && QDELETED(callback.object))
stack_trace("addtimer called with a callback assigned to a qdeleted object")
>>>>>>> f3b771b... Merge pull request #34774 from ShizCalev/addtimer-stack-track-typo
wait = max(wait, 0)
@@ -422,4 +418,4 @@ SUBSYSTEM_DEF(timer)
#undef BUCKET_LEN
#undef BUCKET_POS
#undef BUCKET_POS