sync

code/controllers/configuration.dm

@@ -275,7 +275,7 @@
 
 		if(M.config_tag)
 			if(!(M.config_tag in modes))		// ensure each mode is added only once
-				GLOB.config_error_log << "Adding game mode [M.name] ([M.config_tag]) to configuration."
+				WRITE_FILE(GLOB.config_error_log, "Adding game mode [M.name] ([M.config_tag]) to configuration.")
 				modes += M.config_tag
 				mode_names[M.config_tag] = M.name
 				probabilities[M.config_tag] = M.probability
@@ -549,7 +549,7 @@
 				if("irc_announce_new_game")
 					irc_announce_new_game = TRUE
 				else
-					GLOB.config_error_log << "Unknown setting in configuration: '[name]'"
+					WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'")
 
 		else if(type == "game_options")
 			switch(name)
@@ -612,13 +612,13 @@
 					if(mode_name in modes)
 						continuous[mode_name] = 1
 					else
-						GLOB.config_error_log << "Unknown continuous configuration definition: [mode_name]."
+						WRITE_FILE(GLOB.config_error_log, "Unknown continuous configuration definition: [mode_name].")
 				if("midround_antag")
 					var/mode_name = lowertext(value)
 					if(mode_name in modes)
 						midround_antag[mode_name] = 1
 					else
-						GLOB.config_error_log << "Unknown midround antagonist configuration definition: [mode_name]."
+						WRITE_FILE(GLOB.config_error_log, "Unknown midround antagonist configuration definition: [mode_name].")
 				if("midround_antag_time_check")
 					midround_antag_time_check = text2num(value)
 				if("midround_antag_life_check")
@@ -634,9 +634,9 @@
 						if(mode_name in modes)
 							min_pop[mode_name] = text2num(mode_value)
 						else
-							GLOB.config_error_log << "Unknown minimum population configuration definition: [mode_name]."
+							WRITE_FILE(GLOB.config_error_log, "Unknown minimum population configuration definition: [mode_name].")
 					else
-						GLOB.config_error_log << "Incorrect minimum population configuration definition: [mode_name]  [mode_value]."
+						WRITE_FILE(GLOB.config_error_log, "Incorrect minimum population configuration definition: [mode_name]  [mode_value].")
 				if("max_pop")
 					var/pop_pos = findtext(value, " ")
 					var/mode_name = null
@@ -648,9 +648,9 @@
 						if(mode_name in modes)
 							max_pop[mode_name] = text2num(mode_value)
 						else
-							GLOB.config_error_log << "Unknown maximum population configuration definition: [mode_name]."
+							WRITE_FILE(GLOB.config_error_log, "Unknown maximum population configuration definition: [mode_name].")
 					else
-						GLOB.config_error_log << "Incorrect maximum population configuration definition: [mode_name]  [mode_value]."
+						WRITE_FILE(GLOB.config_error_log, "Incorrect maximum population configuration definition: [mode_name]  [mode_value].")
 				if("shuttle_refuel_delay")
 					shuttle_refuel_delay     = text2num(value)
 				if("show_game_type_odds")
@@ -678,9 +678,9 @@
 						if(prob_name in modes)
 							probabilities[prob_name] = text2num(prob_value)
 						else
-							GLOB.config_error_log << "Unknown game mode probability configuration definition: [prob_name]."
+							WRITE_FILE(GLOB.config_error_log, "Unknown game mode probability configuration definition: [prob_name].")
 					else
-						GLOB.config_error_log << "Incorrect probability configuration definition: [prob_name]  [prob_value]."
+						WRITE_FILE(GLOB.config_error_log, "Incorrect probability configuration definition: [prob_name]  [prob_value].")
 
 				if("protect_roles_from_antagonist")
 					protect_roles_from_antagonist	= 1
@@ -727,7 +727,7 @@
 					// Value is in the form "LAWID,NUMBER"
 					var/list/L = splittext(value, ",")
 					if(L.len != 2)
-						GLOB.config_error_log << "Invalid LAW_WEIGHT: " + t
+						WRITE_FILE(GLOB.config_error_log, "Invalid LAW_WEIGHT: " + t)
 						continue
 					var/lawid = L[1]
 					var/weight = text2num(L[2])
@@ -782,7 +782,7 @@
 				if("mice_roundstart")
 					mice_roundstart = text2num(value)
 				else
-					GLOB.config_error_log << "Unknown setting in configuration: '[name]'"
+					WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'")
 		else if(type == "policies")
 			policies[name] = value
 
@@ -840,7 +840,7 @@
 			if ("disabled")
 				currentmap = null
 			else
-				GLOB.config_error_log << "Unknown command in map vote config: '[command]'"
+				WRITE_FILE(GLOB.config_error_log, "Unknown command in map vote config: '[command]'")
 
 
 /datum/configuration/proc/loadsql(filename)
@@ -884,7 +884,7 @@
 			if("feedback_tableprefix")
 				global.sqlfdbktableprefix = value
 			else
-				GLOB.config_error_log << "Unknown setting in configuration: '[name]'"
+				WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'")
 
 /datum/configuration/proc/pick_mode(mode_name)
 	// I wish I didn't have to instance the game modes in order to look up

code/controllers/hooks-defs.dm

@@ -68,14 +68,14 @@
 /**
  * Employee reassignment hook.
  * Called in card.dm when someone's card is reassigned at the HoP's desk.
- * Parameters: var/obj/item/weapon/card/id
+ * Parameters: var/obj/item/card/id
  */
 /hook/reassign_employee
 
 /**
  * Employee terminated hook.
  * Called in card.dm when someone's card is terminated at the HoP's desk.
- * Parameters: var/obj/item/weapon/card/id
+ * Parameters: var/obj/item/card/id
  */
 /hook/terminate_employee
 

code/controllers/master.dm

@@ -53,7 +53,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	var/static/restart_clear = 0
 	var/static/restart_timeout = 0
 	var/static/restart_count = 0
-	
+
 	//current tick limit, assigned before running a subsystem.
 	//used by CHECK_TICK as well so that the procs subsystems call can obey that SS's tick limits
 	var/static/current_ticklimit = TICK_LIMIT_RUNNING
@@ -131,7 +131,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 				FireHim = TRUE
 			if(3)
 				msg = "The [BadBoy.name] subsystem seems to be destabilizing the MC and will be offlined."
-				BadBoy.flags |= SS_NO_FIRE
+				BadBoy.flags_1 |= SS_NO_FIRE
 		if(msg)
 			to_chat(GLOB.admins, "<span class='boldannounce'>[msg]</span>")
 			log_world(msg)
@@ -167,7 +167,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	// Initialize subsystems.
 	current_ticklimit = config.tick_limit_mc_init
 	for (var/datum/controller/subsystem/SS in subsystems)
-		if (SS.flags & SS_NO_INIT)
+		if (SS.flags_1 & SS_NO_INIT)
 			continue
 		SS.Initialize(REALTIMEOFDAY)
 		CHECK_TICK
@@ -232,13 +232,13 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 	var/timer = world.time
 	for (var/thing in subsystems)
 		var/datum/controller/subsystem/SS = thing
-		if (SS.flags & SS_NO_FIRE)
+		if (SS.flags_1 & SS_NO_FIRE)
 			continue
 		SS.queued_time = 0
 		SS.queue_next = null
 		SS.queue_prev = null
 		SS.state = SS_IDLE
