Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into revert-8235-defib-notouch

code/__HELPERS/_lists.dm

@@ -681,3 +681,11 @@
 			continue
 		if(istype(D, path))
 			return TRUE
+
+/proc/safe_json_encode(list/L, default = "")
+	. = default
+	return json_encode(L)
+
+/proc/safe_json_decode(string, default = list())
+	. = default
+	return json_decode(string)

code/__HELPERS/roundend.dm

@@ -402,7 +402,7 @@
 	for (var/i in GLOB.ai_list)
 		var/mob/living/silicon/ai/aiPlayer = i
 		if(aiPlayer.mind)
-			parts += "<b>[aiPlayer.name]</b> (Played by: <b>[aiPlayer.mind.key]</b>)'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was <span class='redtext'>deactivated</span>"] were:"
+			parts += "<b>[aiPlayer.name]</b>[aiPlayer.mind.hide_ckey ? "" : " (Played by: <b>[aiPlayer.mind.key]</b>)"]'s laws [aiPlayer.stat != DEAD ? "at the end of the round" : "when it was <span class='redtext'>deactivated</span>"] were:"
 			parts += aiPlayer.laws.get_law_list(include_zeroth=TRUE)
 
 		parts += "<b>Total law changes: [aiPlayer.law_change_counter]</b>"
@@ -413,14 +413,14 @@
 			for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots)
 				borg_num--
 				if(robo.mind)
-					robolist += "<b>[robo.name]</b> (Played by: <b>[robo.mind.key]</b>)[robo.stat == DEAD ? " <span class='redtext'>(Deactivated)</span>" : ""][borg_num ?", ":""]<br>"
+					robolist += "<b>[robo.name]</b>[robo.mind.hide_ckey ? "" : " (Played by: <b>[robo.mind.key]</b>)"] [robo.stat == DEAD ? " <span class='redtext'>(Deactivated)</span>" : ""][borg_num ?", ":""]<br>"
 			parts += "[robolist]"
 		if(!borg_spacer)
 			borg_spacer = TRUE
 
 	for (var/mob/living/silicon/robot/robo in GLOB.silicon_mobs)
 		if (!robo.connected_ai && robo.mind)
-			parts += "[borg_spacer?"<br>":""]<b>[robo.name]</b> (Played by: <b>[robo.mind.key]</b>) [(robo.stat != DEAD)? "<span class='greentext'>survived</span> as an AI-less borg!" : "was <span class='redtext'>unable to survive</span> the rigors of being a cyborg without an AI."] Its laws were:"
+			parts += "[borg_spacer?"<br>":""]<b>[robo.name]</b>[robo.mind.hide_ckey ? "" : " (Played by: <b>[robo.mind.key]</b>)"] [(robo.stat != DEAD)? "<span class='greentext'>survived</span> as an AI-less borg!" : "was <span class='redtext'>unable to survive</span> the rigors of being a cyborg without an AI."] Its laws were:"
 
 			if(robo) //How the hell do we lose robo between here and the world messages directly above this?
 				parts += robo.laws.get_law_list(include_zeroth=TRUE)
@@ -529,7 +529,7 @@
 	var/jobtext = ""
 	if(ply.assigned_role)
 		jobtext = " the <b>[ply.assigned_role]</b>"
-	var/text = "<b>[ply.key]</b> was <b>[ply.name]</b>[jobtext] and"
+	var/text = "<b>[ply.hide_ckey ? "<b>[ply.name]</b>[jobtext] " : "[ply.key]</b> was <b>[ply.name]</b>[jobtext] and "]"
 	if(ply.current)
 		if(ply.current.stat == DEAD)
 			text += " <span class='redtext'>died</span>"

code/__HELPERS/type2type.dm

@@ -462,16 +462,14 @@
 		else
 			. = max(0, min(255, 138.5177312231 * log(temp - 10) - 305.0447927307))
 
-/proc/fusionpower2text(power) //used when displaying fusion power on analyzers
-	switch(power)
-		if(0 to 5)
-			return "low"
-		if(5 to 20)
-			return "mid"
-		if(20 to 50)
-			return "high"
-		if(50 to INFINITY)
-			return "super"
+/proc/instability2text(instability) //used when displaying fusion power on analyzers
+	switch(instability)
+		if(0 to 2)
+			return "stable, meaning that its heat will always increase."
+		if(2 to 3)
+			return "metastable, meaning that its heat will trend upwards."
+		if (3 to INFINITY)
+			return "unstable, meaning that its heat will trend downwards."
 
 /proc/color2hex(color)	//web colors
 	if(!color)

code/_globalvars/lists/maintenance_loot.dm

@@ -107,13 +107,8 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/toy/eightball = 1,
 	/obj/item/reagent_containers/pill/floorpill = 1,
 	/obj/item/reagent_containers/food/snacks/cannedpeaches/maint = 2,
-	/obj/item/storage/daki = 3, //VERY IMPORTANT CIT CHANGE - adds bodypillows to maint
-	/obj/item/storage/pill_bottle/penis_enlargement = 2,
-	/obj/item/storage/pill_bottle/breast_enlargement = 2,
 	/obj/item/clothing/shoes/wheelys = 1,
 	/obj/item/clothing/shoes/kindleKicks = 1,
-	/obj/item/autosurgeon/penis = 1,
-	/obj/item/autosurgeon/testicles = 1,
 	/obj/item/storage/box/marshmallow = 2,
 	/obj/item/clothing/gloves/tackler/offbrand = 1,
 	/obj/item/stack/sticky_tape = 1,

code/_globalvars/lists/objects.dm

@@ -13,6 +13,7 @@ GLOBAL_LIST_EMPTY(deliverybeacontags)			    //list of all tags associated with d
 GLOBAL_LIST_EMPTY(nuke_list)
 GLOBAL_LIST_EMPTY(alarmdisplay)				        //list of all machines or programs that can display station alerts
 GLOBAL_LIST_EMPTY(singularities)				    //list of all singularities on the station (actually technically all engines)
+GLOBAL_LIST_EMPTY(grounding_rods)					//list of all grounding rods on the station
 
 GLOBAL_LIST(chemical_reactions_list)				//list of all /datum/chemical_reaction datums. Used during chemical reactions
 GLOBAL_LIST(chemical_reagents_list)				//list of all /datum/reagent datums indexed by reagent id. Used by chemistry stuff

code/datums/mind.dm

@@ -41,6 +41,8 @@
 	var/special_role
 	var/list/restricted_roles = list()
 
+	var/hide_ckey = FALSE //hide ckey from round-end report
+
 	var/list/spell_list = list() // Wizard mode & "Give Spell" badmin button.
 
 	var/linglink
@@ -69,6 +71,7 @@
 	///What character we spawned in as- either at roundstart or latejoin, so we know for persistent scars if we ended as the same person or not
 	var/mob/original_character
 
+
 /datum/mind/New(var/key)
 	skill_holder = new(src)
 	src.key = key
@@ -137,6 +140,8 @@
 		if(L.client?.prefs && L.client.prefs.auto_ooc && L.client.prefs.chat_toggles & CHAT_OOC)
 			DISABLE_BITFIELD(L.client.prefs.chat_toggles,CHAT_OOC)
 
+	hide_ckey = current.client?.prefs?.hide_ckey
+
 	SEND_SIGNAL(src, COMSIG_MIND_TRANSFER, new_character, old_character)
 	SEND_SIGNAL(new_character, COMSIG_MOB_ON_NEW_MIND)
 
@@ -780,6 +785,7 @@
 	if(!mind.name)
 		mind.name = real_name
 	mind.current = src
