Merge branch 'master' into upstream-merge-30176

2017-09-06 17:43:07 -05:00
parent 9265694418 bbab9d8d5a
commit 2f3f56352c
675 changed files with 20253 additions and 158942 deletions
@@ -1,9 +1,9 @@
-#define MC_TICK_CHECK ( ( world.tick_usage > Master.current_ticklimit || src.state != SS_RUNNING ) ? pause() : 0 )
+#define MC_TICK_CHECK ( ( TICK_USAGE > Master.current_ticklimit || src.state != SS_RUNNING ) ? pause() : 0 )

 #define MC_SPLIT_TICK_INIT(phase_count) var/original_tick_limit = Master.current_ticklimit; var/split_tick_phases = ##phase_count
 #define MC_SPLIT_TICK \
    if(split_tick_phases > 1){\
-        Master.current_ticklimit = ((original_tick_limit - world.tick_usage) / split_tick_phases) + world.tick_usage;\
+        Master.current_ticklimit = ((original_tick_limit - TICK_USAGE) / split_tick_phases) + TICK_USAGE;\
        --split_tick_phases;\
    } else {\
        Master.current_ticklimit = original_tick_limit;\
@@ -22,7 +22,7 @@
 #define START_PROCESSING(Processor, Datum) if (!Datum.isprocessing) {Datum.isprocessing = TRUE;Processor.processing += Datum}
 #define STOP_PROCESSING(Processor, Datum) Datum.isprocessing = FALSE;Processor.processing -= Datum

-//SubSystem flags_1 (Please design any new flags_1 so that the default is off, to make adding flags_1 to subsystems easier)
+//SubSystem flags (Please design any new flags so that the default is off, to make adding flags to subsystems easier)

 //subsystem does not initialize.
 #define SS_NO_INIT 1
@@ -0,0 +1,10 @@
+#define TICK_LIMIT_RUNNING 80
+#define TICK_LIMIT_TO_RUN 78
+#define TICK_LIMIT_MC 70
+#define TICK_LIMIT_MC_INIT_DEFAULT 98
+
+#define TICK_USAGE world.tick_usage //for general usage
+#define TICK_USAGE_REAL world.tick_usage    //to be used where the result isn't checked
+
+#define TICK_CHECK ( TICK_USAGE > Master.current_ticklimit )
+#define CHECK_TICK if TICK_CHECK stoplag()
@@ -1,9 +0,0 @@
-diff a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm	(rejected hunks)
-@@ -9,6 +9,7 @@
- #define INVESTIGATE_SUPERMATTER      "supermatter"
- #define INVESTIGATE_TELESCI          "telesci"
- #define INVESTIGATE_WIRES            "wires"
-+#define INVESTIGATE_HALLUCINATIONS   "hallucinations"
- 
- //Individual logging defines
- #define INDIVIDUAL_ATTACK_LOG   "Attack log"
@@ -1,25 +1,25 @@
-#define PI						3.1415
-#define SPEED_OF_LIGHT			3e8		//not exact but hey!
-#define SPEED_OF_LIGHT_SQ		9e+16
-#define INFINITY				1e31	//closer then enough
-
-//atmos
-#define R_IDEAL_GAS_EQUATION	8.31	//kPa*L/(K*mol)
-#define ONE_ATMOSPHERE			101.325	//kPa
-#define T0C						273.15	// 0degC
-#define T20C					293.15	// 20degC
-#define TCMB					2.7		// -270.3degC
-
-//"fancy" math for calculating time in ms from tick_usage percentage and the length of ticks
-//percent_of_tick_used * (ticklag * 100(to convert to ms)) / 100(percent ratio)
-//collapsed to percent_of_tick_used * tick_lag
-#define TICK_DELTA_TO_MS(percent_of_tick_used) ((percent_of_tick_used) * world.tick_lag)
-#define TICK_USAGE_TO_MS(starting_tickusage) (TICK_DELTA_TO_MS(world.tick_usage-starting_tickusage))
-
-#define PERCENT(val) (round(val*100, 0.1))
-#define CLAMP01(x) (Clamp(x, 0, 1))
-
-//time of day but automatically adjusts to the server going into the next day within the same round.
-//for when you need a reliable time number that doesn't depend on byond time.
-#define REALTIMEOFDAY (world.timeofday + (MIDNIGHT_ROLLOVER * MIDNIGHT_ROLLOVER_CHECK))
-#define MIDNIGHT_ROLLOVER_CHECK ( GLOB.rollovercheck_last_timeofday != world.timeofday ? update_midnight_rollover() : GLOB.midnight_rollovers )
+#define PI						3.1415
+#define SPEED_OF_LIGHT			3e8		//not exact but hey!
+#define SPEED_OF_LIGHT_SQ		9e+16
+#define INFINITY				1e31	//closer then enough
+
+//atmos
+#define R_IDEAL_GAS_EQUATION	8.31	//kPa*L/(K*mol)
+#define ONE_ATMOSPHERE			101.325	//kPa
+#define T0C						273.15	// 0degC
+#define T20C					293.15	// 20degC
+#define TCMB					2.7		// -270.3degC
+
+//"fancy" math for calculating time in ms from tick_usage percentage and the length of ticks
+//percent_of_tick_used * (ticklag * 100(to convert to ms)) / 100(percent ratio)
+//collapsed to percent_of_tick_used * tick_lag
+#define TICK_DELTA_TO_MS(percent_of_tick_used) ((percent_of_tick_used) * world.tick_lag)
+#define TICK_USAGE_TO_MS(starting_tickusage) (TICK_DELTA_TO_MS(TICK_USAGE_REAL - starting_tickusage))
+
+#define PERCENT(val) (round(val*100, 0.1))
+#define CLAMP01(x) (Clamp(x, 0, 1))
+
+//time of day but automatically adjusts to the server going into the next day within the same round.
+//for when you need a reliable time number that doesn't depend on byond time.
+#define REALTIMEOFDAY (world.timeofday + (MIDNIGHT_ROLLOVER * MIDNIGHT_ROLLOVER_CHECK))
+#define MIDNIGHT_ROLLOVER_CHECK ( GLOB.rollovercheck_last_timeofday != world.timeofday ? update_midnight_rollover() : GLOB.midnight_rollovers )
@@ -315,9 +315,16 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define APPEARANCE_CONSIDER_ALPHA			~RESET_ALPHA
 #define APPEARANCE_LONG_GLIDE				LONG_GLIDE

-// Consider these images/atoms as part of the UI/HUD
-#define APPEARANCE_UI_IGNORE_ALPHA			RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|RESET_ALPHA
-#define APPEARANCE_UI						RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR
+#ifndef PIXEL_SCALE
+#define PIXEL_SCALE 0
+#if DM_VERSION >= 512
+#error HEY, PIXEL_SCALE probably exists now, remove this gross ass shim.
+#endif
+#endif
+
+ // Consider these images/atoms as part of the UI/HUD
+#define APPEARANCE_UI_IGNORE_ALPHA			RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|RESET_ALPHA|PIXEL_SCALE
+#define APPEARANCE_UI								RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR

 //Just space
 #define SPACE_ICON_STATE	"[((x + y) ^ ~(x * y) + z) % 25]"
@@ -47,4 +47,22 @@
 #define SEC_DEPT_ENGINEERING "Engineering"
 #define SEC_DEPT_MEDICAL "Medical"
 #define SEC_DEPT_SCIENCE "Science"
-#define SEC_DEPT_SUPPLY "Supply"
+#define SEC_DEPT_SUPPLY "Supply"
+
+// Playtime tracking system, see jobs_exp.dm
+#define EXP_TYPE_LIVING			"Living"
+#define EXP_TYPE_CREW			"Crew"
+#define EXP_TYPE_COMMAND		"Command"
+#define EXP_TYPE_ENGINEERING	"Engineering"
+#define EXP_TYPE_MEDICAL		"Medical"
+#define EXP_TYPE_SCIENCE		"Science"
+#define EXP_TYPE_SUPPLY			"Supply"
+#define EXP_TYPE_SECURITY		"Security"
+#define EXP_TYPE_SILICON		"Silicon"
+#define EXP_TYPE_SERVICE		"Service"
+#define EXP_TYPE_ANTAG			"Antag"
+#define EXP_TYPE_SPECIAL		"Special"
+#define EXP_TYPE_GHOST			"Ghost"
+
+//Flags in the players table in the db
+#define DB_FLAG_EXEMPT 1
@@ -53,9 +53,14 @@
 #define ENGINE_COEFF_MAX 2
 #define ENGINE_DEFAULT_MAXSPEED_ENGINES 5

-//Docking error flags_1
+//Docking error flags
 #define DOCKING_SUCCESS 0
-#define DOCKING_COMPLETE 1
-#define DOCKING_BLOCKED 2
-#define DOCKING_IMMOBILIZED 4
-#define DOCKING_AREA_EMPTY 8
+#define DOCKING_BLOCKED 1
+#define DOCKING_IMMOBILIZED 2
+#define DOCKING_AREA_EMPTY 4
+
+
+//Docking turf movements
+#define MOVE_TURF 1
+#define MOVE_AREA 2
+#define MOVE_CONTENTS 4
@@ -10,12 +10,13 @@
 #define CHANNEL_BICYCLE 1016

 //Citadel code
-#define CHANNEL_PRED 1018
+#define CHANNEL_PRED 1015
+#define CHANNEL_PREYLOOP 1014

 //THIS SHOULD ALWAYS BE THE LOWEST ONE!
 //KEEP IT UPDATED

-#define CHANNEL_HIGHEST_AVAILABLE 1015
+#define CHANNEL_HIGHEST_AVAILABLE 1013

 #define CHANNEL_HIGHEST_AVAILABLE 1017
 #define SOUND_MINIMUM_PRESSURE 10
@@ -1,7 +0,0 @@
-#define TICK_LIMIT_RUNNING 80
-#define TICK_LIMIT_TO_RUN 78
-#define TICK_LIMIT_MC 70
-#define TICK_LIMIT_MC_INIT_DEFAULT 98
-
-#define TICK_CHECK ( world.tick_usage > Master.current_ticklimit )
-#define CHECK_TICK if TICK_CHECK stoplag()
@@ -2,6 +2,7 @@
 #define DM_HOLD "Hold"
 #define DM_DIGEST "Digest"
 #define DM_HEAL "Heal"
+#define DM_NOISY "Noisy"

 #define VORE_STRUGGLE_EMOTE_CHANCE 40

@@ -97,8 +97,7 @@
 		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]CHAT: [text]")

 /proc/log_sql(text)
-	if(config.sql_enabled)
-		WRITE_FILE(GLOB.world_game_log, "\[[time_stamp()]]SQL: [text]")
+	WRITE_FILE(GLOB.sql_error_log, "\[[time_stamp()]]SQL: [text]")

 //This replaces world.log so it displays both in DD and the file
 /proc/log_world(text)
@@ -20,7 +20,7 @@
 	A non null 'fixed_underlay' list var will skip copying the previous turf appearance and always use the list. If the list is
 	not set properly, the underlay will default to regular floor plating.

-	To see an example of a diagonal wall, see '/turf/closed/wall/shuttle' and its subtypes.
+	To see an example of a diagonal wall, see '/turf/closed/wall/mineral/titanium' and its subtypes.
 */

 //Redefinitions of the diagonal directions so they can be stored in one var without conflicts
@@ -72,7 +72,9 @@
 	return .

 //Splits the text of a file at seperator and returns them in a list.
-/world/proc/file2list(filename, seperator="\n")
+/world/proc/file2list(filename, seperator="\n", trim = TRUE)
+	if (trim)
+		return splittext(trim(file2text(filename)),seperator)
 	return splittext(file2text(filename),seperator)

 //Turns a direction into text
@@ -551,4 +553,4 @@
 				return /atom
 			else
 				return /datum