-		if (SS.flags & SS_TICKER)
+		if (SS.flags_1 & SS_TICKER)
 			tickersubsystems += SS
 			timer += world.tick_lag * rand(1, 5)
 			SS.next_fire = timer
@@ -371,7 +371,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 			continue
 		if (SS.next_fire > world.time)
 			continue
-		SS_flags = SS.flags
+		SS_flags = SS.flags_1
 		if (SS_flags & SS_NO_FIRE)
 			subsystemstocheck -= SS
 			continue
@@ -408,7 +408,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 			if (ran && world.tick_usage > TICK_LIMIT_RUNNING)
 				break
 
-			queue_node_flags = queue_node.flags
+			queue_node_flags = queue_node.flags_1
 			queue_node_priority = queue_node.queued_priority
 
 			//super special case, subsystems where we can't make them pause mid way through

code/controllers/subsystem.dm

@@ -6,7 +6,7 @@
 	var/wait = 20			//time to wait (in deciseconds) between each call to fire(). Must be a positive integer.
 	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)
+	var/flags_1 = 0			//see MC.dm in __DEFINES Most flags_1 must be set on world start to take full effect. (You can also restart the mc to force them to process again)
 
 	//set to 0 to prevent fire() calls, mostly for admin use or subsystems that may be resumed later
 	//	use the SS_NO_FIRE flag instead for systems that never fire to keep it from even being added to the list