+	mind.hide_ckey = client?.prefs?.hide_ckey
 
 /mob/living/carbon/mind_initialize()
 	..()

code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm

@@ -200,13 +200,15 @@
 /datum/dynamic_ruleset/latejoin/heretic_smuggler
 	name = "Heretic Smuggler"
 	antag_datum = /datum/antagonist/heretic
-	antag_flag = ROLE_HERETIC
+	antag_flag = "latejoin_heretic"
 	protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster")
 	restricted_roles = list("AI","Cyborg")
 	required_candidates = 1
 	weight = 4
-	cost = 10
-	requirements = list(40,30,20,10,10,10,10,10,10,10)
+	cost = 25
+	requirements = list(60,60,60,55,50,50,50,50,50,50)
+	high_population_requirement = 50
+	property_weights = list("story_potential" = 1, "trust" = -1, "chaos" = 2, "extended" = -1, "valid" = 2)
 	repeatable = TRUE
 
 //////////////////////////////////////////////

code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm

@@ -538,7 +538,7 @@
 	name = "Slaughter Demon"
 	config_tag = "slaughter_demon"
 	antag_flag = ROLE_ALIEN
-	enemy_roles = list("Security Officer","Shaft Miner","Head of Security","Captain","Janitor","AI","Cyborg")
+	enemy_roles = list("Security Officer","Shaft Miner","Head of Security","Captain","Janitor","AI","Cyborg","Bartender")
 	required_enemies = list(3,2,2,2,2,1,1,1,1,0)
 	required_candidates = 1
 	weight = 4

code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm

@@ -151,16 +151,18 @@
 
 /datum/dynamic_ruleset/roundstart/heretics
 	name = "Heretics"
-	antag_flag = ROLE_HERETIC
+	antag_flag = "heretic"
 	antag_datum = /datum/antagonist/heretic
 	protected_roles = list("Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain")
 	restricted_roles = list("AI", "Cyborg")
 	required_candidates = 1
 	weight = 3
-	cost = 20
+	cost = 25
 	scaling_cost = 15
-	requirements = list(50,45,45,40,35,20,20,15,10,10)
+	requirements = list(60,60,60,55,50,50,50,50,50,50)
+	property_weights = list("story_potential" = 1, "trust" = -1, "chaos" = 2, "extended" = -1, "valid" = 2)
 	antag_cap = list(1,1,1,1,2,2,2,2,3,3)
+	high_population_requirement = 50
 
 
 /datum/dynamic_ruleset/roundstart/heretics/pre_execute()

code/game/gamemodes/dynamic/dynamic_storytellers.dm

@@ -22,14 +22,14 @@
 	var/datum/game_mode/dynamic/mode = null // Cached as soon as it's made, by dynamic.
 
 /**
-Property weights are:
+Property weights are added to the config weight of the ruleset. They are:
 "story_potential" -- essentially how many different ways the antag can be played.
 "trust" -- How much it makes the crew trust each other. Negative values means they're suspicious. Team antags are like this.
 "chaos" -- How chaotic it makes the round. Has some overlap with "valid" and somewhat contradicts "extended".
 "valid" -- How likely the non-antag-enemy crew are to get involved, e.g. nukies encouraging the warden to
            let everyone into the armory, wizard moving around and being a nuisance, nightmare busting lights.
 "extended" -- How much the antag is conducive to a long round. Nukies and cults are bad for this; Wizard is less bad; and so on.
-"conversion" -- Basically a bool. Conversion antags, well, convert. It's its own class for a good reason.
+"conversion" -- Basically a bool. Conversion antags, well, convert. It's in its own class 'cause people kinda hate conversion.
 */
 
 /datum/dynamic_storyteller/proc/start_injection_cooldowns()
@@ -126,8 +126,9 @@ Property weights are:
 				for(var/property in property_weights)
 					if(property in rule.property_weights) // just treat it as 0 if it's not in there
 						property_weight += rule.property_weights[property] * property_weights[property]
-				if(property_weight > 0)
-					drafted_rules[rule] = rule.get_weight() * property_weight * rule.weight_mult
+				var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult
+				if(calced_weight > 0) // negatives in the list might cause problems
+					drafted_rules[rule] = calced_weight
 	return drafted_rules
 
 /datum/dynamic_storyteller/proc/midround_draft()
@@ -144,21 +145,24 @@ Property weights are:
 				for(var/property in property_weights)
 					if(property in rule.property_weights) // just treat it as 0 if it's not in there
 						property_weight += rule.property_weights[property] * property_weights[property]
-				if(property_weight > 0)
-					var/threat_weight = 1
-					if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)) // makes the traitor rulesets always possible anyway
-						var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat))
-						/*	Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to
-							pick this particular ruleset.
-							Let's use a toy example: there's 60 threat level and 10 threat spent.
-							We want to pick a ruleset that's close to that, so we run the below equation, on two rulesets.
-							Ruleset 1 has 30 cost, ruleset 2 has 5 cost.
-							When we do the math, ruleset 1's threat_weight is 0.538, and ruleset 2's is 0.238, meaning ruleset 1
-							is 2.26 times as likely to be picked, all other things considered.
-							Of course, we don't want it to GUARANTEE the closest, that's no fun, so it's just a weight.
-						*/
-						threat_weight = abs(1-abs(1-LOGISTIC_FUNCTION(2,0.05,cost_difference,0)))
-					drafted_rules[rule] = rule.get_weight() * property_weight * rule.weight_mult * threat_weight
+				var/threat_weight = 1
+				if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)) // makes the traitor rulesets always possible anyway
+					var/cost_difference = rule.cost-(mode.threat_level-mode.threat)
+					/*	Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to
+						pick this particular ruleset.
+						Let's use a toy example: there's 60 threat level and 10 threat spent.
+						We want to pick a ruleset that's close to that, so we run the below equation, on two rulesets.
+						Ruleset 1 has 30 cost, ruleset 2 has 5 cost.
+						When we do the math, ruleset 1's threat_weight is 0.538, and ruleset 2's is 0.238, meaning ruleset 1
+						is 2.26 times as likely to be picked, all other things considered.
+						Of course, we don't want it to GUARANTEE the closest, that's no fun, so it's just a weight.
+					*/
+					threat_weight = abs(1-abs(1-LOGISTIC_FUNCTION(2,0.05,abs(cost_difference),0)))
+					if(cost_difference > 0)
+						threat_weight /= (1+(cost_difference*0.1))
+				var/calced_weight =  (rule.get_weight() + property_weight) * rule.weight_mult * threat_weight
+				if(calced_weight > 0)
+					drafted_rules[rule] = calced_weight
 	return drafted_rules
 
 /datum/dynamic_storyteller/proc/latejoin_draft(mob/living/carbon/human/newPlayer)
@@ -180,12 +184,15 @@ Property weights are:
 				for(var/property in property_weights)
 					if(property in rule.property_weights)
 						property_weight += rule.property_weights[property] * property_weights[property]
-				if(property_weight > 0)
-					var/threat_weight = 1
-					if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))
-						var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat))
-						threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,cost_difference,0)))
-					drafted_rules[rule] = rule.get_weight() * property_weight * rule.weight_mult * threat_weight
+				var/threat_weight = 1
+				if(!(rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET))
+					var/cost_difference = rule.cost-(mode.threat_level-mode.threat)
+					threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,abs(cost_difference),0)))
+					if(cost_difference > 0)
+						threat_weight /= (1+(cost_difference*0.1))
+				var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult * threat_weight
+				if(calced_weight > 0)
+					drafted_rules[rule] = calced_weight
 	return drafted_rules
 
 /datum/dynamic_storyteller/proc/event_draft()