-	return text2path(copytext(string_type, 1, last_slash))
+	return text2path(copytext(string_type, 1, last_slash))
@@ -1,5 +1,5 @@
 /*
-// Contains VOREStation type2type functions
+// Contains VOREStation based vore description type2type functions
 // list2text - takes delimiter and returns text
 // text2list - takes delimiter, and creates list
 //
@@ -357,6 +357,17 @@ Turf and target are separate in case you want to teleport some distance from a t
 	var/M = E/(SPEED_OF_LIGHT_SQ)
 	return M

+//Takes the value of energy used/produced/ect.
+//Returns a text value of that number in W, kW, MW, or GW.
+/proc/DisplayPower(var/powerused)
+	if(powerused < 1000) //Less than a kW
+		return "[powerused] W"
+	else if(powerused < 1000000) //Less than a MW
+		return "[round((powerused * 0.001),0.01)] kW"
+	else if(powerused < 1000000000) //Less than a GW
+		return "[round((powerused * 0.000001),0.001)] MW"
+	return "[round((powerused * 0.000000001),0.0001)] GW"
+
 /proc/key_name(whom, include_link = null, include_name = 1)
 	var/mob/M
 	var/client/C
@@ -1230,7 +1241,7 @@ proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())

 //Increases delay as the server gets more overloaded,
 //as sleeps aren't cheap and sleeping only to wake up and sleep again is wasteful
-#define DELTA_CALC max(((max(world.tick_usage, world.cpu) / 100) * max(Master.sleep_delta,1)), 1)
+#define DELTA_CALC max(((max(TICK_USAGE, world.cpu) / 100) * max(Master.sleep_delta,1)), 1)

 /proc/stoplag()
 	if (!Master || !(Master.current_runlevel & RUNLEVELS_DEFAULT))
@@ -1242,7 +1253,7 @@ proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
 		. += round(i*DELTA_CALC)
 		sleep(i*world.tick_lag*DELTA_CALC)
 		i *= 2
-	while (world.tick_usage > min(TICK_LIMIT_TO_RUN, Master.current_ticklimit))
+	while (TICK_USAGE > min(TICK_LIMIT_TO_RUN, Master.current_ticklimit))

 #undef DELTA_CALC

@@ -1266,6 +1277,7 @@ proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
 #define RANDOM_COLOUR (rgb(rand(0,255),rand(0,255),rand(0,255)))

 #define QDEL_IN(item, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, item), time, TIMER_STOPPABLE)
+#define QDEL_IN_CLIENT_TIME(item, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, item), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME)
 #define QDEL_NULL(item) qdel(item); item = null
 #define QDEL_LIST(L) if(L) { for(var/I in L) qdel(I); L.Cut(); }
 #define QDEL_LIST_IN(L, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/______qdel_list_wrapper, L), time, TIMER_STOPPABLE)
@@ -1453,3 +1465,7 @@ GLOBAL_PROTECT(valid_HTTPSGet)
 	var/temp = bitfield - ((bitfield>>1)&46811) - ((bitfield>>2)&37449) //0133333 and 0111111 respectively
 	temp = ((temp + (temp>>3))&29127) % 63	//070707
 	return temp
+
+//checks if a turf is in the planet z list.
+/proc/turf_z_is_planet(turf/T)
+	return GLOB.z_is_planet["[T.z]"]
@@ -105,53 +105,17 @@ GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals",

 GLOBAL_LIST_INIT(guitar_notes, flist("sound/guitar/"))

-GLOBAL_LIST_INIT(station_prefixes, list("", "Imperium", "Heretical", "Cuban",
-	"Psychic", "Elegant", "Common", "Uncommon", "Rare", "Unique",
-	"Houseruled", "Religious", "Atheist", "Traditional", "Houseruled",
-	"Mad", "Super", "Ultra", "Secret", "Top Secret", "Deep", "Death",
-	"Zybourne", "Central", "Main", "Government", "Uoi", "Fat",
-	"Automated", "Experimental", "Augmented"))
+GLOBAL_LIST_INIT(station_prefixes, world.file2list("strings/station_prefixes.txt") + "")

-GLOBAL_LIST_INIT(station_names, list("", "Stanford", "Dorf", "Alium",
-	"Prefix", "Clowning", "Aegis", "Ishimura", "Scaredy", "Death-World",
-	"Mime", "Honk", "Rogue", "MacRagge", "Ultrameens", "Safety", "Paranoia",
-	"Explosive", "Neckbear", "Donk", "Muppet", "North", "West", "East",
-	"South", "Slant-ways", "Widdershins", "Rimward", "Expensive",
-	"Procreatory", "Imperial", "Unidentified", "Immoral", "Carp", "Ork",
-	"Pete", "Control", "Nettle", "Aspie", "Class", "Crab", "Fist",
-	"Corrogated","Skeleton","Race", "Fatguy", "Gentleman", "Capitalist",
-	"Communist", "Bear", "Beard", "Derp", "Space", "Spess", "Star", "Moon",
-	"System", "Mining", "Neckbeard", "Research", "Supply", "Military",
-	"Orbital", "Battle", "Science", "Asteroid", "Home", "Production",
-	"Transport", "Delivery", "Extraplanetary", "Orbital", "Correctional",
-	"Robot", "Hats", "Pizza"))
+GLOBAL_LIST_INIT(station_names, world.file2list("strings/station_names.txt" + ""))

-GLOBAL_LIST_INIT(station_suffixes, list("Station", "Frontier",
-	"Suffix", "Death-trap", "Space-hulk", "Lab", "Hazard","Spess Junk",
-	"Fishery", "No-Moon", "Tomb", "Crypt", "Hut", "Monkey", "Bomb",
-	"Trade Post", "Fortress", "Village", "Town", "City", "Edition", "Hive",
-	"Complex", "Base", "Facility", "Depot", "Outpost", "Installation",
-	"Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform",
-	"Construct", "Hangar", "Prison", "Center", "Port", "Waystation",
-	"Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object",
-	"Fortification", "Colony", "Planet-Cracker", "Roost", "Fat Camp",
-	"Airstrip"))
+GLOBAL_LIST_INIT(station_suffixes, world.file2list("strings/station_suffixes.txt"))

-GLOBAL_LIST_INIT(greek_letters, list("Alpha", "Beta", "Gamma", "Delta",
-	"Epsilon", "Zeta", "Eta", "Theta", "Iota", "Kappa", "Lambda", "Mu",
-	"Nu", "Xi", "Omicron", "Pi", "Rho", "Sigma", "Tau", "Upsilon", "Phi",
-	"Chi", "Psi", "Omega"))
+GLOBAL_LIST_INIT(greek_letters, world.file2list("strings/greek_letters.txt"))

-GLOBAL_LIST_INIT(phonetic_alphabet, list("Alpha", "Bravo", "Charlie",
-	"Delta", "Echo", "Foxtrot", "Golf", "Hotel", "India", "Juliet",
-	"Kilo", "Lima", "Mike", "November", "Oscar", "Papa", "Quebec",
-	"Romeo", "Sierra", "Tango", "Uniform", "Victor", "Whiskey", "X-ray",
-	"Yankee", "Zulu"))
+GLOBAL_LIST_INIT(phonetic_alphabet, world.file2list("strings/phonetic_alphabet.txt"))

-GLOBAL_LIST_INIT(numbers_as_words, list("One", "Two", "Three", "Four",
-	"Five", "Six", "Seven", "Eight", "Nine", "Ten", "Eleven", "Twelve",
-	"Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen",
-	"Eighteen", "Nineteen"))
+GLOBAL_LIST_INIT(numbers_as_words, world.file2list("strings/numbers_as_words.txt"))

 /proc/generate_number_strings()
 	var/list/L[198]
@@ -35,3 +35,5 @@ GLOBAL_LIST_EMPTY(wire_color_directory)
 GLOBAL_LIST_EMPTY(wire_name_directory)

 GLOBAL_LIST_EMPTY(ai_status_displays)
+
+GLOBAL_LIST_EMPTY(mob_spawners) 		    // All mob_spawn objects
@@ -6,5 +6,6 @@
 #define POLL_IGNORE_ALIEN_LARVA "alien_larva"
 #define POLL_IGNORE_CLOCKWORK_MARAUDER "clockwork_marauder"
 #define POLL_IGNORE_SYNDICATE "syndicate"
+#define POLL_IGNORE_HOLOPARASITE "holoparasite"

 GLOBAL_LIST_EMPTY(poll_ignore)
@@ -12,6 +12,8 @@ GLOBAL_VAR(round_id)
 GLOBAL_PROTECT(round_id)
 GLOBAL_VAR(config_error_log)
 GLOBAL_PROTECT(config_error_log)
+GLOBAL_VAR(sql_error_log)
+GLOBAL_PROTECT(sql_error_log)

 GLOBAL_LIST_EMPTY(bombers)
 GLOBAL_PROTECT(bombers)
@@ -25,7 +25,7 @@
 	* If you are diagonally adjacent, ensure you can pass through at least one of the mutually adjacent square.
 		* Passing through in this case ignores anything with the LETPASSTHROW pass flag, such as tables, racks, and morgue trays.
 */
-/turf/Adjacent(atom/neighbor, atom/target = null, atom/movable/mover = null)
+/turf/Adjacent(atom/neighbor, atom/target = null, atom/movable/mover = null)
 	var/turf/T0 = get_turf(neighbor)

 	if(T0 == src) //same turf
@@ -37,7 +37,7 @@
 	// Non diagonal case
 	if(T0.x == x || T0.y == y)
 		// Check for border blockages
-		return T0.ClickCross(get_dir(T0,src), border_only = 1, target_atom = target, mover = mover) && src.ClickCross(get_dir(src,T0), border_only = 1, target_atom = target, mover = mover)
+		return T0.ClickCross(get_dir(T0,src), border_only = 1, target_atom = target, mover = mover) && src.ClickCross(get_dir(src,T0), border_only = 1, target_atom = target, mover = mover)

 	// Diagonal case
 	var/in_dir = get_dir(T0,src) // eg. northwest (1+8) = 9 (00001001)
@@ -45,16 +45,16 @@
 	var/d2 = in_dir&12			 // eg. west	  (1+8)&12 (0000 1100) = 8 (0000 1000)

 	for(var/d in list(d1,d2))
-		if(!T0.ClickCross(d, border_only = 1, target_atom = target, mover = mover))
+		if(!T0.ClickCross(d, border_only = 1, target_atom = target, mover = mover))
 			continue // could not leave T0 in that direction

 		var/turf/T1 = get_step(T0,d)
-		if(!T1 || T1.density)
-			continue
-		if(!T1.ClickCross(get_dir(T1,src), border_only = 0, target_atom = target, mover = mover) || !T1.ClickCross(get_dir(T1,T0), border_only = 0, target_atom = target, mover = mover))
+		if(!T1 || T1.density)
+			continue
+		if(!T1.ClickCross(get_dir(T1,src), border_only = 0, target_atom = target, mover = mover) || !T1.ClickCross(get_dir(T1,T0), border_only = 0, target_atom = target, mover = mover))
 			continue // couldn't enter or couldn't leave T1

-		if(!src.ClickCross(get_dir(src,T1), border_only = 1, target_atom = target, mover = mover))
+		if(!src.ClickCross(get_dir(src,T1), border_only = 1, target_atom = target, mover = mover))
 			continue // could not enter src

 		return 1 // we don't care about our own density
@@ -70,7 +70,7 @@
 		return TRUE
 	if(!isturf(loc))
 		return FALSE
-	if(loc.Adjacent(neighbor,target = neighbor, mover = src))
+	if(loc.Adjacent(neighbor,target = neighbor, mover = src))
 		return TRUE
 	return FALSE

@@ -85,20 +85,19 @@

 /*
 	This checks if you there is uninterrupted airspace between that turf and this one.
-	This is defined as any dense ON_BORDER_1 object, or any dense object without LETPASSTHROW.
+	This is defined as any dense ON_BORDER_1 object, or any dense object without LETPASSTHROW.
 	The border_only flag allows you to not objects (for source and destination squares)
 */
-/turf/proc/ClickCross(target_dir, border_only, target_atom = null, atom/movable/mover = null)
+/turf/proc/ClickCross(target_dir, border_only, target_atom = null, atom/movable/mover = null)
 	for(var/obj/O in src)
-		if((mover && O.CanPass(mover,get_step(src,target_dir))) || (!mover && !O.density))
-			continue
-		if(O == target_atom || (O.pass_flags & LETPASSTHROW)) //check if there's a dense object present on the turf
+		if((mover && O.CanPass(mover,get_step(src,target_dir))) || (!mover && !O.density))
+			continue
+		if(O == target_atom || O == mover || (O.pass_flags & LETPASSTHROW)) //check if there's a dense object present on the turf
 			continue // LETPASSTHROW is used for anything you can click through (or the firedoor special case, see above)

-		if( O.flags_1&ON_BORDER_1) // windows are on border, check them first
+		if( O.flags_1&ON_BORDER_1) // windows are on border, check them first
 			if( O.dir & target_dir || O.dir & (O.dir-1) ) // full tile windows are just diagonals mechanically
 				return 0								  //O.dir&(O.dir-1) is false for any cardinal direction, but true for diagonal ones
-
 		else if( !border_only ) // dense, not on border, cannot pass over
 			return 0
 	return 1
@@ -355,7 +355,7 @@
 		else
 			user.listed_turf = T
 			user.client.statpanel = T.name
-	return
+	user.Stat() //responsive ui pls

 /mob/proc/TurfAdjacent(turf/T)
 	return T.Adjacent(src)
@@ -1,19 +1,20 @@
-/*
-	MouseDrop:
-
-	Called on the atom you're dragging.  In a lot of circumstances we want to use the
-	recieving object instead, so that's the default action.  This allows you to drag
-	almost anything into a trash can.
-*/
-/atom/MouseDrop(atom/over, src_location, over_location, src_control, over_control, params)
-	if(!usr || !over) return
-	if(over == src)
-		return usr.client.Click(src, src_location, src_control, params)
-	if(!Adjacent(usr) || !over.Adjacent(usr)) return // should stop you from dragging through windows
-
-	over.MouseDrop_T(src,usr)
-	return
-
-// recieve a mousedrop
-/atom/proc/MouseDrop_T(atom/dropping, mob/user)
-	return
+/*
+	MouseDrop:
+
+	Called on the atom you're dragging.  In a lot of circumstances we want to use the
+	recieving object instead, so that's the default action.  This allows you to drag
+	almost anything into a trash can.
+*/
+/atom/MouseDrop(atom/over, src_location, over_location, src_control, over_control, params)
+	if(!usr || !over) 
+		return
+	if(over == src)
+		return usr.client.Click(src, src_location, src_control, params)
+	if(!Adjacent(usr) || !over.Adjacent(usr)) return // should stop you from dragging through windows
+
+	over.MouseDrop_T(src,usr)
+	return
+
+// recieve a mousedrop
+/atom/proc/MouseDrop_T(atom/dropping, mob/user)
+	return
@@ -0,0 +1,20 @@
+
+//For custom items.
+
+/obj/item/custom/ceb_soap
+	name = "Cebutris' Soap"
+	desc = "A generic bar of soap that doesn't really seem to work right."
+	gender = PLURAL
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "cebu"
+	w_class = WEIGHT_CLASS_TINY
+	flags_1 = NOBLUDGEON_1
+
+/obj/item/clothing/neck/cloak/inferno
+	name = "Kiara's Cloak"
+	desc = "The design on this seems a little too familiar."
+	icon = 'icons/obj/clothing/cloaks.dmi'
+	icon_state = "infcloak"
+	item_state = "infcloak"
+	w_class = WEIGHT_CLASS_SMALL
+	body_parts_covered = CHEST|GROIN|LEGS|ARMS
@@ -0,0 +1,61 @@
+
+//Proc that does the actual loading of items to mob
+/*Itemlists are formatted as
+"[typepath]" = number_of_it_to_spawn
+*/
+
+#define DROP_TO_FLOOR 0
+#define LOADING_TO_HUMAN 1
+
+/proc/handle_roundstart_items(mob/living/M, ckey_override, job_override, special_override)
+	if(!istype(M) || (!M.ckey && !ckey_override) || (!M.mind && (!job_override || !special_override)))
+		return FALSE
+	return load_itemlist_to_mob(M, parse_custom_roundstart_items(ckey_override? ckey_override : M.ckey, M.name, job_override? job_override : M.mind.assigned_role, special_override? special_override : M.mind.special_role), TRUE, TRUE, FALSE)
+
+//Just incase there's extra mob selections in the future.....
+/proc/load_itemlist_to_mob(mob/living/L, list/itemlist, drop_on_floor_if_full = TRUE, load_to_all_slots = TRUE, replace_slots = FALSE)
+	if(!istype(L) || !islist(itemlist))
+		return FALSE
+	var/loading_mode = DROP_TO_FLOOR
+	var/turf/current_turf = get_turf(L)
+	if(ishuman(L))
+		loading_mode = LOADING_TO_HUMAN
+	switch(loading_mode)
+		if(DROP_TO_FLOOR)
+			for(var/I in itemlist)
+				var/typepath = text2path(I)
+				if(!typepath)
+					continue
+				for(var/i = 0, i < itemlist[I], i++)
+					new typepath(current_turf)
+			return TRUE
+		if(LOADING_TO_HUMAN)
+			return load_itemlist_to_human(L, itemlist, drop_on_floor_if_full, load_to_all_slots, replace_slots)
+
+/proc/load_itemlist_to_human(mob/living/carbon/human/H, list/itemlist, drop_on_floor_if_full = TRUE, load_to_all_slots = TRUE, replace_slots = FALSE)
+	if(!istype(H) || !islist(itemlist))
+		return FALSE
+	var/turf/T = get_turf(H)
+	for(var/item in itemlist)
+		var/path = item
+		if(!ispath(path))
+			path = text2path(path)
+		if(!path)
+			continue
+		var/amount = itemlist[item]
+		for(var/i in 1 to amount)
+			var/atom/movable/loaded_atom = new path
+			if(!istype(loaded_atom))
+				QDEL_NULL(loaded_atom)
+				continue
+			if(!istype(loaded_atom, /obj/item))
+				loaded_atom.forceMove(T)
+				continue
+			var/obj/item/loaded = loaded_atom
+			var/obj/item/storage/S = H.get_item_by_slot(slot_back)
+			if(istype(S))
+				S.handle_item_insertion(loaded, TRUE, H)	//Force it into their backpack
+				continue
+			if(!H.put_in_hands(loaded))						//They don't have one/somehow that failed, put it in their hands
+				loaded.forceMove(T)				//Guess we're just dumping it on the floor!
+	return TRUE
@@ -0,0 +1,71 @@
+
+GLOBAL_LIST(custom_item_list)
+//Layered list in form of custom_item_list[ckey][job][items][amounts]
+//ckey is key, job is specific jobs, or "ALL" for all jobs, items for items, amounts for amount of item.
+
+//File should be in the format of ckey|exact job name/exact job name/or put ALL instead of any job names|/path/to/item=amount;/path/to/item=amount
+//Each ckey should be in a different line
+//if there's multiple entries of a single ckey the later ones will add to the earlier definitions.
+
+/proc/reload_custom_roundstart_items_list(custom_filelist)
+	if(!custom_filelist)
+		custom_filelist = "config/custom_roundstart_items.txt"
+	GLOB.custom_item_list = list()
+	var/list/file_lines = world.file2list(custom_filelist)
+	for(var/line in file_lines)
+		if(length(line) == 0)	//Emptyline, no one cares.
+			continue
+		if(copytext(line,1,3) == "//")	//Commented line, ignore.
+			continue
+		var/ckey_str_sep = findtext(line, "|")						//Process our stuff..
+		var/char_str_sep = findtext(line, "|", ckey_str_sep+1)
+		var/job_str_sep = findtext(line, "|", char_str_sep+1)
+		var/item_str_sep = findtext(line, "|", job_str_sep+1)
+		var/ckey_str = ckey(copytext(line, 1, ckey_str_sep))
+		var/char_str = copytext(line, ckey_str_sep+1, char_str_sep)
+		var/job_str = copytext(line, char_str_sep+1, job_str_sep)
+		var/item_str = copytext(line, job_str_sep+1, item_str_sep)
+		if(!ckey_str || !char_str || !job_str || !item_str || !length(ckey_str) || !length(char_str) || !length(job_str) || !length(item_str))
+			log_admin("Errored custom_items_whitelist line: [line] - Component/separator missing!")
+		if(!islist(GLOB.custom_item_list[ckey_str]))
+			GLOB.custom_item_list[ckey_str] = list()	//Initialize list for this ckey if it isn't initialized..
+		var/list/characters = splittext(char_str, "/")
+		for(var/character in characters)
+			if(!islist(GLOB.custom_item_list[ckey_str][character]))
+				GLOB.custom_item_list[ckey_str][character] = list()
+		var/list/jobs = splittext(job_str, "/")
+		for(var/job in jobs)
+			for(var/character in characters)
+				if(!islist(GLOB.custom_item_list[ckey_str][character][job]))
+					GLOB.custom_item_list[ckey_str][character][job] = list()		//Initialize item list for this job of this ckey if not already initialized.
+		var/list/item_strings = splittext(item_str, ";")			//Get item strings in format of /path/to/item=amount
+		for(var/item_string in item_strings)
+			var/path_str_sep = findtext(item_string, "=")
+			var/path = copytext(item_string, 1, path_str_sep)	//Path to spawn
+			var/amount = copytext(item_string, path_str_sep+1)	//Amount to spawn
+			//world << "DEBUG: Item string [item_string] processed"
+			amount = text2num(amount)
+			path = text2path(path)
+			if(!ispath(path) || !isnum(amount))
+				log_admin("Errored custom_items_whitelist line: [line] - Path/number for item missing or invalid.")
+			for(var/character in characters)
+				for(var/job in jobs)
+					if(!GLOB.custom_item_list[ckey_str][character][job][path])		//Doesn't exist, make it exist!
+						GLOB.custom_item_list[ckey_str][character][job][path] = amount
+					else
+						GLOB.custom_item_list[ckey_str][character][job][path] += amount	//Exists, we want more~
+	return GLOB.custom_item_list
+
+/proc/parse_custom_roundstart_items(ckey, char_name = "ALL", job_name = "ALL", special_role)
+	var/list/ret = list()
+	if(GLOB.custom_item_list[ckey])
+		for(var/char in GLOB.custom_item_list[ckey])
+			if((char_name == char) || (char_name == "ALL") || (char == "ALL"))
+				for(var/job in GLOB.custom_item_list[ckey][char])
+					if((job_name == job) || (job == "ALL") || (job_name == "ALL") || (special_role && (job == special_role)))
+						for(var/item_path in GLOB.custom_item_list[ckey][char][job])
+							if(ret[item_path])
+								ret[item_path] += GLOB.custom_item_list[ckey][char][job][item_path]
+							else
+								ret[item_path] = GLOB.custom_item_list[ckey][char][job][item_path]
+	return ret
@@ -23,7 +23,6 @@
 	attack_verb = list("nibbled", "bit", "gnawed", "chomped", "nommed")
 	w_class = 3
 	sharpness = IS_SHARP