@@ -61,13 +61,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 = 0)
-	flags |= SS_NO_FIRE
+	flags_1 |= SS_NO_FIRE
 	throw EXCEPTION("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
+	flags_1 |= SS_NO_FIRE
 	Master.subsystems -= src
 
 
@@ -76,14 +76,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 = flags_1
 	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.flags_1
 
 		if (queue_node_flags & SS_TICKER)
 			if (!(SS_flags & SS_TICKER))
@@ -170,7 +170,7 @@
 
 
 
-	if(can_fire && !(SS_NO_FIRE in flags))
+	if(can_fire && !(SS_NO_FIRE in flags_1))
 		msg = "[round(cost,1)]ms|[round(tick_usage,1)]%([round(tick_overrun,1)]%)|[round(ticks,0.1)]\t[msg]"
 	else
 		msg = "OFFLINE\t[msg]"

code/controllers/subsystem/acid.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(acid)
 	name = "Acid"
 	priority = 40
-	flags = SS_NO_INIT|SS_BACKGROUND
+	flags_1 = SS_NO_INIT|SS_BACKGROUND
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/currentrun = list()

code/controllers/subsystem/air.dm

@@ -11,7 +11,7 @@ SUBSYSTEM_DEF(air)
 	init_order = INIT_ORDER_AIR
 	priority = 20
 	wait = 5
-	flags = SS_BACKGROUND
+	flags_1 = SS_BACKGROUND
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/cost_turfs = 0

code/controllers/subsystem/assets.dm

@@ -1,14 +1,17 @@
 SUBSYSTEM_DEF(assets)
 	name = "Assets"
 	init_order = INIT_ORDER_ASSETS
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 	var/list/cache = list()
+	var/list/preload = list()
 
 /datum/controller/subsystem/assets/Initialize(timeofday)
 	for(var/type in typesof(/datum/asset) - list(/datum/asset, /datum/asset/simple))
 		var/datum/asset/A = new type()
 		A.register()
 
+	preload = cache.Copy() //don't preload assets generated during the round
+
 	for(var/client/C in GLOB.clients)
-		addtimer(CALLBACK(GLOBAL_PROC, .proc/getFilesSlow, C, cache, FALSE), 10)
+		addtimer(CALLBACK(GLOBAL_PROC, .proc/getFilesSlow, C, preload, FALSE), 10)
 	..()

code/controllers/subsystem/atoms.dm

@@ -6,7 +6,7 @@
 SUBSYSTEM_DEF(atoms)
 	name = "Atoms"
 	init_order = INIT_ORDER_ATOMS
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 
 	var/initialized = INITIALIZATION_INSSATOMS
 	var/old_initialized
@@ -30,7 +30,7 @@ SUBSYSTEM_DEF(atoms)
 	initialized = INITIALIZATION_INNEW_MAPLOAD
 
 	LAZYINITLIST(late_loaders)
-	
+
 	var/count
 	var/list/mapload_arg = list(TRUE)
 	if(atoms)
@@ -60,10 +60,10 @@ SUBSYSTEM_DEF(atoms)
 			A.LateInitialize()
 		testing("Late initialized [late_loaders.len] atoms")
 		late_loaders.Cut()
-	
+
 	if(atoms)
 		. = created_atoms + atoms
-		created_atoms = null 
+		created_atoms = null
 
 /datum/controller/subsystem/atoms/proc/InitAtom(atom/A, list/arguments)
 	var/the_type = A.type
@@ -77,7 +77,7 @@ SUBSYSTEM_DEF(atoms)
 
 	if(start_tick != world.time)
 		BadInitializeCalls[the_type] |= BAD_INIT_SLEPT
-	
+
 	var/qdeleted = FALSE
 
 	if(result != INITIALIZE_HINT_NORMAL)
@@ -92,12 +92,12 @@ SUBSYSTEM_DEF(atoms)
 				qdeleted = TRUE
 			else
 				BadInitializeCalls[the_type] |= BAD_INIT_NO_HINT
-				
+
 	if(!A)	//possible harddel
 		qdeleted = TRUE
 	else if(!A.initialized)
 		BadInitializeCalls[the_type] |= BAD_INIT_DIDNT_INIT
-	
+
 	return qdeleted || QDELING(A)
 
 /datum/controller/subsystem/atoms/proc/map_loader_begin()

code/controllers/subsystem/augury.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(augury)
 	name = "Augury"
-	flags = SS_NO_INIT
+	flags_1 = SS_NO_INIT
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/watchers = list()

code/controllers/subsystem/blackbox.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(blackbox)
 	name = "Blackbox"
 	wait = 6000
-	flags = SS_NO_TICK_CHECK | SS_NO_INIT
+	flags_1 = SS_NO_TICK_CHECK | SS_NO_INIT
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 	init_order = INIT_ORDER_BLACKBOX
 
@@ -253,19 +253,17 @@ SUBSYSTEM_DEF(blackbox)
 /datum/feedback_variable/proc/get_variable()
 	return variable
 
-/datum/feedback_variable/proc/set_details(text)
-	if (istext(text))
-		details = text
-
-/datum/feedback_variable/proc/add_details(text)
-	if (istext(text))
-		if (!details)
-			details = text
-		else
-			details += " [text]"
+/datum/feedback_variable/proc/set_details(deets)
+	details = "\"[deets]\""
+
+/datum/feedback_variable/proc/add_details(deets)
+	if (!details)
+		set_details(deets)
+	else
+		details += " | \"[deets]\""
 
 /datum/feedback_variable/proc/get_details()
 	return details
 
 /datum/feedback_variable/proc/get_parsed()
-	return list(variable,value,details)
+	return list(variable,value,details)

code/controllers/subsystem/communications.dm

@@ -1,9 +1,9 @@
-#define COMMUNICATION_COOLDOWN 600
-#define COMMUNICATION_COOLDOWN_AI 600
+#define COMMUNICATION_COOLDOWN 300
+#define COMMUNICATION_COOLDOWN_AI 300
 
 SUBSYSTEM_DEF(communications)
 	name = "Communications"
-	flags = SS_NO_INIT | SS_NO_FIRE
+	flags_1 = SS_NO_INIT | SS_NO_FIRE
 
 	var/silicon_message_cooldown
 	var/nonsilicon_message_cooldown

code/controllers/subsystem/dbcore.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(dbcore)
 	name = "Database"
-	flags = SS_NO_INIT|SS_NO_FIRE
+	flags_1 = SS_NO_INIT|SS_NO_FIRE
 	init_order = INIT_ORDER_DBCORE
 	var/const/FAILED_DB_CONNECTION_CUTOFF = 5
 
@@ -251,7 +251,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table
 	var/table
 	var/position //1-based index into item data
 	var/sql_type
-	var/flags
+	var/flags_1
 	var/length
 	var/max_length
 	//types
@@ -275,7 +275,7 @@ Delayed insert mode was removed in mysql 7 and only works with MyISAM type table
 	table = table_handler
 	position = position_handler
 	sql_type = type_handler
-	flags = flag_handler
+	flags_1 = flag_handler
 	length = length_handler
 	max_length = max_length_handler
 

code/controllers/subsystem/disease.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(disease)
 	name = "Disease"
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE | SS_NO_INIT
 
 	var/list/active_diseases = list() //List of Active disease in all mobs; purely for quick referencing.
 	var/list/diseases
@@ -13,4 +13,4 @@ SUBSYSTEM_DEF(disease)
 		diseases = subtypesof(/datum/disease)
 
 /datum/controller/subsystem/disease/stat_entry(msg)
-	..("P:[active_diseases.len]")
+	..("P:[active_diseases.len]")

code/controllers/subsystem/explosion.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(explosion)
 	priority = 99
 	wait = 1
-	flags = SS_TICKER|SS_NO_INIT
+	flags_1 = SS_TICKER|SS_NO_INIT
 
 	var/list/explosions
 
@@ -49,12 +49,12 @@ SUBSYSTEM_DEF(explosion)
 	flame_cap = SSexplosion.flame_cap
 	dyn_ex_scale = SSexplosion.dyn_ex_scale
 
-/datum/controller/subsystem/explosion/fire()    
+/datum/controller/subsystem/explosion/fire()
 	var/list/cached_explosions = explosions
 	var/num_explosions = cached_explosions.len
 	if(!num_explosions)
 		return
-	
+
 	//figure exactly how many tick splits are required
 	var/num_splits
 	if(rebuild_tick_split_count)
@@ -216,7 +216,7 @@ SUBSYSTEM_DEF(explosion)
 
 	started_at = REALTIMEOFDAY
 	tick_started = world.time
-	
+
 	gathered_turfs = list()
 	calculated_turfs = list()
 	unsafe_turfs = list()
@@ -332,13 +332,13 @@ SUBSYSTEM_DEF(explosion)
 
 		for(var/obj/structure/blob/B in T)
 			current_exp_block += B.explosion_block
-		
+
 		L[T] = current_exp_block
 
 		if(MC_TICK_CHECK)
 			E.gathered_turfs.Cut(1, cut_to)
 			return FALSE
-	
+
 	E.gathered_turfs.Cut()
 	return done_gathering_turfs
 
@@ -358,7 +358,7 @@ SUBSYSTEM_DEF(explosion)
 	var/throw_range_max = E.extent
 
 	var/turf/epi = E.epicenter
-	
+
 	var/x0 = epi.x
 	var/y0 = epi.y
 
@@ -407,7 +407,7 @@ SUBSYSTEM_DEF(explosion)
 				var/throw_range = rand(throw_dist, throw_range_max)
 				var/turf/throw_at = get_ranged_target_turf(I, throw_dir, throw_range)
 				I.throw_speed = 4 //Temporarily change their throw_speed for embedding purposes (Resets when it finishes throwing, regardless of hitting anything)
-				I.throw_at(throw_at, throw_range, 4)		
+				I.throw_at(throw_at, throw_range, 4)
 
 		if(MC_TICK_CHECK)
 			var/circumference = (PI * (init_dist + 4) * 2) //+4 to radius to prevent shit gaps
@@ -432,7 +432,7 @@ SUBSYSTEM_DEF(explosion)
 
 	E.finished_at = REALTIMEOFDAY
 	E.tick_finished = world.time
-	
+
 	return TRUE
 
 /client/proc/check_bomb_impacts()

code/controllers/subsystem/fire_burning.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(fire_burning)
 	name = "Fire Burning"
 	priority = 40
-	flags = SS_NO_INIT|SS_BACKGROUND
+	flags_1 = SS_NO_INIT|SS_BACKGROUND
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/currentrun = list()

code/controllers/subsystem/garbage.dm

@@ -1,8 +1,8 @@
 SUBSYSTEM_DEF(garbage)
 	name = "Garbage"
 	priority = 15
-	wait = 5
-	flags = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
+	wait = 20
+	flags_1 = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
 
 	var/collection_timeout = 3000// deciseconds to wait to let running procs finish before we just say fuck it and force del() the object
@@ -67,9 +67,9 @@ SUBSYSTEM_DEF(garbage)
 	HandleToBeQueued()
 	if(state == SS_RUNNING)
 		HandleQueue()
-	
+
 	if (state == SS_PAUSED) //make us wait again before the next run.
-		state = SS_RUNNING 
+		state = SS_RUNNING
 
 //If you see this proc high on the profile, what you are really seeing is the garbage collection/soft delete overhead in byond.
 //Don't attempt to optimize, not worth the effort.
@@ -114,7 +114,7 @@ SUBSYSTEM_DEF(garbage)
 			var/type = A.type
 			testing("GC: -- \ref[A] | [type] was unable to be GC'd and was deleted --")
 			didntgc["[type]"]++
-			
+
 			HardDelete(A)
 
 			++delslasttick
@@ -149,12 +149,12 @@ SUBSYSTEM_DEF(garbage)
 	var/time = world.timeofday
 	var/tick = world.tick_usage
 	var/ticktime = world.time
-	
+
 	var/type = A.type
 	var/refID = "\ref[A]"
-	
+
 	del(A)
-	
+
 	tick = (world.tick_usage-tick+((world.time-ticktime)/world.tick_lag*100))
 	if (tick > highest_del_tickusage)
 		highest_del_tickusage = tick
@@ -167,7 +167,7 @@ SUBSYSTEM_DEF(garbage)
 		log_game("Error: [type]([refID]) took longer than 1 second to delete (took [time/10] seconds to delete)")
 		message_admins("Error: [type]([refID]) took longer than 1 second to delete (took [time/10] seconds to delete).")
 		postpone(time/5)
-	
+
 /datum/controller/subsystem/garbage/proc/HardQueue(datum/A)
 	if (istype(A) && A.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)
 		tobequeued += A

code/controllers/subsystem/icon_smooth.dm

@@ -3,7 +3,7 @@ SUBSYSTEM_DEF(icon_smooth)
 	init_order = INIT_ORDER_ICON_SMOOTHING
 	wait = 1
 	priority = 35
-	flags = SS_TICKER
+	flags_1 = SS_TICKER
 
 	var/list/smooth_queue = list()
 

code/controllers/subsystem/inbounds.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(inbounds)
 	name = "Inbounds"
 	priority = 40
-	flags = SS_NO_INIT
+	flags_1 = SS_NO_INIT
 	runlevels = RUNLEVEL_GAME
 
 	var/list/processing = list()

code/controllers/subsystem/ipintel.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(ipintel)
 	name = "XKeyScore"
 	init_order = INIT_ORDER_XKEYSCORE
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 	var/enabled = 0 //disable at round start to avoid checking reconnects
 	var/throttle = 0
 	var/errors = 0

code/controllers/subsystem/job.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(job)
 	name = "Jobs"
 	init_order = INIT_ORDER_JOBS
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 
 	var/list/occupations = list()		//List of all jobs
 	var/list/name_occupations = list()	//Dict of all jobs, keys are titles

code/controllers/subsystem/language.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(language)
 	name = "Language"
 	init_order = INIT_ORDER_LANGUAGE
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 
 /datum/controller/subsystem/language/Initialize(timeofday)
 	for(var/L in subtypesof(/datum/language))

code/controllers/subsystem/lighting.dm

@@ -6,7 +6,7 @@ SUBSYSTEM_DEF(lighting)
 	name = "Lighting"
 	wait = 2
 	init_order = INIT_ORDER_LIGHTING
-	flags = SS_TICKER
+	flags_1 = SS_TICKER
 
 	var/initialized = FALSE
 
@@ -24,7 +24,7 @@ SUBSYSTEM_DEF(lighting)
 
 		create_all_lighting_objects()
 		initialized = TRUE
-	
+
 	fire(FALSE, TRUE)
 
 	..()

code/controllers/subsystem/machines.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(machines)
 	name = "Machines"
 	init_order = INIT_ORDER_MACHINES
-	flags = SS_KEEP_TIMING
+	flags_1 = SS_KEEP_TIMING
 	var/list/processing = list()
 	var/list/currentrun = list()
 	var/list/powernets = list()

code/controllers/subsystem/mapping.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(mapping)
 	name = "Mapping"
 	init_order = INIT_ORDER_MAPPING
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 
 	var/list/nuke_tiles = list()
 	var/list/nuke_threats = list()
@@ -84,7 +84,7 @@ SUBSYSTEM_DEF(mapping)
 		C.update_icon()
 
 /datum/controller/subsystem/mapping/Recover()
-	flags |= SS_NO_INIT
+	flags_1 |= SS_NO_INIT
 	map_templates = SSmapping.map_templates
 	ruins_templates = SSmapping.ruins_templates
 	space_ruins_templates = SSmapping.space_ruins_templates

code/controllers/subsystem/minimap.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(minimap)
 	name = "Minimap"
 	init_order = INIT_ORDER_MINIMAP
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 	var/const/MINIMAP_SIZE = 2048
 	var/const/TILE_SIZE = 8
 

code/controllers/subsystem/mobs.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(mobs)
 	name = "Mobs"
 	priority = 100
-	flags = SS_KEEP_TIMING|SS_NO_INIT
+	flags_1 = SS_KEEP_TIMING|SS_NO_INIT
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/currentrun = list()

code/controllers/subsystem/npcpool.dm

@@ -5,7 +5,7 @@
 
 SUBSYSTEM_DEF(npcpool)
 	name = "NPC Pool"
-	flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND
+	flags_1 = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND
 	priority = 20
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
@@ -134,12 +134,12 @@ SUBSYSTEM_DEF(npcpool)
 
 		if(facCount == 1 && helpProb)
 			helpProb = 100
-	
+
 		if(prob(helpProb) && candidate.takeDelegate(check,FALSE))
 			--canBeUsed.len
 			candidate.eye_color = "yellow"
 			candidate.update_icons()
-			
+
 		if(!currentrun.len || MC_TICK_CHECK)	//don't change SS state if it isn't necessary
 			return
 

code/controllers/subsystem/orbit.dm

@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(orbit)
 	name = "Orbits"
 	priority = 35
 	wait = 2
-	flags = SS_NO_INIT|SS_TICKER
+	flags_1 = SS_NO_INIT|SS_TICKER
 
 	var/list/currentrun = list()
 	var/list/processing = list()

code/controllers/subsystem/pai.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(pai)
 	name = "pAI"
 
-	flags = SS_NO_INIT|SS_NO_FIRE
+	flags_1 = SS_NO_INIT|SS_NO_FIRE
 
 	var/list/candidates = list()
 	var/ghost_spam = FALSE
@@ -149,7 +149,6 @@ SUBSYSTEM_DEF(pai)
 				continue
 			if(!(ROLE_PAI in G.client.prefs.be_special))
 				continue
-			//G << 'sound/misc/server-ready.ogg' //Alerting them to their consideration
 			to_chat(G, "<span class='ghostalert'>[user] is requesting a pAI personality! Use the pAI button to submit yourself as one.</span>")
 		addtimer(CALLBACK(src, .proc/spam_again), spam_delay)
 	var/list/available = list()

code/controllers/subsystem/parallax.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(parallax)
 	name = "Parallax"
 	wait = 2
-	flags = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT
+	flags_1 = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT
 	priority = 65
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 	var/list/currentrun

code/controllers/subsystem/persistence.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(persistence)
 	name = "Persistence"
 	init_order = INIT_ORDER_PERSISTENCE
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 	var/savefile/secret_satchels
 	var/list/satchel_blacklist 		= list() //this is a typecache
 	var/list/new_secret_satchels 	= list() //these are objects
@@ -22,7 +22,7 @@ SUBSYSTEM_DEF(persistence)
 
 /datum/controller/subsystem/persistence/proc/LoadSatchels()
 	secret_satchels = new /savefile("data/npc_saves/SecretSatchels.sav")
-	satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/weapon/crowbar))
+	satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/crowbar))
 	secret_satchels[SSmapping.config.map_name] >> old_secret_satchels
 
 	var/list/expanded_old_satchels = list()
