Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

code/controllers/subsystem/adjacent_air.dm

@@ -33,4 +33,4 @@ SUBSYSTEM_DEF(adjacent_air)
 			if(MC_TICK_CHECK)
 				break
 		else
-			CHECK_TICK
+			CHECK_TICK

code/controllers/subsystem/autotransfer.dm

@@ -37,4 +37,4 @@ SUBSYSTEM_DEF(autotransfer)
 	else
 		SSshuttle.autoEnd()
 
-#undef NO_MAXVOTES_CAP
+#undef NO_MAXVOTES_CAP

code/controllers/subsystem/input.dm

@@ -6,6 +6,12 @@ SUBSYSTEM_DEF(input)
 	priority = FIRE_PRIORITY_INPUT
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
 
+	/// KEEP THIS UP TO DATE!
+	var/static/list/all_macrosets = list(
+		SKIN_MACROSET_HOTKEYS,
+		SKIN_MACROSET_CLASSIC_HOTKEYS,
+		SKIN_MACROSET_CLASSIC_INPUT
+	)
 	/// Classic mode input focused macro set. Manually set because we can't define ANY or ANY+UP for classic.
 	var/static/list/macroset_classic_input
 	/// Classic mode map focused macro set. Manually set because it needs to be clientside and go to macroset_classic_input.
@@ -51,11 +57,6 @@ SUBSYSTEM_DEF(input)
 	// let's play the ascii game of A to Z (UPPERCASE)
 	for(var/i in 65 to 90)
 		classic_ctrl_override_keys += ascii2text(i)
-	// let's play the game of clientside bind overrides!
-	classic_ctrl_override_keys -= list("T", "O", "M", "L")
-	macroset_classic_input["Ctrl+T"] = "say"
-	macroset_classic_input["Ctrl+O"] = "ooc"
-	macroset_classic_input["Ctrl+L"] = "looc"
 	// let's play the list iteration game x2
 	for(var/key in classic_ctrl_override_keys)
 		// make sure to double double quote to ensure things are treated as a key combo instead of addition/semicolon logic.
@@ -67,20 +68,6 @@ SUBSYSTEM_DEF(input)
 
 	// FINALLY, WE CAN DO SOMETHING MORE NORMAL FOR THE SNOWFLAKE-BUT-LESS KEYSET.
 
-	// HAHA - SIKE. Because of BYOND weirdness (tl;dr not specifically binding this way results in potentially duplicate chatboxes when
-	//  conflicts occur with something like say indicator vs say), we're going to snowflake this anyways
-	var/list/hard_binds = list(
-		"O" = "ooc",
-		"T" = "say",
-		"L" = "looc",
-		"M" = "me"
-		)
-	var/list/hard_bind_anti_collision = list()
-	var/list/anti_collision_modifiers = list("Ctrl", "Alt", "Shift", "Ctrl+Alt", "Ctrl+Shift", "Alt+Shift", "Ctrl+Alt+Shift")
-	for(var/key in hard_binds)
-		for(var/modifier in anti_collision_modifiers)
-			hard_bind_anti_collision["[modifier]+[key]"] = ".NONSENSICAL_VERB_THAT_DOES_NOTHING"
-
 	macroset_classic_hotkey = list(
 	"Any" = "\"KeyDown \[\[*\]\]\"",
 	"Any+UP" = "\"KeyUp \[\[*\]\]\"",
@@ -89,9 +76,6 @@ SUBSYSTEM_DEF(input)
 	"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"",
 	)
 
-	macroset_classic_hotkey |= hard_binds
-	macroset_classic_hotkey |= hard_bind_anti_collision
-
 	// And finally, the modern set.
 	macroset_hotkey = list(
 	"Any" = "\"KeyDown \[\[*\]\]\"",
@@ -101,24 +85,22 @@ SUBSYSTEM_DEF(input)
 	"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"",
 	)
 