-	var/emagged = 0

 /obj/item/dogborg/jaws/attack(atom/A, mob/living/silicon/robot/user)
 	..()
@@ -173,7 +172,6 @@
 	icon_state = "synthtongue"
 	hitsound = 'sound/effects/attackblob.ogg'
 	cleanspeed = 80
-	var/emagged = 0

 /obj/item/soap/tongue/New()
 	..()
@@ -5,6 +5,10 @@
 #define SECURITY_HAS_MAINT_ACCESS 2
 #define EVERYONE_HAS_MAINT_ACCESS 4

+GLOBAL_VAR_INIT(config_dir, "config/")
+GLOBAL_PROTECT(config_dir)
+
+
 /datum/configuration/can_vv_get(var_name)
 	var/static/list/banned_gets = list("autoadmin", "autoadmin_rank")
 	if (var_name in banned_gets)
@@ -103,6 +107,13 @@
 	var/use_account_age_for_jobs = 0	//Uses the time they made the account for the job restriction stuff. New player joining alerts should be unaffected.
 	var/see_own_notes = 0 //Can players see their own admin notes (read-only)? Config option in config.txt

+	var/use_exp_tracking = FALSE
+	var/use_exp_restrictions_heads = FALSE
+	var/use_exp_restrictions_heads_hours = 0
+	var/use_exp_restrictions_heads_department = FALSE
+	var/use_exp_restrictions_other = FALSE
+	var/use_exp_restrictions_admin_bypass = FALSE
+
 	//Population cap vars
 	var/soft_popcap				= 0
 	var/hard_popcap				= 0
@@ -168,6 +179,7 @@
 	var/rename_cyborg = 0
 	var/ooc_during_round = 0
 	var/emojis = 0
+	var/no_credits_round_end = FALSE

 	//Used for modifying movement speed for mobs.
 	//Unversal modifiers
@@ -287,17 +299,20 @@
 	Reload()

 /datum/configuration/proc/Reload()
-	load("config/config.txt")
-	load("config/game_options.txt","game_options")
-	load("config/policies.txt", "policies")
-	loadsql("config/dbconfig.txt")
+	load("config.txt")
+	load("comms.txt", "comms")
+	load("game_options.txt","game_options")
+	load("policies.txt", "policies")
+	loadsql("dbconfig.txt")
+	reload_custom_roundstart_items_list()
 	if (maprotation)
-		loadmaplist("config/maps.txt")
+		loadmaplist("maps.txt")

 	// apply some settings from config..
 	GLOB.abandon_allowed = respawn

 /datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist
+	filename = "[GLOB.config_dir][filename]"
 	var/list/Lines = world.file2list(filename)

 	for(var/t in Lines)
@@ -335,6 +350,18 @@
 					use_age_restriction_for_jobs = 1
 				if("use_account_age_for_jobs")
 					use_account_age_for_jobs = 1
+				if("use_exp_tracking")
+					use_exp_tracking = TRUE
+				if("use_exp_restrictions_heads")
+					use_exp_restrictions_heads = TRUE
+				if("use_exp_restrictions_heads_hours")
+					use_exp_restrictions_heads_hours = text2num(value)
+				if("use_exp_restrictions_heads_department")
+					use_exp_restrictions_heads_department = TRUE
+				if("use_exp_restrictions_other")
+					use_exp_restrictions_other = TRUE
+				if("use_exp_restrictions_admin_bypass")
+					use_exp_restrictions_admin_bypass = TRUE
 				if("lobby_countdown")
 					lobby_countdown = text2num(value)
 				if("round_end_countdown")
@@ -443,27 +470,12 @@
 					fps = text2num(value)
 				if("automute_on")
 					automute_on = 1
-				if("comms_key")
-					global.comms_key = value
-					if(value != "default_pwd" && length(value) > 6) //It's the default value or less than 6 characters long, warn badmins
-						global.comms_allowed = 1
-				if("cross_server_address")
-					cross_address = value
-					if(value != "byond:\\address:port")
-						cross_allowed = 1
-				if("cross_comms_name")
-					cross_name = value
 				if("panic_server_name")
 					if (value != "\[Put the name here\]")
 						panic_server_name = value
 				if("panic_server_address")
 					if(value != "byond://address:port")
 						panic_address = value
-
-				if("medal_hub_address")
-					global.medal_hub = value
-				if("medal_hub_password")
-					global.medal_pass = value
 				if("show_irc_name")
 					showircname = 1
 				if("see_own_notes")
@@ -548,8 +560,12 @@
 				if("irc_announce_new_game")
 					irc_announce_new_game = TRUE
 				else
-					WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'")
-
+#if DM_VERSION > 511
+#error Replace the line below with WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'")
+#endif
+					HandleCommsConfig(name, value)	//TODO: Deprecate this eventually
+		else if(type == "comms")
+			HandleCommsConfig(name, value)
 		else if(type == "game_options")
 			switch(name)
 				if("damage_multiplier")
@@ -566,6 +582,8 @@
 					ooc_during_round			= 1
 				if("emojis")
 					emojis					= 1
+				if("no_credits_round_end")
+					no_credits_round_end	= TRUE
 				if("run_delay")
 					run_speed				= text2num(value)
 				if("walk_delay")
@@ -789,8 +807,27 @@
 	if(fps <= 0)
 		fps = initial(fps)

+/datum/configuration/proc/HandleCommsConfig(name, value)
+	switch(name)
+		if("comms_key")
+			global.comms_key = value
+			if(value != "default_pwd" && length(value) > 6) //It's the default value or less than 6 characters long, warn badmins
+				global.comms_allowed = TRUE
+		if("cross_server_address")
+			cross_address = value
+			if(value != "byond:\\address:port")
+				cross_allowed = TRUE
+		if("cross_comms_name")
+			cross_name = value
+		if("medal_hub_address")
+			global.medal_hub = value
+		if("medal_hub_password")
+			global.medal_pass = value
+		else
+			WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'")

 /datum/configuration/proc/loadmaplist(filename)
+	filename = "[GLOB.config_dir][filename]"
 	var/list/Lines = world.file2list(filename)

 	var/datum/map_config/currentmap = null
@@ -843,6 +880,7 @@


 /datum/configuration/proc/loadsql(filename)
+	filename = "[GLOB.config_dir][filename]"
 	var/list/Lines = world.file2list(filename)
 	for(var/t in Lines)
 		if(!t)
@@ -0,0 +1,24 @@
+diff a/code/controllers/configuration.dm b/code/controllers/configuration.dm	(rejected hunks)
+@@ -337,17 +337,17 @@
+ 				if("use_account_age_for_jobs")
+ 					use_account_age_for_jobs = 1
+ 				if("use_exp_tracking")
+-					use_exp_tracking = 1
+					use_exp_tracking = TRUE
+ 				if("use_exp_restrictions_heads")
+-					use_exp_restrictions_heads = 1
+					use_exp_restrictions_heads = TRUE
+ 				if("use_exp_restrictions_heads_hours")
+ 					use_exp_restrictions_heads_hours = text2num(value)
+ 				if("use_exp_restrictions_heads_department")
+-					use_exp_restrictions_heads_department = 1
+					use_exp_restrictions_heads_department = TRUE
+ 				if("use_exp_restrictions_other")
+-					use_exp_restrictions_other = 1
+					use_exp_restrictions_other = TRUE
+ 				if("use_exp_restrictions_admin_bypass")
+-					use_exp_restrictions_admin_bypass = 1
+					use_exp_restrictions_admin_bypass = TRUE
+ 				if("lobby_countdown")
+ 					lobby_countdown = text2num(value)
+ 				if("round_end_countdown")
@@ -53,20 +53,24 @@ 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

 /datum/controller/master/New()
 	// Highlander-style: there can only be one! Kill off the old and replace it with the new.
-	subsystems = list()
+	var/list/_subsystems = list()
+	subsystems = _subsystems
 	if (Master != src)
 		if (istype(Master))
 			Recover()
 			qdel(Master)
 		else
-			init_subtypes(/datum/controller/subsystem, subsystems)
+			var/list/subsytem_types = subtypesof(/datum/controller/subsystem)
+			sortTim(subsytem_types, /proc/cmp_subsystem_init)
+			for(var/I in subsytem_types)
+				_subsystems += new I
 		Master = src

 	if(!GLOB)
@@ -131,7 +135,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_1 |= SS_NO_FIRE
+				BadBoy.flags |= SS_NO_FIRE
 		if(msg)
 			to_chat(GLOB.admins, "<span class='boldannounce'>[msg]</span>")
 			log_world(msg)
@@ -167,7 +171,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_1 & SS_NO_INIT)
+		if (SS.flags & SS_NO_INIT)
 			continue
 		SS.Initialize(REALTIMEOFDAY)
 		CHECK_TICK
@@ -232,13 +236,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_1 & SS_NO_FIRE)
+		if (SS.flags & SS_NO_FIRE)
 			continue
 		SS.queued_time = 0
 		SS.queue_next = null
 		SS.queue_prev = null
 		SS.state = SS_IDLE
-		if (SS.flags_1 & SS_TICKER)
+		if (SS.flags & SS_TICKER)
 			tickersubsystems += SS
 			timer += world.tick_lag * rand(1, 5)
 			SS.next_fire = timer
@@ -284,7 +288,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new

 		//if there are mutiple sleeping procs running before us hogging the cpu, we have to run later
 		//	because sleeps are processed in the order received, so longer sleeps are more likely to run first
-		if (world.tick_usage > TICK_LIMIT_MC)
+		if (TICK_USAGE > TICK_LIMIT_MC)
 			sleep_delta += 2
 			current_ticklimit = TICK_LIMIT_RUNNING * 0.5
 			sleep(world.tick_lag * (processing + sleep_delta))
@@ -293,7 +297,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 		sleep_delta = MC_AVERAGE_FAST(sleep_delta, 0)
 		if (last_run + (world.tick_lag * processing) > world.time)
 			sleep_delta += 1
-		if (world.tick_usage > (TICK_LIMIT_MC*0.5))
+		if (TICK_USAGE > (TICK_LIMIT_MC*0.5))
 			sleep_delta += 1

 		if (make_runtime)
@@ -371,7 +375,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 			continue
 		if (SS.next_fire > world.time)
 			continue
-		SS_flags = SS.flags_1
+		SS_flags = SS.flags
 		if (SS_flags & SS_NO_FIRE)
 			subsystemstocheck -= SS
 			continue
@@ -399,16 +403,16 @@ GLOBAL_REAL(Master, /datum/controller/master) = new

 	//keep running while we have stuff to run and we haven't gone over a tick
 	//	this is so subsystems paused eariler can use tick time that later subsystems never used
