diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index cc01b194bd8..eb8079bd902 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -137,6 +137,16 @@ DEFINE_BITFIELD(disease_flags, list( "CURABLE" = CURABLE, )) +DEFINE_BITFIELD(ss_flags, list( + "SS_NO_INIT" = SS_NO_INIT, + "SS_NO_FIRE" = SS_NO_FIRE, + "SS_BACKGROUND" = SS_BACKGROUND, + "SS_TICKER" = SS_TICKER, + "SS_KEEP_TIMING" = SS_KEEP_TIMING, + "SS_POST_FIRE_TIMING" = SS_POST_FIRE_TIMING, + "SS_OK_TO_FAIL_INIT" = SS_OK_TO_FAIL_INIT, +)) + DEFINE_BITFIELD(flags_1, list( "ADMIN_SPAWNED_1" = ADMIN_SPAWNED_1, "ALLOW_DARK_PAINTS_1" = ALLOW_DARK_PAINTS_1, diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 80a0c486fae..3303eed9c5c 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -191,7 +191,7 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie "last_fire" = subsystem.last_fire, "next_fire" = subsystem.next_fire, "can_fire" = subsystem.can_fire, - "doesnt_fire" = !!(subsystem.flags & SS_NO_FIRE), + "doesnt_fire" = !!(subsystem.ss_flags & SS_NO_FIRE), "cost_ms" = subsystem.cost, "tick_usage" = subsystem.tick_usage, "usage_per_tick" = average, @@ -305,7 +305,7 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie FireHim = TRUE if(3) msg = "The [BadBoy.name] subsystem seems to be destabilizing the MC and will be put offline." - BadBoy.flags |= SS_NO_FIRE + BadBoy.ss_flags |= SS_NO_FIRE if(msg) to_chat(GLOB.admins, span_boldannounce("[msg]")) log_world(msg) @@ -494,7 +494,7 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie SS_INIT_NO_MESSAGE, ) - if ((subsystem.flags & SS_NO_INIT) || subsystem.initialized) //Don't init SSs with the corresponding flag or if they already are initialized + if ((subsystem.ss_flags & SS_NO_INIT) || subsystem.initialized) //Don't init SSs with the corresponding flag or if they already are initialized subsystem.initialized = TRUE // set initialized to TRUE, because the value of initialized may still be checked on SS_NO_INIT subsystems as an "is this ready" check return @@ -599,7 +599,7 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie var/timer = world.time for (var/thing in subsystems) var/datum/controller/subsystem/SS = thing - if (SS.flags & SS_NO_FIRE) + if (SS.ss_flags & SS_NO_FIRE) continue if (SS.init_stage > init_stage) continue @@ -607,7 +607,7 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie SS.queue_next = null SS.queue_prev = null SS.state = SS_IDLE - if ((SS.flags & (SS_TICKER|SS_BACKGROUND)) == SS_TICKER) + if ((SS.ss_flags & (SS_TICKER|SS_BACKGROUND)) == SS_TICKER) tickersubsystems += SS // Timer subsystems aren't allowed to bunch up, so we offset them a bit timer += TICKS2DS(rand(0, 1)) @@ -618,7 +618,7 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie if(SS.init_stage == init_stage - 1 && (SS.runlevels & current_runlevel)) // Give em a random offset so things don't clump up too bad var/delay = SS.wait - if(SS.flags & SS_TICKER) + if(SS.ss_flags & SS_TICKER) delay = TICKS2DS(delay) // Gotta convert to ticks cause rand needs integers SS.next_fire = world.time + TICKS2DS(rand(0, DS2TICKS(min(delay, 2 SECONDS)))) @@ -720,7 +720,7 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie continue // If they're new, give em a random offset so things don't clump up too bad var/delay = SS.wait - if(SS.flags & SS_TICKER) + if(SS.ss_flags & SS_TICKER) delay = TICKS2DS(delay) SS.next_fire = world.time + TICKS2DS(rand(0, DS2TICKS(min(delay, 2 SECONDS)))) @@ -813,7 +813,7 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie continue if (SS.next_fire > world.time) continue - SS_flags = SS.flags + SS_flags = SS.ss_flags if (SS_flags & SS_NO_FIRE) subsystemstocheck -= SS continue @@ -855,7 +855,7 @@ ADMIN_VERB(cmd_controller_view_ui, R_SERVER|R_DEBUG, "Controller Overview", "Vie while (queue_node) if (ran && TICK_USAGE > TICK_LIMIT_RUNNING) break - queue_node_flags = queue_node.flags + queue_node_flags = queue_node.ss_flags queue_node_priority = queue_node.queued_priority if (!(queue_node_flags & SS_TICKER) && skip_ticks) diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index 200c65a4c75..92a3e70d02f 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -34,8 +34,8 @@ /// Priority Weight: When multiple subsystems need to run in the same tick, higher priority subsystems will be given a higher share of the tick before MC_TICK_CHECK triggers a sleep, higher priority subsystems also run before lower priority subsystems var/priority = FIRE_PRIORITY_DEFAULT - /// [Subsystem Flags][SS_NO_INIT] to control binary behavior. Flags must be set at compile time or before preinit finishes to take full effect. (You can also restart the mc to force them to process again) - var/flags = NONE + /// [Subsystem flags][SS_NO_INIT] to control binary behavior. ss_flags must be set at compile time or before preinit finishes to take full effect. (You can also restart the mc to force them to process again) + var/ss_flags = NONE /// Which stage does this subsystem init at. Earlier stages can fire while later stages init. var/init_stage = INITSTAGE_MAIN @@ -161,13 +161,13 @@ ///fire() seems more suitable. This is the procedure that gets called every 'wait' deciseconds. ///Sleeping in here prevents future fires until returned. /datum/controller/subsystem/proc/fire(resumed = FALSE) - flags |= SS_NO_FIRE + ss_flags |= SS_NO_FIRE CRASH("Subsystem [src]([type]) does not fire() but did not set the SS_NO_FIRE flag. Please add the SS_NO_FIRE flag to any subsystem that doesn't fire so it doesn't get added to the processing list and waste cpu.") /datum/controller/subsystem/Destroy() dequeue() can_fire = 0 - flags |= SS_NO_FIRE + ss_flags |= SS_NO_FIRE if (Master) Master.subsystems -= src return ..() @@ -177,7 +177,7 @@ * reset_time (bool) - Ignore things that would normally alter the next fire, like tick_overrun, and last_fire. (also resets postpone) */ /datum/controller/subsystem/proc/update_nextfire(reset_time = FALSE) - var/queue_node_flags = flags + var/queue_node_flags = ss_flags if (reset_time) postponed_fires = 0 @@ -202,14 +202,14 @@ /// (this lets us sort our run order correctly without having to re-sort the entire already sorted list) /datum/controller/subsystem/proc/enqueue() var/SS_priority = priority - var/SS_flags = flags + var/SS_flags = ss_flags var/datum/controller/subsystem/queue_node var/queue_node_priority var/queue_node_flags for (queue_node = Master.queue_head; queue_node; queue_node = queue_node.queue_next) queue_node_priority = queue_node.queued_priority - queue_node_flags = queue_node.flags + queue_node_flags = queue_node.ss_flags if (queue_node_flags & (SS_TICKER|SS_BACKGROUND) == SS_TICKER) if ((SS_flags & (SS_TICKER|SS_BACKGROUND)) != SS_TICKER) @@ -290,7 +290,7 @@ return SS_INIT_NONE /datum/controller/subsystem/stat_entry(msg) - if(can_fire && !(SS_NO_FIRE & flags) && init_stage <= Master.init_stage_completed) + if(can_fire && !(SS_NO_FIRE & ss_flags) && init_stage <= Master.init_stage_completed) msg = "[round(cost,1)]ms|[round(tick_usage,1)]%([round(tick_overrun,1)]%)|[round(ticks,0.1)] [msg]" else msg = "OFFLINE\t[msg]" diff --git a/code/controllers/subsystem/achievements.dm b/code/controllers/subsystem/achievements.dm index 56a85284cd4..9548de2ce60 100644 --- a/code/controllers/subsystem/achievements.dm +++ b/code/controllers/subsystem/achievements.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(achievements) name = "Achievements" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE var/achievements_enabled = FALSE ///List of achievements diff --git a/code/controllers/subsystem/admin_verbs.dm b/code/controllers/subsystem/admin_verbs.dm index 732508f0f8a..9891f13a4cf 100644 --- a/code/controllers/subsystem/admin_verbs.dm +++ b/code/controllers/subsystem/admin_verbs.dm @@ -2,7 +2,7 @@ GENERAL_PROTECT_DATUM(/datum/controller/subsystem/admin_verbs) SUBSYSTEM_DEF(admin_verbs) name = "Admin Verbs" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE init_stage = INITSTAGE_EARLY /// A list of all admin verbs indexed by their type. var/list/datum/admin_verb/admin_verbs_by_type = list() diff --git a/code/controllers/subsystem/ai_controllers.dm b/code/controllers/subsystem/ai_controllers.dm index 95abc7e8da3..4102806be67 100644 --- a/code/controllers/subsystem/ai_controllers.dm +++ b/code/controllers/subsystem/ai_controllers.dm @@ -1,7 +1,7 @@ /// The subsystem used to tick [/datum/ai_controllers] instances. Handling the re-checking of plans. SUBSYSTEM_DEF(ai_controllers) name = "AI Controller Ticker" - flags = SS_POST_FIRE_TIMING|SS_BACKGROUND + ss_flags = SS_POST_FIRE_TIMING|SS_BACKGROUND priority = FIRE_PRIORITY_NPC dependencies = list( /datum/controller/subsystem/movement/ai_movement, diff --git a/code/controllers/subsystem/ai_idle_controllers.dm b/code/controllers/subsystem/ai_idle_controllers.dm index 19fcad9c50e..94b43207f82 100644 --- a/code/controllers/subsystem/ai_idle_controllers.dm +++ b/code/controllers/subsystem/ai_idle_controllers.dm @@ -1,6 +1,6 @@ AI_CONTROLLER_SUBSYSTEM_DEF(ai_idle_controllers) name = "AI Idle Controllers" - flags = SS_POST_FIRE_TIMING | SS_BACKGROUND + ss_flags = SS_POST_FIRE_TIMING | SS_BACKGROUND priority = FIRE_PRIORITY_IDLE_NPC dependencies = list( /datum/controller/subsystem/ai_controllers, diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index b991b73918d..b75d9e813e3 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -6,7 +6,7 @@ SUBSYSTEM_DEF(air) ) priority = FIRE_PRIORITY_AIR wait = 0.5 SECONDS - flags = SS_BACKGROUND + ss_flags = SS_BACKGROUND runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/cached_cost = 0 diff --git a/code/controllers/subsystem/ambience.dm b/code/controllers/subsystem/ambience.dm index 88db3ffcc33..79f5e7dbd1a 100644 --- a/code/controllers/subsystem/ambience.dm +++ b/code/controllers/subsystem/ambience.dm @@ -1,7 +1,7 @@ /// The subsystem used to play ambience to users every now and then, makes them real excited. SUBSYSTEM_DEF(ambience) name = "Ambience" - flags = SS_BACKGROUND|SS_NO_INIT + ss_flags = SS_BACKGROUND|SS_NO_INIT priority = FIRE_PRIORITY_AMBIENCE runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME wait = 1 SECONDS diff --git a/code/controllers/subsystem/area_contents.dm b/code/controllers/subsystem/area_contents.dm index 830c6857561..ae33933a4b9 100644 --- a/code/controllers/subsystem/area_contents.dm +++ b/code/controllers/subsystem/area_contents.dm @@ -8,7 +8,7 @@ */ SUBSYSTEM_DEF(area_contents) name = "Area Contents" - flags = SS_NO_INIT + ss_flags = SS_NO_INIT runlevels = RUNLEVEL_LOBBY|RUNLEVELS_DEFAULT var/list/currentrun var/list/area/marked_for_clearing = list() diff --git a/code/controllers/subsystem/asset_loading.dm b/code/controllers/subsystem/asset_loading.dm index 8bafe88ffbc..d591475c880 100644 --- a/code/controllers/subsystem/asset_loading.dm +++ b/code/controllers/subsystem/asset_loading.dm @@ -4,7 +4,7 @@ SUBSYSTEM_DEF(asset_loading) name = "Asset Loading" priority = FIRE_PRIORITY_ASSETS - flags = SS_NO_INIT + ss_flags = SS_NO_INIT runlevels = RUNLEVEL_LOBBY|RUNLEVELS_DEFAULT var/list/datum/asset/generate_queue = list() var/assets_generating = 0 diff --git a/code/controllers/subsystem/assets.dm b/code/controllers/subsystem/assets.dm index e3b03c01222..dad696c002a 100644 --- a/code/controllers/subsystem/assets.dm +++ b/code/controllers/subsystem/assets.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(assets) /datum/controller/subsystem/persistent_paintings, /datum/controller/subsystem/greyscale_previews, ) - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE var/list/datum/asset_cache_item/cache = list() var/list/preload = list() var/datum/asset_transport/transport = new() diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index 0ea51fe9624..80e649d7504 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -6,7 +6,7 @@ SUBSYSTEM_DEF(atoms) /datum/controller/subsystem/mapping, /datum/controller/subsystem/job, ) - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE /// A stack of list(source, desired initialized state) /// We read the source of init changes from the last entry, and assert that all changes will come with a reset diff --git a/code/controllers/subsystem/augury.dm b/code/controllers/subsystem/augury.dm index e686e5cdb62..681ac744c15 100644 --- a/code/controllers/subsystem/augury.dm +++ b/code/controllers/subsystem/augury.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(augury) name = "Augury" - flags = SS_NO_INIT + ss_flags = SS_NO_INIT runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/list/watchers = list() diff --git a/code/controllers/subsystem/ban_cache.dm b/code/controllers/subsystem/ban_cache.dm index 21e1a92a7ed..1e4c710031b 100644 --- a/code/controllers/subsystem/ban_cache.dm +++ b/code/controllers/subsystem/ban_cache.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(ban_cache) /datum/controller/subsystem/ban_cache name = "Ban Cache" init_stage = INITSTAGE_LAST - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE var/query_started = FALSE /datum/controller/subsystem/ban_cache/Initialize() diff --git a/code/controllers/subsystem/blood_drying.dm b/code/controllers/subsystem/blood_drying.dm index 79202cb8d8c..ec8d9d174e0 100644 --- a/code/controllers/subsystem/blood_drying.dm +++ b/code/controllers/subsystem/blood_drying.dm @@ -5,7 +5,7 @@ */ PROCESSING_SUBSYSTEM_DEF(blood_drying) name = "Blood Drying" - flags = SS_NO_INIT | SS_BACKGROUND + ss_flags = SS_NO_INIT | SS_BACKGROUND priority = FIRE_PRIORITY_BLOOD_DRYING runlevels = RUNLEVEL_GAME wait = 4 SECONDS diff --git a/code/controllers/subsystem/cameras.dm b/code/controllers/subsystem/cameras.dm index 62e8af1c973..d6f7866b808 100644 --- a/code/controllers/subsystem/cameras.dm +++ b/code/controllers/subsystem/cameras.dm @@ -1,7 +1,7 @@ /// Manages the security cameras and camera chunks SUBSYSTEM_DEF(cameras) name = "Cameras" - flags = SS_BACKGROUND + ss_flags = SS_BACKGROUND priority = FIRE_PRIORITY_CAMERAS runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME wait = 2 MINUTES diff --git a/code/controllers/subsystem/chat.dm b/code/controllers/subsystem/chat.dm index d2303074077..4864e9aec8a 100644 --- a/code/controllers/subsystem/chat.dm +++ b/code/controllers/subsystem/chat.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(chat) name = "Chat" - flags = SS_TICKER|SS_NO_INIT + ss_flags = SS_TICKER|SS_NO_INIT wait = 1 priority = FIRE_PRIORITY_CHAT init_stage = INITSTAGE_LAST diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index 17b2bf737dd..b68454a5acc 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -1,7 +1,7 @@ #define SHUTDOWN_QUERY_TIMELIMIT (1 MINUTES) SUBSYSTEM_DEF(dbcore) name = "Database" - flags = SS_TICKER + ss_flags = SS_TICKER init_stage = INITSTAGE_FIRST wait = 10 // Not seconds because we're running on SS_TICKER runlevels = RUNLEVEL_LOBBY|RUNLEVELS_DEFAULT diff --git a/code/controllers/subsystem/dcs.dm b/code/controllers/subsystem/dcs.dm index a3dcc26af54..e65c820e944 100644 --- a/code/controllers/subsystem/dcs.dm +++ b/code/controllers/subsystem/dcs.dm @@ -1,6 +1,6 @@ PROCESSING_SUBSYSTEM_DEF(dcs) name = "Datum Component System" - flags = SS_NO_INIT + ss_flags = SS_NO_INIT wait = 1 SECONDS var/list/elements_by_type = list() diff --git a/code/controllers/subsystem/disease.dm b/code/controllers/subsystem/disease.dm index bfa6fd66b7d..843148d6f43 100644 --- a/code/controllers/subsystem/disease.dm +++ b/code/controllers/subsystem/disease.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(disease) name = "Disease" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE var/list/active_diseases = list() //List of Active disease in all mobs; purely for quick referencing. var/list/diseases diff --git a/code/controllers/subsystem/dynamic/dynamic.dm b/code/controllers/subsystem/dynamic/dynamic.dm index bdebecb717d..8d614412ae8 100644 --- a/code/controllers/subsystem/dynamic/dynamic.dm +++ b/code/controllers/subsystem/dynamic/dynamic.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(dynamic) name = "Dynamic" - flags = SS_NO_INIT + ss_flags = SS_NO_INIT wait = 5 MINUTES // These vars just exist for admins interfacing with dynamic diff --git a/code/controllers/subsystem/early_assets.dm b/code/controllers/subsystem/early_assets.dm index df155a4db10..a480fbc49a9 100644 --- a/code/controllers/subsystem/early_assets.dm +++ b/code/controllers/subsystem/early_assets.dm @@ -14,7 +14,7 @@ SUBSYSTEM_DEF(early_assets) /datum/controller/subsystem/atoms, ) init_stage = INITSTAGE_EARLY - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE /datum/controller/subsystem/early_assets/Initialize() var/init_source = "early assets" diff --git a/code/controllers/subsystem/explosions.dm b/code/controllers/subsystem/explosions.dm index c01fe4f718f..f5c733c0fd6 100644 --- a/code/controllers/subsystem/explosions.dm +++ b/code/controllers/subsystem/explosions.dm @@ -9,7 +9,7 @@ SUBSYSTEM_DEF(explosions) name = "Explosions" priority = FIRE_PRIORITY_EXPLOSIONS wait = 1 - flags = SS_TICKER|SS_NO_INIT + ss_flags = SS_TICKER|SS_NO_INIT runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/cost_lowturf = 0 diff --git a/code/controllers/subsystem/fluids.dm b/code/controllers/subsystem/fluids.dm index 6b68ae71722..9ceec065086 100644 --- a/code/controllers/subsystem/fluids.dm +++ b/code/controllers/subsystem/fluids.dm @@ -20,7 +20,7 @@ SUBSYSTEM_DEF(fluids) name = "Fluid" wait = 0 // Will be autoset to whatever makes the most sense given the spread and effect waits. - flags = SS_KEEP_TIMING + ss_flags = SS_KEEP_TIMING runlevels = RUNLEVEL_GAME|RUNLEVEL_POSTGAME priority = FIRE_PRIORITY_FLUIDS diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index bb1475a4f50..ae01679b094 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -25,7 +25,7 @@ SUBSYSTEM_DEF(garbage) name = "Garbage" priority = FIRE_PRIORITY_GARBAGE wait = 2 SECONDS - flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT + ss_flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY init_stage = INITSTAGE_FIRST diff --git a/code/controllers/subsystem/greyscale_previews.dm b/code/controllers/subsystem/greyscale_previews.dm index 9a63cb6b2de..79bc1fa1fe9 100644 --- a/code/controllers/subsystem/greyscale_previews.dm +++ b/code/controllers/subsystem/greyscale_previews.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(greyscale_previews) name = "Greyscale Previews" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE init_stage = INITSTAGE_EARLY dependencies = list( /datum/controller/subsystem/processing/greyscale, diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm index 77a2c1670ae..7fb7f5c6199 100644 --- a/code/controllers/subsystem/icon_smooth.dm +++ b/code/controllers/subsystem/icon_smooth.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(icon_smooth) ) wait = 1 priority = FIRE_PRIORITY_SMOOTHING - flags = SS_TICKER + ss_flags = SS_TICKER ///Blueprints assemble an image of what pipes/manifolds/wires look like on initialization, and thus should be taken after everything's been smoothed var/list/blueprint_queue = list() diff --git a/code/controllers/subsystem/init_profiler.dm b/code/controllers/subsystem/init_profiler.dm index dcb163e596a..a27c1a5bf39 100644 --- a/code/controllers/subsystem/init_profiler.dm +++ b/code/controllers/subsystem/init_profiler.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(init_profiler) name = "Init Profiler" init_stage = INITSTAGE_LAST - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE /datum/controller/subsystem/init_profiler/Initialize() if(CONFIG_GET(flag/auto_profile)) diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm index 11b75be8af7..dff1edad054 100644 --- a/code/controllers/subsystem/input.dm +++ b/code/controllers/subsystem/input.dm @@ -1,7 +1,7 @@ VERB_MANAGER_SUBSYSTEM_DEF(input) name = "Input" init_stage = INITSTAGE_EARLY - flags = SS_TICKER + ss_flags = SS_TICKER priority = FIRE_PRIORITY_INPUT runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY diff --git a/code/controllers/subsystem/ipintel.dm b/code/controllers/subsystem/ipintel.dm index 6ba87c02780..e3e33d1d79e 100644 --- a/code/controllers/subsystem/ipintel.dm +++ b/code/controllers/subsystem/ipintel.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(ipintel) name = "XKeyScore" - flags = SS_NO_INIT|SS_NO_FIRE + ss_flags = SS_NO_INIT|SS_NO_FIRE /// The threshold for probability to be considered a VPN and/or bad IP var/probability_threshold diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index c37577d24bd..9b23ad6528a 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -3,7 +3,7 @@ SUBSYSTEM_DEF(job) dependencies = list( /datum/controller/subsystem/processing/station, ) - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE /// List of all jobs. var/list/datum/job/all_occupations = list() diff --git a/code/controllers/subsystem/lag_switch.dm b/code/controllers/subsystem/lag_switch.dm index 291e80fe18f..70979b40816 100644 --- a/code/controllers/subsystem/lag_switch.dm +++ b/code/controllers/subsystem/lag_switch.dm @@ -1,7 +1,7 @@ /// The subsystem for controlling drastic performance enhancements aimed at reducing server load for a smoother albeit slightly duller gaming experience SUBSYSTEM_DEF(lag_switch) name = "Lag Switch" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE /// If the lag switch measures should attempt to trigger automatically, TRUE if a config value exists var/auto_switch = FALSE diff --git a/code/controllers/subsystem/library.dm b/code/controllers/subsystem/library.dm index 87b64f1af87..a368a390304 100644 --- a/code/controllers/subsystem/library.dm +++ b/code/controllers/subsystem/library.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(library) /datum/controller/subsystem/atoms, /datum/controller/subsystem/mapping, ) - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE /// List of bookselves to prefill with books var/list/shelves_to_load = list() diff --git a/code/controllers/subsystem/lighting.dm b/code/controllers/subsystem/lighting.dm index 2bff25b00a5..4717e7dcf8c 100644 --- a/code/controllers/subsystem/lighting.dm +++ b/code/controllers/subsystem/lighting.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(lighting) /datum/controller/subsystem/mapping, ) wait = 2 - flags = SS_TICKER + ss_flags = SS_TICKER var/static/list/sources_queue = list() // List of lighting sources queued for update. var/static/list/corners_queue = list() // List of lighting corners queued for update. var/static/list/objects_queue = list() // List of lighting objects queued for update. diff --git a/code/controllers/subsystem/machines.dm b/code/controllers/subsystem/machines.dm index e3e0b0357a0..8e19623ad29 100644 --- a/code/controllers/subsystem/machines.dm +++ b/code/controllers/subsystem/machines.dm @@ -3,7 +3,7 @@ SUBSYSTEM_DEF(machines) dependencies = list( /datum/controller/subsystem/atoms, ) - flags = SS_KEEP_TIMING + ss_flags = SS_KEEP_TIMING wait = 2 SECONDS /// Assosciative list of all machines that exist. diff --git a/code/controllers/subsystem/map_vote.dm b/code/controllers/subsystem/map_vote.dm index 6b0495613ea..4229ee82737 100644 --- a/code/controllers/subsystem/map_vote.dm +++ b/code/controllers/subsystem/map_vote.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(map_vote) name = "Map Vote" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE /// Has an admin specifically set a map. var/admin_override = FALSE diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index caec055f21f..e83341269cd 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -351,7 +351,7 @@ Used by the AI doomsday and the self-destruct nuke. /datum/controller/subsystem/mapping/Recover() - flags |= SS_NO_INIT + ss_flags |= SS_NO_INIT initialized = SSmapping.initialized map_templates = SSmapping.map_templates ruins_templates = SSmapping.ruins_templates diff --git a/code/controllers/subsystem/market.dm b/code/controllers/subsystem/market.dm index 8d165bee25d..62631201ba4 100644 --- a/code/controllers/subsystem/market.dm +++ b/code/controllers/subsystem/market.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(market) name = "Market" - flags = SS_BACKGROUND + ss_flags = SS_BACKGROUND dependencies = list( /datum/controller/subsystem/atoms, ) diff --git a/code/controllers/subsystem/materials.dm b/code/controllers/subsystem/materials.dm index 62d72a9d18c..0bbeb16fbe3 100644 --- a/code/controllers/subsystem/materials.dm +++ b/code/controllers/subsystem/materials.dm @@ -6,7 +6,7 @@ These materials call on_applied() on whatever item they are applied to, common e */ SUBSYSTEM_DEF(materials) name = "Materials" - flags = SS_NO_FIRE | SS_NO_INIT + ss_flags = SS_NO_FIRE | SS_NO_INIT /// Dictionary of material.id || material ref var/list/materials /// Flat list of materials diff --git a/code/controllers/subsystem/minor_mapping.dm b/code/controllers/subsystem/minor_mapping.dm index aca5845a14d..5f59bf8d597 100644 --- a/code/controllers/subsystem/minor_mapping.dm +++ b/code/controllers/subsystem/minor_mapping.dm @@ -6,7 +6,7 @@ SUBSYSTEM_DEF(minor_mapping) /datum/controller/subsystem/mapping, /datum/controller/subsystem/atoms, ) - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE ///a list of vermin we pick from to spawn. var/list/vermin_chances = list( /mob/living/basic/mouse = 72, diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index 7f500e08289..d0078891c22 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(mobs) name = "Mobs" priority = FIRE_PRIORITY_MOBS - flags = SS_KEEP_TIMING | SS_NO_INIT + ss_flags = SS_KEEP_TIMING | SS_NO_INIT runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME wait = 2 SECONDS diff --git a/code/controllers/subsystem/moods.dm b/code/controllers/subsystem/moods.dm index 20111747bdb..5f2c3151ad2 100644 --- a/code/controllers/subsystem/moods.dm +++ b/code/controllers/subsystem/moods.dm @@ -1,5 +1,5 @@ PROCESSING_SUBSYSTEM_DEF(mood) name = "Mood" - flags = SS_NO_INIT | SS_BACKGROUND + ss_flags = SS_NO_INIT | SS_BACKGROUND priority = 20 wait = 1 SECONDS diff --git a/code/controllers/subsystem/mouse_entered.dm b/code/controllers/subsystem/mouse_entered.dm index 6dc8d995a52..baf60e33024 100644 --- a/code/controllers/subsystem/mouse_entered.dm +++ b/code/controllers/subsystem/mouse_entered.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(mouse_entered) name = "MouseEntered" wait = 1 - flags = SS_NO_INIT | SS_TICKER + ss_flags = SS_NO_INIT | SS_TICKER priority = FIRE_PRIORITY_MOUSE_ENTERED runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY diff --git a/code/controllers/subsystem/movement/ai_movement.dm b/code/controllers/subsystem/movement/ai_movement.dm index 8703fbfdfc6..9c96ea6a22b 100644 --- a/code/controllers/subsystem/movement/ai_movement.dm +++ b/code/controllers/subsystem/movement/ai_movement.dm @@ -1,7 +1,7 @@ /// The subsystem used to tick [/datum/ai_movement] instances. Handling the movement of individual AI instances MOVEMENT_SUBSYSTEM_DEF(ai_movement) name = "AI movement" - flags = SS_BACKGROUND|SS_TICKER + ss_flags = SS_BACKGROUND|SS_TICKER priority = FIRE_PRIORITY_NPC_MOVEMENT runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME diff --git a/code/controllers/subsystem/movement/cliff_falling.dm b/code/controllers/subsystem/movement/cliff_falling.dm index b3d7f114dfb..d9e56eb2a02 100644 --- a/code/controllers/subsystem/movement/cliff_falling.dm +++ b/code/controllers/subsystem/movement/cliff_falling.dm @@ -2,7 +2,7 @@ MOVEMENT_SUBSYSTEM_DEF(cliff_falling) name = "Cliff Falling" priority = FIRE_PRIORITY_CLIFF_FALLING - flags = SS_NO_INIT|SS_TICKER + ss_flags = SS_NO_INIT|SS_TICKER runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME /// Who are currently falling and with which movemanager? diff --git a/code/controllers/subsystem/movement/hyperspace_drift.dm b/code/controllers/subsystem/movement/hyperspace_drift.dm index bd1ac67a6f0..66710bd02f3 100644 --- a/code/controllers/subsystem/movement/hyperspace_drift.dm +++ b/code/controllers/subsystem/movement/hyperspace_drift.dm @@ -2,5 +2,5 @@ MOVEMENT_SUBSYSTEM_DEF(hyperspace_drift) name = "Hyperspace Drift" priority = FIRE_PRIORITY_HYPERSPACE_DRIFT - flags = SS_NO_INIT|SS_TICKER + ss_flags = SS_NO_INIT|SS_TICKER runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME diff --git a/code/controllers/subsystem/movement/movement.dm b/code/controllers/subsystem/movement/movement.dm index 2b0463db790..052b82991e3 100644 --- a/code/controllers/subsystem/movement/movement.dm +++ b/code/controllers/subsystem/movement/movement.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(movement) name = "Movement Loops" - flags = SS_NO_INIT|SS_TICKER + ss_flags = SS_NO_INIT|SS_TICKER wait = 1 //Fire each tick /* A breif aside about the bucketing system here diff --git a/code/controllers/subsystem/movement/newtonian_movement.dm b/code/controllers/subsystem/movement/newtonian_movement.dm index e4143669678..d88a7d72f57 100644 --- a/code/controllers/subsystem/movement/newtonian_movement.dm +++ b/code/controllers/subsystem/movement/newtonian_movement.dm @@ -1,7 +1,7 @@ /// The subsystem is intended to tick things related to space/newtonian movement, such as constant sources of inertia MOVEMENT_SUBSYSTEM_DEF(newtonian_movement) name = "Newtonian Movement" - flags = SS_NO_INIT|SS_TICKER + ss_flags = SS_NO_INIT|SS_TICKER runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/stat_tag = "P" //Used for logging diff --git a/code/controllers/subsystem/networks/bitrunning.dm b/code/controllers/subsystem/networks/bitrunning.dm index 6f6d68a0b05..1bb8eb49e4d 100644 --- a/code/controllers/subsystem/networks/bitrunning.dm +++ b/code/controllers/subsystem/networks/bitrunning.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(bitrunning) name = "Bitrunning" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE var/list/all_domains = list() diff --git a/code/controllers/subsystem/networks/circuit_component.dm b/code/controllers/subsystem/networks/circuit_component.dm index bae302ed9d0..54ece202903 100644 --- a/code/controllers/subsystem/networks/circuit_component.dm +++ b/code/controllers/subsystem/networks/circuit_component.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(circuit_component) name = "Circuit Components" wait = 0.1 SECONDS priority = FIRE_PRIORITY_DEFAULT - flags = SS_NO_INIT + ss_flags = SS_NO_INIT var/list/callbacks_to_invoke = list() var/list/currentrun = list() diff --git a/code/controllers/subsystem/networks/id_access.dm b/code/controllers/subsystem/networks/id_access.dm index 889c59fbf5b..482bd5e119f 100644 --- a/code/controllers/subsystem/networks/id_access.dm +++ b/code/controllers/subsystem/networks/id_access.dm @@ -3,7 +3,7 @@ */ SUBSYSTEM_DEF(id_access) name = "IDs and Access" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE /// Dictionary of access flags. Keys are accesses. Values are their associated bitflags. var/list/flags_by_access = list() diff --git a/code/controllers/subsystem/networks/radio.dm b/code/controllers/subsystem/networks/radio.dm index 6d880cedeb3..8ddc9ae955c 100644 --- a/code/controllers/subsystem/networks/radio.dm +++ b/code/controllers/subsystem/networks/radio.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(radio) name = "Radio" - flags = SS_NO_FIRE|SS_NO_INIT + ss_flags = SS_NO_FIRE|SS_NO_INIT var/list/datum/radio_frequency/frequencies = list() var/list/saymodes = list() diff --git a/code/controllers/subsystem/networks/wiremod_composite.dm b/code/controllers/subsystem/networks/wiremod_composite.dm index 15b21beefa1..e099a2bfa90 100644 --- a/code/controllers/subsystem/networks/wiremod_composite.dm +++ b/code/controllers/subsystem/networks/wiremod_composite.dm @@ -7,7 +7,7 @@ **/ SUBSYSTEM_DEF(wiremod_composite) name = "Wiremod Composite Templates" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE /// The templates created and stored var/list/templates = list() diff --git a/code/controllers/subsystem/npcpool.dm b/code/controllers/subsystem/npcpool.dm index 6fbfdadf682..a03e7c9872b 100644 --- a/code/controllers/subsystem/npcpool.dm +++ b/code/controllers/subsystem/npcpool.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(npcpool) name = "NPC Pool" - flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND + ss_flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND priority = FIRE_PRIORITY_NPC runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm index 96041edd423..dda905504d8 100644 --- a/code/controllers/subsystem/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(overlays) name = "Overlay" - flags = SS_NO_FIRE|SS_NO_INIT + ss_flags = SS_NO_FIRE|SS_NO_INIT var/list/stats /datum/controller/subsystem/overlays/PreInit() diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index 4abc752ea81..b2db11c4a51 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(pai) name = "pAI" - flags = SS_NO_INIT|SS_NO_FIRE + ss_flags = SS_NO_INIT|SS_NO_FIRE /// List of pAI candidates, including those not submitted. var/list/candidates = list() diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm index e7ccfff74c1..1b509f8d757 100644 --- a/code/controllers/subsystem/parallax.dm +++ b/code/controllers/subsystem/parallax.dm @@ -4,7 +4,7 @@ SUBSYSTEM_DEF(parallax) name = "Parallax" wait = 2 - flags = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT + ss_flags = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT priority = FIRE_PRIORITY_PARALLAX runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT var/list/currentrun diff --git a/code/controllers/subsystem/persistence/_persistence.dm b/code/controllers/subsystem/persistence/_persistence.dm index cb312ba29c2..405f8129eea 100644 --- a/code/controllers/subsystem/persistence/_persistence.dm +++ b/code/controllers/subsystem/persistence/_persistence.dm @@ -7,7 +7,7 @@ SUBSYSTEM_DEF(persistence) /datum/controller/subsystem/mapping, /datum/controller/subsystem/atoms, ) - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE ///instantiated wall engraving components var/list/wall_engravings = list() diff --git a/code/controllers/subsystem/persistent_paintings.dm b/code/controllers/subsystem/persistent_paintings.dm index e9a057432fe..6d9aabf9989 100644 --- a/code/controllers/subsystem/persistent_paintings.dm +++ b/code/controllers/subsystem/persistent_paintings.dm @@ -120,7 +120,7 @@ SUBSYSTEM_DEF(persistent_paintings) name = "Persistent Paintings" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE dependencies = list( /datum/controller/subsystem/persistence, ) diff --git a/code/controllers/subsystem/ping.dm b/code/controllers/subsystem/ping.dm index 22a64c2802a..0607f89162c 100644 --- a/code/controllers/subsystem/ping.dm +++ b/code/controllers/subsystem/ping.dm @@ -8,7 +8,7 @@ SUBSYSTEM_DEF(ping) priority = FIRE_PRIORITY_PING init_stage = INITSTAGE_EARLY wait = 4 SECONDS - flags = SS_NO_INIT + ss_flags = SS_NO_INIT runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT var/list/currentrun = list() diff --git a/code/controllers/subsystem/points_of_interest.dm b/code/controllers/subsystem/points_of_interest.dm index 7bec303d66a..6844c84ecdc 100644 --- a/code/controllers/subsystem/points_of_interest.dm +++ b/code/controllers/subsystem/points_of_interest.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(points_of_interest) name = "Points of Interest" - flags = SS_NO_FIRE | SS_NO_INIT + ss_flags = SS_NO_FIRE | SS_NO_INIT /// List of mob POIs. This list is automatically sorted. var/list/datum/point_of_interest/mob_poi/mob_points_of_interest = list() diff --git a/code/controllers/subsystem/polling.dm b/code/controllers/subsystem/polling.dm index 1477fa7e7c3..b830aec53ef 100644 --- a/code/controllers/subsystem/polling.dm +++ b/code/controllers/subsystem/polling.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(polling) name = "Polling" - flags = SS_BACKGROUND | SS_NO_INIT + ss_flags = SS_BACKGROUND | SS_NO_INIT wait = 1 SECONDS runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME /// List of polls currently ongoing, to be checked on next fire() diff --git a/code/controllers/subsystem/processing/acid.dm b/code/controllers/subsystem/processing/acid.dm index a92880f51e3..2e16efdda89 100644 --- a/code/controllers/subsystem/processing/acid.dm +++ b/code/controllers/subsystem/processing/acid.dm @@ -2,5 +2,5 @@ PROCESSING_SUBSYSTEM_DEF(acid) name = "Acid" priority = FIRE_PRIORITY_ACID - flags = SS_NO_INIT|SS_BACKGROUND + ss_flags = SS_NO_INIT|SS_BACKGROUND runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME diff --git a/code/controllers/subsystem/processing/ai_basic_avoidance.dm b/code/controllers/subsystem/processing/ai_basic_avoidance.dm index 2a3fe992f44..9fdd5d2d453 100644 --- a/code/controllers/subsystem/processing/ai_basic_avoidance.dm +++ b/code/controllers/subsystem/processing/ai_basic_avoidance.dm @@ -1,4 +1,4 @@ PROCESSING_SUBSYSTEM_DEF(basic_avoidance) name = "Basic Avoidance" - flags = SS_NO_INIT + ss_flags = SS_NO_INIT wait = 2 SECONDS diff --git a/code/controllers/subsystem/processing/ai_behaviors.dm b/code/controllers/subsystem/processing/ai_behaviors.dm index 56904fb3c2f..7304c5ed362 100644 --- a/code/controllers/subsystem/processing/ai_behaviors.dm +++ b/code/controllers/subsystem/processing/ai_behaviors.dm @@ -1,7 +1,7 @@ /// The subsystem used to tick [/datum/ai_behavior] instances. Handling the individual actions an AI can take like punching someone in the fucking NUTS PROCESSING_SUBSYSTEM_DEF(ai_behaviors) name = "AI Behavior Ticker" - flags = SS_POST_FIRE_TIMING|SS_BACKGROUND + ss_flags = SS_POST_FIRE_TIMING|SS_BACKGROUND priority = FIRE_PRIORITY_NPC_ACTIONS runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME dependencies = list( diff --git a/code/controllers/subsystem/processing/ai_idle_behaviors.dm b/code/controllers/subsystem/processing/ai_idle_behaviors.dm index c776451ab20..2b631da96f3 100644 --- a/code/controllers/subsystem/processing/ai_idle_behaviors.dm +++ b/code/controllers/subsystem/processing/ai_idle_behaviors.dm @@ -1,6 +1,6 @@ PROCESSING_SUBSYSTEM_DEF(idle_ai_behaviors) name = "AI Idle Behaviors" - flags = SS_BACKGROUND + ss_flags = SS_BACKGROUND wait = 1.5 SECONDS priority = FIRE_PRIORITY_IDLE_NPC dependencies = list( diff --git a/code/controllers/subsystem/processing/antag_hud.dm b/code/controllers/subsystem/processing/antag_hud.dm index aaf10a5e2ec..98e439039e8 100644 --- a/code/controllers/subsystem/processing/antag_hud.dm +++ b/code/controllers/subsystem/processing/antag_hud.dm @@ -1,4 +1,4 @@ PROCESSING_SUBSYSTEM_DEF(antag_hud) name = "Antag HUDs" - flags = SS_NO_INIT + ss_flags = SS_NO_INIT wait = 2 SECONDS diff --git a/code/controllers/subsystem/processing/aura.dm b/code/controllers/subsystem/processing/aura.dm index 12a7d511fb7..992a64680a3 100644 --- a/code/controllers/subsystem/processing/aura.dm +++ b/code/controllers/subsystem/processing/aura.dm @@ -1,5 +1,5 @@ /// The subsystem used to tick auras ([/datum/component/aura_healing] and [/datum/component/damage_aura]). PROCESSING_SUBSYSTEM_DEF(aura) name = "Aura" - flags = SS_NO_INIT | SS_BACKGROUND | SS_KEEP_TIMING + ss_flags = SS_NO_INIT | SS_BACKGROUND | SS_KEEP_TIMING wait = 0.3 SECONDS diff --git a/code/controllers/subsystem/processing/clock_component.dm b/code/controllers/subsystem/processing/clock_component.dm index d07acaa6d79..13d165e90ff 100644 --- a/code/controllers/subsystem/processing/clock_component.dm +++ b/code/controllers/subsystem/processing/clock_component.dm @@ -1,5 +1,5 @@ /// The subsystem used to tick [/datum/component/acid] instances. PROCESSING_SUBSYSTEM_DEF(clock_component) name = "Clock Component" - flags = SS_NO_INIT|SS_BACKGROUND|SS_KEEP_TIMING + ss_flags = SS_NO_INIT|SS_BACKGROUND|SS_KEEP_TIMING wait = COMP_CLOCK_DELAY diff --git a/code/controllers/subsystem/processing/digital_clock.dm b/code/controllers/subsystem/processing/digital_clock.dm index 6981e785d1c..4146a2c857f 100644 --- a/code/controllers/subsystem/processing/digital_clock.dm +++ b/code/controllers/subsystem/processing/digital_clock.dm @@ -1,5 +1,5 @@ /// The subsystem used to tick digital clocks PROCESSING_SUBSYSTEM_DEF(digital_clock) name = "Digital Clocks" - flags = SS_NO_INIT|SS_BACKGROUND|SS_KEEP_TIMING + ss_flags = SS_NO_INIT|SS_BACKGROUND|SS_KEEP_TIMING wait = 1 SECONDS diff --git a/code/controllers/subsystem/processing/fire_burning.dm b/code/controllers/subsystem/processing/fire_burning.dm index 6cde5e3c34f..35b794b5f54 100644 --- a/code/controllers/subsystem/processing/fire_burning.dm +++ b/code/controllers/subsystem/processing/fire_burning.dm @@ -2,5 +2,5 @@ PROCESSING_SUBSYSTEM_DEF(burning) name = "Burning" priority = FIRE_PRIORITY_BURNING - flags = SS_NO_INIT|SS_BACKGROUND + ss_flags = SS_NO_INIT|SS_BACKGROUND runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME diff --git a/code/controllers/subsystem/processing/fishing.dm b/code/controllers/subsystem/processing/fishing.dm index 5283560a5a5..9c048a7724f 100644 --- a/code/controllers/subsystem/processing/fishing.dm +++ b/code/controllers/subsystem/processing/fishing.dm @@ -4,7 +4,7 @@ PROCESSING_SUBSYSTEM_DEF(fishing) dependencies = list( /datum/controller/subsystem/atoms, ) - flags = SS_BACKGROUND + ss_flags = SS_BACKGROUND wait = 0.05 SECONDS // If you raise it to 0.1 SECONDS, you better also modify [datum/fish_movement/move_fish()] ///A list of cached fish icons var/list/cached_fish_icons diff --git a/code/controllers/subsystem/processing/greyscale.dm b/code/controllers/subsystem/processing/greyscale.dm index 03b19ac2eff..551f7a12e49 100644 --- a/code/controllers/subsystem/processing/greyscale.dm +++ b/code/controllers/subsystem/processing/greyscale.dm @@ -1,6 +1,6 @@ PROCESSING_SUBSYSTEM_DEF(greyscale) name = "Greyscale" - flags = SS_BACKGROUND + ss_flags = SS_BACKGROUND wait = 3 SECONDS init_stage = INITSTAGE_EARLY var/list/datum/greyscale_config/configurations = list() diff --git a/code/controllers/subsystem/processing/instruments.dm b/code/controllers/subsystem/processing/instruments.dm index 9cd8706e0c4..197c16047b7 100644 --- a/code/controllers/subsystem/processing/instruments.dm +++ b/code/controllers/subsystem/processing/instruments.dm @@ -1,7 +1,7 @@ PROCESSING_SUBSYSTEM_DEF(instruments) name = "Instruments" wait = 0.5 - flags = SS_KEEP_TIMING + ss_flags = SS_KEEP_TIMING priority = FIRE_PRIORITY_INSTRUMENTS /// List of all instrument data, associative id = datum var/static/list/datum/instrument/instrument_data = list() diff --git a/code/controllers/subsystem/processing/newplayer.dm b/code/controllers/subsystem/processing/newplayer.dm index e7537da5ead..8b12cb5bf31 100644 --- a/code/controllers/subsystem/processing/newplayer.dm +++ b/code/controllers/subsystem/processing/newplayer.dm @@ -1,5 +1,5 @@ PROCESSING_SUBSYSTEM_DEF(newplayer_info) name = "New Player Info" - flags = SS_NO_INIT | SS_BACKGROUND + ss_flags = SS_NO_INIT | SS_BACKGROUND wait = 1 SECONDS runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT diff --git a/code/controllers/subsystem/processing/obj.dm b/code/controllers/subsystem/processing/obj.dm index 3566e8a4dc2..c5eb6e3374c 100644 --- a/code/controllers/subsystem/processing/obj.dm +++ b/code/controllers/subsystem/processing/obj.dm @@ -1,5 +1,5 @@ PROCESSING_SUBSYSTEM_DEF(obj) name = "Objects" priority = FIRE_PRIORITY_OBJ - flags = SS_NO_INIT + ss_flags = SS_NO_INIT wait = 2 SECONDS diff --git a/code/controllers/subsystem/processing/personality.dm b/code/controllers/subsystem/processing/personality.dm index 0f9c1021bef..8b642edd84a 100644 --- a/code/controllers/subsystem/processing/personality.dm +++ b/code/controllers/subsystem/processing/personality.dm @@ -1,7 +1,7 @@ PROCESSING_SUBSYSTEM_DEF(personalities) name = "Personalities" runlevels = RUNLEVEL_GAME - flags = SS_BACKGROUND|SS_POST_FIRE_TIMING + ss_flags = SS_BACKGROUND|SS_POST_FIRE_TIMING wait = 3 SECONDS /// All personality singletons indexed by their type diff --git a/code/controllers/subsystem/processing/plumbing.dm b/code/controllers/subsystem/processing/plumbing.dm index 34d6d8f882e..5a9204edf64 100644 --- a/code/controllers/subsystem/processing/plumbing.dm +++ b/code/controllers/subsystem/processing/plumbing.dm @@ -2,4 +2,4 @@ PROCESSING_SUBSYSTEM_DEF(plumbing) name = "Plumbing" wait = 10 stat_tag = "FD" //its actually Fluid Ducts - flags = SS_NO_INIT + ss_flags = SS_NO_INIT diff --git a/code/controllers/subsystem/processing/priority_effects.dm b/code/controllers/subsystem/processing/priority_effects.dm index f3be081ec50..51274cbfefd 100644 --- a/code/controllers/subsystem/processing/priority_effects.dm +++ b/code/controllers/subsystem/processing/priority_effects.dm @@ -1,6 +1,6 @@ PROCESSING_SUBSYSTEM_DEF(priority_effects) name = "Priority Status Effects" - flags = SS_KEEP_TIMING | SS_NO_INIT + ss_flags = SS_KEEP_TIMING | SS_NO_INIT wait = 0.2 SECONDS // Same as SSfastprocess, but can be anything, assuming you refactor all high-priority status effect intervals and durations to be a multiple of it. priority = FIRE_PRIORITY_PRIORITY_EFFECTS stat_tag = "PEFF" diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm index d2b25521168..4338ae420d9 100644 --- a/code/controllers/subsystem/processing/processing.dm +++ b/code/controllers/subsystem/processing/processing.dm @@ -3,7 +3,7 @@ SUBSYSTEM_DEF(processing) name = "Processing" priority = FIRE_PRIORITY_PROCESS - flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT + ss_flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT wait = 1 SECONDS var/stat_tag = "P" //Used for logging diff --git a/code/controllers/subsystem/processing/projectiles.dm b/code/controllers/subsystem/processing/projectiles.dm index 0124296a3a2..75c0e20ccf8 100644 --- a/code/controllers/subsystem/processing/projectiles.dm +++ b/code/controllers/subsystem/processing/projectiles.dm @@ -2,7 +2,7 @@ PROCESSING_SUBSYSTEM_DEF(projectiles) name = "Projectiles" wait = 1 stat_tag = "PP" - flags = SS_NO_INIT|SS_TICKER + ss_flags = SS_NO_INIT|SS_TICKER /* * Maximum amount of pixels a projectile can pass per tick *unless* its a hitscan projectile. * This prevents projectiles from turning into essentially hitscans if SSprojectiles starts chugging diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 1d7725dffe8..5c4239962b2 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -44,7 +44,7 @@ GLOBAL_LIST_INIT(quirk_string_blacklist, generate_quirk_string_blacklist()) // - Quirk datums are stored and hold different effects, as well as being a vector for applying trait string PROCESSING_SUBSYSTEM_DEF(quirks) name = "Quirks" - flags = SS_BACKGROUND + ss_flags = SS_BACKGROUND runlevels = RUNLEVEL_GAME wait = 1 SECONDS diff --git a/code/controllers/subsystem/processing/reagents.dm b/code/controllers/subsystem/processing/reagents.dm index b116d859709..2891a4cdd67 100644 --- a/code/controllers/subsystem/processing/reagents.dm +++ b/code/controllers/subsystem/processing/reagents.dm @@ -4,7 +4,7 @@ PROCESSING_SUBSYSTEM_DEF(reagents) name = "Reagents" priority = FIRE_PRIORITY_REAGENTS wait = 0.25 SECONDS //You might think that rate_up_lim has to be set to half, but since everything is normalised around seconds_per_tick, it automatically adjusts it to be per second. Magic! - flags = SS_KEEP_TIMING + ss_flags = SS_KEEP_TIMING runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME init_stage = INITSTAGE_EARLY ///What time was it when we last ticked diff --git a/code/controllers/subsystem/processing/station.dm b/code/controllers/subsystem/processing/station.dm index c19e04559cd..382a531f398 100644 --- a/code/controllers/subsystem/processing/station.dm +++ b/code/controllers/subsystem/processing/station.dm @@ -1,6 +1,6 @@ PROCESSING_SUBSYSTEM_DEF(station) name = "Station" - flags = SS_BACKGROUND + ss_flags = SS_BACKGROUND runlevels = RUNLEVEL_GAME wait = 5 SECONDS diff --git a/code/controllers/subsystem/processing/turrets.dm b/code/controllers/subsystem/processing/turrets.dm index 34f128b5c22..f7818a8f2a2 100644 --- a/code/controllers/subsystem/processing/turrets.dm +++ b/code/controllers/subsystem/processing/turrets.dm @@ -1,6 +1,6 @@ /// The subsystem used for portable turrets, as they're relatively more intensive compared to most other machines, so we don't want them hogging tick usage from everything else. PROCESSING_SUBSYSTEM_DEF(turrets) name = "Turret Processing" - flags = SS_NO_INIT | SS_KEEP_TIMING + ss_flags = SS_NO_INIT | SS_KEEP_TIMING wait = 2 SECONDS runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME diff --git a/code/controllers/subsystem/queuelinks.dm b/code/controllers/subsystem/queuelinks.dm index 20b55622931..781d863f651 100644 --- a/code/controllers/subsystem/queuelinks.dm +++ b/code/controllers/subsystem/queuelinks.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(queuelinks) name = "Queue Links" - flags = SS_NO_FIRE | SS_NO_INIT + ss_flags = SS_NO_FIRE | SS_NO_INIT ///assoc list of pending queues, id = /datum/queue_link var/list/queues = list() diff --git a/code/controllers/subsystem/radiation.dm b/code/controllers/subsystem/radiation.dm index 316331db7c9..31e06b1afe1 100644 --- a/code/controllers/subsystem/radiation.dm +++ b/code/controllers/subsystem/radiation.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(radiation) name = "Radiation" - flags = SS_BACKGROUND | SS_NO_INIT + ss_flags = SS_BACKGROUND | SS_NO_INIT wait = 0.5 SECONDS diff --git a/code/controllers/subsystem/radioactive_nebula.dm b/code/controllers/subsystem/radioactive_nebula.dm index 0778725accb..44a908bbb3f 100644 --- a/code/controllers/subsystem/radioactive_nebula.dm +++ b/code/controllers/subsystem/radioactive_nebula.dm @@ -7,7 +7,7 @@ SUBSYSTEM_DEF(radioactive_nebula) dependencies = list( /datum/controller/subsystem/processing/station, ) - flags = SS_BACKGROUND + ss_flags = SS_BACKGROUND wait = 30 SECONDS VAR_PRIVATE diff --git a/code/controllers/subsystem/restaurant.dm b/code/controllers/subsystem/restaurant.dm index 034a7610cb6..c22c9163fbb 100644 --- a/code/controllers/subsystem/restaurant.dm +++ b/code/controllers/subsystem/restaurant.dm @@ -5,7 +5,7 @@ This subsystem exists to serve as a holder for important info for the restaurant SUBSYSTEM_DEF(restaurant) name = "Restaurant" wait = 20 SECONDS //Roll for new guests but don't do it too fast. - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE ///All venues that exist, assoc list of type - reference var/list/all_venues = list() ///All customer data datums that exist, assoc list of type - reference diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index c4428f297ae..44a13093a7f 100644 --- a/code/controllers/subsystem/server_maint.dm +++ b/code/controllers/subsystem/server_maint.dm @@ -3,7 +3,7 @@ SUBSYSTEM_DEF(server_maint) name = "Server Tasks" wait = 6 - flags = SS_POST_FIRE_TIMING + ss_flags = SS_POST_FIRE_TIMING priority = FIRE_PRIORITY_SERVER_MAINT init_stage = INITSTAGE_EARLY runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 7b1ba551a8e..0553cc6d565 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -14,7 +14,7 @@ SUBSYSTEM_DEF(shuttle) /datum/controller/subsystem/atoms, /datum/controller/subsystem/air, ) - flags = SS_KEEP_TIMING + ss_flags = SS_KEEP_TIMING runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME /// A list of all the mobile docking ports. diff --git a/code/controllers/subsystem/skills.dm b/code/controllers/subsystem/skills.dm index 0ece2ac2aaa..0a7ac5383ed 100644 --- a/code/controllers/subsystem/skills.dm +++ b/code/controllers/subsystem/skills.dm @@ -4,7 +4,7 @@ This subsystem mostly exists to populate and manage the skill singletons. SUBSYSTEM_DEF(skills) name = "Skills" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE ///Dictionary of skill.type || skill ref var/list/all_skills = list() ///List of level names with index corresponding to skill level diff --git a/code/controllers/subsystem/sounds.dm b/code/controllers/subsystem/sounds.dm index 5dd2c985f97..db3f94a080b 100644 --- a/code/controllers/subsystem/sounds.dm +++ b/code/controllers/subsystem/sounds.dm @@ -2,7 +2,7 @@ SUBSYSTEM_DEF(sounds) name = "Sounds" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE init_stage = INITSTAGE_EARLY var/static/using_channels_max = CHANNEL_HIGHEST_AVAILABLE //BYOND max channels /// Amount of channels to reserve for random usage rather than reservations being allowed to reserve all channels. Also a nice safeguard for when someone screws up. diff --git a/code/controllers/subsystem/sprite_accessories.dm b/code/controllers/subsystem/sprite_accessories.dm index 2ceed1d3fbb..5173960a3ff 100644 --- a/code/controllers/subsystem/sprite_accessories.dm +++ b/code/controllers/subsystem/sprite_accessories.dm @@ -14,7 +14,7 @@ /// A sprite accessory is something that we add to a human sprite to make them look different. This is hair, facial hair, underwear, mutant bits, etc. SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity name = "Sprite Accessories" - flags = SS_NO_FIRE | SS_NO_INIT + ss_flags = SS_NO_FIRE | SS_NO_INIT // HOLY SHIT COMPACT THIS INTO ASSOCIATED LISTS SO WE STOP ADDING VARIABLES //Hairstyles diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 48f1cc1b313..27c0b2d597d 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -3,7 +3,7 @@ SUBSYSTEM_DEF(statpanels) wait = 4 priority = FIRE_PRIORITY_STATPANEL runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY - flags = SS_NO_INIT + ss_flags = SS_NO_INIT var/list/currentrun = list() var/list/global_data var/list/mc_data diff --git a/code/controllers/subsystem/stickyban.dm b/code/controllers/subsystem/stickyban.dm index 8a955b2fb0d..e19c574a9fa 100644 --- a/code/controllers/subsystem/stickyban.dm +++ b/code/controllers/subsystem/stickyban.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(stickyban) name = "PRISM" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE var/list/cache = list() var/list/dbcache = list() diff --git a/code/controllers/subsystem/tcgsetup.dm b/code/controllers/subsystem/tcgsetup.dm index 5904c821e79..0a4914ec97c 100644 --- a/code/controllers/subsystem/tcgsetup.dm +++ b/code/controllers/subsystem/tcgsetup.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(trading_card_game) name = "Trading Card Game" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE /// Base directory for all related string files var/card_directory = "strings/tcg" /// List of card files to load diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm index ea8b02e8129..9f5d518b6c2 100644 --- a/code/controllers/subsystem/tgui.dm +++ b/code/controllers/subsystem/tgui.dm @@ -13,7 +13,7 @@ SUBSYSTEM_DEF(tgui) name = "tgui" wait = 9 - flags = SS_NO_INIT + ss_flags = SS_NO_INIT priority = FIRE_PRIORITY_TGUI runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 95c6923269f..db7512a6271 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -5,7 +5,7 @@ SUBSYSTEM_DEF(throwing) name = "Throwing" priority = FIRE_PRIORITY_THROWING wait = 1 - flags = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER + ss_flags = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME var/list/currentrun diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 92e0390d63e..6bd850c3d08 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -4,7 +4,7 @@ SUBSYSTEM_DEF(ticker) name = "Ticker" priority = FIRE_PRIORITY_TICKER - flags = SS_KEEP_TIMING + ss_flags = SS_KEEP_TIMING runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME /// state of current round (used by process()) Use the defines GAME_STATE_* ! diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index ef6826396c2..a9f3d9dcd34 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -18,7 +18,7 @@ SUBSYSTEM_DEF(timer) name = "Timer" wait = 1 // SS_TICKER subsystem, so wait is in ticks priority = FIRE_PRIORITY_TIMER - flags = SS_TICKER|SS_NO_INIT + ss_flags = SS_TICKER|SS_NO_INIT /// Queue used for storing timers that do not fit into the current buckets var/list/datum/timedevent/second_queue = list() diff --git a/code/controllers/subsystem/title.dm b/code/controllers/subsystem/title.dm index 8ced977dea2..4b8e12aa4c7 100644 --- a/code/controllers/subsystem/title.dm +++ b/code/controllers/subsystem/title.dm @@ -1,6 +1,6 @@ SUBSYSTEM_DEF(title) name = "Title Screen" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE init_stage = INITSTAGE_EARLY var/file_path var/icon/icon diff --git a/code/controllers/subsystem/traitor.dm b/code/controllers/subsystem/traitor.dm index ad765dd916b..edb0f237f5e 100644 --- a/code/controllers/subsystem/traitor.dm +++ b/code/controllers/subsystem/traitor.dm @@ -4,7 +4,7 @@ SUBSYSTEM_DEF(traitor) /datum/controller/subsystem/mapping, /datum/controller/subsystem/atoms, ) - flags = SS_KEEP_TIMING + ss_flags = SS_KEEP_TIMING wait = 10 SECONDS runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME diff --git a/code/controllers/subsystem/tts.dm b/code/controllers/subsystem/tts.dm index 15c57b15e5d..12d904af246 100644 --- a/code/controllers/subsystem/tts.dm +++ b/code/controllers/subsystem/tts.dm @@ -156,7 +156,7 @@ SUBSYSTEM_DEF(tts) /datum/controller/subsystem/tts/fire(resumed) if(!tts_enabled) - flags |= SS_NO_FIRE + ss_flags |= SS_NO_FIRE return if(!resumed) diff --git a/code/controllers/subsystem/tutorials.dm b/code/controllers/subsystem/tutorials.dm index ceb1fa78786..b03af66028d 100644 --- a/code/controllers/subsystem/tutorials.dm +++ b/code/controllers/subsystem/tutorials.dm @@ -1,7 +1,7 @@ /// Namespace for housing code relating to giving contextual tutorials to users. SUBSYSTEM_DEF(tutorials) name = "Tutorials" - flags = SS_NO_FIRE + ss_flags = SS_NO_FIRE /// A mapping of /datum/tutorial type to their manager singleton. /// You probably shouldn't be indexing this directly. diff --git a/code/controllers/subsystem/unplanned_controllers.dm b/code/controllers/subsystem/unplanned_controllers.dm index 49fbcb2e83b..e2e78e0951e 100644 --- a/code/controllers/subsystem/unplanned_controllers.dm +++ b/code/controllers/subsystem/unplanned_controllers.dm @@ -2,7 +2,7 @@ GLOBAL_LIST_EMPTY(unplanned_controller_subsystems) /// Handles making mobs perform lightweight "idle" behaviors such as wandering around when they have nothing planned SUBSYSTEM_DEF(unplanned_controllers) name = "Unplanned AI Controllers" - flags = SS_POST_FIRE_TIMING|SS_BACKGROUND + ss_flags = SS_POST_FIRE_TIMING|SS_BACKGROUND priority = FIRE_PRIORITY_UNPLANNED_NPC dependencies = list( /datum/controller/subsystem/movement/ai_movement, diff --git a/code/controllers/subsystem/verb_manager.dm b/code/controllers/subsystem/verb_manager.dm index f09c0509641..0949033ab17 100644 --- a/code/controllers/subsystem/verb_manager.dm +++ b/code/controllers/subsystem/verb_manager.dm @@ -22,7 +22,7 @@ SUBSYSTEM_DEF(verb_manager) name = "Verb Manager" wait = 1 - flags = SS_TICKER | SS_NO_INIT + ss_flags = SS_TICKER | SS_NO_INIT priority = FIRE_PRIORITY_DELAYED_VERBS runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT @@ -120,7 +120,7 @@ SUBSYSTEM_DEF(verb_manager) return TRUE if((usr.client?.holder && !can_queue_admin_verbs) \ - || (!initialized && !(flags & SS_NO_INIT)) \ + || (!initialized && !(ss_flags & SS_NO_INIT)) \ || FOR_ADMINS_IF_VERBS_FUCKED_immediately_execute_all_verbs \ || !(runlevels & Master.current_runlevel)) return FALSE diff --git a/code/controllers/subsystem/vis_overlays.dm b/code/controllers/subsystem/vis_overlays.dm index 717455a77bc..9a4d0c6f08e 100644 --- a/code/controllers/subsystem/vis_overlays.dm +++ b/code/controllers/subsystem/vis_overlays.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(vis_overlays) name = "Vis contents overlays" wait = 1 MINUTES - flags = SS_NO_INIT + ss_flags = SS_NO_INIT priority = FIRE_PRIORITY_VIS var/list/vis_overlay_cache = list() diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 776c787f0a4..0d5678a4abe 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -4,7 +4,7 @@ SUBSYSTEM_DEF(vote) name = "Vote" wait = 1 SECONDS - flags = SS_KEEP_TIMING + ss_flags = SS_KEEP_TIMING runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT /// A list of all generated action buttons diff --git a/code/controllers/subsystem/wardrobe.dm b/code/controllers/subsystem/wardrobe.dm index 4f25ff47d1c..f394c9b30d2 100644 --- a/code/controllers/subsystem/wardrobe.dm +++ b/code/controllers/subsystem/wardrobe.dm @@ -8,7 +8,7 @@ SUBSYSTEM_DEF(wardrobe) name = "Wardrobe" wait = 10 // This is more like a queue then anything else - flags = SS_BACKGROUND + ss_flags = SS_BACKGROUND dependencies = list( /datum/controller/subsystem/atoms, /datum/controller/subsystem/mapping, diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index c330455fb15..7a89236e08a 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -1,7 +1,7 @@ /// Used for all kinds of weather, ex. lavaland ash storms. SUBSYSTEM_DEF(weather) name = "Weather" - flags = SS_BACKGROUND + ss_flags = SS_BACKGROUND dependencies = list( /datum/controller/subsystem/mapping, ) diff --git a/code/modules/escape_menu/subsystem.dm b/code/modules/escape_menu/subsystem.dm index f75726514ec..a692a9d1f8e 100644 --- a/code/modules/escape_menu/subsystem.dm +++ b/code/modules/escape_menu/subsystem.dm @@ -1,6 +1,6 @@ /// Subsystem for controlling anything related to the escape menu PROCESSING_SUBSYSTEM_DEF(escape_menu) name = "Escape Menu" - flags = SS_NO_INIT + ss_flags = SS_NO_INIT runlevels = ALL wait = 2 SECONDS diff --git a/code/modules/lootpanel/ss_looting.dm b/code/modules/lootpanel/ss_looting.dm index 94e12f88f95..eb8cff36e69 100644 --- a/code/modules/lootpanel/ss_looting.dm +++ b/code/modules/lootpanel/ss_looting.dm @@ -2,7 +2,7 @@ /// Queues image generation for search objects without icons SUBSYSTEM_DEF(looting) name = "Loot Icon Generation" - flags = SS_NO_INIT + ss_flags = SS_NO_INIT priority = FIRE_PRIORITY_PROCESS runlevels = RUNLEVEL_LOBBY|RUNLEVELS_DEFAULT wait = 0.5 SECONDS diff --git a/code/modules/research/techweb/__techweb_helpers.dm b/code/modules/research/techweb/__techweb_helpers.dm index d1d3b6ecfde..34c076d5946 100644 --- a/code/modules/research/techweb/__techweb_helpers.dm +++ b/code/modules/research/techweb/__techweb_helpers.dm @@ -34,6 +34,6 @@ for(var/i in pointlist) var/research_line = "[(i in SSresearch.point_types) || "ERRORED POINT TYPE"]: [pointlist[i]]" if(last_pointlist[i] > 0) - research_line += " (+[(last_pointlist[i]) * ((SSresearch.flags & SS_TICKER)? (600 / (world.tick_lag * SSresearch.wait)) : (600 / SSresearch.wait))]/ minute)" + research_line += " (+[(last_pointlist[i]) * ((SSresearch.ss_flags & SS_TICKER)? (600 / (world.tick_lag * SSresearch.wait)) : (600 / SSresearch.wait))]/ minute)" ret += research_line return ret.Join("
") diff --git a/code/modules/unit_tests/subsystem_init.dm b/code/modules/unit_tests/subsystem_init.dm index 82c9fc956fb..f5168079a90 100644 --- a/code/modules/unit_tests/subsystem_init.dm +++ b/code/modules/unit_tests/subsystem_init.dm @@ -3,12 +3,12 @@ /datum/unit_test/subsystem_init/Run() for(var/datum/controller/subsystem/subsystem as anything in Master.subsystems) - if(subsystem.flags & SS_NO_INIT) + if(subsystem.ss_flags & SS_NO_INIT) continue if(subsystem.initialized) continue - var/should_fail = !(subsystem.flags & SS_OK_TO_FAIL_INIT) + var/should_fail = !(subsystem.ss_flags & SS_OK_TO_FAIL_INIT) var/list/message_strings = list("[subsystem] ([subsystem.type]) is a subsystem meant to initialize but could not get initialized.") if(!isnull(subsystem.initialization_failure_message))