@@ -196,8 +203,9 @@ Property weights are:
 			for(var/property in property_weights)
 				if(property in rule.property_weights)
 					property_weight += rule.property_weights[property] * property_weights[property]
-			if(property_weight > 0)
-				drafted_rules[rule] = rule.get_weight() + property_weight * rule.weight_mult
+			var/calced_weight = (rule.get_weight() + property_weight) * rule.weight_mult
+			if(calced_weight > 0)	
+				drafted_rules[rule] = calced_weight
 	return drafted_rules
 
 
@@ -327,12 +335,6 @@ Property weights are:
 	flags = USE_PREV_ROUND_WEIGHTS
 	property_weights = list("story_potential" = 2)
 
-
-/datum/dynamic_storyteller/story/calculate_threat()
-	var/current_time = (world.time / SSautotransfer.targettime)*180
-	mode.threat_level = round((mode.initial_threat_level*(sin(current_time)/2)+0.75),0.1)
-	return ..()
-
 /datum/dynamic_storyteller/classic
 	name = "Classic"
 	config_tag = "classic"

code/game/machinery/doors/firedoor.dm

@@ -74,12 +74,6 @@
 /obj/machinery/door/firedoor/Bumped(atom/movable/AM)
 	if(panel_open || operating || welded)
 		return
-	if(ismob(AM))
-		var/mob/user = AM
-		if(density && !welded && !operating && !(stat & NOPOWER) && (!density || allow_hand_open(user)))
-			add_fingerprint(user)
-			open()
-			return TRUE
 	return FALSE
 
 /obj/machinery/door/firedoor/power_change()
@@ -90,14 +84,6 @@
 		stat |= NOPOWER
 
 /obj/machinery/door/firedoor/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
-	if(!welded && !operating && !(stat & NOPOWER) && (!density || allow_hand_open(user)))
-		add_fingerprint(user)
-		if(density)
-			emergency_close_timer = world.time + 30 // prevent it from instaclosing again if in space
-			open()
-		else
-			close()
-		return TRUE
 	if(operating || !density)
 		return
 

code/game/mecha/mecha_defense.dm

@@ -1,12 +1,10 @@
 /obj/mecha/proc/get_armour_facing(relative_dir)
 	switch(relative_dir)
-		if(0) // BACKSTAB!
+		if(180) // BACKSTAB!
 			return facing_modifiers[BACK_ARMOUR]
-		if(45, 90, 270, 315)
-			return facing_modifiers[SIDE_ARMOUR]
-		if(225, 180, 135)
+		if(0, 45) // direct or 45 degrees off
 			return facing_modifiers[FRONT_ARMOUR]
-	return 1 //always return non-0
+	return facing_modifiers[SIDE_ARMOUR] //if its not a front hit or back hit then assume its from the side
 
 /obj/mecha/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
 	. = ..()
@@ -43,7 +41,7 @@
 				break
 
 	if(attack_dir)
-		var/facing_modifier = get_armour_facing(dir2angle(attack_dir) - dir2angle(src))
+		var/facing_modifier = get_armour_facing(abs(dir2angle(dir) - dir2angle(attack_dir)))
 		booster_damage_modifier /= facing_modifier
 		booster_deflection_modifier *= facing_modifier
 	if(prob(deflect_chance * booster_deflection_modifier))

code/game/objects/effects/anomalies.dm

@@ -285,7 +285,7 @@
 	S.rabid = TRUE
 	S.amount_grown = SLIME_EVOLUTION_THRESHOLD
 	S.Evolve()
-	offer_control(S)
+	offer_control(S,POLL_IGNORE_SENTIENCE_POTION)
 
 /////////////////////
 

code/game/objects/items/broom.dm

@@ -28,39 +28,37 @@
 /// triggered on wield of two handed item
 /obj/item/broom/proc/on_wield(obj/item/source, mob/user)
 	to_chat(user, "<span class='notice'>You brace the [src] against the ground in a firm sweeping stance.</span>")
-	RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/sweep)
+	RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, .proc/sweep)
 
 /// triggered on unwield of two handed item
 /obj/item/broom/proc/on_unwield(obj/item/source, mob/user)
-	UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
+	UnregisterSignal(user, COMSIG_MOVABLE_PRE_MOVE)
 
 /obj/item/broom/afterattack(atom/A, mob/user, proximity)
 	. = ..()
 	if(!proximity)
 		return
-	sweep(user, A, FALSE)
+	sweep(user, A)
 
-/obj/item/broom/proc/sweep(mob/user, atom/A, moving = TRUE)
-	var/turf/target
-	if (!moving)
-		if (isturf(A))
-			target = A
-		else
-			target = A.loc
-	else
-		target = user.loc
-	if (!isturf(target))
+/obj/item/broom/proc/sweep(datum/source, atom/newLoc)
+	if(!ismob(source) || !isturf(newLoc) || (get_dist(source, newLoc) > 1))
 		return
-	if (locate(/obj/structure/table) in target.contents)
+	var/turf/target = newLoc
+	var/atom/movable/AM
+	var/sweep_dir = get_dir(source, target)
+	if(!sweep_dir)
 		return
+	for(var/i in target.contents)
+		AM = i
+		if(AM.density)		// eh good enough heuristic check
+			return
 	var/i = 0
 	for(var/obj/item/garbage in target.contents)
 		if(!garbage.anchored)
-			garbage.Move(get_step(target, user.dir), user.dir)
-		i++
-		if(i >= 20)
+			step(garbage, sweep_dir)
+		if(++i > 20)
 			break
-	if(i >= 1)
+	if(i)
 		playsound(loc, 'sound/weapons/thudswoosh.ogg', 30, TRUE, -1)
 
 /obj/item/broom/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J) //bless you whoever fixes this copypasta

code/game/objects/items/devices/portable_chem_mixer.dm