-	while (ran && queue_head && world.tick_usage < TICK_LIMIT_MC)
+	while (ran && queue_head && TICK_USAGE < TICK_LIMIT_MC)
 		ran = FALSE
 		bg_calc = FALSE
 		current_tick_budget = queue_priority_count
 		queue_node = queue_head
 		while (queue_node)
-			if (ran && world.tick_usage > TICK_LIMIT_RUNNING)
+			if (ran && TICK_USAGE > TICK_LIMIT_RUNNING)
 				break

-			queue_node_flags = queue_node.flags_1
+			queue_node_flags = queue_node.flags
 			queue_node_priority = queue_node.queued_priority

 			//super special case, subsystems where we can't make them pause mid way through
@@ -417,7 +421,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 			//(unless we haven't even ran anything this tick, since its unlikely they will ever be able run
 			//	in those cases, so we just let them run)
 			if (queue_node_flags & SS_NO_TICK_CHECK)
-				if (queue_node.tick_usage > TICK_LIMIT_RUNNING - world.tick_usage && ran_non_ticker)
+				if (queue_node.tick_usage > TICK_LIMIT_RUNNING - TICK_USAGE && ran_non_ticker)
 					queue_node.queued_priority += queue_priority_count * 0.10
 					queue_priority_count -= queue_node_priority
 					queue_priority_count += queue_node.queued_priority
@@ -429,7 +433,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 				current_tick_budget = queue_priority_count_bg
 				bg_calc = TRUE

-			tick_remaining = TICK_LIMIT_RUNNING - world.tick_usage
+			tick_remaining = TICK_LIMIT_RUNNING - TICK_USAGE

 			if (current_tick_budget > 0 && queue_node_priority > 0)
 				tick_precentage = tick_remaining / (current_tick_budget / queue_node_priority)
@@ -438,7 +442,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new

 			tick_precentage = max(tick_precentage*0.5, tick_precentage-queue_node.tick_overrun)

-			current_ticklimit = round(world.tick_usage + tick_precentage)
+			current_ticklimit = round(TICK_USAGE + tick_precentage)

 			if (!(queue_node_flags & SS_TICKER))
 				ran_non_ticker = TRUE
@@ -449,9 +453,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new

 			queue_node.state = SS_RUNNING

-			tick_usage = world.tick_usage
+			tick_usage = TICK_USAGE
 			var/state = queue_node.ignite(queue_node_paused)
-			tick_usage = world.tick_usage - tick_usage
+			tick_usage = TICK_USAGE - tick_usage

 			if (state == SS_RUNNING)
 				state = SS_IDLE
@@ -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_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)
+	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)

 	//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_1 |= SS_NO_FIRE
+	flags |= 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_1 |= SS_NO_FIRE
+	flags |= 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_1
+	var/SS_flags = 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_1
+		queue_node_flags = queue_node.flags

 		if (queue_node_flags & SS_TICKER)
 			if (!(SS_flags & SS_TICKER))
@@ -170,7 +170,7 @@



-	if(can_fire && !(SS_NO_FIRE in flags_1))
+	if(can_fire && !(SS_NO_FIRE in flags))
 		msg = "[round(cost,1)]ms|[round(tick_usage,1)]%([round(tick_overrun,1)]%)|[round(ticks,0.1)]\t[msg]"
 	else
 		msg = "OFFLINE\t[msg]"
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(acid)
 	name = "Acid"
 	priority = 40
-	flags_1 = SS_NO_INIT|SS_BACKGROUND
+	flags = SS_NO_INIT|SS_BACKGROUND
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME

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

 	var/cost_turfs = 0
@@ -71,65 +71,65 @@ SUBSYSTEM_DEF(air)


 /datum/controller/subsystem/air/fire(resumed = 0)
-	var/timer = world.tick_usage
+	var/timer = TICK_USAGE_REAL

 	if(currentpart == SSAIR_PIPENETS || !resumed)
 		process_pipenets(resumed)
