diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm index f963f09a35c9..569e0a388ab8 100644 --- a/code/__HELPERS/cmp.dm +++ b/code/__HELPERS/cmp.dm @@ -33,9 +33,7 @@ var/cmp_field = "name" return b.init_order - a.init_order /proc/cmp_subsystem_display(datum/subsystem/a, datum/subsystem/b) - if(a.display_order == b.display_order) - return sorttext(b.name, a.name) - return a.display_order - b.display_order + return sorttext(b.name, a.name) /proc/cmp_subsystem_priority(datum/subsystem/a, datum/subsystem/b) return a.priority - b.priority diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index a45c45de2f1f..cbaf5d681472 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -5,7 +5,6 @@ var/name = "fire coderbus" //name of the subsystem var/init_order = 0 //order of initialization. Higher numbers are initialized first, lower numbers later. Can be decimal and negative values. var/wait = 20 //time to wait (in deciseconds) between each call to fire(). Must be a positive integer. - var/display_order = 100 //display affects the order the subsystem is displayed in the MC tab var/priority = 50 //When mutiple subsystems need to run in the same tick, higher priority subsystems will run first and be given a higher share of the tick before MC_TICK_CHECK triggers a sleep var/flags = 0 //see MC.dm in __DEFINES Most flags must be set on world start to take full effect. (You can also restart the mc to force them to process again) diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 5bc767d61f5f..424c1ba5a9bf 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -13,7 +13,6 @@ var/datum/subsystem/air/SSair priority = 20 wait = 5 flags = SS_BACKGROUND - display_order = 1 var/cost_turfs = 0 var/cost_groups = 0 diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 9e30cde9efee..14716de948fb 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -4,7 +4,6 @@ var/datum/subsystem/garbage_collector/SSgarbage name = "Garbage" priority = 15 wait = 5 - display_order = 2 flags = SS_FIRE_IN_LOBBY|SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT var/collection_timeout = 3000// deciseconds to wait to let running procs finish before we just say fuck it and force del() the object diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index f15f04f15be3..c43468625bb9 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -9,7 +9,6 @@ var/datum/subsystem/lighting/SSlighting wait = 1 flags = SS_TICKER priority = 25 - display_order = 5 var/list/changed_lights = list() //list of all datum/light_source that need updating var/changed_lights_workload = 0 //stats on the largest number of lights (max changed_lights.len) diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm index 7369ba6409e9..a5a6238abe28 100644 --- a/code/controllers/subsystem/machines.dm +++ b/code/controllers/subsystem/machines.dm @@ -3,7 +3,6 @@ var/datum/subsystem/machines/SSmachine /datum/subsystem/machines name = "Machines" init_order = 9 - display_order = 3 flags = SS_KEEP_TIMING var/list/processing = list() var/list/currentrun = list() diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 359f20f83e81..38350bc8e20f 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -4,7 +4,6 @@ var/datum/subsystem/mapping/SSmapping name = "Mapping" init_order = 12 flags = SS_NO_FIRE - display_order = 50 var/list/nuke_tiles = list() var/list/nuke_threats = list() diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index ef526f4dda74..2d6657886ff3 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -3,7 +3,6 @@ var/datum/subsystem/mobs/SSmob /datum/subsystem/mobs name = "Mobs" init_order = 4 - display_order = 4 priority = 100 flags = SS_KEEP_TIMING|SS_NO_INIT diff --git a/code/controllers/subsystem/npcpool.dm b/code/controllers/subsystem/npcpool.dm index 228b994818f5..7c5d97ac400f 100644 --- a/code/controllers/subsystem/npcpool.dm +++ b/code/controllers/subsystem/npcpool.dm @@ -3,7 +3,6 @@ var/datum/subsystem/npcpool/SSnpc /datum/subsystem/npcpool name = "NPC Pool" init_order = 17 - display_order = 6 flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_NO_TICK_CHECK priority = 25 diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm index 0a82e857ac36..a9381b2eb24d 100644 --- a/code/controllers/subsystem/tgui.dm +++ b/code/controllers/subsystem/tgui.dm @@ -4,7 +4,6 @@ var/datum/subsystem/tgui/SStgui name = "tgui" wait = 9 init_order = 16 - display_order = 6 flags = SS_NO_INIT|SS_FIRE_IN_LOBBY priority = 110