@@ -38,7 +38,7 @@ SUBSYSTEM_DEF(persistence)
 	var/list/free_satchels = list()
 	for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,ZLEVEL_STATION), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,ZLEVEL_STATION)))) //Nontrivially expensive but it's roundstart only
 		if(isfloorturf(T) && !istype(T, /turf/open/floor/plating/))
-			free_satchels += new /obj/item/weapon/storage/backpack/satchel/flat/secret(T)
+			free_satchels += new /obj/item/storage/backpack/satchel/flat/secret(T)
 			if(!isemptylist(free_satchels) && ((free_satchels.len + placed_satchels) >= (50 - expanded_old_satchels.len) * 0.1)) //up to six tiles, more than enough to kill anything that moves
 				break
 
@@ -49,7 +49,7 @@ SUBSYSTEM_DEF(persistence)
 		satchel_string = pick_n_take(expanded_old_satchels)
 
 	old_secret_satchels = jointext(expanded_old_satchels,"#")
-	secret_satchels[SSmapping.config.map_name] << old_secret_satchels
+	WRITE_FILE(secret_satchels[SSmapping.config.map_name], old_secret_satchels)
 
 	var/list/chosen_satchel = splittext(satchel_string,"|")
 	if(!chosen_satchel || isemptylist(chosen_satchel) || chosen_satchel.len != 3) //Malformed
@@ -59,7 +59,7 @@ SUBSYSTEM_DEF(persistence)
 	if(!path)
 		return 0
 
