cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 15:11:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds soda dispenser to beach bar.

Browse Source
This commit is contained in:
Tastyfish
2016-02-27 03:24:48 -05:00
parent cb2989eea1
commit b55f79f754
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/controllers/Processes/timer.dm
View File

@@ -1,4 +1,4 @@
var/global/datum/controller/process/timer/timer_controller
var/global/datum/controller/process/timer/timer_master
/datum/controller/process/timer
var/list/processing_timers = list()
@@ -7,7 +7,7 @@ var/global/datum/controller/process/timer/timer_controller
/datum/controller/process/timer/setup()
name = "timer"
schedule_interval = 5 //every 0.5 seconds
timer_controller = src
timer_master = src
/datum/controller/process/timer/statProcess()
..()
@@ -44,17 +44,17 @@ var/global/datum/controller/process/timer/timer_controller
nextid++
/datum/timedevent/Destroy()
timer_controller.processing_timers -= src
timer_controller.hashes -= hash
timer_master.processing_timers -= src
timer_master.hashes -= hash
return QDEL_HINT_IWILLGC
/proc/addtimer(thingToCall, procToCall, wait, unique = FALSE, ...)
if(!timer_controller) //can't run timers before the mc has been created
if(!timer_master) //can't run timers before the mc has been created
return
if(!thingToCall || !procToCall || wait <= 0)
return
if(timer_controller.disabled)
timer_controller.disabled = 0
if(timer_master.disabled)
timer_master.disabled = 0
var/datum/timedevent/event = new()
event.thingToCall = thingToCall
@@ -66,15 +66,15 @@ var/global/datum/controller/process/timer/timer_controller
// Check for dupes if unique = 1.
if(unique)
if(event.hash in timer_controller.hashes)
if(event.hash in timer_master.hashes)
return
// If we are unique (or we're not checking that), add the timer and return the id.
timer_controller.processing_timers += event
timer_controller.hashes += event.hash
timer_master.processing_timers += event
timer_master.hashes += event.hash
return event.id
/proc/deltimer(id)
for(var/datum/timedevent/event in timer_controller.processing_timers)
for(var/datum/timedevent/event in timer_master.processing_timers)
if(event.id == id)
qdel(event)
return 1