-		cost_pipenets = MC_AVERAGE(cost_pipenets, TICK_DELTA_TO_MS(world.tick_usage - timer))
+		cost_pipenets = MC_AVERAGE(cost_pipenets, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
 		currentpart = SSAIR_ATMOSMACHINERY

 	if(currentpart == SSAIR_ATMOSMACHINERY)
-		timer = world.tick_usage
+		timer = TICK_USAGE_REAL
 		process_atmos_machinery(resumed)
-		cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(world.tick_usage - timer))
+		cost_atmos_machinery = MC_AVERAGE(cost_atmos_machinery, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
 		currentpart = SSAIR_ACTIVETURFS

 	if(currentpart == SSAIR_ACTIVETURFS)
-		timer = world.tick_usage
+		timer = TICK_USAGE_REAL
 		process_active_turfs(resumed)
-		cost_turfs = MC_AVERAGE(cost_turfs, TICK_DELTA_TO_MS(world.tick_usage - timer))
+		cost_turfs = MC_AVERAGE(cost_turfs, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
 		currentpart = SSAIR_EXCITEDGROUPS

 	if(currentpart == SSAIR_EXCITEDGROUPS)
-		timer = world.tick_usage
+		timer = TICK_USAGE_REAL
 		process_excited_groups(resumed)
-		cost_groups = MC_AVERAGE(cost_groups, TICK_DELTA_TO_MS(world.tick_usage - timer))
+		cost_groups = MC_AVERAGE(cost_groups, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
 		currentpart = SSAIR_HIGHPRESSURE

 	if(currentpart == SSAIR_HIGHPRESSURE)
-		timer = world.tick_usage
+		timer = TICK_USAGE_REAL
 		process_high_pressure_delta(resumed)
-		cost_highpressure = MC_AVERAGE(cost_highpressure, TICK_DELTA_TO_MS(world.tick_usage - timer))
+		cost_highpressure = MC_AVERAGE(cost_highpressure, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
 		currentpart = SSAIR_HOTSPOTS

 	if(currentpart == SSAIR_HOTSPOTS)
-		timer = world.tick_usage
+		timer = TICK_USAGE_REAL
 		process_hotspots(resumed)
-		cost_hotspots = MC_AVERAGE(cost_hotspots, TICK_DELTA_TO_MS(world.tick_usage - timer))
+		cost_hotspots = MC_AVERAGE(cost_hotspots, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
 		currentpart = SSAIR_SUPERCONDUCTIVITY

 	if(currentpart == SSAIR_SUPERCONDUCTIVITY)
-		timer = world.tick_usage
+		timer = TICK_USAGE_REAL
 		process_super_conductivity(resumed)
-		cost_superconductivity = MC_AVERAGE(cost_superconductivity, TICK_DELTA_TO_MS(world.tick_usage - timer))
+		cost_superconductivity = MC_AVERAGE(cost_superconductivity, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
 		if(state != SS_RUNNING)
 			return
 		resumed = 0
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(assets)
 	name = "Assets"
 	init_order = INIT_ORDER_ASSETS
-	flags_1 = SS_NO_FIRE
+	flags = SS_NO_FIRE
 	var/list/cache = list()
 	var/list/preload = list()

@@ -6,7 +6,7 @@
 SUBSYSTEM_DEF(atoms)
 	name = "Atoms"
 	init_order = INIT_ORDER_ATOMS
-	flags_1 = SS_NO_FIRE
+	flags = SS_NO_FIRE

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

 	var/list/watchers = list()
@@ -1,269 +1,281 @@
-SUBSYSTEM_DEF(blackbox)
-	name = "Blackbox"
-	wait = 6000
-	flags_1 = SS_NO_TICK_CHECK | SS_NO_INIT
-	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
-	init_order = INIT_ORDER_BLACKBOX
-
-	var/list/msg_common = list()
-	var/list/msg_science = list()
-	var/list/msg_command = list()
-	var/list/msg_medical = list()
-	var/list/msg_engineering = list()
-	var/list/msg_security = list()
-	var/list/msg_deathsquad = list()
-	var/list/msg_syndicate = list()
-	var/list/msg_service = list()
-	var/list/msg_cargo = list()
-	var/list/msg_other = list()
-
-	var/list/feedback = list()	//list of datum/feedback_variable
-
-	var/sealed = FALSE	//time to stop tracking stats?
-
-//poll population
-/datum/controller/subsystem/blackbox/fire()
-	if(!SSdbcore.Connect())
-		return
-	var/playercount = 0
-	for(var/mob/M in GLOB.player_list)
-		if(M.client)
-			playercount += 1
-	var/admincount = GLOB.admins.len
-	var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]')")
-	query_record_playercount.Execute()
-
-/datum/controller/subsystem/blackbox/Recover()
-	msg_common = SSblackbox.msg_common
-	msg_science = SSblackbox.msg_science
-	msg_command = SSblackbox.msg_command
-	msg_medical = SSblackbox.msg_medical
-	msg_engineering = SSblackbox.msg_engineering
-	msg_security = SSblackbox.msg_security
-	msg_deathsquad = SSblackbox.msg_deathsquad
-	msg_syndicate = SSblackbox.msg_syndicate
-	msg_service = SSblackbox.msg_service
-	msg_cargo = SSblackbox.msg_cargo
-	msg_other = SSblackbox.msg_other
-
-	feedback = SSblackbox.feedback
-
-	sealed = SSblackbox.sealed
-
-//no touchie
-/datum/controller/subsystem/blackbox/can_vv_get(var_name)
-	if(var_name == "feedback")
-		return FALSE
-	return ..()
-
-/datum/controller/subsystem/blackbox/vv_edit_var(var_name, var_value)
-	return FALSE
-
-/datum/controller/subsystem/blackbox/Shutdown()
-	sealed = FALSE
-	set_val("ahelp_unresolved", GLOB.ahelp_tickets.active_tickets.len)
-
-	var/pda_msg_amt = 0
-	var/rc_msg_amt = 0
-
-	for (var/obj/machinery/message_server/MS in GLOB.message_servers)
-		if (MS.pda_msgs.len > pda_msg_amt)
-			pda_msg_amt = MS.pda_msgs.len
-		if (MS.rc_msgs.len > rc_msg_amt)
-			rc_msg_amt = MS.rc_msgs.len
-
-	set_details("radio_usage","")
-
-	add_details("radio_usage","COM-[msg_common.len]")
-	add_details("radio_usage","SCI-[msg_science.len]")
-	add_details("radio_usage","HEA-[msg_command.len]")
-	add_details("radio_usage","MED-[msg_medical.len]")
-	add_details("radio_usage","ENG-[msg_engineering.len]")
-	add_details("radio_usage","SEC-[msg_security.len]")
-	add_details("radio_usage","DTH-[msg_deathsquad.len]")
-	add_details("radio_usage","SYN-[msg_syndicate.len]")
-	add_details("radio_usage","SRV-[msg_service.len]")
-	add_details("radio_usage","CAR-[msg_cargo.len]")
-	add_details("radio_usage","OTH-[msg_other.len]")
-	add_details("radio_usage","PDA-[pda_msg_amt]")
-	add_details("radio_usage","RC-[rc_msg_amt]")
-
-	if (!SSdbcore.Connect())
-		return
-
-	var/list/sqlrowlist = list()
-
-	for (var/datum/feedback_variable/FV in feedback)
-		sqlrowlist += list(list("time" = "Now()", "round_id" = GLOB.round_id, "var_name" =  "'[sanitizeSQL(FV.get_variable())]'", "var_value" = FV.get_value(), "details" = "'[sanitizeSQL(FV.get_details())]'"))
-
-	if (!length(sqlrowlist))
-		return
-
-	SSdbcore.MassInsert(format_table_name("feedback"), sqlrowlist, ignore_errors = TRUE, delayed = TRUE)
-
-
-/datum/controller/subsystem/blackbox/proc/LogBroadcast(blackbox_msg, freq)
-	if(sealed)
-		return
-	switch(freq)
-		if(1459)
-			msg_common += blackbox_msg
-		if(1351)
-			msg_science += blackbox_msg
-		if(1353)
-			msg_command += blackbox_msg
-		if(1355)
-			msg_medical += blackbox_msg
-		if(1357)
-			msg_engineering += blackbox_msg
-		if(1359)
-			msg_security += blackbox_msg
-		if(1441)
-			msg_deathsquad += blackbox_msg
-		if(1213)
-			msg_syndicate += blackbox_msg
-		if(1349)
-			msg_service += blackbox_msg
-		if(1347)
-			msg_cargo += blackbox_msg
-		else
-			msg_other += blackbox_msg
-
-/datum/controller/subsystem/blackbox/proc/find_feedback_datum(variable)
-	for(var/datum/feedback_variable/FV in feedback)
-		if(FV.get_variable() == variable)
-			return FV
-
-	var/datum/feedback_variable/FV = new(variable)
-	feedback += FV
-	return FV
-
-/datum/controller/subsystem/blackbox/proc/set_val(variable, value)
-	if(sealed)
-		return
-	var/datum/feedback_variable/FV = find_feedback_datum(variable)
-	FV.set_value(value)
-
-/datum/controller/subsystem/blackbox/proc/inc(variable, value)
-	if(sealed)
-		return
-	var/datum/feedback_variable/FV = find_feedback_datum(variable)
-	FV.inc(value)
-
-/datum/controller/subsystem/blackbox/proc/dec(variable,value)
-	if(sealed)
-		return
-	var/datum/feedback_variable/FV = find_feedback_datum(variable)
-	FV.dec(value)
-
-/datum/controller/subsystem/blackbox/proc/set_details(variable,details)
-	if(sealed)
-		return
-	var/datum/feedback_variable/FV = find_feedback_datum(variable)
-	FV.set_details(details)
-
-/datum/controller/subsystem/blackbox/proc/add_details(variable,details)
-	if(sealed)
-		return
-	var/datum/feedback_variable/FV = find_feedback_datum(variable)
-	FV.add_details(details)
-
-/datum/controller/subsystem/blackbox/proc/ReportDeath(mob/living/L)
-	if(sealed)
-		return
-	if(!SSdbcore.Connect())
-		return
-	if(!L || !L.key || !L.mind)
-		return
-	var/turf/T = get_turf(L)
-	var/area/placeofdeath = get_area(T.loc)
-	var/sqlname = sanitizeSQL(L.real_name)
-	var/sqlkey = sanitizeSQL(L.ckey)
-	var/sqljob = sanitizeSQL(L.mind.assigned_role)
-	var/sqlspecial = sanitizeSQL(L.mind.special_role)
-	var/sqlpod = sanitizeSQL(placeofdeath.name)
-	var/laname
-	var/lakey
-	if(L.lastattacker && ismob(L.lastattacker))
-		var/mob/LA = L.lastattacker
-		laname = sanitizeSQL(LA.real_name)
-		lakey = sanitizeSQL(LA.key)
-	var/sqlbrute = sanitizeSQL(L.getBruteLoss())
-	var/sqlfire = sanitizeSQL(L.getFireLoss())
-	var/sqlbrain = sanitizeSQL(L.getBrainLoss())
-	var/sqloxy = sanitizeSQL(L.getOxyLoss())
-	var/sqltox = sanitizeSQL(L.getToxLoss())
-	var/sqlclone = sanitizeSQL(L.getCloneLoss())
-	var/sqlstamina = sanitizeSQL(L.getStaminaLoss())
-	var/x_coord = sanitizeSQL(L.x)
-	var/y_coord = sanitizeSQL(L.y)
-	var/z_coord = sanitizeSQL(L.z)
-	var/map = sanitizeSQL(SSmapping.config.map_name)
-	var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss) VALUES ('[sqlpod]', '[x_coord]', '[y_coord]', '[z_coord]', '[map]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]', [GLOB.round_id], '[SQLtime()]', '[sqljob]', '[sqlspecial]', '[sqlname]', '[sqlkey]', '[laname]', '[lakey]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina])")
-	query_report_death.Execute()
-
-/datum/controller/subsystem/blackbox/proc/Seal()
-	if(sealed)
-		return
-	if(IsAdminAdvancedProcCall())
-		var/msg = "[key_name_admin(usr)] sealed the blackbox!"
-		message_admins(msg)
-	log_game("Blackbox sealed[IsAdminAdvancedProcCall() ? " by [key_name(usr)]" : ""].")
-	sealed = TRUE
-
-//feedback variable datum, for storing all kinds of data
-/datum/feedback_variable
-	var/variable
-	var/value
-	var/details
-
-/datum/feedback_variable/New(param_variable, param_value = 0)
-	variable = param_variable
-	value = param_value
-
-/datum/feedback_variable/proc/inc(num = 1)
-	if (isnum(value))
-		value += num
-	else
-		value = text2num(value)
-		if (isnum(value))
-			value += num
-		else
-			value = num
-
-/datum/feedback_variable/proc/dec(num = 1)
-	if (isnum(value))
-		value -= num
-	else
-		value = text2num(value)
-		if (isnum(value))
-			value -= num
-		else
-			value = -num
-
-/datum/feedback_variable/proc/set_value(num)
-	if (isnum(num))
-		value = num
-
-/datum/feedback_variable/proc/get_value()
-	if (!isnum(value))
-		return 0
-	return value
-
-/datum/feedback_variable/proc/get_variable()
-	return variable
-
+SUBSYSTEM_DEF(blackbox)
+	name = "Blackbox"
+	wait = 6000
+	flags = SS_NO_TICK_CHECK
+	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+	init_order = INIT_ORDER_BLACKBOX
+
+	var/list/msg_common = list()
+	var/list/msg_science = list()
+	var/list/msg_command = list()
+	var/list/msg_medical = list()
+	var/list/msg_engineering = list()
+	var/list/msg_security = list()
+	var/list/msg_deathsquad = list()
+	var/list/msg_syndicate = list()
+	var/list/msg_service = list()
+	var/list/msg_cargo = list()
+	var/list/msg_other = list()
+
+	var/list/feedback = list()	//list of datum/feedback_variable
+	var/triggertime = 0
+	var/sealed = FALSE	//time to stop tracking stats?
+
+
+/datum/controller/subsystem/blackbox/Initialize()
+	triggertime = world.time
+	. = ..()
+
+//poll population
+/datum/controller/subsystem/blackbox/fire()
+	if(!SSdbcore.Connect())
+		return
+	var/playercount = 0
+	for(var/mob/M in GLOB.player_list)
+		if(M.client)
+			playercount += 1
+	var/admincount = GLOB.admins.len
+	var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port, round_id) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]', '[GLOB.round_id]')")
+	query_record_playercount.Execute()
+
+	if(config.use_exp_tracking)
+		if((triggertime < 0) || (world.time > (triggertime +3000)))	//subsystem fires once at roundstart then once every 10 minutes. a 5 min check skips the first fire. The <0 is midnight rollover check
+			update_exp(10,FALSE)
+
+
+/datum/controller/subsystem/blackbox/Recover()
+	msg_common = SSblackbox.msg_common
+	msg_science = SSblackbox.msg_science
+	msg_command = SSblackbox.msg_command
+	msg_medical = SSblackbox.msg_medical
+	msg_engineering = SSblackbox.msg_engineering
+	msg_security = SSblackbox.msg_security
+	msg_deathsquad = SSblackbox.msg_deathsquad
+	msg_syndicate = SSblackbox.msg_syndicate
+	msg_service = SSblackbox.msg_service
+	msg_cargo = SSblackbox.msg_cargo
+	msg_other = SSblackbox.msg_other
+
+	feedback = SSblackbox.feedback
+
+	sealed = SSblackbox.sealed
+
+//no touchie
+/datum/controller/subsystem/blackbox/can_vv_get(var_name)
+	if(var_name == "feedback")
+		return FALSE
+	return ..()
+
+/datum/controller/subsystem/blackbox/vv_edit_var(var_name, var_value)
+	return FALSE
+
+/datum/controller/subsystem/blackbox/Shutdown()
+	sealed = FALSE
+	set_val("ahelp_unresolved", GLOB.ahelp_tickets.active_tickets.len)
+
+	var/pda_msg_amt = 0
+	var/rc_msg_amt = 0
+
+	for (var/obj/machinery/message_server/MS in GLOB.message_servers)
+		if (MS.pda_msgs.len > pda_msg_amt)
+			pda_msg_amt = MS.pda_msgs.len
+		if (MS.rc_msgs.len > rc_msg_amt)
+			rc_msg_amt = MS.rc_msgs.len
+
+	set_details("radio_usage","")
+
+	add_details("radio_usage","COM-[msg_common.len]")
+	add_details("radio_usage","SCI-[msg_science.len]")
+	add_details("radio_usage","HEA-[msg_command.len]")
+	add_details("radio_usage","MED-[msg_medical.len]")
+	add_details("radio_usage","ENG-[msg_engineering.len]")
+	add_details("radio_usage","SEC-[msg_security.len]")
+	add_details("radio_usage","DTH-[msg_deathsquad.len]")
+	add_details("radio_usage","SYN-[msg_syndicate.len]")
+	add_details("radio_usage","SRV-[msg_service.len]")
+	add_details("radio_usage","CAR-[msg_cargo.len]")
+	add_details("radio_usage","OTH-[msg_other.len]")
+	add_details("radio_usage","PDA-[pda_msg_amt]")
+	add_details("radio_usage","RC-[rc_msg_amt]")
+
+	if (!SSdbcore.Connect())
+		return
+
+	var/list/sqlrowlist = list()
+
+	for (var/datum/feedback_variable/FV in feedback)
+		sqlrowlist += list(list("time" = "Now()", "round_id" = GLOB.round_id, "var_name" =  "'[sanitizeSQL(FV.get_variable())]'", "var_value" = FV.get_value(), "details" = "'[sanitizeSQL(FV.get_details())]'"))
+
+	if (!length(sqlrowlist))
+		return
+
+	SSdbcore.MassInsert(format_table_name("feedback"), sqlrowlist, ignore_errors = TRUE, delayed = TRUE)
+
+
+/datum/controller/subsystem/blackbox/proc/LogBroadcast(blackbox_msg, freq)
+	if(sealed)
+		return
+	switch(freq)
+		if(1459)
+			msg_common += blackbox_msg
+		if(1351)
+			msg_science += blackbox_msg
+		if(1353)
+			msg_command += blackbox_msg
+		if(1355)
+			msg_medical += blackbox_msg
+		if(1357)
+			msg_engineering += blackbox_msg
+		if(1359)
+			msg_security += blackbox_msg
+		if(1441)
+			msg_deathsquad += blackbox_msg
+		if(1213)
+			msg_syndicate += blackbox_msg
+		if(1349)
+			msg_service += blackbox_msg
+		if(1347)
+			msg_cargo += blackbox_msg
+		else
+			msg_other += blackbox_msg
+
+/datum/controller/subsystem/blackbox/proc/find_feedback_datum(variable)
+	for(var/datum/feedback_variable/FV in feedback)
+		if(FV.get_variable() == variable)
+			return FV
+
+	var/datum/feedback_variable/FV = new(variable)
+	feedback += FV
+	return FV
+
+/datum/controller/subsystem/blackbox/proc/set_val(variable, value)
+	if(sealed)
+		return
+	var/datum/feedback_variable/FV = find_feedback_datum(variable)
+	FV.set_value(value)
+
+/datum/controller/subsystem/blackbox/proc/inc(variable, value)
+	if(sealed)
+		return
+	var/datum/feedback_variable/FV = find_feedback_datum(variable)
+	FV.inc(value)
+
+/datum/controller/subsystem/blackbox/proc/dec(variable,value)
+	if(sealed)
+		return
+	var/datum/feedback_variable/FV = find_feedback_datum(variable)
+	FV.dec(value)
+
+/datum/controller/subsystem/blackbox/proc/set_details(variable,details)
+	if(sealed)
+		return
+	var/datum/feedback_variable/FV = find_feedback_datum(variable)
+	FV.set_details(details)
+
+/datum/controller/subsystem/blackbox/proc/add_details(variable,details)
+	if(sealed)
+		return
+	var/datum/feedback_variable/FV = find_feedback_datum(variable)
+	FV.add_details(details)
+
+/datum/controller/subsystem/blackbox/proc/ReportDeath(mob/living/L)
+	if(sealed)
+		return
+	if(!SSdbcore.Connect())
+		return
+	if(!L || !L.key || !L.mind)
+		return
+	var/turf/T = get_turf(L)
+	var/area/placeofdeath = get_area(T.loc)
+	var/sqlname = sanitizeSQL(L.real_name)
+	var/sqlkey = sanitizeSQL(L.ckey)
+	var/sqljob = sanitizeSQL(L.mind.assigned_role)
+	var/sqlspecial = sanitizeSQL(L.mind.special_role)
+	var/sqlpod = sanitizeSQL(placeofdeath.name)
+	var/laname
+	var/lakey
+	if(L.lastattacker && ismob(L.lastattacker))
+		var/mob/LA = L.lastattacker
+		laname = sanitizeSQL(LA.real_name)
+		lakey = sanitizeSQL(LA.key)
+	var/sqlbrute = sanitizeSQL(L.getBruteLoss())
+	var/sqlfire = sanitizeSQL(L.getFireLoss())
+	var/sqlbrain = sanitizeSQL(L.getBrainLoss())
+	var/sqloxy = sanitizeSQL(L.getOxyLoss())
+	var/sqltox = sanitizeSQL(L.getToxLoss())
+	var/sqlclone = sanitizeSQL(L.getCloneLoss())
+	var/sqlstamina = sanitizeSQL(L.getStaminaLoss())
+	var/x_coord = sanitizeSQL(L.x)
+	var/y_coord = sanitizeSQL(L.y)
+	var/z_coord = sanitizeSQL(L.z)
+	var/last_words = sanitizeSQL(L.last_words)
+	var/suicide = sanitizeSQL(L.suiciding)
+	var/map = sanitizeSQL(SSmapping.config.map_name)
+	var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (pod, x_coord, y_coord, z_coord, mapname, server_ip, server_port, round_id, tod, job, special, name, byondkey, laname, lakey, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, last_words, suicide) VALUES ('[sqlpod]', '[x_coord]', '[y_coord]', '[z_coord]', '[map]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]', [GLOB.round_id], '[SQLtime()]', '[sqljob]', '[sqlspecial]', '[sqlname]', '[sqlkey]', '[laname]', '[lakey]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[last_words]', [suicide])")
+	query_report_death.Execute()
+
+/datum/controller/subsystem/blackbox/proc/Seal()
+	if(sealed)
+		return
+	if(IsAdminAdvancedProcCall())
+		var/msg = "[key_name_admin(usr)] sealed the blackbox!"
+		message_admins(msg)
+	log_game("Blackbox sealed[IsAdminAdvancedProcCall() ? " by [key_name(usr)]" : ""].")
+	sealed = TRUE
+
+//feedback variable datum, for storing all kinds of data
+/datum/feedback_variable
+	var/variable
+	var/value
+	var/list/details
+
+/datum/feedback_variable/New(param_variable, param_value = 0)
+	variable = param_variable
+	value = param_value
+
+/datum/feedback_variable/proc/inc(num = 1)
+	if (isnum(value))
+		value += num
+	else
+		value = text2num(value)
+		if (isnum(value))
+			value += num
+		else
+			value = num
+
+/datum/feedback_variable/proc/dec(num = 1)
+	if (isnum(value))
+		value -= num
+	else
+		value = text2num(value)
+		if (isnum(value))
+			value -= num
+		else
+			value = -num
+
+/datum/feedback_variable/proc/set_value(num)
+	if (isnum(num))
+		value = num
+
+/datum/feedback_variable/proc/get_value()
+	if (!isnum(value))
+		return 0
+	return value
+
+/datum/feedback_variable/proc/get_variable()
+	return variable
+
 /datum/feedback_variable/proc/set_details(deets)
-	details = "\"[deets]\""
+	details = list("\"[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)
+		details += "\"[deets]\""
+
+/datum/feedback_variable/proc/get_details()
+	return details.Join(" | ")
+
+/datum/feedback_variable/proc/get_parsed()
+	return list(variable,value,details.Join(" | "))
@@ -0,0 +1,10 @@
+diff a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm	(rejected hunks)
+@@ -40,7 +40,7 @@ SUBSYSTEM_DEF(blackbox)
+ 
+ 	if(config.use_exp_tracking)
+ 		if((triggertime < 0) || (world.time > (triggertime +3000)))	//subsystem fires once at roundstart then once every 10 minutes. a 5 min check skips the first fire. The <0 is midnight rollover check
+-			SSblackbox.update_exp(10,FALSE)
+			update_exp(10,FALSE)
+ 
+ 
+ /datum/controller/subsystem/blackbox/Recover()
@@ -3,7 +3,7 @@

 SUBSYSTEM_DEF(communications)
 	name = "Communications"
-	flags_1 = SS_NO_INIT | SS_NO_FIRE
+	flags = SS_NO_INIT | SS_NO_FIRE

 	var/silicon_message_cooldown
 	var/nonsilicon_message_cooldown
@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(dbcore)
 	name = "Database"
-	flags_1 = SS_NO_INIT|SS_NO_FIRE
+	flags = 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_1
+	var/flags
 	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_1 = flag_handler
+	flags = flag_handler
 	length = length_handler
 	max_length = max_length_handler

@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(disease)
 	name = "Disease"
-	flags_1 = SS_NO_FIRE | SS_NO_INIT
+	flags = 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
@@ -14,3 +14,10 @@ SUBSYSTEM_DEF(disease)

 /datum/controller/subsystem/disease/stat_entry(msg)
 	..("P:[active_diseases.len]")
+
+/datum/controller/subsystem/disease/proc/get_disease_name(id)
+	var/datum/disease/advance/A = archive_diseases[id]
+	if(A.name)
+		return A.name
+	else
+		return "Unknown"
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(explosion)
 	priority = 99
 	wait = 1
-	flags_1 = SS_TICKER|SS_NO_INIT
+	flags = SS_TICKER|SS_NO_INIT

 	var/list/explosions

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

 	var/list/currentrun = list()
@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(garbage)
 	name = "Garbage"
 	priority = 15
 	wait = 20
-	flags_1 = SS_POST_FIRE_TIMING|SS_BACKGROUND|SS_NO_INIT
+	flags = 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
@@ -147,15 +147,15 @@ SUBSYSTEM_DEF(garbage)
 //this is purely to separate things profile wise.
 /datum/controller/subsystem/garbage/proc/HardDelete(datum/A)
 	var/time = world.timeofday
-	var/tick = world.tick_usage
+	var/tick = 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))
+	
+	tick = (TICK_USAGE-tick+((world.time-ticktime)/world.tick_lag*100))
 	if (tick > highest_del_tickusage)
 		highest_del_tickusage = tick
 	time = world.timeofday - time
@@ -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
@@ -3,7 +3,7 @@ SUBSYSTEM_DEF(icon_smooth)
 	init_order = INIT_ORDER_ICON_SMOOTHING
 	wait = 1
 	priority = 35
-	flags_1 = SS_TICKER
+	flags = SS_TICKER

 	var/list/smooth_queue = list()

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

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

 	var/list/occupations = list()		//List of all jobs
 	var/list/name_occupations = list()	//Dict of all jobs, keys are titles
@@ -73,6 +73,8 @@ SUBSYSTEM_DEF(job)
 			return 0
 		if(!job.player_old_enough(player.client))
 			return 0
+		if(job.required_playtime_remaining(player.client))
+			return 0
 		var/position_limit = job.total_positions
 		if(!latejoin)
 			position_limit = job.spawn_positions
@@ -95,6 +97,9 @@ SUBSYSTEM_DEF(job)
 		if(!job.player_old_enough(player.client))
 			Debug("FOC player not old enough, Player: [player]")
 			continue
+		if(job.required_playtime_remaining(player.client))
+			Debug("FOC player not enough xp, Player: [player]")
+			continue
 		if(flag && (!(flag in player.client.prefs.be_special)))
 			Debug("FOC flag failed, Player: [player], Flag: [flag], ")
 			continue
@@ -130,6 +135,10 @@ SUBSYSTEM_DEF(job)
 			Debug("GRJ player not old enough, Player: [player]")
 			continue

+		if(job.required_playtime_remaining(player.client))
+			Debug("GRJ player not enough xp, Player: [player]")
+			continue
+
 		if(player.mind && job.title in player.mind.restricted_roles)
 			Debug("GRJ incompatible with antagonist role, Player: [player], Job: [job.title]")
 			continue
@@ -300,6 +309,10 @@ SUBSYSTEM_DEF(job)
 					Debug("DO player not old enough, Player: [player], Job:[job.title]")
 					continue

+				if(job.required_playtime_remaining(player.client))
+					Debug("DO player not enough xp, Player: [player], Job:[job.title]")
+					continue
+
 				if(player.mind && job.title in player.mind.restricted_roles)
 					Debug("DO incompatible with antagonist role, Player: [player], Job:[job.title]")
 					continue
@@ -407,7 +420,7 @@ SUBSYSTEM_DEF(job)

 	if(job && H)
 		job.after_spawn(H, M)
-
+	handle_roundstart_items(H, M.ckey, H.mind.assigned_role, H.mind.special_role)
 	return H


@@ -463,6 +476,9 @@ SUBSYSTEM_DEF(job)
 			if(!job.player_old_enough(player.client))
 				level6++
 				continue
+			if(job.required_playtime_remaining(player.client))
+				level6++
+				continue
 			if(player.client.prefs.GetJobDepartment(job, 1) & job.flag)
 				level1++
 			else if(player.client.prefs.GetJobDepartment(job, 2) & job.flag)
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(language)
 	name = "Language"
 	init_order = INIT_ORDER_LANGUAGE
-	flags_1 = SS_NO_FIRE
+	flags = SS_NO_FIRE

 /datum/controller/subsystem/language/Initialize(timeofday)
 	for(var/L in subtypesof(/datum/language))
@@ -6,7 +6,7 @@ SUBSYSTEM_DEF(lighting)
 	name = "Lighting"
 	wait = 2
 	init_order = INIT_ORDER_LIGHTING
-	flags_1 = SS_TICKER
+	flags = SS_TICKER

 	var/initialized = FALSE

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(machines)
 	name = "Machines"
 	init_order = INIT_ORDER_MACHINES
-	flags_1 = SS_KEEP_TIMING
+	flags = SS_KEEP_TIMING
 	var/list/processing = list()
 	var/list/currentrun = list()
 	var/list/powernets = list()
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(mapping)
 	name = "Mapping"
 	init_order = INIT_ORDER_MAPPING
-	flags_1 = SS_NO_FIRE
+	flags = 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_1 |= SS_NO_INIT
+	flags |= SS_NO_INIT
 	map_templates = SSmapping.map_templates
 	ruins_templates = SSmapping.ruins_templates
 	space_ruins_templates = SSmapping.space_ruins_templates
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(minimap)
 	name = "Minimap"
 	init_order = INIT_ORDER_MINIMAP
-	flags_1 = SS_NO_FIRE
+	flags = SS_NO_FIRE
 	var/const/MINIMAP_SIZE = 2048
 	var/const/TILE_SIZE = 8

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

 	var/list/currentrun = list()
@@ -5,7 +5,7 @@

 SUBSYSTEM_DEF(npcpool)
 	name = "NPC Pool"
-	flags_1 = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND
+	flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND
 	priority = 20
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME

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

 	var/list/currentrun = list()
 	var/list/processing = list()
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(pai)
 	name = "pAI"

-	flags_1 = SS_NO_INIT|SS_NO_FIRE
+	flags = SS_NO_INIT|SS_NO_FIRE

 	var/list/candidates = list()
 	var/ghost_spam = FALSE
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(parallax)
 	name = "Parallax"
 	wait = 2
-	flags_1 = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT
+	flags = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_INIT
 	priority = 65
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 	var/list/currentrun
@@ -1,16 +1,14 @@
 SUBSYSTEM_DEF(persistence)
 	name = "Persistence"
 	init_order = INIT_ORDER_PERSISTENCE
-	flags_1 = SS_NO_FIRE
-	var/savefile/secret_satchels
+	flags = SS_NO_FIRE
 	var/list/satchel_blacklist 		= list() //this is a typecache
 	var/list/new_secret_satchels 	= list() //these are objects
-	var/old_secret_satchels 		= ""
+	var/list/old_secret_satchels 	= list()

 	var/list/obj/structure/chisel_message/chisel_messages = list()
 	var/list/saved_messages = list()

-	var/savefile/trophy_sav
 	var/list/saved_trophies = list()

 /datum/controller/subsystem/persistence/Initialize()
@@ -21,67 +19,77 @@ 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/crowbar))
-	secret_satchels[SSmapping.config.map_name] >> old_secret_satchels
-
-	var/list/expanded_old_satchels = list()
-	var/placed_satchels = 0
-
-	if(!isnull(old_secret_satchels))
-		expanded_old_satchels = splittext(old_secret_satchels,"#")
-		if(PlaceSecretSatchel(expanded_old_satchels))
-			placed_satchels++
+	var/placed_satchel = 0
+	var/path
+	var/obj/item/storage/backpack/satchel/flat/F = new()
+	if(fexists("data/npc_saves/SecretSatchels.sav")) //legacy compatability to convert old format to new
+		var/savefile/secret_satchels = new /savefile("data/npc_saves/SecretSatchels.sav")
+		var/sav_text
+		secret_satchels[SSmapping.config.map_name] >> sav_text
+		fdel("data/npc_saves/SecretSatchels.sav")
+		if(sav_text)
+			old_secret_satchels = splittext(sav_text,"#")
+			if(old_secret_satchels.len >= 20)
+				var/satchel_string = pick_n_take(old_secret_satchels)
+				var/list/chosen_satchel = splittext(satchel_string,"|")
+				if(chosen_satchel.len == 3)
+					F.x = text2num(chosen_satchel[1])
+					F.y = text2num(chosen_satchel[2])
+					F.z = ZLEVEL_STATION
+					path = text2path(chosen_satchel[3])
 	else