@@ -0,0 +1,207 @@
+/obj/item/storage/portable_chem_mixer
+	name = "Portable Chemical Mixer"
+	desc = "A portable device that dispenses and mixes chemicals. All necessary reagents need to be supplied with beakers. A label indicates that a screwdriver is required to open it for refills. This device can be worn on a belt. The letters 'S&T' are imprinted on the side."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "portablechemicalmixer_open"
+	w_class = WEIGHT_CLASS_HUGE
+	slot_flags = ITEM_SLOT_BELT
+	custom_price = 2000
+	custom_premium_price = 2000
+
+	var/obj/item/reagent_containers/beaker = null	///Creating an empty slot for a beaker that can be added to dispense into
+	var/amount = 30	///The amount of reagent that is to be dispensed currently
+
+	var/list/dispensable_reagents = list()	///List in which all currently dispensable reagents go
+
+/obj/item/storage/portable_chem_mixer/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_combined_w_class = 200
+	STR.max_items = 50
+	STR.insert_preposition = "in"
+	STR.can_hold = typecacheof(list(
+		/obj/item/reagent_containers/glass/beaker,
+	))
+
+/obj/item/storage/portable_chem_mixer/Destroy()
+	QDEL_NULL(beaker)
+	return ..()
+
+/obj/item/storage/portable_chem_mixer/ex_act(severity, target)
+	if(severity < 3)
+		..()
+
+/obj/item/storage/portable_chem_mixer/attackby(obj/item/I, mob/user, params)
+	var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
+	if (I.tool_behaviour == TOOL_SCREWDRIVER)
+		SEND_SIGNAL(src, COMSIG_TRY_STORAGE_SET_LOCKSTATE, !locked)
+		if (!locked)
+			update_contents()
+		if (locked)
+			replace_beaker(user)
+		update_icon()
+		I.play_tool_sound(src, 50)
+		return
+
+	else if (istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container() && locked)
+		var/obj/item/reagent_containers/B = I
+		. = TRUE //no afterattack
+		if(!user.transferItemToLoc(B, src))
+			return
+		replace_beaker(user, B)
+		update_icon()
+		updateUsrDialog()
+		return
+
+	return ..()
+
+/**
+  * Updates the contents of the portable chemical mixer
+  *
+  * A list of dispensable reagents is created by iterating through each source beaker in the portable chemical beaker and reading its contents
+  */
+/obj/item/storage/portable_chem_mixer/proc/update_contents()
+	dispensable_reagents.Cut()
+
+	for (var/obj/item/reagent_containers/glass/beaker/B in contents)
+		var/key = B.reagents.get_master_reagent_id()
+		if (!(key in dispensable_reagents))
+			dispensable_reagents[key] = list()
+			dispensable_reagents[key]["reagents"] = list()
+		dispensable_reagents[key]["reagents"] += B.reagents
+
+	return
+
+/obj/item/storage/portable_chem_mixer/update_icon_state()
+	var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
+	if (!locked)
+		icon_state = "portablechemicalmixer_open"
+	else if (beaker)
+		icon_state = "portablechemicalmixer_full"
+	else
+		icon_state = "portablechemicalmixer_empty"
+
+
+/obj/item/storage/portable_chem_mixer/AltClick(mob/living/user)
+	var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
+	if (!locked)
+		return ..()
+	if(!can_interact(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		return
+	replace_beaker(user)
+	update_icon()
+
+/**
+  * Replaces the beaker of the portable chemical mixer with another beaker, or simply adds the new beaker if none is in currently
+  *
+  * Checks if a valid user and a valid new beaker exist and attempts to replace the current beaker in the portable chemical mixer with the one in hand. Simply places the new beaker in if no beaker is currently loaded
+  *	Arguments:
+  * * mob/living/user							-	The user who is trying to exchange beakers
+  *	* obj/item/reagent_containers/new_beaker	-	The new beaker that the user wants to put into the device
+  */
+/obj/item/storage/portable_chem_mixer/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
+	if(!user)
+		return FALSE
+	if(beaker)
+		user.put_in_hands(beaker)
+		beaker = null
+	if(new_beaker)
+		beaker = new_beaker
+	return TRUE
+
+/obj/item/storage/portable_chem_mixer/attack_hand(mob/user)
+	if (loc != user)
+		return ..()
+	if(SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED))
+		ui_interact(user)
+		return
+
+/obj/item/storage/portable_chem_mixer/attack_self(mob/user)
+	if(loc == user)
+		var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
+		if (locked)
+			ui_interact(user)
+			return
+		else
+			to_chat(user, "<span class='notice'>The portable chemical mixer is currently open and its contents can be accessed.</span>")
+			return
+	return
+
+/obj/item/storage/portable_chem_mixer/MouseDrop(obj/over_object)
+	. = ..()
+	if(ismob(loc))
+		var/mob/M = loc
+		if(!M.incapacitated() && istype(over_object, /obj/screen/inventory/hand))
+			var/obj/screen/inventory/hand/H = over_object
+			M.putItemFromInventoryInHandIfPossible(src, H.held_index)
+
+/obj/item/storage/portable_chem_mixer/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "PortableChemMixer", name)
+		if(user.hallucinating())
+			// to not ruin the immersion by constantly changing the fake chemicals
+			ui.set_autoupdate(FALSE)
+		ui.open()
+
+/obj/item/storage/portable_chem_mixer/ui_data(mob/user)
+	var/list/data = list()
+	data["amount"] = amount
+	data["isBeakerLoaded"] = beaker ? 1 : 0
+	data["beakerCurrentVolume"] = beaker ? beaker.reagents.total_volume : null
+	data["beakerMaxVolume"] = beaker ? beaker.volume : null
+	data["beakerTransferAmounts"] = beaker ? beaker.possible_transfer_amounts : null
+	var/chemicals[0]
+	var/is_hallucinating = user.hallucinating()
+	if(user.hallucinating())
+		is_hallucinating = TRUE
+	for(var/re in dispensable_reagents)
+		var/value = dispensable_reagents[re]
+		var/datum/reagent/temp = GLOB.chemical_reagents_list[re]
+		if(temp)
+			var/chemname = temp.name
+			var/total_volume = 0
+			for (var/datum/reagents/rs in value["reagents"])
+				total_volume += rs.total_volume
+			if(is_hallucinating && prob(5))
+				chemname = "[pick_list_replacements("hallucination.json", "chemicals")]"
+			chemicals.Add(list(list("title" = chemname, "id" = ckey(temp.name), "volume" = total_volume )))
+	data["chemicals"] = chemicals
+	var/beakerContents[0]
+	if(beaker)
+		for(var/datum/reagent/R in beaker.reagents.reagent_list)
+			beakerContents.Add(list(list("name" = R.name, "id" = ckey(R.name), "volume" = R.volume))) // list in a list because Byond merges the first list...
+	data["beakerContents"] = beakerContents
+	return data
+
+/obj/item/storage/portable_chem_mixer/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("amount")
+			var/target = text2num(params["target"])
+			amount = target
+			. = TRUE
+		if("dispense")
+			var/reagent_name = params["reagent"]
+			var/datum/reagent/reagent = GLOB.name2reagent[reagent_name]
+			var/entry = dispensable_reagents[reagent]
+			if(beaker)
+				var/datum/reagents/R = beaker.reagents
+				var/actual = min(amount, 1000, R.maximum_volume - R.total_volume)
+				// todo: add check if we have enough reagent left
+				for (var/datum/reagents/source in entry["reagents"])
+					var/to_transfer = min(source.total_volume, actual)
+					source.trans_to(beaker, to_transfer)
+					actual -= to_transfer
+					if (actual <= 0)
+						break
+			. = TRUE
+		if("remove")
+			var/amount = text2num(params["amount"])
+			beaker.reagents.remove_all(amount)
+			. = TRUE
+		if("eject")
+			replace_beaker(usr)
+			update_icon()
+			. = TRUE

code/game/objects/items/devices/scanners.dm

@@ -729,10 +729,10 @@ GENETICS SCANNER
 				to_chat(user, "<span class='notice'>[target] is empty!</span>")
 
 		if(cached_scan_results && cached_scan_results["fusion"]) //notify the user if a fusion reaction was detected
-			var/fusion_power = round(cached_scan_results["fusion"], 0.01)
-			var/tier = fusionpower2text(fusion_power)
+			var/instability = round(cached_scan_results["fusion"], 0.01)
+			var/tier = instability2text(instability)
 			to_chat(user, "<span class='boldnotice'>Large amounts of free neutrons detected in the air indicate that a fusion reaction took place.</span>")
-			to_chat(user, "<span class='notice'>Power of the last fusion reaction: [fusion_power]\n This power indicates it was a [tier]-tier fusion reaction.</span>")
+			to_chat(user, "<span class='notice'>Instability of the last fusion reaction: [instability]\n This indicates it was [tier].</span>")
 	return
 
 /obj/item/analyzer/proc/scan_turf(mob/user, turf/location)
@@ -783,10 +783,10 @@ GENETICS SCANNER
 		to_chat(user, "<span class='info'>Temperature: [round(environment.return_temperature()-T0C, 0.01)] &deg;C ([round(environment.return_temperature(), 0.01)] K)</span>")
 
 		if(cached_scan_results && cached_scan_results["fusion"]) //notify the user if a fusion reaction was detected