-	var/obj/item/weapon/storage/backpack/satchel/flat/F = new()
+	var/obj/item/storage/backpack/satchel/flat/F = new()
 	F.x = text2num(chosen_satchel[1])
 	F.y = text2num(chosen_satchel[2])
 	F.z = ZLEVEL_STATION
@@ -157,7 +157,7 @@ SUBSYSTEM_DEF(persistence)
 
 /datum/controller/subsystem/persistence/proc/CollectSecretSatchels()
 	for(var/A in new_secret_satchels)
-		var/obj/item/weapon/storage/backpack/satchel/flat/F = A
+		var/obj/item/storage/backpack/satchel/flat/F = A
 		if(QDELETED(F) || F.z != ZLEVEL_STATION || F.invisibility != INVISIBILITY_MAXIMUM)
 			continue
 		var/list/savable_obj = list()
@@ -171,7 +171,7 @@ SUBSYSTEM_DEF(persistence)
 		if(isemptylist(savable_obj))
 			continue
 		old_secret_satchels += "[F.x]|[F.y]|[pick(savable_obj)]#"
-	secret_satchels[SSmapping.config.map_name] << old_secret_satchels
+	WRITE_FILE(secret_satchels[SSmapping.config.map_name], old_secret_satchels)
 
 /datum/controller/subsystem/persistence/proc/CollectChiselMessages()
 	var/savefile/chisel_messages_sav = new /savefile("data/npc_saves/ChiselMessages.sav")
@@ -181,14 +181,14 @@ SUBSYSTEM_DEF(persistence)
 
 	log_world("Saved [saved_messages.len] engraved messages on map [SSmapping.config.map_name]")
 
-	chisel_messages_sav[SSmapping.config.map_name] << json_encode(saved_messages)
+	WRITE_FILE(chisel_messages_sav[SSmapping.config.map_name], json_encode(saved_messages))
 
 /datum/controller/subsystem/persistence/proc/SaveChiselMessage(obj/structure/chisel_message/M)
 	saved_messages += list(M.pack()) // dm eats one list
 
 
 /datum/controller/subsystem/persistence/proc/CollectTrophies()
-	trophy_sav << json_encode(saved_trophies)
+	WRITE_FILE(trophy_sav, json_encode(saved_trophies))
 
 /datum/controller/subsystem/persistence/proc/SaveTrophy(obj/structure/displaycase/trophy/T)
 	if(!T.added_roundstart && T.showpiece)

code/controllers/subsystem/ping.dm

@@ -3,7 +3,7 @@
 SUBSYSTEM_DEF(ping)
 	name = "Ping"
 	wait = 6
-	flags = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY
+	flags_1 = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY
 	priority = 10
 	var/list/currentrun
 

code/controllers/subsystem/processing/fields.dm

@@ -2,5 +2,5 @@ PROCESSING_SUBSYSTEM_DEF(fields)
 	name = "Fields"
 	wait = 2
 	priority = 40
-	flags = SS_KEEP_TIMING | SS_NO_INIT
+	flags_1 = SS_KEEP_TIMING | SS_NO_INIT
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME

code/controllers/subsystem/processing/flightpacks.dm

@@ -3,7 +3,7 @@ PROCESSING_SUBSYSTEM_DEF(flightpacks)
 	priority = 30
 	wait = 2
 	stat_tag = "FM"
-	flags = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING
+	flags_1 = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING
 
 	var/flightsuit_processing = FLIGHTSUIT_PROCESSING_FULL
 

code/controllers/subsystem/processing/obj.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(obj)
 	name = "Objects"
 	priority = 40
-	flags = SS_NO_INIT
+	flags_1 = SS_NO_INIT
 
 	var/list/processing = list()
 	var/list/currentrun = list()

code/controllers/subsystem/processing/overlays.dm

@@ -1,6 +1,6 @@
 PROCESSING_SUBSYSTEM_DEF(overlays)
 	name = "Overlay"
-	flags = SS_TICKER
+	flags_1 = SS_TICKER
 	wait = 1
 	priority = 500
 	init_order = INIT_ORDER_OVERLAY
@@ -55,7 +55,7 @@ PROCESSING_SUBSYSTEM_DEF(overlays)
 		overlays = po
 	else
 		overlays.Cut()
-	flags &= ~OVERLAY_QUEUED
+	flags_1 &= ~OVERLAY_QUEUED_1
 
 /proc/iconstate2appearance(icon, iconstate)
 	var/static/image/stringbro = new()
@@ -102,8 +102,8 @@ PROCESSING_SUBSYSTEM_DEF(overlays)
 			new_overlays[i] = appearance_bro.appearance
 	return new_overlays
 
-#define NOT_QUEUED_ALREADY (!(flags & OVERLAY_QUEUED))
-#define QUEUE_FOR_COMPILE flags |= OVERLAY_QUEUED; SSoverlays.processing += src;
+#define NOT_QUEUED_ALREADY (!(flags_1 & OVERLAY_QUEUED_1))
+#define QUEUE_FOR_COMPILE flags_1 |= OVERLAY_QUEUED_1; SSoverlays.processing += src;
 /atom/proc/cut_overlays(priority = FALSE)
 	var/list/cached_overlays = our_overlays
 	var/list/cached_priority = priority_overlays

code/controllers/subsystem/processing/processing.dm

@@ -3,7 +3,7 @@
 SUBSYSTEM_DEF(processing)
 	name = "Processing"
 	priority = 25
-	flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
+	flags_1 = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
 	wait = 10
 
 	var/stat_tag = "P" //Used for logging

code/controllers/subsystem/radio.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(radio)
 	name = "Radio"
-	flags = SS_NO_FIRE|SS_NO_INIT
+	flags_1 = SS_NO_FIRE|SS_NO_INIT
 
 	var/list/datum/radio_frequency/frequencies = list()
 

code/controllers/subsystem/religion.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(religion)
 	name = "Religion"
-	flags = SS_NO_FIRE|SS_NO_INIT
+	flags_1 = SS_NO_FIRE|SS_NO_INIT
 
 	var/religion
 	var/deity

code/controllers/subsystem/server_maint.dm

@@ -3,7 +3,7 @@
 SUBSYSTEM_DEF(server_maint)
 	name = "Server Tasks"
 	wait = 6
-	flags = SS_POST_FIRE_TIMING
+	flags_1 = SS_POST_FIRE_TIMING
 	priority = 10
 	init_order = INIT_ORDER_SERVER_MAINT
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
@@ -40,9 +40,15 @@ SUBSYSTEM_DEF(server_maint)
 
 /datum/controller/subsystem/server_maint/Shutdown()
 	kick_clients_in_lobby("<span class='boldannounce'>The round came to an end with you in the lobby.</span>", TRUE) //second parameter ensures only afk clients are kicked
+	var/server = config.server
 	for(var/thing in GLOB.clients)
+		if(!thing)
+			continue
 		var/client/C = thing
-		if(C && config.server)	//if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
-			C << link("byond://[config.server]")
+		var/datum/chatOutput/co = C.chatOutput
+		if(co)
+			co.ehjax_send(data = "roundrestart")
+		if(server)	//if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
+			C << link("byond://[server]")
 
 #undef PING_BUFFER_TIME

code/controllers/subsystem/shuttle.dm

@@ -5,7 +5,7 @@ SUBSYSTEM_DEF(shuttle)
 	name = "Shuttle"
 	wait = 10
 	init_order = INIT_ORDER_SHUTTLE