-		expanded_old_satchels.len = 0
-
+		var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
+		if(!fexists(json_file))
+			return
+		var/list/json = list()
+		json = json_decode(file2text(json_file))
+		old_secret_satchels = json["data"]
+		if(old_secret_satchels.len)
+			if(old_secret_satchels.len >= 20) //guards against low drop pools assuring that one player cannot reliably find his own gear.
+				var/pos = rand(1, old_secret_satchels.len)
+				old_secret_satchels.Cut(pos, pos+1)
+				F.x = old_secret_satchels[pos]["x"]
+				F.y = old_secret_satchels[pos]["y"]
+				F.z = ZLEVEL_STATION
+				path = text2path(old_secret_satchels[pos]["saved_obj"])
+	if(!ispath(path))
+		return
+	if(isfloorturf(F.loc) && !istype(F.loc, /turf/open/floor/plating/))
+		F.hide(1)
+	new path(F)
+	placed_satchel++
 	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/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
+			if(!isemptylist(free_satchels) && ((free_satchels.len + placed_satchel) >= (50 - old_secret_satchels.len) * 0.1)) //up to six tiles, more than enough to kill anything that moves
 				break

-/datum/controller/subsystem/persistence/proc/PlaceSecretSatchel(list/expanded_old_satchels)
-	var/satchel_string
-
-	if(expanded_old_satchels.len >= 20) //guards against low drop pools assuring that one player cannot reliably find his own gear.
-		satchel_string = pick_n_take(expanded_old_satchels)
-
-	old_secret_satchels = jointext(expanded_old_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
-		return 0
-
-	var/path = text2path(chosen_satchel[3]) //If the item no longer exist, this returns null
-	if(!path)
-		return 0
-
-	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
-	if(isfloorturf(F.loc) && !istype(F.loc, /turf/open/floor/plating/))
-		F.hide(1)
-	new path(F)
-	return 1
-
 /datum/controller/subsystem/persistence/proc/LoadPoly()
 	for(var/mob/living/simple_animal/parrot/Poly/P in GLOB.living_mob_list)
 		twitterize(P.speech_buffer, "polytalk")
 		break //Who's been duping the bird?!

 /datum/controller/subsystem/persistence/proc/LoadChiselMessages()
-	var/savefile/chisel_messages_sav = new /savefile("data/npc_saves/ChiselMessages.sav")
-	var/saved_json
-	chisel_messages_sav[SSmapping.config.map_name] >> saved_json
+	var/list/saved_messages = list()
+	if(fexists("data/npc_saves/ChiselMessages.sav")) //legacy compatability to convert old format to new
+		var/savefile/chisel_messages_sav = new /savefile("data/npc_saves/ChiselMessages.sav")
+		var/saved_json
+		chisel_messages_sav[SSmapping.config.map_name] >> saved_json
+		if(!saved_json)
+			return
+		saved_messages = json_decode(saved_json)
+		fdel("data/npc_saves/ChiselMessages.sav")
+	else
+		var/json_file = file("data/npc_saves/ChiselMessages[SSmapping.config.map_name].json")
+		if(!fexists(json_file))
+			return
+		var/list/json
+		json = json_decode(file2text(json_file))

-	if(!saved_json)
-		return
-
-	var/list/saved_messages = json_decode(saved_json)
+		if(!json)
+			return
+		saved_messages = json["data"]

 	for(var/item in saved_messages)
 		if(!islist(item))
@@ -109,20 +117,23 @@ SUBSYSTEM_DEF(persistence)
 	log_world("Loaded [saved_messages.len] engraved messages on map [SSmapping.config.map_name]")

 /datum/controller/subsystem/persistence/proc/LoadTrophies()
-	trophy_sav = new /savefile("data/npc_saves/TrophyItems.sav")
-	var/saved_json
-	trophy_sav >> saved_json
-
-	if(!saved_json)
-		return
-
-	var/decoded_json = json_decode(saved_json)
-
-	if(!islist(decoded_json))
-		return
-
-	saved_trophies = decoded_json
-
+	if(fexists("data/npc_saves/TrophyItems.sav")) //legacy compatability to convert old format to new
+		var/savefile/S = new /savefile("data/npc_saves/TrophyItems.sav")
+		var/saved_json
+		S >> saved_json
+		if(!saved_json)
+			return
+		saved_trophies = json_decode(saved_json)
+		fdel("data/npc_saves/TrophyItems.sav")
+	else
+		var/json_file = file("data/npc_saves/TrophyItems.json")
+		if(!fexists(json_file))
+			return
+		var/list/json = list()
+		json = json_decode(file2text(json_file))
+		if(!json)
+			return
+		saved_trophies = json["data"]
 	SetUpTrophies(saved_trophies.Copy())

 /datum/controller/subsystem/persistence/proc/SetUpTrophies(list/trophy_items)
@@ -156,6 +167,8 @@ SUBSYSTEM_DEF(persistence)
 	CollectTrophies()

 /datum/controller/subsystem/persistence/proc/CollectSecretSatchels()
+	var/list/satchels = list()
+	satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/crowbar))
 	for(var/A in new_secret_satchels)
 		var/obj/item/storage/backpack/satchel/flat/F = A
 		if(QDELETED(F) || F.z != ZLEVEL_STATION || F.invisibility != INVISIBILITY_MAXIMUM)
@@ -170,25 +183,39 @@ SUBSYSTEM_DEF(persistence)
 				savable_obj += O.type
 		if(isemptylist(savable_obj))
 			continue
-		old_secret_satchels += "[F.x]|[F.y]|[pick(savable_obj)]#"
-	WRITE_FILE(secret_satchels[SSmapping.config.map_name], old_secret_satchels)
+		var/list/data = list()
+		data["x"] = F.x
+		data["y"] = F.y
+		data["saved_obj"] = pick(savable_obj)
+		satchels += list(data)
+	var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
+	var/list/file_data = list()
+	file_data["data"] = satchels
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))

 /datum/controller/subsystem/persistence/proc/CollectChiselMessages()
-	var/savefile/chisel_messages_sav = new /savefile("data/npc_saves/ChiselMessages.sav")
+	var/json_file = file("data/npc_saves/ChiselMessages[SSmapping.config.map_name].json")

 	for(var/obj/structure/chisel_message/M in chisel_messages)
 		saved_messages += list(M.pack())

 	log_world("Saved [saved_messages.len] engraved messages on map [SSmapping.config.map_name]")
-
-	WRITE_FILE(chisel_messages_sav[SSmapping.config.map_name], json_encode(saved_messages))
+	var/list/file_data = list()
+	file_data["data"] = saved_messages
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))

 /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()
-	WRITE_FILE(trophy_sav, json_encode(saved_trophies))
+	var/json_file = file("data/npc_saves/TrophyItems.json")
+	var/list/file_data = list()
+	file_data["data"] = saved_trophies
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))

 /datum/controller/subsystem/persistence/proc/SaveTrophy(obj/structure/displaycase/trophy/T)
 	if(!T.added_roundstart && T.showpiece)
@@ -3,7 +3,7 @@
 SUBSYSTEM_DEF(ping)
 	name = "Ping"
 	wait = 6
-	flags_1 = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY
+	flags = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY
 	priority = 10
 	var/list/currentrun

@@ -2,5 +2,5 @@ PROCESSING_SUBSYSTEM_DEF(fields)
 	name = "Fields"
 	wait = 2
 	priority = 40
-	flags_1 = SS_KEEP_TIMING | SS_NO_INIT
+	flags = SS_KEEP_TIMING | SS_NO_INIT
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
@@ -3,7 +3,7 @@ PROCESSING_SUBSYSTEM_DEF(flightpacks)
 	priority = 30
 	wait = 2
 	stat_tag = "FM"