-			var/fusion_power = round(cached_scan_results["fusion"], 0.01)
-			var/tier = fusionpower2text(fusion_power)
+			var/instability = round(cached_scan_results["fusion"], 0.01)
+			var/tier = instability2text(instability)
 			to_chat(user, "<span class='boldnotice'>Large amounts of free neutrons detected in the air indicate that a fusion reaction took place.</span>")
-			to_chat(user, "<span class='notice'>Power of the last fusion reaction: [fusion_power]\n This power indicates it was a [tier]-tier fusion reaction.</span>")
+			to_chat(user, "<span class='notice'>Instability of the last fusion reaction: [instability]\n This indicates it was [tier].</span>")
 
 /obj/item/analyzer/ranged
 	desc = "A hand-held scanner which uses advanced spectroscopy and infrared readings to analyze gases as a distance. Alt-Click to use the built in barometer function."
@@ -992,4 +992,4 @@ GENETICS SCANNER
 #undef SCANMODE_CHEMICAL
 #undef SCANMODE_WOUND
 #undef SCANNER_CONDENSED
-#undef SCANNER_VERBOSE
+#undef SCANNER_VERBOSE

code/game/objects/items/melee/misc.dm

@@ -234,6 +234,9 @@
 /obj/item/melee/rapier/attack(mob/living/target, mob/living/user)
 	. = ..()
 	if(iscarbon(target))
+		if(HAS_TRAIT(user, TRAIT_PACIFISM))
+			visible_message("<span class='warning'>[user] gently taps [target] with [src].</span>",null,null,COMBAT_MESSAGE_RANGE)
+		log_combat(user, target, "slept", src)
 		var/mob/living/carbon/H = target
 		H.Dizzy(10)
 		H.adjustStaminaLoss(30)

code/game/objects/objs.dm

@@ -304,18 +304,20 @@
 /obj/proc/reskin_obj(mob/M)
 	if(!LAZYLEN(unique_reskin))
 		return
-	var/dat = "<b>Reskin options for [name]:</b>\n"
-	for(var/V in unique_reskin)
-		var/output = icon2html(src, M, unique_reskin[V])
-		dat += "[V]: <span class='reallybig'>[output]</span>\n"
-	to_chat(M, dat)
-
-	var/choice = input(M, always_reskinnable ? "Choose the a reskin for [src]" : "Warning, you can only reskin [src] once!","Reskin Object") as null|anything in unique_reskin
-	if(QDELETED(src) || !choice || (current_skin && !always_reskinnable) || M.incapacitated() || !in_range(M,src) || !unique_reskin[choice] || unique_reskin[choice] == current_skin)
-		return
-	current_skin = choice
+	var/list/skins = list()
+	for(var/S in unique_reskin)
+		skins[S] = image(icon = icon, icon_state = unique_reskin[S])
+	var/choice = show_radial_menu(M, src, skins, custom_check = CALLBACK(src, .proc/check_skinnable, M), radius = 40, require_near = TRUE)
+	if(!choice)
+		return FALSE
 	icon_state = unique_reskin[choice]
-	to_chat(M, "[src] is now skinned as '[choice]'.")
+	current_skin = choice
+	return
+
+/obj/proc/check_skinnable(/mob/M)
+	if(current_skin || !always_reskinnable)
+		return FALSE
+	return TRUE
 
 /obj/update_overlays()
 	. = ..()

code/game/world.dm

@@ -20,8 +20,6 @@ GLOBAL_LIST(topic_status_cache)
 
 	log_world("World loaded at [TIME_STAMP("hh:mm:ss", FALSE)]!")
 
-	SetupExternalRSC()
-
 	GLOB.config_error_log = GLOB.world_manifest_log = GLOB.world_pda_log = GLOB.world_job_debug_log = GLOB.sql_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = "data/logs/config_error.[GUID()].log" //temporary file used to record errors with loading config, moved to log directory once logging is set bl
 
 	make_datum_references_lists()	//initialises global lists for referencing frequently used datums (so that we only ever do it once)
@@ -87,17 +85,6 @@ GLOBAL_LIST(topic_status_cache)
 #endif
 	SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/addtimer, cb, 10 SECONDS))
 
-/world/proc/SetupExternalRSC()
-#if (PRELOAD_RSC == 0)
-	GLOB.external_rsc_urls = world.file2list("[global.config.directory]/external_rsc_urls.txt","\n")
-	var/i=1
-	while(i<=GLOB.external_rsc_urls.len)
-		if(GLOB.external_rsc_urls[i])
-			i++
-		else
-			GLOB.external_rsc_urls.Cut(i,i+1)
-#endif
-
 /world/proc/SetupLogs()
 	var/override_dir = params[OVERRIDE_LOG_DIRECTORY_PARAMETER]
 	if(!override_dir)

code/modules/antagonists/clockcult/clock_mobs/_eminence.dm

@@ -251,7 +251,8 @@
 	var/mob/camera/eminence/E = owner
 	E.eminence_help()
 
-//Returns to the Ark
+/*
+//Returns to the Ark - Commented out and replaced with obelisk_jump
 /datum/action/innate/eminence/ark_jump
 	name = "Return to Ark"
 	desc = "Warps you to the Ark."
@@ -265,6 +266,40 @@
 		flash_color(owner, flash_color = "#AF0AAF", flash_time = 25)
 	else
 		to_chat(owner, "<span class='warning'>There is no Ark!</span>")
+*/
+
+//Warps to a chosen Obelisk
+/datum/action/innate/eminence/obelisk_jump
+	name = "Warp to Obelisk"
+	desc = "Warps to a chosen clockwork obelisk."
+	button_icon_state = "Abscond"
+
+/datum/action/innate/eminence/obelisk_jump/Activate()
+	var/list/possible_targets = list()
+	var/list/warpnames = list()
+
+	for(var/obj/structure/destructible/clockwork/powered/clockwork_obelisk/O in GLOB.all_clockwork_objects)
+		if(!O.Adjacent(owner) && O.anchored)
+			var/area/A = get_area(O)
+			var/locname = initial(A.name)
+			possible_targets[avoid_assoc_duplicate_keys("[locname] [O.name]", warpnames)] = O
+
+	if(!possible_targets.len)
+		to_chat(owner, "<span class='warning'>There are no Obelisks to warp to!</span>")
+		return
+
+	var/target_key = input(owner, "Choose an Obelisk to warp to.", "Obelisk Warp") as null|anything in possible_targets
+	var/obj/structure/destructible/clockwork/powered/clockwork_obelisk/target = possible_targets[target_key]
+
+	if(!target_key || !owner)
+		return
+
+	if(!target)
+		to_chat(owner, "<span class='warning'>That Obelisk does no longer exist!</span>")
+		return
+	owner.forceMove(get_turf(target))
+	owner.playsound_local(owner, 'sound/magic/magic_missile.ogg', 50, TRUE)
+	flash_color(owner, flash_color = "#AF0AAF", flash_time = 25)
 
 //Warps to the Station
 /datum/action/innate/eminence/station_jump

code/modules/antagonists/eldritch_cult/eldritch_antag.dm

@@ -6,6 +6,7 @@
 	job_rank = ROLE_HERETIC
 	antag_hud_type = ANTAG_HUD_HERETIC
 	antag_hud_name = "heretic"
+	threat = 10
 	var/give_equipment = TRUE
 	var/list/researched_knowledge = list()
 	var/total_sacrifices = 0
