Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-story-storyteller

code/modules/antagonists/blob/blob/blobs/blob_mobs.dm

@@ -42,7 +42,7 @@
 /mob/living/simple_animal/hostile/blob/fire_act(exposed_temperature, exposed_volume)
 	..()
 	if(exposed_temperature)
-		adjustFireLoss(CLAMP(0.01 * exposed_temperature, 1, 5))
+		adjustFireLoss(clamp(0.01 * exposed_temperature, 1, 5))
 	else
 		adjustFireLoss(5)
 

code/modules/antagonists/blob/blob/overmind.dm

@@ -203,7 +203,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 				B.hud_used.blobpwrdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='#82ed00'>[round(blob_core.obj_integrity)]</font></div>"
 
 /mob/camera/blob/proc/add_points(points)
-	blob_points = CLAMP(blob_points + points, 0, max_blob_points)
+	blob_points = clamp(blob_points + points, 0, max_blob_points)
 	hud_used.blobpwrdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='#82ed00'>[round(blob_points)]</font></div>"
 
 /mob/camera/blob/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)

code/modules/antagonists/blob/blob/theblob.dm

@@ -77,7 +77,7 @@
 
 /obj/structure/blob/CanAStarPass(ID, dir, caller)
 	. = 0
-	if(ismovableatom(caller))
+	if(ismovable(caller))
 		var/atom/movable/mover = caller
 		. = . || (mover.pass_flags & PASSBLOB)
 

code/modules/antagonists/bloodsucker/bloodsucker_life.dm

@@ -39,7 +39,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /datum/antagonist/bloodsucker/proc/AddBloodVolume(value)
-	owner.current.blood_volume = CLAMP(owner.current.blood_volume + value, 0, max_blood_volume)
+	owner.current.blood_volume = clamp(owner.current.blood_volume + value, 0, max_blood_volume)
 	update_hud()
 
 /datum/antagonist/bloodsucker/proc/HandleFeeding(mob/living/carbon/target, mult=1)
@@ -112,7 +112,7 @@
 			CheckVampOrgans() // Heart, Eyes
 			if(check_limbs(costMult))
 				return TRUE
-			
+
 		// BRUTE: Always Heal
 		var/bruteheal = min(C.getBruteLoss(), actual_regen)
 		var/toxinheal = min(C.getToxLoss(), actual_regen)
@@ -121,7 +121,7 @@
 			if(mult == 0)
 				return TRUE
 			if(owner.current.stat >= UNCONSCIOUS) //Faster regeneration while unconcious, so you dont have to wait all day
-				mult *= 2  
+				mult *= 2
 			// We have damage. Let's heal (one time)
 			C.adjustBruteLoss(-bruteheal * mult, forced = TRUE)// Heal BRUTE / BURN in random portions throughout the body.
 			C.adjustFireLoss(-fireheal * mult, forced = TRUE)
@@ -129,7 +129,7 @@
 			//C.heal_overall_damage(bruteheal * mult, fireheal * mult)				 // REMOVED: We need to FORCE this, because otherwise, vamps won't heal EVER. Swapped to above.
 			AddBloodVolume((bruteheal * -0.5 + fireheal * -1 + toxinheal * -0.2) / mult * costMult)	// Costs blood to heal
 			return TRUE // Healed! Done for this tick.
-		
+
 
 
 /datum/antagonist/bloodsucker/proc/check_limbs(costMult)
@@ -137,7 +137,7 @@
 	var/mob/living/carbon/C = owner.current
 	var/list/missing = C.get_missing_limbs()
 	if(missing.len && C.blood_volume < limb_regen_cost + 5)
-		return FALSE 
+		return FALSE
 	for(var/targetLimbZone in missing) 			// 1) Find ONE Limb and regenerate it.
 		C.regenerate_limb(targetLimbZone, FALSE)		// regenerate_limbs() <--- If you want to EXCLUDE certain parts, do it like this ----> regenerate_limbs(0, list("head"))
 		AddBloodVolume(50)