-	macroset_hotkey |= hard_binds
-	macroset_hotkey |= hard_bind_anti_collision
-
 // Badmins just wanna have fun ♪
 /datum/controller/subsystem/input/proc/refresh_client_macro_sets()
 	var/list/clients = GLOB.clients
 	for(var/i in 1 to clients.len)
 		var/client/user = clients[i]
-		user.set_macros()
-		user.update_movement_keys()
+		user.full_macro_assert()
 
 /datum/controller/subsystem/input/fire()
+	set waitfor = FALSE
 	var/list/clients = GLOB.clients // Let's sing the list cache song
 	for(var/i in 1 to clients.len)
 		var/client/C = clients[i]
 		C.keyLoop()
 
+#define NONSENSICAL_VERB "NONSENSICAL_VERB_THAT_DOES_NOTHING"
 /// *sigh
 /client/verb/NONSENSICAL_VERB_THAT_DOES_NOTHING()
-	set name = ".NONSENSICAL_VERB_THAT_DOES_NOTHING"
+	set name = "NONSENSICAL_VERB_THAT_DOES_NOTHING"
 	set hidden = TRUE

code/controllers/subsystem/job.dm

@@ -670,11 +670,12 @@ SUBSYSTEM_DEF(job)
 	var/mob/the_mob = N
 	if(!the_mob)
 		the_mob = M // cause this doesn't get assigned if player is a latejoiner
-	if(the_mob.client && the_mob.client.prefs && (the_mob.client.prefs.chosen_gear && the_mob.client.prefs.chosen_gear.len))
+	var/list/chosen_gear = the_mob.client.prefs.loadout_data["SAVE_[the_mob.client.prefs.loadout_slot]"]
+	if(the_mob.client && the_mob.client.prefs && (chosen_gear && chosen_gear.len))
 		if(!ishuman(M))//no silicons allowed
 			return
-		for(var/i in the_mob.client.prefs.chosen_gear)
-			var/datum/gear/G = i
+		for(var/i in chosen_gear)
+			var/datum/gear/G = istext(i[LOADOUT_ITEM]) ? text2path(i[LOADOUT_ITEM]) : i[LOADOUT_ITEM]
 			G = GLOB.loadout_items[initial(G.category)][initial(G.subcategory)][initial(G.name)]
 			if(!G)
 				continue
@@ -690,6 +691,21 @@ SUBSYSTEM_DEF(job)
 			if(!permitted)
 				continue
 			var/obj/item/I = new G.path