@@ -208,6 +209,14 @@
 /datum/antagonist/heretic/proc/get_all_knowledge()
 	return researched_knowledge
 
+/datum/antagonist/heretic/threat()
+	. = ..()
+	for(var/X in researched_knowledge)
+		var/datum/eldritch_knowledge/EK = researched_knowledge[X]
+		. += EK.cost
+	if(ascended)
+		. += 20
+
 ////////////////
 // Objectives //
 ////////////////

code/modules/antagonists/slaughter/slaughter.dm

@@ -66,6 +66,10 @@
 	var/wound_bonus_per_hit = 5
 	// How much our wound_bonus hitstreak bonus caps at (peak demonry)
 	var/wound_bonus_hitstreak_max = 12
+	// Keep the people we eat
+	var/list/consumed_mobs = list()
+	//buffs only happen when hearts are eaten, so this needs to be kept track separately
+	var/consumed_buff = 0
 
 /mob/living/simple_animal/slaughter/Initialize()
 	..()
@@ -112,8 +116,44 @@
 /mob/living/simple_animal/slaughter/phasein()
 	. = ..()
 	add_movespeed_modifier(/datum/movespeed_modifier/slaughter)
-	addtimer(CALLBACK(src, .proc/remove_movespeed_modifier, /datum/movespeed_modifier/slaughter), 6 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
+	var/slowdown_time = 6 SECONDS + (0.5 * consumed_buff)
+	addtimer(CALLBACK(src, .proc/remove_movespeed_modifier, /datum/movespeed_modifier/slaughter), slowdown_time, TIMER_UNIQUE | TIMER_OVERRIDE)
 
+/mob/living/simple_animal/slaughter/Destroy()
+	release_victims()
+	. = ..()
+
+/mob/living/simple_animal/slaughter/proc/release_victims()
+	if(!consumed_mobs)
+		return
+
+	for(var/mob/living/M in consumed_mobs)
+		if(!M)
+			continue
+		var/turf/T = find_safe_turf()
+		if(!T)
+			T = get_turf(src)
+		M.forceMove(T)
+
+/mob/living/simple_animal/slaughter/proc/refresh_consumed_buff()
+	melee_damage_lower = 22.5 + (0.5 * consumed_buff)
+	melee_damage_upper = 22.5 + (1 * consumed_buff)
+
+/mob/living/simple_animal/slaughter/bloodcrawl_swallow(var/mob/living/victim)
+	if(consumed_mobs)
+		// Keep their corpse so rescue is possible
+		consumed_mobs += victim
+		victim.reagents?.add_reagent(/datum/reagent/preservahyde,3) // make it so that they don't decay in there
+		var/obj/item/organ/heart/heart = victim.getorganslot(ORGAN_SLOT_HEART)
+		if(heart)
+			qdel(heart)
+			consumed_buff++
+			refresh_consumed_buff()
+	else
+		// Be safe and just eject the corpse
+		victim.forceMove(get_turf(victim))
+		victim.exit_blood_effect()
+		victim.visible_message("[victim] falls out of the air, covered in blood, looking highly confused. And dead.")
 
 //The loot from killing a slaughter demon - can be consumed to allow the user to blood crawl
 /obj/item/organ/heart/demon
@@ -178,9 +218,6 @@
 		prison of hugs."
 	loot = list(/mob/living/simple_animal/pet/cat/kitten{name = "Laughter"})
 
-	// Keep the people we hug!
-	var/list/consumed_mobs = list()
-
 	playstyle_string = "<span class='big bold'>You are a laughter \
 	demon,</span><B> a wonderful creature from another realm. You have a single \
 	desire: <span class='clown'>To hug and tickle.</span><BR>\
@@ -195,10 +232,6 @@
 	released and fully healed, because in the end it's just a jape, \
 	sibling!</B>"
 
-/mob/living/simple_animal/slaughter/laughter/Destroy()
-	release_friends()
-	. = ..()
-
 /mob/living/simple_animal/slaughter/laughter/ex_act(severity)
 	switch(severity)
 		if(1)
@@ -208,7 +241,22 @@
 		if(3)
 			adjustBruteLoss(30)
 
-/mob/living/simple_animal/slaughter/laughter/proc/release_friends()
+/mob/living/simple_animal/slaughter/laughter/refresh_consumed_buff()
+	melee_damage_lower -= 0.5 // JAPES
+	melee_damage_upper += 1
+
+/mob/living/simple_animal/slaughter/laughter/bloodcrawl_swallow(var/mob/living/victim)
+	if(consumed_mobs)
+		// Keep their corpse so rescue is possible
+		consumed_mobs += victim
+		refresh_consumed_buff()
+	else
+		// Be safe and just eject the corpse
+		victim.forceMove(get_turf(victim))
+		victim.exit_blood_effect()
+		victim.visible_message("[victim] falls out of the air, covered in blood, looking highly confused. And dead.")
+
+/mob/living/simple_animal/slaughter/laughter/release_victims()
 	if(!consumed_mobs)
 		return
 
@@ -223,13 +271,3 @@
 			M.grab_ghost(force = TRUE)
 			playsound(T, feast_sound, 50, 1, -1)
 			to_chat(M, "<span class='clown'>You leave [src]'s warm embrace,	and feel ready to take on the world.</span>")
-
-/mob/living/simple_animal/slaughter/laughter/bloodcrawl_swallow(var/mob/living/victim)
-	if(consumed_mobs)
-		// Keep their corpse so rescue is possible
-		consumed_mobs += victim
-	else
-		// Be safe and just eject the corpse
-		victim.forceMove(get_turf(victim))
-		victim.exit_blood_effect()
-		victim.visible_message("[victim] falls out of the air, covered in blood, looking highly confused. And dead.")

code/modules/antagonists/traitor/classes/freeform.dm

@@ -1,7 +1,7 @@
 /datum/traitor_class/human/freeform
 	name = "Waffle Co Agent"
 	employer = "Waffle Company"
-	weight = 16
+	weight = 0 // should not spawn in unless admins bus something in the traitor panel with setting traitor classes
 	chaos = 0
 
 /datum/traitor_class/human/freeform/forge_objectives(datum/antagonist/traitor/T)

code/modules/antagonists/traitor/classes/subterfuge.dm

@@ -1,7 +1,7 @@
 /datum/traitor_class/human/subterfuge
 	name = "MI13 Operative"
 	employer = "MI13"
-	weight = 20
+	weight = 36
 	chaos = -5
 
 /datum/traitor_class/human/subterfuge/forge_single_objective(datum/antagonist/traitor/T)

code/modules/client/preferences.dm

@@ -163,6 +163,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		)
 	var/custom_speech_verb = "default" //if your say_mod is to be something other than your races
 	var/custom_tongue = "default" //if your tongue is to be something other than your races
+	var/chosen_limb_id //body sprite selected to load for the users limbs, null means default, is sanitized when loaded
 
 	/// Security record note section
 	var/security_records
@@ -246,7 +247,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	/// Which of the 5 persistent scar slots we randomly roll to load for this round, if enabled. Actually rolled in [/datum/preferences/proc/load_character(slot)]
 	var/scars_index = 1
 
-	var/chosen_limb_id //body sprite selected to load for the users limbs, null means default, is sanitized when loaded
+	var/hide_ckey = FALSE //pref for hiding if your ckey shows round-end or not
 
 /datum/preferences/New(client/C)
 	parent = C
@@ -372,6 +373,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					dat += "[medical_records]"
 			else
 				dat += "[TextPreview(medical_records)]...<BR>"
