Conflict Resolution

This one made a lynx cry.
This commit is contained in:
Unknown
2019-03-28 13:19:19 -04:00
parent 3256202407
commit cf39c61c2d
27 changed files with 96 additions and 1836 deletions

View File

@@ -45,6 +45,3 @@
. = B[STAT_ENTRY_TIME] - A[STAT_ENTRY_TIME]
if (!.)
. = B[STAT_ENTRY_COUNT] - A[STAT_ENTRY_COUNT]
/proc/cmp_timer(datum/timedevent/a, datum/timedevent/b)
return a.timeToRun - b.timeToRun