-	flags_1 = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING
+	flags = SS_NO_INIT|SS_TICKER|SS_KEEP_TIMING

 	var/flightsuit_processing = FLIGHTSUIT_PROCESSING_FULL

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(obj)
 	name = "Objects"
 	priority = 40
-	flags_1 = SS_NO_INIT
+	flags = SS_NO_INIT

 	var/list/processing = list()
 	var/list/currentrun = list()
@@ -1,6 +1,6 @@
 PROCESSING_SUBSYSTEM_DEF(overlays)
 	name = "Overlay"
-	flags_1 = SS_TICKER
+	flags = SS_TICKER
 	wait = 1
 	priority = 500
 	init_order = INIT_ORDER_OVERLAY
@@ -3,7 +3,7 @@
 SUBSYSTEM_DEF(processing)
 	name = "Processing"
 	priority = 25
-	flags_1 = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
+	flags = SS_BACKGROUND|SS_POST_FIRE_TIMING|SS_NO_INIT
 	wait = 10

 	var/stat_tag = "P" //Used for logging
@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(radio)
 	name = "Radio"
-	flags_1 = SS_NO_FIRE|SS_NO_INIT
+	flags = SS_NO_FIRE|SS_NO_INIT

 	var/list/datum/radio_frequency/frequencies = list()

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

 	var/religion
 	var/deity
@@ -3,7 +3,7 @@
 SUBSYSTEM_DEF(server_maint)
 	name = "Server Tasks"
 	wait = 6
-	flags_1 = SS_POST_FIRE_TIMING
+	flags = SS_POST_FIRE_TIMING
 	priority = 10
 	init_order = INIT_ORDER_SERVER_MAINT
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
@@ -33,7 +33,7 @@ SUBSYSTEM_DEF(server_maint)
 					qdel(C)

 		if (!(!C || world.time - C.connection_time < PING_BUFFER_TIME || C.inactivity >= (wait-1)))
-			winset(C, null, "command=.update_ping+[world.time+world.tick_lag*world.tick_usage/100]")
+			winset(C, null, "command=.update_ping+[world.time+world.tick_lag*TICK_USAGE_REAL/100]")

 		if (MC_TICK_CHECK) //one day, when ss13 has 1000 people per server, you guys are gonna be glad I added this tick check
 			return
@@ -0,0 +1,30 @@
+diff a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm	(rejected hunks)
+@@ -6,18 +6,16 @@ SUBSYSTEM_DEF(server_maint)
+ 	flags = SS_POST_FIRE_TIMING|SS_FIRE_IN_LOBBY
+ 	priority = 10
+ 	var/list/currentrun
+-	var/triggertime = null
+ 
+ /datum/controller/subsystem/server_maint/Initialize(timeofday)
+ 	if (config.hub)
+ 		world.visibility = 1
+-	triggertime = REALTIMEOFDAY
+ 	..()
+ 
+ /datum/controller/subsystem/server_maint/fire(resumed = FALSE)
+ 	if(!resumed)
+ 		src.currentrun = GLOB.clients.Copy()
+-	
+
+ 	var/list/currentrun = src.currentrun
+ 	var/round_started = SSticker.HasRoundStarted()
+ 
+@@ -39,8 +37,3 @@ SUBSYSTEM_DEF(server_maint)
+ 			return
+ 
+ #undef PING_BUFFER_TIME
+-	if(config.sql_enabled)
+-		sql_poll_population()
+-		if(config.use_exp_tracking)
+-			if(REALTIMEOFDAY > (triggertime +3000))	//server maint fires once at roundstart then once every 10 minutes. a 5 min check skips the first fire
+-				update_exp(10,0)
@@ -5,7 +5,7 @@ SUBSYSTEM_DEF(shuttle)
 	name = "Shuttle"
 	wait = 10
 	init_order = INIT_ORDER_SHUTTLE
-	flags_1 = SS_KEEP_TIMING|SS_NO_TICK_CHECK
+	flags = SS_KEEP_TIMING|SS_NO_TICK_CHECK
 	runlevels = RUNLEVEL_SETUP | RUNLEVEL_GAME

 	var/list/mobile = list()
@@ -341,7 +341,7 @@ SUBSYSTEM_DEF(shuttle)
 		if(M.request(getDock(destination)))
 			return 2
 	else
-		if(M.dock(getDock(destination)))
+		if(M.dock(getDock(destination)) != DOCKING_SUCCESS)
 			return 2
 	return 0	//dock successful

@@ -356,7 +356,7 @@ SUBSYSTEM_DEF(shuttle)
 		if(M.request(D))
 			return 2
 	else
-		if(M.dock(D))
+		if(M.dock(D) != DOCKING_SUCCESS)
 			return 2
 	return 0	//dock successful

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

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

 	var/list/exposed_wires = list()

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(stickyban)
 	name = "Sticky Ban"
 	init_order = INIT_ORDER_STICKY_BAN
-	flags_1 = SS_NO_FIRE
+	flags = SS_NO_FIRE

 	var/list/cache = list()

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(sun)
 	name = "Sun"
 	wait = 600
-	flags_1 = SS_NO_TICK_CHECK|SS_NO_INIT
+	flags = SS_NO_TICK_CHECK|SS_NO_INIT
 	var/angle
 	var/dx
 	var/dy
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(tgui)
 	name = "tgui"
 	wait = 9
-	flags_1 = SS_NO_INIT
+	flags = SS_NO_INIT
 	priority = 110
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT

@@ -5,7 +5,7 @@ SUBSYSTEM_DEF(throwing)
 	name = "Throwing"
 	priority = 25
 	wait = 1
-	flags_1 = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER
+	flags = SS_NO_INIT|SS_KEEP_TIMING|SS_TICKER
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME

 	var/list/currentrun
@@ -5,7 +5,7 @@ SUBSYSTEM_DEF(ticker)
 	init_order = INIT_ORDER_TICKER

 	priority = 200
-	flags_1 = SS_KEEP_TIMING
+	flags = 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_* !
@@ -470,6 +470,12 @@ SUBSYSTEM_DEF(ticker)

 	to_chat(world, "<BR><BR><BR><FONT size=3><B>The round has ended.</B></FONT>")

+/*	var/nocredits = config.no_credits_round_end
+		for(var/client/C in GLOB.clients)
+		if(!C.credits && !nocredits)
+			C.RollCredits()
+ 		C.playtitlemusic(40)*/
+
 	//Player status report
 	for(var/mob/Player in GLOB.mob_list)
 		if(Player.mind && !isnewplayer(Player))
@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(time_track)
 	name = "Time Tracking"
 	wait = 600
-	flags_1 = SS_NO_INIT|SS_NO_TICK_CHECK
+	flags = SS_NO_INIT|SS_NO_TICK_CHECK
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT

 	var/time_dilation_current = 0
@@ -7,7 +7,7 @@ SUBSYSTEM_DEF(timer)
 	wait = 1 //SS_TICKER subsystem, so wait is in ticks
 	init_order = INIT_ORDER_TIMER

-	flags_1 = SS_TICKER|SS_NO_INIT
+	flags = SS_TICKER|SS_NO_INIT

 	var/list/datum/timedevent/processing = list()
 	var/list/hashes = list()
@@ -215,7 +215,7 @@ SUBSYSTEM_DEF(timer)
 	var/datum/callback/callBack
 	var/timeToRun
 	var/hash
-	var/list/flags_1
+	var/list/flags
 	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_1, hash)
+/datum/timedevent/New(datum/callback/callBack, timeToRun, flags, hash)
 	id = TIMER_ID_NULL
 	src.callBack = callBack
 	src.timeToRun = timeToRun
-	src.flags_1 = flags_1
+	src.flags = flags
 	src.hash = hash

-	if (flags_1 & TIMER_UNIQUE)
+	if (flags & TIMER_UNIQUE)
 		SStimer.hashes[hash] = src
-	if (flags_1 & TIMER_STOPPABLE)
+	if (flags & 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_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(", ") : ""])"
+	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(", ") : ""])"

 	if (callBack.object != GLOBAL_PROC)
 		LAZYADD(callBack.object.active_timers, src)

-	if (flags_1 & TIMER_CLIENT_TIME)
+	if (flags & 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_1 & TIMER_UNIQUE)
+	if (flags & TIMER_UNIQUE)
 		SStimer.hashes -= hash


@@ -301,10 +301,10 @@ SUBSYSTEM_DEF(timer)

 	callBack = null

-	if (flags_1 & TIMER_STOPPABLE)
+	if (flags & TIMER_STOPPABLE)
 		SStimer.timer_id_dict -= "timerid" + num2text(id, 8)

-	if (flags_1 & TIMER_CLIENT_TIME)
+	if (flags & 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_1)
+/proc/addtimer(datum/callback/callback, wait, flags)
 	if (!callback)
 		return

@@ -354,12 +354,12 @@ SUBSYSTEM_DEF(timer)

 	var/hash

-	if (flags_1 & TIMER_UNIQUE)
+	if (flags & TIMER_UNIQUE)
 		var/list/hashlist
-		if(flags_1 & TIMER_NO_HASH_WAIT)
-			hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, flags_1 & TIMER_CLIENT_TIME)
+		if(flags & TIMER_NO_HASH_WAIT)
+			hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, flags & TIMER_CLIENT_TIME)
 		else
-			hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, wait, flags_1 & TIMER_CLIENT_TIME)
+			hashlist = list(callback.object, "(\ref[callback.object])", callback.delegate, wait, flags & TIMER_CLIENT_TIME)
 		hashlist += callback.arguments
 		hash = hashlist.Join("|||||||")

@@ -370,19 +370,19 @@ SUBSYSTEM_DEF(timer)
 				SStimer.hashes -= hash
 			else

-				if (flags_1 & TIMER_OVERRIDE)
+				if (flags & TIMER_OVERRIDE)
 					qdel(hash_timer)
 				else
-					if (hash_timer.flags_1 & TIMER_STOPPABLE)
+					if (hash_timer.flags & TIMER_STOPPABLE)
 						. = hash_timer.id
 					return


 	var/timeToRun = world.time + wait
-	if (flags_1 & TIMER_CLIENT_TIME)
+	if (flags & TIMER_CLIENT_TIME)
 		timeToRun = REALTIMEOFDAY + wait

-	var/datum/timedevent/timer = new(callback, timeToRun, flags_1, hash)
+	var/datum/timedevent/timer = new(callback, timeToRun, flags, hash)
 	return timer.id

 /proc/deltimer(id)
@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(title)
 	name = "Title Screen"
-	flags_1 = SS_NO_FIRE|SS_NO_INIT
+	flags = SS_NO_FIRE|SS_NO_INIT

 	var/file_path
 	var/icon/icon
@@ -2,7 +2,7 @@ SUBSYSTEM_DEF(vote)
 	name = "Vote"
 	wait = 10

-	flags_1 = SS_KEEP_TIMING|SS_NO_INIT
+	flags = SS_KEEP_TIMING|SS_NO_INIT

 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT

@@ -1,7 +1,7 @@
 //Used for all kinds of weather, ex. lavaland ash storms.
 SUBSYSTEM_DEF(weather)
 	name = "Weather"
-	flags_1 = SS_BACKGROUND
+	flags = SS_BACKGROUND
 	wait = 10
 	runlevels = RUNLEVEL_GAME
 	var/list/processing = list()
@@ -172,6 +172,7 @@

 /datum/action/item_action/rcl
 	name = "Change Cable Color"
+	icon_icon = 'icons/mob/actions/actions_items.dmi'
 	button_icon_state = "rcl_rainbow"

 /datum/action/item_action/startchainsaw
@@ -405,27 +406,24 @@
 /datum/action/item_action/initialize_ninja_suit
 	name = "Toggle ninja suit"

-/datum/action/item_action/ninjajaunt
-	name = "Phase Jaunt (10E)"
-	desc = "Utilizes the internal VOID-shift device to rapidly transit in direction facing."
-	icon_icon = 'icons/mob/actions/actions_items.dmi'
-	button_icon_state = "ninja_phase"
-
 /datum/action/item_action/ninjasmoke
 	name = "Smoke Bomb"
 	desc = "Blind your enemies momentarily with a well-placed smoke bomb."
 	button_icon_state = "smoke"
+	icon_icon = 'icons/mob/actions/actions_spells.dmi'

 /datum/action/item_action/ninjaboost
-	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_CONSCIOUS
+	check_flags = NONE
 	name = "Adrenaline Boost"
 	desc = "Inject a secret chemical that will counteract all movement-impairing effect."
 	button_icon_state = "repulse"
+	icon_icon = 'icons/mob/actions/actions_spells.dmi'

 /datum/action/item_action/ninjapulse
 	name = "EM Burst (25E)"
 	desc = "Disable any nearby technology with a electro-magnetic pulse."
 	button_icon_state = "emp"
+	icon_icon = 'icons/mob/actions/actions_spells.dmi'

 /datum/action/item_action/ninjastar
 	name = "Create Throwing Stars (1E)"
@@ -448,8 +446,8 @@
 /datum/action/item_action/ninja_stealth
 	name = "Toggle Stealth"
 	desc = "Toggles stealth mode on and off."
-	icon_icon = 'icons/mob/actions/actions_items.dmi'
 	button_icon_state = "ninja_cloak"
+	icon_icon = 'icons/mob/actions/actions_minor_antag.dmi'

 /datum/action/item_action/toggle_glove
 	name = "Toggle interaction"
@@ -491,7 +489,7 @@
 	S.action = src
 	name = S.name
 	desc = S.desc
-	button_icon = S.action_icon
+	icon_icon = S.action_icon
 	button_icon_state = S.action_icon_state
 	background_icon_state = S.action_background_icon_state
 	button.name = name
@@ -188,7 +188,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
 	if(form == BLOOD_LIZARD && SOULVALUE < BLOOD_THRESHOLD)
 		regress_humanoid()
 	if(SOULVALUE < 0)
-		remove_spells()
+		give_appropriate_spells()
 		to_chat(owner.current, "<span class='warning'>As punishment for your failures, all of your powers except contract creation have been revoked.")

 /datum/antagonist/devil/proc/regress_humanoid()
@@ -408,7 +408,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
 		reviveNumber += LOSS_PER_DEATH
 		update_hud()
 	if(body)
-		body.revive(1,0)
+		body.revive(TRUE, TRUE) //Adminrevive also recovers organs, preventing someone from resurrecting without a heart.
 		if(istype(body.loc, /obj/effect/dummy/slaughter/))
 			body.forceMove(get_turf(body))//Fixes dying while jaunted leaving you permajaunted.
 		if(istype(body, /mob/living/carbon/true_devil))
@@ -41,7 +41,6 @@
 	H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/space_ninja(H), slot_wear_mask)
 	H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), slot_glasses)
 	H.equip_to_slot_or_del(EK, slot_belt)
-	H.equip_to_slot_or_del(new /obj/item/device/flashlight(H), slot_r_store)
 	H.equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(H), slot_l_store)
 	H.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen(H), slot_s_store)
 	H.equip_to_slot_or_del(new /obj/item/tank/jetpack/carbondioxide(H), slot_back)
