Revert "Merge pull request #33537 from ninjanomnom/priority-defines" (#34528)

This reverts commit 0244b61886, reversing
changes made to 5d07df08ea.
This commit is contained in:
Kyle Spier-Swenson
2018-01-16 20:04:35 -05:00
committed by ShizCalev
parent 1b4a3f6e7d
commit fa136e71f4
28 changed files with 28 additions and 60 deletions
+2 -2
View File
@@ -3,7 +3,7 @@ SUBSYSTEM_DEF(input)
wait = 1 //SS_TICKER means this runs every tick
init_order = INIT_ORDER_INPUT
flags = SS_TICKER
priority = FIRE_PRIORITY_INPUT
priority = 1000
runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
var/list/macro_sets
@@ -23,7 +23,7 @@ SUBSYSTEM_DEF(input)
// This is for when macro sets are eventualy datumized
/datum/controller/subsystem/input/proc/setup_default_macro_sets()
var/list/static/default_macro_sets
if(default_macro_sets)
macro_sets = default_macro_sets
return