-	flags = SS_KEEP_TIMING|SS_NO_TICK_CHECK
+	flags_1 = SS_KEEP_TIMING|SS_NO_TICK_CHECK
 	runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME
 
 	var/list/mobile = list()
@@ -34,8 +34,8 @@ SUBSYSTEM_DEF(shuttle)
 	var/obj/docking_port/mobile/supply/supply
 	var/ordernum = 1					//order number given to next order
 	var/points = 5000					//number of trade-points we have
-	var/centcom_message = ""			//Remarks from Centcom on how well you checked the last order.
-	var/list/discoveredPlants = list()	//Typepaths for unusual plants we've already sent CentComm, associated with their potencies
+	var/centcom_message = ""			//Remarks from CentCom on how well you checked the last order.
+	var/list/discoveredPlants = list()	//Typepaths for unusual plants we've already sent CentCom, associated with their potencies
 
 	var/list/supply_packs = list()
 	var/list/shoppinglist = list()
@@ -84,7 +84,7 @@ SUBSYSTEM_DEF(shuttle)
 		var/turf/T = i
 		T.ChangeTurf(/turf/open/space)
 		transit_turfs += T
-		T.flags |= UNUSED_TRANSIT_TURF
+		T.flags_1 |= UNUSED_TRANSIT_TURF_1
 
 #ifdef HIGHLIGHT_DYNAMIC_TRANSIT
 /datum/controller/subsystem/shuttle/proc/color_space()
@@ -101,8 +101,6 @@ SUBSYSTEM_DEF(shuttle)
 			T.color = "#00ffff"
 #endif
 
-	//world.log << "[transit_turfs.len] transit turfs registered"
-
 /datum/controller/subsystem/shuttle/fire()
 	for(var/thing in mobile)
 		if(!thing)
@@ -185,7 +183,7 @@ SUBSYSTEM_DEF(shuttle)
 
 	switch(emergency.mode)
 		if(SHUTTLE_RECALL)
-			to_chat(user, "The emergency shuttle may not be called while returning to Centcom.")
+			to_chat(user, "The emergency shuttle may not be called while returning to CentCom.")
 			return
 		if(SHUTTLE_CALL)
 			to_chat(user, "The emergency shuttle is already on its way.")
@@ -200,7 +198,7 @@ SUBSYSTEM_DEF(shuttle)
 			to_chat(user, "The emergency shuttle is moving away to a safe distance.")
 			return
 		if(SHUTTLE_STRANDED)
-			to_chat(user, "The emergency shuttle has been disabled by Centcom.")
+			to_chat(user, "The emergency shuttle has been disabled by CentCom.")
 			return
 
 	call_reason = trim(html_encode(call_reason))
@@ -414,13 +412,13 @@ SUBSYSTEM_DEF(shuttle)
 		for(var/i in transit_turfs)
 			CHECK_TICK
 			var/turf/topleft = i
-			if(!(topleft.flags & UNUSED_TRANSIT_TURF))
+			if(!(topleft.flags_1 & UNUSED_TRANSIT_TURF_1))
 				continue
 			var/turf/bottomright = locate(topleft.x + transit_width,
 				topleft.y + transit_height, topleft.z)
 			if(!bottomright)
 				continue
-			if(!(bottomright.flags & UNUSED_TRANSIT_TURF))
+			if(!(bottomright.flags_1 & UNUSED_TRANSIT_TURF_1))
 				continue
 
 			proposed_zone = block(topleft, bottomright)
@@ -430,7 +428,7 @@ SUBSYSTEM_DEF(shuttle)
 				var/turf/T = j
 				if(!T)
 					continue base
-				if(!(T.flags & UNUSED_TRANSIT_TURF))
+				if(!(T.flags_1 & UNUSED_TRANSIT_TURF_1))
 					continue base
 			//to_chat(world, "[COORD(topleft)] and [COORD(bottomright)]")
 			break base
@@ -502,7 +500,7 @@ SUBSYSTEM_DEF(shuttle)
 	for(var/i in new_transit_dock.assigned_turfs)
 		var/turf/T = i
 		T.ChangeTurf(transit_path)
-		T.flags &= ~(UNUSED_TRANSIT_TURF)
+		T.flags_1 &= ~(UNUSED_TRANSIT_TURF_1)
 
 	M.assigned_transit = new_transit_dock
 	return TRUE

code/controllers/subsystem/spacedrift.dm

@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(spacedrift)
 	name = "Space Drift"
 	priority = 30
 	wait = 5
-	flags = SS_NO_INIT|SS_KEEP_TIMING
+	flags_1 = SS_NO_INIT|SS_KEEP_TIMING
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/currentrun = list()

code/controllers/subsystem/squeak.dm

@@ -5,7 +5,7 @@
 SUBSYSTEM_DEF(squeak)
 	name = "Squeak"
 	init_order = INIT_ORDER_SQUEAK
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 
 	var/list/exposed_wires = list()
 

code/controllers/subsystem/stickyban.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(stickyban)
 	name = "Sticky Ban"
 	init_order = INIT_ORDER_STICKY_BAN
-	flags = SS_NO_FIRE
+	flags_1 = SS_NO_FIRE
 
 	var/list/cache = list()
 
@@ -27,6 +27,6 @@ SUBSYSTEM_DEF(stickyban)
 		ban["existing_user_matches_this_round"] = list()
 		ban["admin_matches_this_round"] = list()
 		cache[ckey] = ban
-	
+
 	for (var/bannedckey in cache)
 		world.SetConfig("ban", bannedckey, list2stickyban(cache[bannedckey]))

code/controllers/subsystem/sun.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(sun)
 	name = "Sun"
 	wait = 600
-	flags = SS_NO_TICK_CHECK|SS_NO_INIT
+	flags_1 = SS_NO_TICK_CHECK|SS_NO_INIT
 	var/angle
 	var/dx
 	var/dy

code/controllers/subsystem/tgui.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(tgui)
 	name = "tgui"
 	wait = 9
-	flags = SS_NO_INIT
+	flags_1 = SS_NO_INIT
 	priority = 110
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 

code/controllers/subsystem/throwing.dm

@@ -5,7 +5,7 @@ SUBSYSTEM_DEF(throwing)
 	name = "Throwing"
 	priority = 25
 	wait = 1
-	flags = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER
+	flags_1 = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
 
 	var/list/currentrun
@@ -135,6 +135,6 @@ SUBSYSTEM_DEF(throwing)
 		var/atom/movable/AM = thing
 		if (AM == thrownthing)
 			continue
-		if (AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags & ON_BORDER))
+		if (AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags_1 & ON_BORDER_1))
 			finalize(hit=TRUE, target=AM)
 			return TRUE

code/controllers/subsystem/ticker.dm

@@ -5,7 +5,7 @@ SUBSYSTEM_DEF(ticker)
 	init_order = INIT_ORDER_TICKER
 
 	priority = 200
-	flags = SS_KEEP_TIMING
+	flags_1 = SS_KEEP_TIMING
 	runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME
 
 	var/current_state = GAME_STATE_STARTUP	//state of current round (used by process()) Use the defines GAME_STATE_* !
@@ -225,7 +225,7 @@ SUBSYSTEM_DEF(ticker)
 	round_start_time = world.time
 
 	to_chat(world, "<FONT color='blue'><B>Welcome to [station_name()], enjoy your stay!</B></FONT>")