@@ -183,7 +183,7 @@
 		owner.current.blur_eyes(8 - 8 * (owner.current.blood_volume / BLOOD_VOLUME_BAD))
 	// Nutrition
 	owner.current.nutrition = clamp(owner.current.blood_volume, 545, 0) //The amount of blood is how full we are.
-	//A bit higher regeneration based on blood volume 
+	//A bit higher regeneration based on blood volume
 	if(owner.current.blood_volume < 700)
 		additional_regen = 0.4
 	else if(owner.current.blood_volume < BLOOD_VOLUME_NORMAL)
@@ -369,8 +369,8 @@
 				 //Puke blood only if puke_blood is true, and loose some blood, else just puke normally.
 				if(puke_blood)
 					C.blood_volume = max(0, C.blood_volume - foodInGut * 2)
-					C.vomit(foodInGut * 4, foodInGut * 2, 0) 
-				else 
+					C.vomit(foodInGut * 4, foodInGut * 2, 0)
+				else
 					C.vomit(foodInGut * 4, FALSE, 0)
 				C.Stun(30)
 				//C.Dizzy(50)

code/modules/antagonists/bloodsucker/bloodsucker_objectives.dm

@@ -87,7 +87,7 @@
 	// Heads?
 	if (target_role == "HEAD")
 		target_amount = rand(1, round(SSticker.mode.num_players() / 20))
-		target_amount = CLAMP(target_amount,1,3)
+		target_amount = clamp(target_amount,1,3)
 	// Department?
 	else
 		switch(target_role)
@@ -100,7 +100,7 @@
 			if("Quartermaster")
 				department_string = "Cargo"
 		target_amount = rand(round(SSticker.mode.num_players() / 20), round(SSticker.mode.num_players() / 10))
-		target_amount = CLAMP(target_amount, 2, 4)
+		target_amount = clamp(target_amount, 2, 4)
 	..()
 
 //						EXPLANATION

code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm

@@ -200,39 +200,3 @@
 					to_chat(resident, "<span class='notice'>You fix the mechanism and lock it.</span>")
 					broken = FALSE
 					locked = TRUE
-
-// Look up recipes.dm OR pneumaticCannon.dm
-/datum/crafting_recipe/bloodsucker/blackcoffin
-	name = "Black Coffin"
-	result = /obj/structure/closet/crate/coffin/blackcoffin
-	tools = list(/obj/item/weldingtool,
-				 /obj/item/screwdriver)
-	reqs = list(/obj/item/stack/sheet/cloth = 1,
-				/obj/item/stack/sheet/mineral/wood = 5,
-				/obj/item/stack/sheet/metal = 1)
-				///obj/item/stack/packageWrap = 8,
-				///obj/item/pipe = 2)
-	time = 150
-	category = CAT_MISC
-	always_availible = TRUE
-
-/datum/crafting_recipe/bloodsucker/meatcoffin
-	name = "Meat Coffin"
-	result =/obj/structure/closet/crate/coffin/meatcoffin
-	tools = list(/obj/item/kitchen/knife,
-				 /obj/item/kitchen/rollingpin)
-	reqs = list(/obj/item/reagent_containers/food/snacks/meat/slab = 5,
-				/obj/item/restraints/handcuffs/cable = 1)
-	time = 150
-	category = CAT_MISC
-	always_availible = TRUE
-
-/datum/crafting_recipe/bloodsucker/metalcoffin
-	name = "Metal Coffin"
-	result =/obj/structure/closet/crate/coffin/metalcoffin
-	tools = list(/obj/item/weldingtool,
-				 /obj/item/screwdriver)
-	reqs = list(/obj/item/stack/sheet/metal = 5)
-	time = 100
-	category = CAT_MISC
-	always_availible = TRUE

code/modules/antagonists/bloodsucker/objects/bloodsucker_lair.dm