+			if(I && length(i[LOADOUT_COLOR])) //handle loadout colors
+			 	//handle polychromic items
+				if((G.loadout_flags & LOADOUT_CAN_COLOR_POLYCHROMIC) && length(G.loadout_initial_colors))
+					var/datum/element/polychromic/polychromic = I.comp_lookup["item_worn_overlays"] //stupid way to do it but GetElement does not work for this
+					if(polychromic && istype(polychromic))
+						var/list/polychromic_entry = polychromic.colors_by_atom[I]
+						if(polychromic_entry)
+							if(polychromic.suits_with_helmet_typecache[I.type]) //is this one of those toggleable hood/helmet things?
+								polychromic.connect_helmet(I,i[LOADOUT_COLOR])
+							polychromic.colors_by_atom[I] = i[LOADOUT_COLOR]
+							I.update_icon()
+				else
+					//handle non-polychromic items (they only have one color)
+					I.add_atom_colour(i[LOADOUT_COLOR][1], FIXED_COLOUR_PRIORITY)
+					I.update_icon()
 			if(!M.equip_to_slot_if_possible(I, G.slot, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) // If the job's dresscode compliant, try to put it in its slot, first
 				if(iscarbon(M))
 					var/mob/living/carbon/C = M

code/controllers/subsystem/minor_mapping.dm

@@ -35,4 +35,4 @@ SUBSYSTEM_DEF(minor_mapping)
 		if(locate(/obj/structure/cable) in T)
 			exposed_wires += T
 
-	return shuffle(exposed_wires)
+	return shuffle(exposed_wires)

code/controllers/subsystem/persistence.dm

@@ -422,7 +422,7 @@ SUBSYSTEM_DEF(persistence)
 	saved_storytellers[3] = saved_storytellers[2]
 	saved_storytellers[2] = saved_storytellers[1]
 	saved_storytellers[1] = mode.storyteller.name
-	average_dynamic_threat = (mode.threat_average + average_dynamic_threat) / 2
+	average_dynamic_threat = (mode.max_threat + average_dynamic_threat) / 2
 	var/json_file = file("data/RecentStorytellers.json")
 	var/list/file_data = list()
 	file_data["data"] = saved_storytellers + average_dynamic_threat

code/controllers/subsystem/processing/nanites.dm

@@ -19,4 +19,4 @@ PROCESSING_SUBSYSTEM_DEF(nanites)
 		if(!force && !check_hardware(backup))
 			return
 		if(backup.cloud_id == cloud_id)
-			return backup
+			return backup

code/controllers/subsystem/radiation.dm

@@ -14,4 +14,4 @@ PROCESSING_SUBSYSTEM_DEF(radiation)
 	var/atom/master = contamination.parent
 	SSblackbox.record_feedback("tally", "contaminated", 1, master.type)
 	var/msg = "has become contamintaed with enough radiation to contaminate other objects. || Source: [contamination.source] || Strength: [contamination.strength]"
-	master.investigate_log(msg, INVESTIGATE_RADIATION)
+	master.investigate_log(msg, INVESTIGATE_RADIATION)

code/controllers/subsystem/ticker.dm

@@ -371,6 +371,11 @@ SUBSYSTEM_DEF(ticker)
 		if(player.ready == PLAYER_READY_TO_PLAY && player.mind)
 			GLOB.joined_player_list += player.ckey
 			player.create_character(FALSE)
+			if(player.new_character && player.client && player.client.prefs) // we cannot afford a runtime, ever
+				LAZYOR(player.client.prefs.slots_joined_as, player.client.prefs.default_slot)
+				LAZYOR(player.client.prefs.characters_joined_as, player.new_character.real_name)
+			else
+				stack_trace("WARNING: Either a player did not have a new_character, did not have a client, or did not have preferences. This is VERY bad.")
 		else
 			player.new_player_panel()
 		CHECK_TICK

code/controllers/subsystem/traumas.dm

@@ -52,7 +52,7 @@ SUBSYSTEM_DEF(traumas)
 					   "doctors"   = typecacheof(list(/mob/living/simple_animal/bot/medbot)),
 					   "the supernatural"   = typecacheof(list(/mob/living/simple_animal/hostile/construct,
 					   /mob/living/simple_animal/hostile/clockwork, /mob/living/simple_animal/drone/cogscarab,
-					   /mob/living/simple_animal/revenant, /mob/living/simple_animal/shade)),
+					   /mob/living/simple_animal/revenant, /mob/living/simple_animal/hostile/construct/shade)),
 					   "aliens"   = typecacheof(list(/mob/living/carbon/alien, /mob/living/simple_animal/slime)),
 					   "conspiracies" = typecacheof(list(/mob/living/simple_animal/bot/secbot, /mob/living/simple_animal/bot/ed209, /mob/living/simple_animal/drone,
 					   /mob/living/simple_animal/pet/penguin)),

code/controllers/subsystem/vote.dm

@@ -492,7 +492,7 @@ SUBSYSTEM_DEF(vote)
 			if("dynamic")
 				GLOB.master_mode = "dynamic"
 				var/list/probabilities = CONFIG_GET(keyed_list/storyteller_weight)
-				for(var/T in config.storyteller_cache)
+				for(var/T in config.get_runnable_storytellers())
 					var/datum/dynamic_storyteller/S = T
 					var/probability = ((initial(S.config_tag) in probabilities) ? probabilities[initial(S.config_tag)] : initial(S.weight))
 					if(probability > 0)