-	world << sound('sound/ai/welcome.ogg')
+	SEND_SOUND(world, sound('sound/ai/welcome.ogg'))
 
 	current_state = GAME_STATE_PLAYING
 	Master.SetRunLevel(RUNLEVEL_GAME)
@@ -283,7 +283,7 @@ SUBSYSTEM_DEF(ticker)
 		SSshuttle.lockdown = TRUE
 
 	//initialise our cinematic screen object
-	cinematic = new /obj/screen{icon='icons/effects/station_explosion.dmi';icon_state="station_intact";layer=21;mouse_opacity=0;screen_loc="1,0";}(src)
+	cinematic = new /obj/screen{icon='icons/effects/station_explosion.dmi';icon_state="station_intact";layer=21;mouse_opacity = MOUSE_OPACITY_TRANSPARENT;screen_loc="1,0";}(src)
 
 	for(var/mob/M in GLOB.mob_list)
 		M.notransform = TRUE //stop everything moving
@@ -300,7 +300,7 @@ SUBSYSTEM_DEF(ticker)
 				if("nuclear emergency") //Nuke wasn't on station when it blew up
 					flick("intro_nuke",cinematic)
 					sleep(35)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)
 					flick("station_intact_fade_red",cinematic)
 					cinematic.icon_state = "summary_nukefail"
@@ -308,12 +308,12 @@ SUBSYSTEM_DEF(ticker)
 					cinematic.icon_state = null
 					flick("intro_cult",cinematic)
 					sleep(25)
-					world << sound('sound/magic/enter_blood.ogg')
+					SEND_SOUND(world, sound('sound/magic/enter_blood.ogg'))
 					sleep(28)
-					world << sound('sound/machines/terminal_off.ogg')
+					SEND_SOUND(world, sound('sound/machines/terminal_off.ogg'))
 					sleep(20)
 					flick("station_corrupted",cinematic)
-					world << sound('sound/effects/ghost.ogg')
+					SEND_SOUND(world, sound('sound/effects/ghost.ogg'))
 					actually_blew_up = FALSE
 				if("gang war") //Gang Domination (just show the override screen)
 					cinematic.icon_state = "intro_malf_still"
@@ -323,19 +323,19 @@ SUBSYSTEM_DEF(ticker)
 				if("fake") //The round isn't over, we're just freaking people out for fun
 					flick("intro_nuke",cinematic)
 					sleep(35)
-					world << sound('sound/items/bikehorn.ogg')
+					SEND_SOUND(world, sound('sound/items/bikehorn.ogg'))
 					flick("summary_selfdes",cinematic)
 					actually_blew_up = FALSE
 				else
 					flick("intro_nuke",cinematic)
 					sleep(35)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)
 
 
 		if(NUKE_MISS_STATION || NUKE_SYNDICATE_BASE)	//nuke was nowhere nearby	//TODO: a really distant explosion animation
 			sleep(50)
-			world << sound('sound/effects/explosionfar.ogg')
+			SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 			station_explosion_detonation(bomb)
 			actually_blew_up = station_missed == NUKE_SYNDICATE_BASE	//don't kill everyone on station if it detonated off station
 		else	//station was destroyed
@@ -346,42 +346,42 @@ SUBSYSTEM_DEF(ticker)
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_explode_fade_red",cinematic)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)
 					cinematic.icon_state = "summary_nukewin"
 				if("AI malfunction") //Malf (screen,explosion,summary)
 					flick("intro_malf",cinematic)
 					sleep(76)
 					flick("station_explode_fade_red",cinematic)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)	//TODO: If we ever decide to actually detonate the vault bomb
 					cinematic.icon_state = "summary_malf"
 				if("blob") //Station nuked (nuke,explosion,summary)
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_explode_fade_red",cinematic)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)	//TODO: no idea what this case could be
 					cinematic.icon_state = "summary_selfdes"
 				if("cult") //Station nuked (nuke,explosion,summary)
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_explode_fade_red",cinematic)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)	//TODO: no idea what this case could be
 					cinematic.icon_state = "summary_cult"
 				if("no_core") //Nuke failed to detonate as it had no core
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_intact",cinematic)
-					world << sound('sound/ambience/signal.ogg')
+					SEND_SOUND(world, sound('sound/ambience/signal.ogg'))
 					addtimer(CALLBACK(src, .proc/finish_cinematic, null, FALSE), 100)
 					return	//Faster exit, since nothing happened
 				else //Station nuked (nuke,explosion,summary)
 					flick("intro_nuke",cinematic)
 					sleep(35)
 					flick("station_explode_fade_red", cinematic)
-					world << sound('sound/effects/explosionfar.ogg')
+					SEND_SOUND(world, sound('sound/effects/explosion_distant.ogg'))
 					station_explosion_detonation(bomb)
 					cinematic.icon_state = "summary_selfdes"
 	//If its actually the end of the round, wait for it to end.
@@ -479,7 +479,7 @@ SUBSYSTEM_DEF(ticker)
 					var/list/area/shuttle_areas
 					if(SSshuttle && SSshuttle.emergency)
 						shuttle_areas = SSshuttle.emergency.shuttle_areas
-					if(!Player.onCentcom() && !Player.onSyndieBase())
+					if(!Player.onCentCom() && !Player.onSyndieBase())
 						to_chat(Player, "<font color='blue'><b>You managed to survive, but were marooned on [station_name()]...</b></FONT>")
 					else
 						num_escapees++
@@ -636,7 +636,7 @@ SUBSYSTEM_DEF(ticker)
 			if(living_player_count() < config.hard_popcap)
 				if(next_in_line && next_in_line.client)
 					to_chat(next_in_line, "<span class='userdanger'>A slot has opened! You have approximately 20 seconds to join. <a href='?src=\ref[next_in_line];late_join=override'>\>\>Join Game\<\<</a></span>")
-					next_in_line << sound('sound/misc/notice1.ogg')
+					SEND_SOUND(next_in_line, sound('sound/misc/notice1.ogg'))
 					next_in_line.LateChoices()
 					return
 				queued_players -= next_in_line //Client disconnected, remove he
@@ -804,7 +804,7 @@ SUBSYSTEM_DEF(ticker)
 /datum/controller/subsystem/ticker/proc/save_mode(the_mode)
 	var/F = file("data/mode.txt")
 	fdel(F)
-	F << the_mode
+	WRITE_FILE(F, the_mode)
 
 /datum/controller/subsystem/ticker/proc/SetRoundEndSound(the_sound)
 	set waitfor = FALSE
@@ -858,4 +858,4 @@ SUBSYSTEM_DEF(ticker)
 		'sound/roundend/disappointed.ogg'\
 		)
 
-	world << sound(round_end_sound)
+	SEND_SOUND(world, sound(round_end_sound))

code/controllers/subsystem/time_track.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(time_track)
 	name = "Time Tracking"
 	wait = 600
-	flags = SS_NO_INIT|SS_NO_TICK_CHECK
+	flags_1 = SS_NO_INIT|SS_NO_TICK_CHECK
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 
 	var/time_dilation_current = 0

code/controllers/subsystem/timer.dm

@@ -7,7 +7,7 @@ SUBSYSTEM_DEF(timer)
 	wait = 1 //SS_TICKER subsystem, so wait is in ticks
 	init_order = INIT_ORDER_TIMER
 