@@ -63,7 +63,7 @@
 		// Find Animals in Area
 	/*	if(rand(0,2) == 0)
 			var/mobCount = 0
-			var/mobMax = CLAMP(area_turfs.len / 25, 1, 4)
+			var/mobMax = clamp(area_turfs.len / 25, 1, 4)
 			for (var/turf/T in area_turfs)
 				if(!T) continue
 				var/mob/living/simple_animal/SA = locate() in T

code/modules/antagonists/bloodsucker/powers/fortitude.dm

@@ -3,7 +3,7 @@
 
 
 /datum/action/bloodsucker/fortitude
-	name = "Fortitude"//"Cellular Emporium"
+	name = "Fortitude"
 	desc = "Withstand egregious physical wounds and walk away from attacks that would stun, pierce, and dismember lesser beings. You cannot run while active."
 	button_icon_state = "power_fortitude"
 	bloodcost = 30
@@ -11,28 +11,27 @@
 	bloodsucker_can_buy = TRUE
 	amToggle = TRUE
 	warn_constant_cost = TRUE
+	var/was_running
 
-	var/this_resist // So we can raise and lower your brute resist based on what your level_current WAS.
+	var/fortitude_resist // So we can raise and lower your brute resist based on what your level_current WAS.
 
 /datum/action/bloodsucker/fortitude/ActivatePower()
-	var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
+	var/datum/antagonist/bloodsucker/B = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
 	var/mob/living/user = owner
 	to_chat(user, "<span class='notice'>Your flesh, skin, and muscles become as steel.</span>")
 	// Traits & Effects
 	ADD_TRAIT(user, TRAIT_PIERCEIMMUNE, "fortitude")
 	ADD_TRAIT(user, TRAIT_NODISMEMBER, "fortitude")
 	ADD_TRAIT(user, TRAIT_STUNIMMUNE, "fortitude")
-	ADD_TRAIT(user, TRAIT_NORUNNING, "fortitude")
 	if(ishuman(owner))
 		var/mob/living/carbon/human/H = owner
-		this_resist = max(0.3, 0.7 - level_current * 0.1)
-		H.physiology.brute_mod *= this_resist//0.5
-		H.physiology.burn_mod *= this_resist//0.5
-	// Stop Running   (Taken from /datum/quirk/nyctophobia in negative.dm)
-	var/was_running = (user.m_intent == MOVE_INTENT_RUN)
+		fortitude_resist = max(0.3, 0.7 - level_current * 0.1)
+		H.physiology.brute_mod *= fortitude_resist
+		H.physiology.burn_mod *= fortitude_resist
+	was_running = (user.m_intent == MOVE_INTENT_RUN)
 	if(was_running)
 		user.toggle_move_intent()
-	while(bloodsuckerdatum && ContinueActive(user) || user.m_intent == MOVE_INTENT_RUN)
+	while(B && ContinueActive(user) || user.m_intent == MOVE_INTENT_RUN)
 		if(istype(user.buckled, /obj/vehicle)) //We dont want people using fortitude being able to use vehicles
 			var/obj/vehicle/V = user.buckled
 			var/datum/component/riding/VRD = V.GetComponent(/datum/component/riding)
@@ -44,20 +43,21 @@
 				to_chat(user, "<span class='notice'>You fall off the [V], your weight making you too heavy to be supported by it.</span>")
 		// Pay Blood Toll (if awake)
 		if(user.stat == CONSCIOUS)
-			bloodsuckerdatum.AddBloodVolume(-0.5) // Used to be 0.3 blood per 2 seconds, but we're making it more expensive to keep on.
+			B.AddBloodVolume(-0.5)
 		sleep(20) // Check every few ticks that we haven't disabled this power
 	// Return to Running (if you were before)
-	if(was_running && user.m_intent != MOVE_INTENT_RUN)
-		user.toggle_move_intent()
-
+	
 /datum/action/bloodsucker/fortitude/DeactivatePower(mob/living/user = owner, mob/living/target)
 	..()
 	// Restore Traits & Effects
 	REMOVE_TRAIT(user, TRAIT_PIERCEIMMUNE, "fortitude")
 	REMOVE_TRAIT(user, TRAIT_NODISMEMBER, "fortitude")
 	REMOVE_TRAIT(user, TRAIT_STUNIMMUNE, "fortitude")
-	REMOVE_TRAIT(user, TRAIT_NORUNNING, "fortitude")
-	if(ishuman(owner))
-		var/mob/living/carbon/human/H = owner
-		H.physiology.brute_mod /= this_resist//0.5
-		H.physiology.burn_mod /= this_resist//0.5
+	if(!ishuman(owner))
+		return
+	var/mob/living/carbon/human/H = owner
+	H.physiology.brute_mod /= fortitude_resist
+	H.physiology.burn_mod /= fortitude_resist
+	if(was_running && user.m_intent == MOVE_INTENT_WALK)
+		user.toggle_move_intent()
+

code/modules/antagonists/bloodsucker/powers/lunge.dm

@@ -1,88 +1,46 @@
-// Level 1: Grapple level 2
-// Level 2: Grapple 3 from Behind
-// Level 3: Grapple 3 from Shadows
-/datum/action/bloodsucker/targeted/lunge
+
+
+/datum/action/bloodsucker/lunge
 	name = "Predatory Lunge"
-	desc = "Spring at your target and aggressively grapple them without warning. Attacks from concealment or the rear may even knock them down."
+	desc = "Prepare the strenght to grapple your prey."
 	button_icon_state = "power_lunge"
 	bloodcost = 10
-	cooldown = 120
-	target_range = 3
-	power_activates_immediately = TRUE
-	message_Trigger = "Whom will you ensnare within your grasp?"
-	must_be_capacitated = TRUE
+	cooldown = 30
 	bloodsucker_can_buy = TRUE
+	warn_constant_cost = TRUE
+	amToggle = TRUE
+	var/leap_skill_mod = 5
 
-/datum/action/bloodsucker/targeted/lunge/CheckCanUse(display_error)
-	if(!..(display_error))// DEFAULT CHECKS
-		return FALSE
-	// Being Grabbed
-	if(owner.pulledby && owner.pulledby.grab_state >= GRAB_AGGRESSIVE)
-		if(display_error)
-			to_chat(owner, "<span class='warning'>You're being grabbed!</span>")
-		return FALSE
-	if(!owner.has_gravity(owner.loc))//TODO figure out how to check if theyre able to move while in nograv
-		if(display_error)
-			to_chat(owner, "<span class='warning'>You cant lunge while floating!</span>")
-		return FALSE
-	return TRUE
+/datum/action/bloodsucker/lunge/New()
+	. = ..()
+	
 
-/datum/action/bloodsucker/targeted/lunge/CheckValidTarget(atom/A)
-	return iscarbon(A)
+/datum/action/bloodsucker/lunge/Destroy()
+	. = ..()
+	UnregisterSignal(owner, COMSIG_CARBON_TACKLED)
 
-/datum/action/bloodsucker/targeted/lunge/CheckCanTarget(atom/A, display_error)
-	// Check: Self
-	if(target == owner)
-		return FALSE
-	// Check: Range
-	//if (!(target in view(target_range, get_turf(owner))))
-	//	if (display_error)
-	//		to_chat(owner, "<span class='warning'>Your victim is too far away.</span>")
-	//	return FALSE
-	// DEFAULT CHECKS (Distance)
-	if(!..())
-		return FALSE
-	// Check: Turf
-	var/mob/living/L = A
-	if(!isturf(L.loc))
-		return FALSE
-	return TRUE
+/datum/action/bloodsucker/lunge/ActivatePower()
+	var/mob/living/carbon/user = owner
+	var/datum/antagonist/bloodsucker/B = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
+	var/datum/component/tackler/T = user.LoadComponent(/datum/component/tackler)
+	T.stamina_cost = 50
+	T.base_knockdown = 3 SECONDS
+	T.range = 4
+	T.speed = 0.8
+	T.skill_mod = 5 //Monstrous tackling
+	T.min_distance = 2
+	active = TRUE
+	user.toggle_throw_mode()
+	RegisterSignal(user, COMSIG_CARBON_TACKLED, .proc/DelayedDeactivatePower)
+	while(B && ContinueActive(user))
+		B.AddBloodVolume(-0.1)
+		sleep(5)
 
-/datum/action/bloodsucker/targeted/lunge/FireTargetedPower(atom/A)
-	// set waitfor = FALSE   <---- DONT DO THIS!We WANT this power to hold up ClickWithPower(), so that we can unlock the power when it's done.
-	var/mob/living/carbon/target = A
-	var/turf/T = get_turf(target)
-	var/mob/living/L = owner
-	// Clear Vars
-	owner.pulling = null
-	// Will we Knock them Down?
-	var/do_knockdown = !is_A_facing_B(target,owner) || owner.alpha <= 0 || istype(owner.loc, /obj/structure/closet)
-	// CAUSES: Target has their back to me, I'm invisible, or I'm in a Closet
-	// Step One: Heatseek toward Target's Turf
-	addtimer(CALLBACK(GLOBAL_PROC, .proc/_walk, owner, 0), 2 SECONDS)
-	target.playsound_local(get_turf(owner), 'sound/bloodsucker/lunge_warn.ogg', 60, FALSE, pressure_affected = FALSE) // target-only telegraphing
-	owner.playsound_local(owner, 'sound/bloodsucker/lunge_warn.ogg', 60, FALSE, pressure_affected = FALSE) // audio feedback to the user
-	if(do_mob(owner, owner, 7, TRUE, TRUE))
-		walk_towards(owner, T, 0.1, 10) // yes i know i shouldn't use this but i don't know how to work in anything better
-		if(get_turf(owner) != T && !(isliving(target) && target.Adjacent(owner)) && owner.incapacitated() && !CHECK_MOBILITY(L, MOBILITY_STAND))
-			var/send_dir = get_dir(owner, T)
-			new /datum/forced_movement(owner, get_ranged_target_turf(owner, send_dir, 1), 1, FALSE)
-			owner.spin(10)
-			// Step Two: Check if I'm at/adjectent to Target's CURRENT turf (not original...that was just a destination)
-		for(var/i in 1 to 6)
-			if (target.Adjacent(owner))
-				// LEVEL 2: If behind target, mute or unconscious!
-				if(do_knockdown) // && level_current >= 1)
-					target.Knockdown(15 + 10 * level_current,1)
-					target.adjustStaminaLoss(40 + 10 * level_current)
-				// Cancel Walk (we were close enough to contact them)
-				walk(owner, 0)
-				target.Stun(10,1) //Without this the victim can just walk away
-				target.grabbedby(owner) // Taken from mutations.dm under changelings
-				target.grippedby(owner, instant = TRUE) //instant aggro grab
-				break
-			sleep(3)
+//Without this, the leap component would get removed too early, causing the normal crash into effects.
+/datum/action/bloodsucker/lunge/proc/DelayedDeactivatePower() 
+	addtimer(CALLBACK(src, .proc/DeactivatePower), 1 SECONDS, TIMER_UNIQUE)
 
-/datum/action/bloodsucker/targeted/lunge/DeactivatePower(mob/living/user = owner, mob/living/target)
-	..() // activate = FALSE
-	user.update_mobility()
+/datum/action/bloodsucker/lunge/DeactivatePower(mob/living/user = owner)
+	. = ..()
+	qdel(user.GetComponent(/datum/component/tackler))
+	UnregisterSignal(user, COMSIG_CARBON_TACKLED)

code/modules/antagonists/changeling/changeling.dm

@@ -430,7 +430,7 @@
 		objectives += destroy_objective
 	else
 		if(prob(70))
-			var/datum/objective/assassinate/kill_objective = new
+			var/datum/objective/assassinate/once/kill_objective = new
 			kill_objective.owner = owner
 			if(team_mode) //No backstabbing while in a team
 				kill_objective.find_target_by_role(role = ROLE_CHANGELING, role_type = 1, invert = 1)

code/modules/antagonists/changeling/powers/humanform.dm

@@ -27,7 +27,7 @@
 
 	changeling.purchasedpowers -= src
 
-	var/newmob = user.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS)
+	var/newmob = user.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_KEEPSE)
 
 	changeling_transform(newmob, chosen_prof)
 	return TRUE

code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm

@@ -239,7 +239,7 @@
 		if(!do_after(user, repair_values["healing_for_cycle"] * fabricator.speed_multiplier, target = src, \
 			extra_checks = CALLBACK(fabricator, /obj/item/clockwork/replica_fabricator.proc/fabricator_repair_checks, repair_values, src, user, TRUE)))
 			break
-		obj_integrity = CLAMP(obj_integrity + repair_values["healing_for_cycle"], 0, max_integrity)
+		obj_integrity = clamp(obj_integrity + repair_values["healing_for_cycle"], 0, max_integrity)
 		adjust_clockwork_power(-repair_values["power_required"])
 		playsound(src, 'sound/machines/click.ogg', 50, 1)
 

code/modules/antagonists/clockcult/clock_helpers/power_helpers.dm

@@ -10,7 +10,7 @@
 	if(GLOB.ratvar_awakens)
 		current_power = GLOB.clockwork_power = INFINITY
 	else
-		current_power = GLOB.clockwork_power = CLAMP(GLOB.clockwork_power + amount, 0, MAX_CLOCKWORK_POWER)
+		current_power = GLOB.clockwork_power = clamp(GLOB.clockwork_power + amount, 0, MAX_CLOCKWORK_POWER)
 	for(var/obj/effect/clockwork/sigil/transmission/T in GLOB.all_clockwork_objects)
 		T.update_icon()
 	var/unlock_message

code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm

@@ -211,7 +211,7 @@
 					var/mob/living/carbon/C = L
 					C.stuttering = max(8, C.stuttering)
 					C.drowsyness = max(8, C.drowsyness)
-					C.confused += CLAMP(16 - C.confused, 0, 8)
+					C.confused += clamp(16 - C.confused, 0, 8)
 					C.apply_status_effect(STATUS_EFFECT_BELLIGERENT)
 				L.adjustFireLoss(15)
 	..()

code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm

@@ -59,7 +59,7 @@
 				if(issilicon(L))
 					L.DefaultCombatKnockdown(100)
 				else if(iscultist(L))
-					L.confused += CLAMP(10 - L.confused, 0, 5) // Spearthrow now confuses enemy cultists + just deals extra damage / sets on fire instead of hardstunning + damage
+					L.confused += clamp(10 - L.confused, 0, 5) // Spearthrow now confuses enemy cultists + just deals extra damage / sets on fire instead of hardstunning + damage
 					to_chat(L, "<span class ='userdanger'>[src] crashes into you with burning force, sending you reeling!</span>")
 					L.adjust_fire_stacks(2)
 					L.DefaultCombatKnockdown(1)

code/modules/antagonists/clockcult/clock_scriptures/scripture_applications.dm

@@ -111,7 +111,7 @@
 		var/mob/living/L = M.current
 		if(ishuman(L) && L.stat != DEAD)
 			human_servants++
-	construct_limit = round(CLAMP((human_servants / 4), 1, 3))	//1 per 4 human servants, maximum of 3
+	construct_limit = round(clamp((human_servants / 4), 1, 3))	//1 per 4 human servants, maximum of 3
 
 //Summon Neovgre: Summon a very powerful combat mech that explodes when destroyed for massive damage.
 /datum/clockwork_scripture/create_object/summon_arbiter

code/modules/antagonists/clockcult/clock_structures/mania_motor.dm

@@ -63,4 +63,4 @@
 				break
 		if(!M)
 			M = H.apply_status_effect(STATUS_EFFECT_MANIAMOTOR, src)
-		M.severity = CLAMP(M.severity + ((11 - get_dist(src, H)) * efficiency * efficiency), 0, MAX_MANIA_SEVERITY)
+		M.severity = clamp(M.severity + ((11 - get_dist(src, H)) * efficiency * efficiency), 0, MAX_MANIA_SEVERITY)

code/modules/antagonists/cult/blood_magic.dm

@@ -454,16 +454,16 @@
 					S.emp_act(EMP_HEAVY)
 				else if(iscarbon(target))
 					var/mob/living/carbon/C = L
-					C.silent += CLAMP(12 - C.silent, 0, 6)
-					C.stuttering += CLAMP(30 - C.stuttering, 0, 15)
-					C.cultslurring += CLAMP(30 - C.cultslurring, 0, 15)
+					C.silent += clamp(12 - C.silent, 0, 6)
+					C.stuttering += clamp(30 - C.stuttering, 0, 15)
+					C.cultslurring += clamp(30 - C.cultslurring, 0, 15)
 					C.Jitter(15)
 			else					// cultstun no longer hardstuns + damages hostile cultists, instead debuffs them hard + deals some damage; debuffs for a bit longer since they don't add the clockie belligerent debuff
 				if(iscarbon(target))
 					var/mob/living/carbon/C = L
 					C.stuttering = max(10, C.stuttering)
 					C.drowsyness = max(10, C.drowsyness)
-					C.confused += CLAMP(20 - C.confused, 0, 10)
+					C.confused += clamp(20 - C.confused, 0, 10)
 				L.adjustBruteLoss(15)
 			to_chat(user, "<span class='cultitalic'>In an brilliant flash of red, [L] [iscultist(L) ? "writhes in pain" : "falls to the ground!"]</span>")
 		uses--

code/modules/antagonists/cult/cult_items.dm

@@ -731,7 +731,7 @@
 			if(!L.anti_magic_check())
 				if(is_servant_of_ratvar(L))
 					to_chat(L, "<span class='cultlarge'>\"Kneel for me, scum\"</span>")
-					L.confused += CLAMP(10 - L.confused, 0, 5) //confuses and lightly knockdowns + damages hostile cultists instead of hardstunning like before
+					L.confused += clamp(10 - L.confused, 0, 5) //confuses and lightly knockdowns + damages hostile cultists instead of hardstunning like before
 					L.DefaultCombatKnockdown(15)
 					L.adjustBruteLoss(10)
 				else

code/modules/antagonists/nukeop/equipment/nuclearbomb.dm

@@ -358,7 +358,7 @@
 							if(NUKEUI_AWAIT_TIMER)
 								var/number_value = text2num(numeric_input)
 								if(number_value)
-									timer_set = CLAMP(number_value, minimum_timer_set, maximum_timer_set)
+									timer_set = clamp(number_value, minimum_timer_set, maximum_timer_set)
 									playsound(src, 'sound/machines/nuke/general_beep.ogg', 50, FALSE)
 									set_safety()
 									. = TRUE

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

@@ -16,3 +16,6 @@
 /datum/traitor_class/human/hijack/finalize_traitor(datum/antagonist/traitor/T)
 	T.hijack_speed=1
 	return TRUE
+
+/datum/traitor_class/human/hijack/clean_up_traitor(datum/antagonist/traitor/T)
+	T.hijack_speed = 0.5

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

@@ -38,3 +38,7 @@ GLOBAL_LIST_EMPTY(traitor_classes)
 /datum/traitor_class/proc/finalize_traitor(datum/antagonist/traitor/T)
 	// Finalization. Return TRUE if should play standard traitor sound/equip, return FALSE if both are special case
 	return TRUE
+
+/datum/traitor_class/proc/clean_up_traitor(datum/antagonist/traitor/T)
+	// Any effects that need to be cleaned up if traitor class is being swapped.
+	

code/modules/antagonists/traitor/datum_traitor.dm

@@ -15,36 +15,53 @@
 	threat = 5
 
 /datum/antagonist/traitor/New()
-	..()
 	if(!GLOB.traitor_classes.len)//Only need to fill the list when it's needed.
 		for(var/I in subtypesof(/datum/traitor_class))
 			new I
+	..()
 
-/datum/antagonist/traitor/proc/set_traitor_kind(var/kind)
+/datum/antagonist/traitor/proc/set_traitor_kind(kind)
+	var/swap_from_old = FALSE
+	if(traitor_kind)
+		traitor_kind.remove_innate_effects(owner.current)
+		traitor_kind.clean_up_traitor(src)
+		swap_from_old = TRUE
 	traitor_kind = GLOB.traitor_classes[kind]
+	traitor_kind.apply_innate_effects(owner.current)
+	if(give_objectives)
+		for(var/O in objectives)
+			qdel(O)
+		traitor_kind.forge_objectives(src)
+	if(swap_from_old)
+		traitor_kind.finalize_traitor(src)
+		traitor_kind.greet(src)
+		owner.announce_objectives()
+
+/proc/get_random_traitor_kind(var/list/blacklist = list())
+	var/chaos_weight = 0
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		chaos_weight = (mode.threat - 50)/50
+	var/list/weights = list()
+	for(var/C in GLOB.traitor_classes)
+		if(!(C in blacklist))
+			var/datum/traitor_class/class = GLOB.traitor_classes[C]
+			var/weight = LOGISTIC_FUNCTION(1.5*class.weight,chaos_weight,class.chaos,0)
+			weights[C] = weight * 1000
+	var/choice = pickweightAllowZero(weights)
+	if(!choice)
+		choice = TRAITOR_HUMAN // it's an "easter egg"
+	var/datum/traitor_class/actual_class = GLOB.traitor_classes[choice]
+	actual_class.weight *= 0.8 // less likely this round
+	return choice
 
 /datum/antagonist/traitor/on_gain()
 	if(owner.current && isAI(owner.current))
 		set_traitor_kind(TRAITOR_AI)
 	else
-		var/chaos_weight = 0
-		if(istype(SSticker.mode,/datum/game_mode/dynamic))
-			var/datum/game_mode/dynamic/mode = SSticker.mode
-			chaos_weight = (mode.threat - 50)/50
-		var/list/weights = list()
-		for(var/C in GLOB.traitor_classes)
-			var/datum/traitor_class/class = GLOB.traitor_classes[C]
-			var/weight = LOGISTIC_FUNCTION(1.5*class.weight,chaos_weight,class.chaos,0)
-			weights[C] = weight
-		var/choice = pickweightAllowZero(weights)
-		if(!choice)
-			choice = GLOB.traitor_classes[TRAITOR_HUMAN] // it's an "easter egg"
-		set_traitor_kind(choice)
-		traitor_kind.weight *= 0.8 // less likely this round
+		set_traitor_kind(get_random_traitor_kind())
 	SSticker.mode.traitors += owner
 	owner.special_role = special_role
-	if(give_objectives)
-		traitor_kind.forge_objectives(src)
 	finalize_traitor()
 	..()
 
@@ -97,7 +114,8 @@
 		owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE)
 
 /datum/antagonist/traitor/antag_panel_objectives()
-	. = ..()
+	. += "<i><b>Traitor class:</b></i> <a href='?src=[REF(owner)];traitor_class=1;target_antag=[REF(src)]'>[traitor_kind.employer]</a><br>"
+	. += ..()
 	if(contractor_hub?.assigned_targets && length(contractor_hub.assigned_targets))
 		. += "<i><b>Contract Targets</b></i>:<br>"
 		for(var/datum/mind/M in contractor_hub.assigned_targets)