Bleeding edgy refresh (#303)

* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
This commit is contained in:
Poojawa
2017-03-21 11:44:10 -05:00
committed by GitHub
parent 099a6c8764
commit f67e9f6d87
1476 changed files with 344416 additions and 40694 deletions
+7 -8
View File
@@ -1,12 +1,11 @@
#define BUCKET_LEN (world.fps*1*60) //how many ticks should we keep in the bucket. (1 minutes worth)
#define BUCKET_POS(timer) (round((timer.timeToRun - SStimer.head_offset) / world.tick_lag) + 1)
var/datum/subsystem/timer/SStimer
var/datum/controller/subsystem/timer/SStimer
/datum/subsystem/timer
/datum/controller/subsystem/timer
name = "Timer"
wait = 1 //SS_TICKER subsystem, so wait is in ticks
init_order = 1
display_order = 3
flags = SS_FIRE_IN_LOBBY|SS_TICKER|SS_NO_INIT
@@ -25,7 +24,7 @@ var/datum/subsystem/timer/SStimer
var/list/clienttime_timers //special snowflake timers that run on fancy pansy "client time"
/datum/subsystem/timer/New()
/datum/controller/subsystem/timer/New()
processing = list()
hashes = list()
bucket_list = list()
@@ -36,10 +35,10 @@ var/datum/subsystem/timer/SStimer
NEW_SS_GLOBAL(SStimer)
/datum/subsystem/timer/stat_entry(msg)
/datum/controller/subsystem/timer/stat_entry(msg)
..("B:[bucket_count] P:[length(processing)] H:[length(hashes)] C:[length(clienttime_timers)]")
/datum/subsystem/timer/fire(resumed = FALSE)
/datum/controller/subsystem/timer/fire(resumed = FALSE)
while(length(clienttime_timers))
var/datum/timedevent/ctime_timer = clienttime_timers[clienttime_timers.len]
if (ctime_timer.timeToRun <= REALTIMEOFDAY)
@@ -107,7 +106,7 @@ var/datum/subsystem/timer/SStimer
spent.len = 0
/datum/subsystem/timer/proc/shift_buckets()
/datum/controller/subsystem/timer/proc/shift_buckets()
var/list/bucket_list = src.bucket_list
var/list/alltimers = list()
//collect the timers currently in the bucket
@@ -172,7 +171,7 @@ var/datum/subsystem/timer/SStimer
processing = (alltimers - timers_to_remove)
/datum/subsystem/timer/Recover()
/datum/controller/subsystem/timer/Recover()
processing |= SStimer.processing
hashes |= SStimer.hashes
timer_id_dict |= SStimer.timer_id_dict