-	flags = SS_TICKER|SS_NO_INIT
+	flags_1 = SS_TICKER|SS_NO_INIT
 
 	var/list/datum/timedevent/processing = list()
 	var/list/hashes = list()
@@ -50,9 +50,9 @@ SUBSYSTEM_DEF(timer)
 			var/datum/timedevent/bucket_head = bucket_list[i]
 			if (!bucket_head)
 				continue
-				
+
 			log_world("Active timers at index [i]:")
-			
+
 			var/datum/timedevent/bucket_node = bucket_head
 			var/anti_loop_check = 1000
 			do
@@ -215,7 +215,7 @@ SUBSYSTEM_DEF(timer)
 	var/datum/callback/callBack
 	var/timeToRun
 	var/hash
-	var/list/flags
+	var/list/flags_1
 	var/spent = FALSE //set to true right before running.
 	var/name //for easy debugging.
 	//cicular doublely linked list
@@ -224,16 +224,16 @@ SUBSYSTEM_DEF(timer)
 
 	var/static/nextid = 1
 
-/datum/timedevent/New(datum/callback/callBack, timeToRun, flags, hash)
+/datum/timedevent/New(datum/callback/callBack, timeToRun, flags_1, hash)
 	id = TIMER_ID_NULL
 	src.callBack = callBack
 	src.timeToRun = timeToRun
-	src.flags = flags
+	src.flags_1 = flags_1
 	src.hash = hash
-	
-	if (flags & TIMER_UNIQUE)
+
+	if (flags_1 & TIMER_UNIQUE)
 		SStimer.hashes[hash] = src
-	if (flags & TIMER_STOPPABLE)
+	if (flags_1 & TIMER_STOPPABLE)
 		do
 			if (nextid >= TIMER_ID_MAX)
 				nextid = 1
@@ -241,12 +241,12 @@ SUBSYSTEM_DEF(timer)
 		while(SStimer.timer_id_dict["timerid" + num2text(id, 8)])
 		SStimer.timer_id_dict["timerid" + num2text(id, 8)] = src
 
-	name = "Timer: " + num2text(id, 8) + ", TTR: [timeToRun], Flags: [jointext(bitfield2list(flags, list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT")), ", ")], callBack: \ref[callBack], callBack.object: [callBack.object]\ref[callBack.object]([getcallingtype()]), callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""])"
+	name = "Timer: " + num2text(id, 8) + ", TTR: [timeToRun], Flags: [jointext(bitfield2list(flags_1, list("TIMER_UNIQUE", "TIMER_OVERRIDE", "TIMER_CLIENT_TIME", "TIMER_STOPPABLE", "TIMER_NO_HASH_WAIT")), ", ")], callBack: \ref[callBack], callBack.object: [callBack.object]\ref[callBack.object]([getcallingtype()]), callBack.delegate:[callBack.delegate]([callBack.arguments ? callBack.arguments.Join(", ") : ""])"
 
 	if (callBack.object != GLOBAL_PROC)
 		LAZYADD(callBack.object.active_timers, src)
 
-	if (flags & TIMER_CLIENT_TIME)
+	if (flags_1 & TIMER_CLIENT_TIME)
 		//sorted insert
 		var/list/ctts = SStimer.clienttime_timers
 		var/cttl = length(ctts)
@@ -291,7 +291,7 @@ SUBSYSTEM_DEF(timer)
 
 /datum/timedevent/Destroy()
 	..()
-	if (flags & TIMER_UNIQUE)
+	if (flags_1 & TIMER_UNIQUE)
 		SStimer.hashes -= hash
 
 
@@ -301,10 +301,10 @@ SUBSYSTEM_DEF(timer)
 
 	callBack = null
 
-	if (flags & TIMER_STOPPABLE)
+	if (flags_1 & TIMER_STOPPABLE)
 		SStimer.timer_id_dict -= "timerid" + num2text(id, 8)
 
-	if (flags & TIMER_CLIENT_TIME)
+	if (flags_1 & TIMER_CLIENT_TIME)
 		SStimer.clienttime_timers -= src
 		return QDEL_HINT_IWILLGC
 
@@ -346,7 +346,7 @@ SUBSYSTEM_DEF(timer)
 	else
 		. = "[callBack.object.type]"
 
-/proc/addtimer(datum/callback/callback, wait, flags)
+/proc/addtimer(datum/callback/callback, wait, flags_1)
 	if (!callback)
 		return
 
@@ -354,12 +354,12 @@ SUBSYSTEM_DEF(timer)
 
 	var/hash
 
-	if (flags & TIMER_UNIQUE)
+	if (flags_1 & TIMER_UNIQUE)
 		var/list/hashlist
-		if(flags & TIMER_NO_HASH_WAIT)
-			hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, flags & TIMER_CLIENT_TIME)
+		if(flags_1 & TIMER_NO_HASH_WAIT)
+			hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, flags_1 & TIMER_CLIENT_TIME)
 		else
-			hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, wait, flags & TIMER_CLIENT_TIME)
+			hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, wait, flags_1 & TIMER_CLIENT_TIME)
 		hashlist += callback.arguments
 		hash = hashlist.Join("|||||||")
 
@@ -370,20 +370,20 @@ SUBSYSTEM_DEF(timer)
 				SStimer.hashes -= hash
 			else
 
-				if (flags & TIMER_OVERRIDE)
+				if (flags_1 & TIMER_OVERRIDE)
 					qdel(hash_timer)
 				else
-					if (hash_timer.flags & TIMER_STOPPABLE)
+					if (hash_timer.flags_1 & TIMER_STOPPABLE)
 						. = hash_timer.id
 					return
 
 
 	var/timeToRun = world.time + wait
-	if (flags & TIMER_CLIENT_TIME)
+	if (flags_1 & TIMER_CLIENT_TIME)
 		timeToRun = REALTIMEOFDAY + wait
 
-	var/datum/timedevent/timer = new(callback, timeToRun, flags, hash)
-	return timer.id 
+	var/datum/timedevent/timer = new(callback, timeToRun, flags_1, hash)
+	return timer.id
 
 /proc/deltimer(id)
 	if (!id)

code/controllers/subsystem/title.dm

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(title)
 	name = "Title Screen"
-	flags = SS_NO_FIRE|SS_NO_INIT
+	flags_1 = SS_NO_FIRE|SS_NO_INIT
 
 	var/file_path
 	var/icon/icon
@@ -36,7 +36,7 @@ SUBSYSTEM_DEF(title)
 				break
 
 		file_path = "config/title_screens/images/[pick(title_screens)]"
-		
+
 		icon = new(fcopy_rsc(file_path))
 
 		if(splash_turf)
@@ -53,7 +53,7 @@ SUBSYSTEM_DEF(title)
 /datum/controller/subsystem/title/Shutdown()
 	if(file_path)
 		var/F = file("data/previous_title.dat")
-		F << file_path
+		WRITE_FILE(F, file_path)
 
 	for(var/thing in GLOB.clients)
 		if(!thing)

code/controllers/subsystem/vote.dm

@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(vote)
 	name = "Vote"
 	wait = 10
 
-	flags = SS_KEEP_TIMING|SS_NO_INIT
+	flags_1 = SS_KEEP_TIMING|SS_NO_INIT
 
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 

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
+	flags_1 = SS_BACKGROUND
 	wait = 10
 	runlevels = RUNLEVEL_GAME
 	var/list/processing = list()