@@ -1,62 +0,0 @@
-diff a/code/datums/callback.dm b/code/datums/callback.dm	(rejected hunks)
-@@ -100,60 +100,3 @@
- 	if (object == GLOBAL_PROC)
- 		return call(delegate)(arglist(calling_arguments))
- 	return call(object, delegate)(arglist(calling_arguments))
-
-
-/datum/callback_select
-	var/list/finished
-	var/pendingcount
-	var/total
-
-/datum/callback_select/New(count, savereturns)
-	total = count
-	if (savereturns)
-		finished = new(count)
-
-
-/datum/callback_select/proc/invoke_callback(index, datum/callback/callback, list/callback_args, savereturn = TRUE)
-	set waitfor = FALSE
-	if (!callback || !istype(callback))
-		//This check only exists because the alternative is callback_select would block forever if given invalid data
-		CRASH("invalid callback passed to invoke_callback")
-	if (!length(callback_args))
-		callback_args = list()
-	pendingcount++
-	debug_usr("calling callback")
-	var/rtn = callback.Invoke(arglist(callback_args))
-	debug_usr("callback returned")
-	pendingcount--
-	if (savereturn)
-		finished[index] = rtn
-
-
-
-
-//runs a list of callbacks asynchronously, returning once all of them return.
-//callbacks can be repeated.
-//callbacks-args is a optional list of argument lists, in the same order as the callbacks,
-//	the inner lists will be sent to the callbacks when invoked() as additional args.
-//can optionly save and return a list of return values, in the same order as the original list of callbacks
-//resolution is the number of byond ticks between checks.
-/proc/callback_select(list/callbacks, list/callback_args, savereturns = TRUE, resolution = 1)
-	if (!callbacks)
-		return
-	var/count = length(callbacks)
-	if (!count)
-		return
-	if (!callback_args)
-		callback_args = list()
-
-	callback_args.len = count
-
-	var/datum/callback_select/CS = new(count, savereturns)
-	for (var/i in 1 to count)
-		CS.invoke_callback(i, callbacks[i], callback_args[i], savereturns)
-	debug_usr("starting callbacks: [CS.pendingcount]")
-	while(CS.pendingcount)
-		debug_usr("callbacks: [CS.pendingcount]")
-		sleep(resolution*world.tick_lag)
-	return CS.finished
-
@@ -56,7 +56,7 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo
 1. `GET_COMPONENT(varname, component_type)` OR `GET_COMPONENT_FROM(varname, component_type, src)`
    * Shorthand for `var/component_type/varname = src.GetComponent(component_type)`
 1. `/datum/proc/AddComponent(component_type(type), ...) -> datum/component`  (public, final)
-    * Creates an instance of `component_type` in the datum and passes `...` to it's `New()` call
+    * Creates an instance of `component_type` in the datum and passes `...` to its `Initialize()` call
    * Sends the `COMSIG_COMPONENT_ADDED` signal to the datum
    * All components a datum owns are deleted with the datum
    * Returns the component that was created. Or the old component in a dupe situation where `COMPONENT_DUPE_UNIQUE` was set
@@ -1 +0,0 @@
-
@@ -34,20 +34,20 @@
 	..(process, D, copy)


-// Hullucigen
+// Hallucigen

-/datum/disease/advance/hullucigen/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
+/datum/disease/advance/hallucigen/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
 	if(!D)
-		name = "Reality Impairment"
+		name = "Second Sight"
 		symptoms = list(new/datum/symptom/hallucigen)
 	..(process, D, copy)

 // Sensory Restoration

-/datum/disease/advance/sensory_restoration/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
+/datum/disease/advance/mind_restoration/New(var/process = TRUE, var/datum/disease/advance/D, var/copy = FALSE)
 	if(!D)
-		name = "Reality Enhancer"
-		symptoms = list(new/datum/symptom/sensory_restoration)
+		name = "Intelligence Booster"
+		symptoms = list(new/datum/symptom/mind_restoration)
 	..(process, D, copy)

 // Sensory Destruction
@@ -17,6 +17,7 @@ BONUS
 /datum/symptom/beard

 	name = "Facial Hypertrichosis"
+	desc = "The virus increases hair production significantly, causing rapid beard growth."
 	stealth = -3
 	resistance = -1
 	stage_speed = -3
@@ -18,6 +18,7 @@ Bonus
 /datum/symptom/choking

 	name = "Choking"
+	desc = "The virus causes inflammation of the host's air conduits, leading to intermittent choking."
 	stealth = -3
 	resistance = -2
 	stage_speed = -2
@@ -27,6 +28,8 @@ Bonus
 	base_message_chance = 15
 	symptom_delay_min = 10
 	symptom_delay_max = 30
+	threshold_desc = "<b>Stage Speed 8:</b> Causes choking more frequently.<br>\
+					  <b>Stealth 4:</b> The symptom remains hidden until active."

 /datum/symptom/choking/Start(datum/disease/advance/A)
 	..()
@@ -84,6 +87,7 @@ Bonus
 /datum/symptom/asphyxiation

 	name = "Acute respiratory distress syndrome"
+	desc = "The virus causes shrinking of the host's lungs, causing severe asphyxiation. May also lead to heart attacks."
 	stealth = -2
 	resistance = -0
 	stage_speed = -1
@@ -18,6 +18,7 @@ Bonus
 /datum/symptom/confusion

 	name = "Confusion"
+	desc = "The virus interferes with the proper function of the neural system, leading to bouts of confusion and erratic movement."
 	stealth = 1
 	resistance = -1
 	stage_speed = -3
@@ -28,6 +29,9 @@ Bonus
 	symptom_delay_min = 10
 	symptom_delay_max = 30
 	var/brain_damage = FALSE
+	threshold_desc = "<b>Resistance 6:</b> Causes brain damage over time.<br>\
+					  <b>Transmission 6:</b> Increases confusion duration.<br>\
+					  <b>Stealth 4:</b> The symptom remains hidden until active."

 /datum/symptom/confusion/Start(datum/disease/advance/A)
 	..()
@@ -18,6 +18,7 @@ BONUS
 /datum/symptom/cough

 	name = "Cough"
+	desc = "The virus irritates the throat of the host, causing occasional coughing."
 	stealth = -1
 	resistance = 3
 	stage_speed = 1
@@ -28,6 +29,11 @@ BONUS
 	symptom_delay_min = 2
 	symptom_delay_max = 15
 	var/infective = FALSE
+	threshold_desc = "<b>Resistance 3:</b> Host will drop small items when coughing.<br>\
+					  <b>Resistance 10:</b> Occasionally causes coughing fits that stun the host.<br>\
+					  <b>Stage Speed 6:</b> Increases cough frequency.<br>\
+					  <b>If Airborne:</b> Coughing will infect bystanders.<br>\
+					  <b>Stealth 4:</b> The symptom remains hidden until active."

 /datum/symptom/cough/Start(datum/disease/advance/A)
 	..()
@@ -18,6 +18,7 @@ Bonus
 /datum/symptom/deafness

 	name = "Deafness"
+	desc = "The virus causes inflammation of the eardrums, causing intermittent deafness."
 	stealth = -1
 	resistance = -2
 	stage_speed = -1
@@ -27,6 +28,8 @@ Bonus
 	base_message_chance = 100
 	symptom_delay_min = 25
 	symptom_delay_max = 80
+	threshold_desc = "<b>Resistance 9:</b> Causes permanent deafness, instead of intermittent.<br>\
+					  <b>Stealth 4:</b> The symptom remains hidden until active."

 /datum/symptom/deafness/Start(datum/disease/advance/A)
 	..()
@@ -18,7 +18,7 @@ Bonus
 /datum/symptom/dizzy // Not the egg

 	name = "Dizziness"
-	stealth = 2
+	desc = "The virus causes inflammation of the vestibular system, leading to bouts of dizziness."
 	resistance = -2
 	stage_speed = -3
 	transmittable = -1
@@ -27,6 +27,8 @@ Bonus
 	base_message_chance = 50
 	symptom_delay_min = 15
 	symptom_delay_max = 40
+	threshold_desc = "<b>Transmission 6:</b> Also causes druggy vision.<br>\
+					  <b>Stealth 4:</b> The symptom remains hidden until active."

 /datum/symptom/dizzy/Start(datum/disease/advance/A)
 	..()
@@ -16,8 +16,8 @@ Bonus
 */

 /datum/symptom/fever
-
 	name = "Fever"
+	desc = "The virus causes a febrile response from the host, raising its body temperature."
 	stealth = 0
 	resistance = 3
 	stage_speed = 3
@@ -28,6 +28,8 @@ Bonus
 	symptom_delay_min = 10
 	symptom_delay_max = 30
 	var/unsafe = FALSE //over the heat threshold
+	threshold_desc = "<b>Resistance 5:</b> Increases fever intensity, fever can overheat and harm the host.<br>\
+					  <b>Resistance 10:</b> Further increases fever intensity."

 /datum/symptom/fever/Start(datum/disease/advance/A)
 	..()
@@ -18,6 +18,7 @@ Bonus
 /datum/symptom/fire

 	name = "Spontaneous Combustion"
+	desc = "The virus turns fat into an extremely flammable compound, and raises the body's temperature, making the host burst into flames spontaneously."
 	stealth = 1
 	resistance = -4
 	stage_speed = -4
@@ -28,6 +29,10 @@ Bonus
 	symptom_delay_min = 20
 	symptom_delay_max = 75
 	var/infective = FALSE
+	threshold_desc = "<b>Stage Speed 4:</b> Increases the intensity of the flames.<br>\
+					  <b>Stage Speed 8:</b> Further increases flame intensity.<br>\
+					  <b>Transmission 8:</b> Host will spread the virus through skin flakes when bursting into flame.<br>\
+					  <b>Stealth 4:</b> The symptom remains hidden until active."

 /datum/symptom/fire/Start(datum/disease/advance/A)
 	..()
@@ -94,6 +99,7 @@ Bonus
 /datum/symptom/alkali

 	name = "Alkali perspiration"
+	desc = "The virus attaches to sudoriparous glands, synthesizing a chemical that bursts into flames when reacting with water, leading to self-immolation."
 	stealth = 2
 	resistance = -2
 	stage_speed = -2
@@ -105,6 +111,9 @@ Bonus
 	symptom_delay_max = 90
 	var/chems = FALSE
 	var/explosion_power = 1
+	threshold_desc = "<b>Resistance 9:</b> Doubles the intensity of the effect, but reduces its frequency.<br>\
+					  <b>Stage Speed 8:</b> Increases explosion radius when the host is wet.<br>\
+					  <b>Transmission 8:</b> Additionally synthesizes chlorine trifluoride and napalm inside the host."

 /datum/symptom/alkali/Start(datum/disease/advance/A)
 	..()
@@ -18,6 +18,7 @@ Bonus
 /datum/symptom/flesh_eating

 	name = "Necrotizing Fasciitis"
+	desc = "The virus aggressively attacks body cells, necrotizing tissues and organs."
 	stealth = -3
 	resistance = -4
 	stage_speed = 0
@@ -29,6 +30,8 @@ Bonus
 	symptom_delay_max = 60
 	var/bleed = FALSE
 	var/pain = FALSE
+	threshold_desc = "<b>Resistance 7:</b> Host will bleed profusely during necrosis.<br>\
+					  <b>Transmission 8:</b> Causes extreme pain to the host, weakening it."

 /datum/symptom/flesh_eating/Start(datum/disease/advance/A)
 	..()
@@ -80,6 +83,7 @@ Bonus
 /datum/symptom/flesh_death

 	name = "Autophagocytosis Necrosis"
+	desc = "The virus rapidly consumes infected cells, leading to heavy and widespread damage."
 	stealth = -2
 	resistance = -2
 	stage_speed = 1
@@ -91,6 +95,8 @@ Bonus
 	symptom_delay_max = 6
 	var/chems = FALSE
 	var/zombie = FALSE
+	threshold_desc = "<b>Stage Speed 7:</b> Synthesizes Heparin and Lipolicide inside the host, causing increased bleeding and hunger.<br>\
+					  <b>Stealth 5:</b> The symptom remains hidden until active."

 /datum/symptom/flesh_death/Start(datum/disease/advance/A)
 	..()
@@ -16,8 +16,8 @@ Bonus
 */

 /datum/symptom/genetic_mutation
-
 	name = "Deoxyribonucleic Acid Saboteur"
+	desc = "The virus bonds with the DNA of the host, causing damaging mutations until removed."
 	stealth = -2
 	resistance = -3
 	stage_speed = 0
@@ -30,6 +30,9 @@ Bonus
 	symptom_delay_min = 60
 	symptom_delay_max = 120
 	var/no_reset = FALSE
+	threshold_desc = "<b>Resistance 8:</b> Causes two harmful mutations at once.<br>\
+					  <b>Stage Speed 10:</b> Increases mutation frequency.<br>\
+					  <b>Stealth 5:</b> The mutations persist even if the virus is cured."

 /datum/symptom/genetic_mutation/Activate(datum/disease/advance/A)
 	if(!..())
@@ -16,8 +16,8 @@ Bonus
 */

 /datum/symptom/hallucigen
-
 	name = "Hallucigen"
+	desc = "The virus stimulates the brain, causing occasional hallucinations."
 	stealth = -2
 	resistance = -3
 	stage_speed = -3
@@ -28,6 +28,8 @@ Bonus
 	symptom_delay_min = 25
 	symptom_delay_max = 90
 	var/fake_healthy = FALSE
+	threshold_desc = "<b>Stage Speed 7:</b> Increases the amount of hallucinations.<br>\
+					  <b>Stealth 4:</b> The virus mimics positive symptoms.."

 /datum/symptom/hallucigen/Start(datum/disease/advance/A)
 	..()
@@ -19,6 +19,7 @@ BONUS
 /datum/symptom/headache

 	name = "Headache"
+	desc = "The virus causes inflammation inside the brain, causing constant headaches."
 	stealth = -1
 	resistance = 4
 	stage_speed = 2
@@ -28,6 +29,9 @@ BONUS
 	base_message_chance = 100
 	symptom_delay_min = 15
 	symptom_delay_max = 30
+	threshold_desc = "<b>Stage Speed 6:</b> Headaches will cause severe pain, that weakens the host.<br>\
+					  <b>Stage Speed 9:</b> Headaches become less frequent but far more intense, preventing any action from the host.<br>\
+					  <b>Stealth 4:</b> Reduces headache frequency until later stages."

 /datum/symptom/headache/Start(datum/disease/advance/A)
 	..()
@@ -45,11 +49,11 @@ BONUS
 		return
 	var/mob/living/M = A.affected_mob
 	if(power < 2)
-		if(prob(base_message_chance))
+		if(prob(base_message_chance) || A.stage >=4)
 			to_chat(M, "<span class='warning'>[pick("Your head hurts.", "Your head pounds.")]</span>")
-	if(power >= 2)
+	if(power >= 2 && A.stage >= 4)
 		to_chat(M, "<span class='warning'>[pick("Your head hurts a lot.", "Your head pounds incessantly.")]</span>")
 		M.adjustStaminaLoss(25)
-	if(power >= 3)
+	if(power >= 3 && A.stage >= 5)
 		to_chat(M, "<span class='userdanger'>[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]</span>")
 		M.Stun(35)
--- a/Show More
+++ b/Show More