+			dat += "<br><a href='?_src_=prefs;preference=hide_ckey;task=input'><b>Hide ckey: [hide_ckey ? "Enabled" : "Disabled"]</b></a><br>"
 			dat += "</tr></table>"
 
 		//Character Appearance
@@ -1448,6 +1450,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(!isnull(msg))
 						features["ooc_notes"] = msg
 
+				if("hide_ckey")
+					hide_ckey = !hide_ckey
+					if(user)
+						user.mind?.hide_ckey = hide_ckey
+
 				if("hair")
 					var/new_hair = input(user, "Choose your character's hair colour:", "Character Preference","#"+hair_color) as color|null
 					if(new_hair)

code/modules/client/preferences_savefile.dm

@@ -515,7 +515,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["scars4"]							>> scars_list["4"]
 	S["scars5"]							>> scars_list["5"]
 	S["chosen_limb_id"]					>> chosen_limb_id
-
+	S["hide_ckey"]						>> hide_ckey //saved per-character
 
 	//Custom names
 	for(var/custom_name_id in GLOB.preferences_custom_names)
@@ -859,6 +859,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["joblessrole"]		, joblessrole)
 	//Write prefs
 	WRITE_FILE(S["job_preferences"] , job_preferences)
+	WRITE_FILE(S["hide_ckey"]		, hide_ckey)
 
 	//Quirks
 	WRITE_FILE(S["all_quirks"]			, all_quirks)
@@ -874,6 +875,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["scars4"]						, scars_list["4"])
 	WRITE_FILE(S["scars5"]						, scars_list["5"])
 
+
 	//gear loadout
 	if(chosen_gear.len)
 		var/text_to_save = chosen_gear.Join("|")

code/modules/clothing/suits/armor.dm

@@ -80,7 +80,9 @@
 	item_state = "hostrench"
 	flags_inv = 0
 	strip_delay = 80
-	unique_reskin = list("Coat" = "hostrench", "Cloak" = "trenchcloak")
+	unique_reskin = list("Coat" = "hostrench",
+						"Cloak" = "trenchcloak"
+						)
 
 /obj/item/clothing/suit/armor/vest/warden
 	name = "warden's jacket"

code/modules/events/brain_trauma.dm

@@ -14,7 +14,8 @@
 			continue
 		if(!H.getorgan(/obj/item/organ/brain)) // If only I had a brain
 			continue
-
+		if(HAS_TRAIT(H,TRAIT_EXEMPT_HEALTH_EVENTS))
+			continue
 		traumatize(H)
 		break
 

code/modules/events/fake_virus.dm

@@ -6,7 +6,7 @@
 /datum/round_event/fake_virus/start()
 	var/list/fake_virus_victims = list()
 	for(var/mob/living/carbon/human/H in shuffle(GLOB.player_list))
-		if(!H.client || H.stat == DEAD || H.InCritical())
+		if(!H.client || H.stat == DEAD || H.InCritical() || HAS_TRAIT(H,TRAIT_EXEMPT_HEALTH_EVENTS))
 			continue
 		fake_virus_victims += H
 

code/modules/mining/lavaland/necropolis_chests.dm

@@ -78,10 +78,7 @@
 		if(28)
 			new /obj/item/clothing/neck/necklace/memento_mori(src)
 		if(29)
-			if(prob(50))
-				new /obj/item/malf_upgrade(src)
-			else
-				new /obj/item/disk/tech_disk/illegal(src)
+			new /obj/item/disk/tech_disk/illegal(src)
 
 //KA modkit design discs
 /obj/item/disk/design_disk/modkit_disc

code/modules/mob/living/simple_animal/slime/slime.dm

@@ -106,6 +106,7 @@
 	set_colour(new_colour)
 	. = ..()
 	AddComponent(/datum/component/footstep, FOOTSTEP_MOB_SLIME, 7.5)
+	set_nutrition(rand(650, 800))
 
 /mob/living/simple_animal/slime/Destroy()
 	for (var/A in actions)

code/modules/mob/login.dm

@@ -50,6 +50,8 @@
 				var/datum/callback/CB = foo
 				CB.Invoke()
 
+	mind?.hide_ckey = client?.prefs?.hide_ckey
+
 	log_message("Client [key_name(src)] has taken ownership of mob [src]([src.type])", LOG_OWNERSHIP)
 	SEND_SIGNAL(src, COMSIG_MOB_CLIENT_LOGIN, client)
 

code/modules/mob/mob_helpers.dm

@@ -431,7 +431,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 /mob/living/getImplant(type)
 	return locate(type) in implants
 
-/proc/offer_control(mob/M)
+/proc/offer_control(mob/M,ignore_category=null)
 	to_chat(M, "Control of your mob has been offered to dead players.")
 	if(usr)
 		log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.")
@@ -445,7 +445,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		var/datum/antagonist/A = M.mind.has_antag_datum(/datum/antagonist/)
 		if(A)
 			poll_message = "[poll_message] Status:[A.name]."
-	var/list/mob/candidates = pollCandidatesForMob(poll_message, ROLE_PAI, null, FALSE, 100, M)
+	var/list/mob/candidates = pollCandidatesForMob(poll_message, ROLE_PAI, null, FALSE, 100, M, ignore_category)
 
 	if(LAZYLEN(candidates))
 		var/mob/C = pick(candidates)

code/modules/power/tesla/coil.dm

@@ -160,6 +160,14 @@
 	buckle_lying = FALSE
 	buckle_requires_restraints = TRUE
 
+/obj/machinery/power/grounding_rod/Initialize()
+	GLOB.grounding_rods |= src
+	return ..()
+
+/obj/machinery/power/grounding_rod/Destroy()
+	GLOB.grounding_rods.Remove(src)
+	return ..()
+
 /obj/machinery/power/grounding_rod/default_unfasten_wrench(mob/user, obj/item/I, time = 20)
 	. = ..()
 	if(. == SUCCESSFUL_UNFASTEN)

code/modules/power/tesla/energy_ball.dm

@@ -31,6 +31,7 @@
 	var/produced_power
 	var/energy_to_raise = 32
 	var/energy_to_lower = -20
+	var/obj/machinery/power/grounding_rod/rodtarget
 
 /obj/singularity/energy_ball/Initialize(mapload, starting_energy = 50, is_miniball = FALSE)
 	miniball = is_miniball
@@ -60,11 +61,12 @@
 		return //don't annnounce miniballs
 	..()
 
-
 /obj/singularity/energy_ball/process()
 	if(!orbiting)
 		handle_energy()
 
+		determine_containment()
+
 		move_the_basket_ball(4 + orbiting_balls.len * 1.5)
 
 		playsound(src.loc, 'sound/magic/lightningbolt.ogg', 100, TRUE, extrarange = 30)
@@ -87,12 +89,19 @@
 	if(orbiting_balls.len)
 		. += "There are [orbiting_balls.len] mini-balls orbiting it."
 
-
 /obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount)
 	//we face the last thing we zapped, so this lets us favor that direction a bit
 	var/move_bias = pick(GLOB.alldirs)
+	var/move_dir
+	for(var/rod in GLOB.grounding_rods) // grounding rods pull the tesla ball, picks the nearest one
+		if(!rodtarget || get_dist(src,rod)<get_dist(src,rodtarget))
+			rodtarget=rod
+
 	for(var/i in 0 to move_amount)
-		var/move_dir = pick(GLOB.alldirs + move_bias) //ensures large-ball teslas don't just sit around
+		if(rodtarget)
+			move_dir = pick(GLOB.alldirs + get_dir(src,rodtarget))
+		else
+			move_dir = pick(GLOB.alldirs + move_bias) //ensures large-ball teslas don't just sit around
 		if(target && prob(10))
 			move_dir = get_dir(src,target)
 		var/turf/T = get_step(src, move_dir)
@@ -102,6 +111,20 @@
 			for(var/mob/living/carbon/C in loc)
 				dust_mobs(C)
 
+/obj/singularity/energy_ball/proc/determine_containment()
+	contained=0
+	var/found
+	var/tiletocheck
+	for(var/direction in GLOB.cardinals) // check a radius of 10 tiles around the ball for a full containment field
+		tiletocheck=get_step(src,direction)
+		for(var/tile in 1 to 10)
+			found=locate(/obj/machinery/field/containment) in tiletocheck
+			if(found)
+				continue
+			else if (!found && tile==10)
+				return // if one side is lacking a field it doesn't bother checking the others
+			tiletocheck=get_step(tiletocheck,direction)
+	contained=1
 
 /obj/singularity/energy_ball/proc/handle_energy()
 	if(energy >= energy_to_raise)
@@ -121,6 +144,10 @@
 	else if(orbiting_balls.len)
 		dissipate() //sing code has a much better system.
 
+		if(energy<=0)
+			investigate_log("fizzled.", INVESTIGATE_SINGULO)
+			qdel(src)
+
 /obj/singularity/energy_ball/proc/new_mini_ball()
 	if(!loc)
 		return
@@ -134,7 +161,6 @@
 
 	EB.orbit(src, orbitsize, pick(FALSE, TRUE), rand(10, 25), pick(3, 4, 5, 6, 36))
 
-
 /obj/singularity/energy_ball/Bump(atom/A)
 	dust_mobs(A)
 
@@ -166,7 +192,6 @@
 	if (!QDELETED(src))
 		qdel(src)
 
-
 /obj/singularity/energy_ball/proc/dust_mobs(atom/A)
 	if(isliving(A))
 		var/mob/living/L = A
@@ -329,6 +354,12 @@
 
 	else
 		power = closest_atom.zap_act(power, zap_flags, shocked_targets)
+
+		var/obj/singularity/energy_ball/tesla = source
+		if(istype(tesla))
+			if(istype(closest_atom,/obj/machinery/power/grounding_rod) && tesla.energy>13 && !tesla.contained)
+				qdel(closest_atom)							// each rod deletes two miniballs,
+				tesla.energy = round(tesla.energy/1.5625)	// if there are no miniballs the rod stays and continues to pull the ball in
 	if(prob(20))//I know I know
 		tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_targets)
 		tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_targets)

code/modules/reagents/chemistry/reagents/drink_reagents.dm

@@ -329,7 +329,7 @@
 	color = "#101000" // rgb: 16, 16, 0
 	nutriment_factor = 0
 	taste_description = "sweet red tea"
-	glass_icon_state = "teaglass"
+	glass_icon_state = "tea_red"
 	glass_name = "glass of red tea"
 	glass_desc = "A piping hot tea that helps with the digestion of food."
 
@@ -340,6 +340,7 @@
 	M.drowsyness = max(0,M.drowsyness-1)
 	M.jitteriness = max(0,M.jitteriness-3)
 	M.adjust_bodytemperature(23 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
+	..()
 	. = 1
 
 /datum/reagent/consumable/tea/green
@@ -348,7 +349,7 @@
 	color = "#101000" // rgb: 16, 16, 0
 	nutriment_factor = 0
 	taste_description = "tart green tea"
-	glass_icon_state = "teaglass"
+	glass_icon_state = "tea_green"
 	glass_name = "glass of tea"
 	glass_desc = "A calming glass of green tea to help get you through the day."
 
@@ -358,6 +359,7 @@
 	M.drowsyness = max(0,M.drowsyness-1)
 	M.jitteriness = max(0,M.jitteriness-3)
 	M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
+	..()
 	. = 1
 
 /datum/reagent/consumable/tea/forest
@@ -367,7 +369,7 @@
 	nutriment_factor = 0
 	quality = DRINK_NICE
 	taste_description = "sweet tea"
-	glass_icon_state = "teaglass"
+	glass_icon_state = "tea_forest"
 	glass_name = "glass of forest tea"
 	glass_desc = "A lovely glass of tea and honey."
 
@@ -379,6 +381,7 @@
 	M.drowsyness = max(0,M.drowsyness-1)
 	M.jitteriness = max(0,M.jitteriness-3)
 	M.adjust_bodytemperature(15 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
+	..()
 	. = 1
 
 /datum/reagent/consumable/tea/mush
@@ -388,7 +391,7 @@
 	nutriment_factor = 0
 	quality = DRINK_NICE
 	taste_description = "fungal infections"
-	glass_icon_state = "teaglass"
+	glass_icon_state = "tea_mush"
 	glass_name = "glass of mush tea"
 	glass_desc = "A cold merky brown tea."
 
@@ -398,6 +401,7 @@
 		M.Dizzy(10)
 	if(prob(10))
 		M.disgust = 0
+	..()
 	. = 1
 
 /datum/reagent/consumable/lemonade

code/modules/research/designs/medical_designs.dm

@@ -354,6 +354,16 @@
 	category = list("Medical Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
 
+/datum/design/portable_chem_mixer
+	name = "Portable Chemical Mixer"
+	desc = "A portable device that dispenses and mixes chemicals. Reagents have to be supplied with beakers."
+	id = "portable_chem_mixer"
+	build_type = PROTOLATHE
+	departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+	materials = list(/datum/material/plastic = 5000, /datum/material/iron = 10000, /datum/material/glass = 3000)
+	build_path = /obj/item/storage/portable_chem_mixer
+	category = list("Equipment")
+
 /////////////////////////////////////////
 //////////Cybernetic Implants////////////
 /////////////////////////////////////////

code/modules/unit_tests/_unit_tests.dm

@@ -3,6 +3,7 @@
 
 #ifdef UNIT_TESTS
 #include "anchored_mobs.dm"
+#include "character_saving.dm"
 #include "component_tests.dm"
 #include "reagent_id_typos.dm"
 #include "reagent_recipe_collisions.dm"

code/modules/unit_tests/character_saving.dm

@@ -0,0 +1,14 @@
+/datum/unit_test/character_saving/Run()
+	try
+		var/datum/preferences/P = new
+		P.load_path("test")
+		P.features["flavor_text"] = "Foo"
+		P.features["ooc_notes"] = "Bar"
+		P.save_character()
+		P.load_character()
+		if(P.features["flavor_text"] != "Foo")
+			Fail("Flavor text is failing to save.")
+		if(P.features["ooc_notes"] != "Bar")
+			Fail("OOC text is failing to save.")
+	catch(var/exception/e)
+		Fail("Failed to save and load character due to exception [e.name]")

code/modules/vending/kinkmate.dm

@@ -26,7 +26,12 @@
 				/obj/item/clothing/under/shorts/polychromic/pantsu = 3,
 				/obj/item/clothing/under/misc/poly_bottomless = 3,
 				/obj/item/clothing/under/misc/poly_tanktop = 3,
-				/obj/item/clothing/under/misc/poly_tanktop/female = 3
+				/obj/item/clothing/under/misc/poly_tanktop/female = 3,
+				/obj/item/autosurgeon/penis = 3,
+				/obj/item/autosurgeon/testicles = 3,
+				/obj/item/storage/pill_bottle/penis_enlargement = 5,
+				/obj/item/storage/pill_bottle/breast_enlargement = 5,
+				/obj/item/storage/daki = 4
 				)
 	contraband = list(
 				/obj/item/clothing/neck/petcollar/locked = 2,