Merge branch 'master' into upstream-merge-33470

code/modules/admin/admin.dm

@@ -705,15 +705,17 @@
 
 /datum/admins/proc/output_all_devil_info()
 	var/devil_number = 0
-	for(var/D in SSticker.mode.devils)
+	for(var/datum/mind/D in SSticker.mode.devils)
 		devil_number++
-		to_chat(usr, "Devil #[devil_number]:<br><br>" + SSticker.mode.printdevilinfo(D))
+		var/datum/antagonist/devil/devil = D.has_antag_datum(/datum/antagonist/devil)
+		to_chat(usr, "Devil #[devil_number]:<br><br>" + devil.printdevilinfo())
 	if(!devil_number)
 		to_chat(usr, "<b>No Devils located</b>" )
 
 /datum/admins/proc/output_devil_info(mob/living/M)
 	if(is_devil(M))
-		to_chat(usr, SSticker.mode.printdevilinfo(M))
+		var/datum/antagonist/devil/devil = M.mind.has_antag_datum(/datum/antagonist/devil)
+		to_chat(usr, devil.printdevilinfo())
 	else
 		to_chat(usr, "<b>[M] is not a devil.")
 

code/modules/admin/player_panel.dm

@@ -384,9 +384,10 @@
 			dat += "<BR><span class='userdanger'>[other_players] players in invalid state or the statistics code is bugged!</span>"
 		dat += "<BR>"
 
-		if(SSticker.mode.syndicates.len)
+		var/list/nukeops = get_antagonists(/datum/antagonist/nukeop)
+		if(nukeops.len)
 			dat += "<br><table cellspacing=5><tr><td><B>Syndicates</B></td><td></td></tr>"
-			for(var/datum/mind/N in SSticker.mode.syndicates)
+			for(var/datum/mind/N in nukeops)
 				var/mob/M = N.current
 				if(M)
 					dat += "<tr><td><a href='?_src_=holder;[HrefToken()];adminplayeropts=[REF(M)]'>[M.real_name]</a>[M.client ? "" : " <i>(No Client)</i>"][M.stat == DEAD ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
@@ -523,7 +524,7 @@
 
 		if(SSticker.mode.brother_teams.len > 0)
 			dat += "<br><table cellspacing=5><tr><td><B>Brothers</B></td><td></td><td></td></tr>"
-			for(var/datum/objective_team/brother_team/team in SSticker.mode.brother_teams)
+			for(var/datum/team/brother_team/team in SSticker.mode.brother_teams)
 				for(var/datum/mind/brother in team.members)
 					var/mob/M = brother.current
 					if(M)

code/modules/admin/sound_emitter.dm

@@ -92,7 +92,7 @@
 		var/new_volume = input(user, "Choose a volume.", "Sound Emitter", sound_volume) as null|num
 		if(isnull(new_volume))
 			return
-		new_volume = Clamp(new_volume, 0, 100)
+		new_volume = CLAMP(new_volume, 0, 100)
 		sound_volume = new_volume
 		to_chat(user, "<span class='notice'>Volume set to [sound_volume]%.</span>")
 	if(href_list["edit_mode"])
@@ -115,7 +115,7 @@
 		var/new_radius = input(user, "Choose a radius.", "Sound Emitter", sound_volume) as null|num
 		if(isnull(new_radius))
 			return
-		new_radius = Clamp(new_radius, 0, 127)
+		new_radius = CLAMP(new_radius, 0, 127)
 		play_radius = new_radius
 		to_chat(user, "<span class='notice'>Audible radius set to [play_radius].</span>")
 	if(href_list["play"])

code/modules/admin/sql_message_system.dm

@@ -220,7 +220,7 @@
 			var/nsd = CONFIG_GET(number/note_stale_days)
 			var/nfd = CONFIG_GET(number/note_fresh_days)
 			if (agegate && type == "note" && isnum(nsd) && isnum(nfd) && nsd > nfd)
-				var/alpha = Clamp(100 - (age - nfd) * (85 / (nsd - nfd)), 15, 100)
+				var/alpha = CLAMP(100 - (age - nfd) * (85 / (nsd - nfd)), 15, 100)
 				if (alpha < 100)
 					if (alpha <= 15)
 						if (skipped)

code/modules/admin/topic.dm

@@ -1943,7 +1943,7 @@
 			return
 
 		var/list/offset = splittext(href_list["offset"],",")
-		var/number = Clamp(text2num(href_list["object_count"]), 1, 100)
+		var/number = CLAMP(text2num(href_list["object_count"]), 1, 100)
 		var/X = offset.len > 0 ? text2num(offset[1]) : 0
 		var/Y = offset.len > 1 ? text2num(offset[2]) : 0
 		var/Z = offset.len > 2 ? text2num(offset[3]) : 0

code/modules/admin/verbs/SDQL2/SDQL_2.dm

@@ -435,7 +435,7 @@
 		else if(expression[start + 1] == "\[" && islist(v))
 			var/list/L = v
 			var/index = SDQL_expression(source, expression[start + 2])
-			if(isnum(index) && (!IsInteger(index) || L.len < index))
+			if(isnum(index) && (!ISINTEGER(index) || L.len < index))
 				to_chat(usr, "<span class='danger'>Invalid list index: [index]</span>")
 				return null
 			return L[index]

code/modules/admin/verbs/debug.dm

@@ -735,7 +735,7 @@ GLOBAL_PROTECT(LastAdminCalledProc)
 		if(Rad.anchored)
 			if(!Rad.loaded_tank)
 				var/obj/item/tank/internals/plasma/Plasma = new/obj/item/tank/internals/plasma(Rad)
-				ASSERT_GAS(/datum/gas/plasma, Plasma.air_contents)
+				Plasma.air_contents.assert_gas(/datum/gas/plasma)
 				Plasma.air_contents.gases[/datum/gas/plasma][MOLES] = 70
 				Rad.drainratio = 0
 				Rad.loaded_tank = Plasma

code/modules/admin/verbs/modifyvariables.dm

@@ -213,7 +213,9 @@ GLOBAL_PROTECT(VVpixelmovement)
 				.["class"] = null
 				return
 			.["type"] = type
-			.["value"] = new type()
+			var/atom/newguy = new type()
+			newguy.var_edited = TRUE
+			.["value"] = newguy
 
 		if (VV_NEW_DATUM)
 			var/type = pick_closest_path(FALSE, get_fancy_list_of_datum_types())
@@ -221,7 +223,9 @@ GLOBAL_PROTECT(VVpixelmovement)
 				.["class"] = null
 				return
 			.["type"] = type
-			.["value"] = new type()
+			var/datum/newguy = new type()
+			newguy.var_edited = TRUE
+			.["value"] = newguy
 
 		if (VV_NEW_TYPE)
 			var/type = current_value
@@ -237,7 +241,10 @@ GLOBAL_PROTECT(VVpixelmovement)
 				.["class"] = null
 				return
 			.["type"] = type
-			.["value"] = new type()
+			var/datum/newguy = new type()
+			if(istype(newguy))
+				newguy.var_edited = TRUE
+			.["value"] = newguy
 
 
 		if (VV_NEW_LIST)

code/modules/admin/verbs/one_click_antag.dm

@@ -238,26 +238,17 @@
 		if(agentcount < 3)
 			return 0
 
-		var/nuke_code = random_nukecode()
-
-		var/obj/machinery/nuclearbomb/nuke = locate("syndienuke") in GLOB.nuke_list
-		if(nuke)
-			nuke.r_code = nuke_code
-
 		//Let's find the spawn locations
 		var/leader_chosen = FALSE
-		var/spawnpos = 1 //Decides where they'll spawn. 1=leader.
-
+		var/datum/team/nuclear/nuke_team
 		for(var/mob/c in chosen)
-			if(spawnpos > GLOB.nukeop_start.len)
-				spawnpos = 1 //Ran out of spawns. Let's loop back to the first non-leader position
 			var/mob/living/carbon/human/new_character=makeBody(c)
 			if(!leader_chosen)
 				leader_chosen = TRUE
-				new_character.mind.make_Nuke(pick(GLOB.nukeop_leader_start), nuke_code, TRUE)
+				var/datum/antagonist/nukeop/N = new_character.mind.add_antag_datum(/datum/antagonist/nukeop/leader)
+				nuke_team = N.nuke_team
 			else
-				new_character.mind.make_Nuke(GLOB.nukeop_start[spawnpos], nuke_code)
-			spawnpos++
+				new_character.mind.add_antag_datum(/datum/antagonist/nukeop,nuke_team)
 		return 1
 	else
 		return 0
@@ -317,12 +308,15 @@
 			//Assign antag status and the mission
 			SSticker.mode.traitors += Commando.mind
 			Commando.mind.special_role = "deathsquad"
+
 			var/datum/objective/missionobj = new
 			missionobj.owner = Commando.mind
 			missionobj.explanation_text = mission
 			missionobj.completed = 1
 			Commando.mind.objectives += missionobj
 
+			Commando.mind.add_antag_datum(/datum/antagonist/auto_custom)
+
 			//Greet the commando
 			to_chat(Commando, "<B><font size=3 color=red>You are the [numagents==1?"Deathsquad Officer":"Death Commando"].</font></B>")
 			var/missiondesc = "Your squad is being sent on a mission to [station_name()] by Nanotrasen's Security Division."
@@ -369,12 +363,15 @@
 		//Assign antag status and the mission
 		SSticker.mode.traitors += newmob.mind
 		newmob.mind.special_role = "official"
+
 		var/datum/objective/missionobj = new
 		missionobj.owner = newmob.mind
 		missionobj.explanation_text = mission
 		missionobj.completed = 1
 		newmob.mind.objectives += missionobj
 
+		newmob.mind.add_antag_datum(/datum/antagonist/auto_custom)
+
 		if(CONFIG_GET(flag/enforce_human_authority))
 			newmob.set_species(/datum/species/human)
 
@@ -474,12 +471,15 @@
 			//Assign antag status and the mission
 			SSticker.mode.traitors += ERTOperative.mind
 			ERTOperative.mind.special_role = "ERT"
+
 			var/datum/objective/missionobj = new
 			missionobj.owner = ERTOperative.mind
 			missionobj.explanation_text = mission
 			missionobj.completed = 1
 			ERTOperative.mind.objectives += missionobj
 
+			ERTOperative.mind.add_antag_datum(/datum/antagonist/auto_custom)
+
 			//Greet the commando
 			to_chat(ERTOperative, "<B><font size=3 color=red>You are [numagents==1?"the Emergency Response Team Commander":"an Emergency Response Officer"].</font></B>")
 			var/missiondesc = "Your squad is being sent on a Code [alert] mission to [station_name()] by Nanotrasen's Security Division."

code/modules/admin/verbs/onlyone.dm

@@ -28,6 +28,7 @@ GLOBAL_VAR_INIT(highlander, FALSE)
 /mob/living/carbon/human/proc/make_scottish()
 	SSticker.mode.traitors += mind
 	mind.special_role = "highlander"
+	
 	dna.species.species_traits |= NOGUNS //nice try jackass
 
 	var/datum/objective/steal/steal_objective = new
@@ -40,6 +41,8 @@ GLOBAL_VAR_INIT(highlander, FALSE)
 	hijack_objective.owner = mind
 	mind.objectives += hijack_objective
 
+	mind.add_antag_datum(/datum/antagonist/auto_custom)
+
 	mind.announce_objectives()
 
 	for(var/obj/item/I in get_equipped_items())

code/modules/admin/verbs/playsound.dm

@@ -12,7 +12,7 @@
 	var/vol = input(usr, "What volume would you like the sound to play at?",, 100) as null|num
 	if(!vol)
 		return
-	vol = Clamp(vol, 1, 100)
+	vol = CLAMP(vol, 1, 100)
 
 	var/sound/admin_sound = new()
 	admin_sound.file = S

code/modules/admin/verbs/randomverbs.dm

@@ -386,7 +386,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			A.equip_wizard()
 		if("Syndicate")
 			new_character.forceMove(pick(GLOB.nukeop_start))
-			call(/datum/game_mode/proc/equip_syndicate)(new_character)
+			var/datum/antagonist/nukeop/N = new_character.mind.has_antag_datum(/datum/antagonist/nukeop,TRUE)
+			N.equip_op()
 		if("Space Ninja")
 			var/list/ninja_spawn = list()
 			for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list)

code/modules/atmospherics/gasmixtures/gas_mixture.dm

@@ -37,14 +37,24 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 	reaction_results = new
 
 //listmos procs
+//use the macros in performance intensive areas. for their definitions, refer to code/__DEFINES/atmospherics.dm
 
-// The following procs used to live here: thermal_energy(), assert_gas() and add_gas(). They have been moved into defines in code/__DEFINES/atmospherics.dm
+	//assert_gas(gas_id) - used to guarantee that the gas list for this id exists in gas_mixture.gases.
+	//Must be used before adding to a gas. May be used before reading from a gas.
+/datum/gas_mixture/proc/assert_gas(gas_id)
+	ASSERT_GAS(gas_id, src)
 
 	//assert_gases(args) - shorthand for calling ASSERT_GAS() once for each gas type.
 /datum/gas_mixture/proc/assert_gases()
 	for(var/id in args)
 		ASSERT_GAS(id, src)
 
+	//add_gas(gas_id) - similar to assert_gas(), but does not check for an existing
+		//gas list for this id. This can clobber existing gases.
+	//Used instead of assert_gas() when you know the gas does not exist. Faster than assert_gas().
+/datum/gas_mixture/proc/add_gas(gas_id)
+	ADD_GAS(gas_id, gases)
+
 	//add_gases(args) - shorthand for calling add_gas() once for each gas_type.
 /datum/gas_mixture/proc/add_gases()
 	var/cached_gases = gases
@@ -101,6 +111,9 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 /datum/gas_mixture/proc/return_volume() //liters
 	return max(0, volume)
 
+/datum/gas_mixture/proc/thermal_energy() //joules
+	return THERMAL_ENERGY(src) //see code/__DEFINES/atmospherics.dm; use the define in performance critical areas
+
 /datum/gas_mixture/proc/archive()
 	//Update archived versions of variables
 	//Returns: 1 in all cases
@@ -399,7 +412,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 	return ""
 
 /datum/gas_mixture/react(turf/open/dump_location)
-	. = 0
+	. = NO_REACTION
 
 	reaction_results = new
 
@@ -423,6 +436,22 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 					continue reaction_loop
 			//at this point, all minimum requirements for the reaction are satisfied.
 
+			/*	currently no reactions have maximum requirements, so we can leave the checks commented out for a slight performance boost
+				PLEASE DO NOT REMOVE THIS CODE. the commenting is here only for a performance increase.
+				enabling these checks should be as easy as possible and the fact that they are disabled should be as clear as possible
+
+			var/list/max_reqs = reaction.max_requirements.Copy()
+			if((max_reqs["TEMP"] && temp > max_reqs["TEMP"]) \
+			|| (max_reqs["ENER"] && ener > max_reqs["ENER"]))
+				continue
+			max_reqs -= "TEMP"
+			max_reqs -= "ENER"
+			for(var/id in max_reqs)
+				if(cached_gases[id] && cached_gases[id][MOLES] > max_reqs[id])
+					continue reaction_loop
+			//at this point, all requirements for the reaction are satisfied. we can now react()
+			*/
+
 			. |= reaction.react(src, dump_location)
 			if (. & STOP_REACTIONS)
 				break

code/modules/atmospherics/gasmixtures/reactions.dm

@@ -184,7 +184,7 @@
 
 //fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting.
 /datum/gas_reaction/fusion
-	exclude = FALSE
+	exclude = TRUE
 	priority = 2
 	name = "Plasmic Fusion"
 	id = "fusion"

code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm

@@ -185,13 +185,13 @@ Acts like a normal vent, but has an input AND output.
 		pump_direction = 1
 
 	if("set_input_pressure" in signal.data)
-		input_pressure_min = Clamp(text2num(signal.data["set_input_pressure"]),0,ONE_ATMOSPHERE*50)
+		input_pressure_min = CLAMP(text2num(signal.data["set_input_pressure"]),0,ONE_ATMOSPHERE*50)
 
 	if("set_output_pressure" in signal.data)
-		output_pressure_max = Clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50)
+		output_pressure_max = CLAMP(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50)
 
 	if("set_external_pressure" in signal.data)
-		external_pressure_bound = Clamp(text2num(signal.data["set_external_pressure"]),0,ONE_ATMOSPHERE*50)
+		external_pressure_bound = CLAMP(text2num(signal.data["set_external_pressure"]),0,ONE_ATMOSPHERE*50)
 
 	if("status" in signal.data)
 		spawn(2)

code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm

@@ -127,7 +127,7 @@ Passive gate is similar to the regular pump except:
 				pressure = text2num(pressure)
 				. = TRUE
 			if(.)
-				target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
+				target_pressure = CLAMP(pressure, 0, MAX_OUTPUT_PRESSURE)
 				investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
 	update_icon()
 
@@ -149,7 +149,7 @@ Passive gate is similar to the regular pump except:
 		on = !on
 
 	if("set_output_pressure" in signal.data)
-		target_pressure = Clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50)
+		target_pressure = CLAMP(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50)
 
 	if(on != old_on)
 		investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS)

code/modules/atmospherics/machinery/components/binary_devices/pump.dm

@@ -133,9 +133,8 @@ Thus, the two variables affect pump operation are set in New():
 				pressure = text2num(pressure)
 				. = TRUE
 			if(.)
-				target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
-				investigate_log("Pump, [src.name], was set to [target_pressure] kPa by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
-				message_admins("Pump, [src.name], was set to [target_pressure] kPa by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]")
+				target_pressure = CLAMP(pressure, 0, MAX_OUTPUT_PRESSURE)
+				investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
 	update_icon()
 
 /obj/machinery/atmospherics/components/binary/pump/atmosinit()
@@ -156,7 +155,7 @@ Thus, the two variables affect pump operation are set in New():
 		on = !on
 
 	if("set_output_pressure" in signal.data)
-		target_pressure = Clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50)
+		target_pressure = CLAMP(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50)
 
 	if(on != old_on)
 		investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS)

code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm

@@ -133,9 +133,8 @@ Thus, the two variables affect pump operation are set in New():
 				rate = text2num(rate)
 				. = TRUE
 			if(.)
-				transfer_rate = Clamp(rate, 0, MAX_TRANSFER_RATE)
-				investigate_log("Volume Pump, [src.name], was set to [transfer_rate] L/s by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
-				message_admins("Volume Pump, [src.name], was set to [transfer_rate] L/s by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]")
+				transfer_rate = CLAMP(rate, 0, MAX_TRANSFER_RATE)
+				investigate_log("was set to [transfer_rate] L/s by [key_name(usr)]", INVESTIGATE_ATMOS)
 	update_icon()
 
 /obj/machinery/atmospherics/components/binary/volume_pump/receive_signal(datum/signal/signal)
@@ -152,7 +151,7 @@ Thus, the two variables affect pump operation are set in New():
 
 	if("set_transfer_rate" in signal.data)
 		var/datum/gas_mixture/air1 = AIR1
-		transfer_rate = Clamp(text2num(signal.data["set_transfer_rate"]),0,air1.volume)
+		transfer_rate = CLAMP(text2num(signal.data["set_transfer_rate"]),0,air1.volume)
 
 	if(on != old_on)
 		investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS)

code/modules/atmospherics/machinery/components/trinary_devices/filter.dm

@@ -103,7 +103,7 @@
 			var/datum/gas_mixture/filtered_out = new
 
 			filtered_out.temperature = removed.temperature
-			ASSERT_GAS(filter_type, filtered_out)
+			filtered_out.add_gas(filter_type)
 			filtered_out.gases[filter_type][MOLES] = removed.gases[filter_type][MOLES]
 
 			removed.gases[filter_type][MOLES] = 0
@@ -162,7 +162,7 @@
 				pressure = text2num(pressure)
 				. = TRUE
 			if(.)
-				target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
+				target_pressure = CLAMP(pressure, 0, MAX_OUTPUT_PRESSURE)
 				investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
 		if("filter")
 			filter_type = null

code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm

@@ -152,7 +152,7 @@
 				pressure = text2num(pressure)
 				. = TRUE
 			if(.)
-				target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
+				target_pressure = CLAMP(pressure, 0, MAX_OUTPUT_PRESSURE)
 				investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
 		if("node1")
 			var/value = text2num(params["concentration"])

code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm

@@ -131,7 +131,7 @@
 	if("set_volume_rate" in signal.data)
 		var/number = text2num(signal.data["set_volume_rate"])
 		var/datum/gas_mixture/air_contents = AIR1
-		volume_rate = Clamp(number, 0, air_contents.volume)
+		volume_rate = CLAMP(number, 0, air_contents.volume)
 
 	if("status" in signal.data)
 		spawn(2)
@@ -180,7 +180,7 @@
 				rate = text2num(rate)
 				. = TRUE
 			if(.)
-				volume_rate = Clamp(rate, 0, MAX_TRANSFER_RATE)
+				volume_rate = CLAMP(rate, 0, MAX_TRANSFER_RATE)
 				investigate_log("was set to [volume_rate] L/s by [key_name(usr)]", INVESTIGATE_ATMOS)
 	update_icon()
 	broadcast_status()

code/modules/atmospherics/machinery/components/unary_devices/tank.dm

@@ -17,7 +17,7 @@
 	air_contents.volume = volume
 	air_contents.temperature = T20C
 	if(gas_type)
-		ASSERT_GAS(gas_type, air_contents)
+		air_contents.assert_gas(gas_type)
 		air_contents.gases[gas_type][MOLES] = AIR_CONTENTS
 		name = "[name] ([air_contents.gases[gas_type][GAS_META][META_GAS_NAME]])"
 

code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm

@@ -153,7 +153,7 @@
 				target = text2num(target)
 				. = TRUE
 			if(.)
-				target_temperature = Clamp(target, min_temperature, max_temperature)
+				target_temperature = CLAMP(target, min_temperature, max_temperature)
 				investigate_log("was set to [target_temperature] K by [key_name(usr)]", INVESTIGATE_ATMOS)
 
 	update_icon()

code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm

@@ -244,10 +244,10 @@
 		pump_direction = text2num(signal.data["direction"])
 
 	if("set_internal_pressure" in signal.data)
-		internal_pressure_bound = Clamp(text2num(signal.data["set_internal_pressure"]),0,ONE_ATMOSPHERE*50)
+		internal_pressure_bound = CLAMP(text2num(signal.data["set_internal_pressure"]),0,ONE_ATMOSPHERE*50)
 
 	if("set_external_pressure" in signal.data)
-		external_pressure_bound = Clamp(text2num(signal.data["set_external_pressure"]),0,ONE_ATMOSPHERE*50)
+		external_pressure_bound = CLAMP(text2num(signal.data["set_external_pressure"]),0,ONE_ATMOSPHERE*50)
 
 	if("reset_external_pressure" in signal.data)
 		external_pressure_bound = ONE_ATMOSPHERE
@@ -256,10 +256,10 @@
 		internal_pressure_bound = 0
 
 	if("adjust_internal_pressure" in signal.data)
-		internal_pressure_bound = Clamp(internal_pressure_bound + text2num(signal.data["adjust_internal_pressure"]),0,ONE_ATMOSPHERE*50)
+		internal_pressure_bound = CLAMP(internal_pressure_bound + text2num(signal.data["adjust_internal_pressure"]),0,ONE_ATMOSPHERE*50)
 
 	if("adjust_external_pressure" in signal.data)
-		external_pressure_bound = Clamp(external_pressure_bound + text2num(signal.data["adjust_external_pressure"]),0,ONE_ATMOSPHERE*50)
+		external_pressure_bound = CLAMP(external_pressure_bound + text2num(signal.data["adjust_external_pressure"]),0,ONE_ATMOSPHERE*50)
 
 	if("init" in signal.data)
 		name = signal.data["init"]

code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm

@@ -179,7 +179,7 @@
 			filtered_out.temperature = removed.temperature
 
 			for(var/gas in filter_types & removed_gases)
-				ADD_GAS(gas, filtered_gases)
+				filtered_out.add_gas(gas)
 				filtered_gases[gas][MOLES] = removed_gases[gas][MOLES]
 				removed_gases[gas][MOLES] = 0
 

code/modules/atmospherics/machinery/other/miner.dm

@@ -132,7 +132,7 @@
 	if(!isopenturf(O))
 		return FALSE
 	var/datum/gas_mixture/merger = new
-	ASSERT_GAS(spawn_id, merger)
+	merger.assert_gas(spawn_id)
 	merger.gases[spawn_id][MOLES] = (spawn_mol)
 	merger.temperature = spawn_temp
 	O.assume_air(merger)

code/modules/atmospherics/machinery/pipes/layermanifold.dm

@@ -121,7 +121,7 @@
 	if(initialize_directions & dir)
 		return ..()
 	if((NORTH|EAST) & dir)
-		user.ventcrawl_layer = Clamp(user.ventcrawl_layer + 1, PIPING_LAYER_MIN, PIPING_LAYER_MAX)
+		user.ventcrawl_layer = CLAMP(user.ventcrawl_layer + 1, PIPING_LAYER_MIN, PIPING_LAYER_MAX)
 	if((SOUTH|WEST) & dir)
-		user.ventcrawl_layer = Clamp(user.ventcrawl_layer - 1, PIPING_LAYER_MIN, PIPING_LAYER_MAX)
+		user.ventcrawl_layer = CLAMP(user.ventcrawl_layer - 1, PIPING_LAYER_MIN, PIPING_LAYER_MAX)
 	to_chat(user, "You align yourself with the [user.ventcrawl_layer]\th output.")

code/modules/atmospherics/machinery/portable/canister.dm

@@ -196,7 +196,7 @@
 
 /obj/machinery/portable_atmospherics/canister/proc/create_gas()
 	if(gas_type)
-		ADD_GAS(gas_type, air_contents.gases)
+		air_contents.add_gas(gas_type)
 		if(starter_temp)
 			air_contents.temperature = starter_temp
 		air_contents.gases[gas_type][MOLES] = (maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
@@ -411,7 +411,7 @@
 				pressure = text2num(pressure)
 				. = TRUE
 			if(.)
-				release_pressure = Clamp(round(pressure), can_min_release_pressure, can_max_release_pressure)
+				release_pressure = CLAMP(round(pressure), can_min_release_pressure, can_max_release_pressure)
 				investigate_log("was set to [release_pressure] kPa by [key_name(usr)].", INVESTIGATE_ATMOS)
 		if("valve")
 			var/logmsg
@@ -455,7 +455,7 @@
 					var/N = text2num(user_input)
 					if(!N)
 						return
-					timer_set = Clamp(N,minimum_timer_set,maximum_timer_set)
+					timer_set = CLAMP(N,minimum_timer_set,maximum_timer_set)
 					log_admin("[key_name(usr)] has activated a prototype valve timer")
 					. = TRUE
 				if("toggle_timer")

code/modules/atmospherics/machinery/portable/pump.dm

@@ -131,7 +131,7 @@
 				pressure = text2num(pressure)
 				. = TRUE
 			if(.)
-				pump.target_pressure = Clamp(round(pressure), PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE)
+				pump.target_pressure = CLAMP(round(pressure), PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE)
 				investigate_log("was set to [pump.target_pressure] kPa by [key_name(usr)].", INVESTIGATE_ATMOS)
 		if("eject")
 			if(holding)

code/modules/atmospherics/machinery/portable/scrubber.dm

@@ -45,7 +45,7 @@
 
 	filtered.temperature = filtering.temperature
 	for(var/gas in filtering.gases & scrubbing)
-		ADD_GAS(gas, filtered.gases)
+		filtered.add_gas(gas)
 		filtered.gases[gas][MOLES] = filtering.gases[gas][MOLES] // Shuffle the "bad" gasses to the filtered mixture.
 		filtering.gases[gas][MOLES] = 0
 	filtering.garbage_collect() // Now that the gasses are set to 0, clean up the mixture.

code/modules/awaymissions/mission_code/wildwest.dm

@@ -115,9 +115,11 @@
 				to_chat(user, "The Wish Granter punishes you for your wickedness, claiming your soul and warping your body to match the darkness in your heart.")
 				SSticker.mode.traitors += user.mind
 				user.mind.special_role = "traitor"
+				
 				var/datum/objective/hijack/hijack = new
 				hijack.owner = user.mind
 				user.mind.objectives += hijack
+				user.mind.add_antag_datum(/datum/antagonist/auto_custom)
 				to_chat(user, "<B>Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!</B>")
 				user.mind.announce_objectives()
 				user.set_species(/datum/species/shadow)

code/modules/cargo/exports.dm

@@ -86,7 +86,7 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
 
 /datum/export/process()
 	..()
-	cost *= GLOB.E**(k_elasticity * (1/30))
+	cost *= NUM_E**(k_elasticity * (1/30))
 	if(cost > init_cost)
 		cost = init_cost
 
@@ -94,7 +94,7 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
 /datum/export/proc/get_cost(obj/O, contr = 0, emag = 0)
 	var/amount = get_amount(O, contr, emag)
 	if(k_elasticity!=0)
-		return round((cost/k_elasticity) * (1 - GLOB.E**(-1 * k_elasticity * amount)))	//anti-derivative of the marginal cost function
+		return round((cost/k_elasticity) * (1 - NUM_E**(-1 * k_elasticity * amount)))	//anti-derivative of the marginal cost function
 	else
 		return round(cost * amount)	//alternative form derived from L'Hopital to avoid division by 0
 
@@ -131,7 +131,7 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
 	else
 		total_amount += amount
 
-	cost *= GLOB.E**(-1*k_elasticity*amount)		//marginal cost modifier
+	cost *= NUM_E**(-1*k_elasticity*amount)		//marginal cost modifier
 	SSblackbox.record_feedback("nested tally", "export_sold_cost", 1, list("[O.type]", "[the_cost]"))
 
 // Total printout for the cargo console.

code/modules/client/client_defines.dm

@@ -68,3 +68,6 @@
 
 	var/datum/chatOutput/chatOutput
 
+	var/list/credits //lazy list of all credit object bound to this client
+
+	var/datum/player_details/player_details //these persist between logins/logouts during the same round.

code/modules/client/client_procs.dm

@@ -152,7 +152,7 @@ GLOBAL_LIST(external_rsc_urls)
 #if (PRELOAD_RSC == 0)
 	var/static/next_external_rsc = 0
 	if(external_rsc_urls && external_rsc_urls.len)
-		next_external_rsc = Wrap(next_external_rsc+1, 1, external_rsc_urls.len+1)
+		next_external_rsc = WRAP(next_external_rsc+1, 1, external_rsc_urls.len+1)
 		preload_rsc = external_rsc_urls[next_external_rsc]
 #endif
 
@@ -227,6 +227,13 @@ GLOBAL_LIST(external_rsc_urls)
 						message_admins("<font color='red'><B>Notice: </B><font color='blue'>[key_name_admin(src)] has the same [matches] as [key_name_admin(C)] (no longer logged in). </font>")
 						log_access("Notice: [key_name(src)] has the same [matches] as [key_name(C)] (no longer logged in).")
 
+	if(GLOB.player_details[ckey])
+		player_details = GLOB.player_details[ckey]
+	else
+		player_details = new
+		GLOB.player_details[ckey] = player_details
+
+
 	. = ..()	//calls mob.Login()
 
 	chatOutput.start() // Starts the chat
@@ -673,6 +680,13 @@ GLOBAL_LIST(external_rsc_urls)
 			return TRUE
 	. = ..()
 
+/client/proc/rescale_view(change, min, max)
+	var/viewscale = getviewsize(view)
+	var/x = viewscale[1]
+	var/y = viewscale[2]
+	x = CLAMP(x+change, min, max)
+	y = CLAMP(y+change, min,max)
+	change_view("[x]x[y]")
 
 /client/proc/change_view(new_size)
 	if (isnull(new_size))

code/modules/client/player_details.dm

@@ -0,0 +1,2 @@
+/datum/player_details
+	var/list/player_actions = list()

code/modules/client/preferences.dm

@@ -1596,12 +1596,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					toggles ^= MIDROUND_ANTAG
 
 				if("parallaxup")
-					parallax = Wrap(parallax + 1, PARALLAX_INSANE, PARALLAX_DISABLE + 1)
+					parallax = WRAP(parallax + 1, PARALLAX_INSANE, PARALLAX_DISABLE + 1)
 					if (parent && parent.mob && parent.mob.hud_used)
 						parent.mob.hud_used.update_parallax_pref(parent.mob)
 
 				if("parallaxdown")
-					parallax = Wrap(parallax - 1, PARALLAX_INSANE, PARALLAX_DISABLE + 1)
+					parallax = WRAP(parallax - 1, PARALLAX_INSANE, PARALLAX_DISABLE + 1)
 					if (parent && parent.mob && parent.mob.hud_used)
 						parent.mob.hud_used.update_parallax_pref(parent.mob)
 

code/modules/clothing/spacesuits/flightsuit.dm

@@ -164,7 +164,7 @@
 		assembled = TRUE
 		boost_chargerate *= cap
 		boost_drain -= manip
-		powersetting_high = Clamp(laser, 0, 3)
+		powersetting_high = CLAMP(laser, 0, 3)
 		emp_disable_threshold = bin*1.25
 		stabilizer_decay_amount = scan*3.5
 		airbrake_decay_amount = manip*8
@@ -194,15 +194,15 @@
 /obj/item/device/flightpack/proc/adjust_momentum(amountx, amounty, reduce_amount_total = 0)
 	if(reduce_amount_total != 0)
 		if(momentum_x > 0)
-			momentum_x = Clamp(momentum_x - reduce_amount_total, 0, momentum_max)
+			momentum_x = CLAMP(momentum_x - reduce_amount_total, 0, momentum_max)
 		else if(momentum_x < 0)
-			momentum_x = Clamp(momentum_x + reduce_amount_total, -momentum_max, 0)
+			momentum_x = CLAMP(momentum_x + reduce_amount_total, -momentum_max, 0)
 		if(momentum_y > 0)
-			momentum_y = Clamp(momentum_y - reduce_amount_total, 0, momentum_max)
+			momentum_y = CLAMP(momentum_y - reduce_amount_total, 0, momentum_max)
 		else if(momentum_y < 0)
-			momentum_y = Clamp(momentum_y + reduce_amount_total, -momentum_max, 0)
-	momentum_x = Clamp(momentum_x + amountx, -momentum_max, momentum_max)
-	momentum_y = Clamp(momentum_y + amounty, -momentum_max, momentum_max)
+			momentum_y = CLAMP(momentum_y + reduce_amount_total, -momentum_max, 0)
+	momentum_x = CLAMP(momentum_x + amountx, -momentum_max, momentum_max)
+	momentum_y = CLAMP(momentum_y + amounty, -momentum_max, momentum_max)
 	calculate_momentum_speed()
 
 /obj/item/device/flightpack/intercept_user_move(dir, mob, newLoc, oldLoc)
@@ -314,7 +314,7 @@
 
 /obj/item/device/flightpack/proc/handle_damage()
 	if(emp_damage)
-		emp_damage = Clamp(emp_damage-emp_heal_amount, 0, emp_disable_threshold * 10)
+		emp_damage = CLAMP(emp_damage-emp_heal_amount, 0, emp_disable_threshold * 10)
 		if(emp_damage >= emp_disable_threshold)
 			emp_disabled = TRUE
 		if(emp_disabled && (emp_damage <= 0.5))
@@ -347,11 +347,11 @@
 
 /obj/item/device/flightpack/proc/handle_boost()
 	if(boost)
-		boost_charge = Clamp(boost_charge-boost_drain, 0, boost_maxcharge)
+		boost_charge = CLAMP(boost_charge-boost_drain, 0, boost_maxcharge)
 		if(boost_charge < 1)
 			deactivate_booster()
 	if(boost_charge < boost_maxcharge)
-		boost_charge = Clamp(boost_charge+boost_chargerate, 0, boost_maxcharge)
+		boost_charge = CLAMP(boost_charge+boost_chargerate, 0, boost_maxcharge)
 
 /obj/item/device/flightpack/proc/cycle_power()
 	powersetting < powersetting_high? (powersetting++) : (powersetting = 1)

code/modules/clothing/spacesuits/hardsuit.dm

@@ -654,7 +654,7 @@
 
 /obj/item/clothing/suit/space/hardsuit/shielded/process()
 	if(world.time > recharge_cooldown && current_charges < max_charges)
-		current_charges = Clamp((current_charges + recharge_rate), 0, max_charges)
+		current_charges = CLAMP((current_charges + recharge_rate), 0, max_charges)
 		playsound(loc, 'sound/magic/charge.ogg', 50, 1)
 		if(current_charges == max_charges)
 			playsound(loc, 'sound/machines/ding.ogg', 50, 1)

code/modules/clothing/under/accessories.dm

@@ -135,7 +135,7 @@
 											 "<span class='notice'>You pin \the [src] on [M]'s chest.</span>")
 						if(input)
 							SSblackbox.record_feedback("associative", "commendation", 1, list("commender" = "[user.real_name]", "commendee" = "[M.real_name]", "medal" = "[src]", "reason" = input))
-							GLOB.commendations += "[user.real_name] awarded <b>[M.real_name]</b> the <font color='blue'>[name]</font>! \n- [input]"
+							GLOB.commendations += "[user.real_name] awarded <b>[M.real_name]</b> the <span class='medaltext'>[name]</span>! \n- [input]"
 							commended = TRUE
 							log_game("<b>[key_name(M)]</b> was given the following commendation by <b>[key_name(user)]</b>: [input]")
 							message_admins("<b>[key_name(M)]</b> was given the following commendation by <b>[key_name(user)]</b>: [input]")

code/modules/events/_event.dm

@@ -29,8 +29,8 @@
 
 /datum/round_event_control/New()
 	if(config && !wizardevent) // Magic is unaffected by configs
-		earliest_start = Ceiling(earliest_start * CONFIG_GET(number/events_min_time_mul))
-		min_players = Ceiling(min_players * CONFIG_GET(number/events_min_players_mul))
+		earliest_start = CEILING(earliest_start * CONFIG_GET(number/events_min_time_mul), 1)
+		min_players = CEILING(min_players * CONFIG_GET(number/events_min_players_mul), 1)
 
 /datum/round_event_control/wizard
 	wizardevent = 1

code/modules/events/brand_intelligence.dm

@@ -67,12 +67,12 @@
 
 		kill()
 		return
-	if(IsMultiple(activeFor, 4))
+	if(ISMULTIPLE(activeFor, 4))
 		var/obj/machinery/vending/rebel = pick(vendingMachines)
 		vendingMachines.Remove(rebel)
 		infectedMachines.Add(rebel)
 		rebel.shut_up = 0
 		rebel.shoot_inventory = 1
 
-		if(IsMultiple(activeFor, 8))
+		if(ISMULTIPLE(activeFor, 8))
 			originMachine.speak(pick(rampant_speeches))

code/modules/events/disease_outbreak.dm

@@ -10,22 +10,30 @@
 
 	var/virus_type
 
+	var/max_severity = 3
 
-/datum/round_event/disease_outbreak/announce(fake)
+
+/datum/round_event/disease_outbreak/announce()
 	priority_announce("Confirmed outbreak of level 7 viral biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak7.ogg')
 
 /datum/round_event/disease_outbreak/setup()
 	announceWhen = rand(15, 30)
 
+
 /datum/round_event/disease_outbreak/start()
-	if(!virus_type)
+	var/advanced_virus = FALSE
+	max_severity = 3 + max(FLOOR((world.time - control.earliest_start)/6000, 1),0) //3 symptoms at 20 minutes, plus 1 per 10 minutes
+	if(prob(20 + (10 * max_severity)))
+		advanced_virus = TRUE
+
+	if(!virus_type && !advanced_virus)
 		virus_type = pick(/datum/disease/dnaspread, /datum/disease/advance/flu, /datum/disease/advance/cold, /datum/disease/brainrot, /datum/disease/magnitis)
 
 	for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list))
 		var/turf/T = get_turf(H)
 		if(!T)
 			continue
-		if(!(T.z in GLOB.station_z_levels))
+		if(T.z != ZLEVEL_STATION_PRIMARY)
 			continue
 		if(!H.client)
 			continue
@@ -41,16 +49,48 @@
 			continue
 
 		var/datum/disease/D
-		if(virus_type == /datum/disease/dnaspread)		//Dnaspread needs strain_data set to work.
-			if(!H.dna || (H.disabilities & BLIND))	//A blindness disease would be the worst.
-				continue
-			D = new virus_type()
-			var/datum/disease/dnaspread/DS = D
-			DS.strain_data["name"] = H.real_name
-			DS.strain_data["UI"] = H.dna.uni_identity
-			DS.strain_data["SE"] = H.dna.struc_enzymes
+		if(!advanced_virus)
+			if(virus_type == /datum/disease/dnaspread)		//Dnaspread needs strain_data set to work.
+				if(!H.dna || (H.disabilities & BLIND))	//A blindness disease would be the worst.
+					continue
+				D = new virus_type()
+				var/datum/disease/dnaspread/DS = D
+				DS.strain_data["name"] = H.real_name
+				DS.strain_data["UI"] = H.dna.uni_identity
+				DS.strain_data["SE"] = H.dna.struc_enzymes
+			else
+				D = new virus_type()
 		else
-			D = new virus_type()
+			D = make_virus(max_severity, max_severity)
 		D.carrier = TRUE
 		H.AddDisease(D)
-		break
+
+		if(advanced_virus)
+			var/datum/disease/advance/A = D
+			var/list/name_symptoms = list() //for feedback
+			for(var/datum/symptom/S in A.symptoms)
+				name_symptoms += S.name
+			message_admins("An event has triggered a random advanced virus outbreak on [key_name_admin(H)]! It has these symptoms: [english_list(name_symptoms)]")
+			log_game("An event has triggered a random advanced virus outbreak on [key_name(H)]! It has these symptoms: [english_list(name_symptoms)]")
+		break
+
+/datum/round_event/disease_outbreak/proc/make_virus(max_symptoms, max_level)
+	if(max_symptoms > SYMPTOM_LIMIT)
+		max_symptoms = SYMPTOM_LIMIT
+	var/datum/disease/advance/A = new(FALSE, null)
+	A.symptoms = list()
+	var/list/datum/symptom/possible_symptoms = list()
+	for(var/symptom in subtypesof(/datum/symptom))
+		var/datum/symptom/S = symptom
+		if(initial(S.level) > max_level)
+			continue
+		if(initial(S.level) <= 0) //unobtainable symptoms
+			continue
+		possible_symptoms += S
+	for(var/i in 1 to max_symptoms)
+		var/datum/symptom/chosen_symptom = pick_n_take(possible_symptoms)
+		if(chosen_symptom)
+			var/datum/symptom/S = new chosen_symptom
+			A.symptoms += S
+	A.Refresh() //just in case someone already made and named the same disease
+	return A

code/modules/events/holiday/vday.dm

@@ -45,19 +45,26 @@
 			to_chat(L, "<span class='warning'><B>You didn't get a date! They're all having fun without you! you'll show them though...</B></span>")
 			var/datum/objective/martyr/normiesgetout = new
 			normiesgetout.owner = L.mind
+			L.mind.special_role = "heartbreaker"
 			SSticker.mode.traitors |= L.mind
 			L.mind.objectives += normiesgetout
 
+			L.mind.add_antag_datum(/datum/antagonist/auto_custom)
+
 /proc/forge_valentines_objective(mob/living/lover,mob/living/date)
 
 	SSticker.mode.traitors |= lover.mind
 	lover.mind.special_role = "valentine"
+	
 
 	var/datum/objective/protect/protect_objective = new /datum/objective/protect
 	protect_objective.owner = lover.mind
 	protect_objective.target = date.mind
 	protect_objective.explanation_text = "Protect [date.real_name], your date."
 	lover.mind.objectives += protect_objective
+
+	lover.mind.add_antag_datum(/datum/antagonist/auto_custom)
+
 	to_chat(lover, "<span class='warning'><B>You're on a date with [date]! Protect them at all costs. This takes priority over all other loyalties.</B></span>")
 
 

code/modules/events/meteor_wave.dm

@@ -49,7 +49,7 @@
 	priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/ai/meteors.ogg')
 
 /datum/round_event/meteor_wave/tick()
-	if(IsMultiple(activeFor, 3))
+	if(ISMULTIPLE(activeFor, 3))
 		spawn_meteors(5, wave_type) //meteor list types defined in gamemode/meteor/meteors.dm
 
 /datum/round_event_control/meteor_wave/threatening

code/modules/events/nightmare.dm

@@ -35,6 +35,7 @@
 	player_mind.assigned_role = "Nightmare"
 	player_mind.special_role = "Nightmare"
 	SSticker.mode.traitors += player_mind
+	player_mind.add_antag_datum(/datum/antagonist/auto_custom)
 	S.set_species(/datum/species/shadow/nightmare)
 	playsound(S, 'sound/magic/ethereal_exit.ogg', 50, 1, -1)
 	message_admins("[key_name_admin(S)] has been made into a Nightmare by an event.")

code/modules/events/operative.dm

@@ -27,31 +27,13 @@
 	A.copy_to(operative)
 	operative.dna.update_dna_identity()
 
-	operative.equipOutfit(/datum/outfit/syndicate/full)
-
 	var/datum/mind/Mind = new /datum/mind(selected.key)
 	Mind.assigned_role = "Lone Operative"
 	Mind.special_role = "Lone Operative"
-	SSticker.mode.traitors |= Mind
 	Mind.active = 1
 
-	var/obj/machinery/nuclearbomb/selfdestruct/nuke = locate() in GLOB.machines
-	if(nuke)
-		var/nuke_code
-		if(!nuke.r_code || nuke.r_code == "ADMIN")
-			nuke_code = random_nukecode()
-			nuke.r_code = nuke_code
-		else
-			nuke_code = nuke.r_code
-
-		Mind.store_memory("<B>Station Self-Destruct Device Code</B>: [nuke_code]", 0, 0)
-		to_chat(Mind.current, "The nuclear authorization code is: <B>[nuke_code]</B>")
-
-		var/datum/objective/nuclear/O = new()
-		O.owner = Mind
-		Mind.objectives += O
-
 	Mind.transfer_to(operative)
+	Mind.add_antag_datum(/datum/antagonist/nukeop/lone)
 
 	message_admins("[key_name_admin(operative)] has been made into lone operative by an event.")
 	log_game("[key_name(operative)] was spawned as a lone operative by an event.")

code/modules/events/portal_storm.dm

@@ -64,7 +64,7 @@
 			T = safepick(get_area_turfs(pick(station_areas)))
 		hostiles_spawn += T
 
-	next_boss_spawn = startWhen + Ceiling(2 * number_of_hostiles / number_of_bosses)
+	next_boss_spawn = startWhen + CEILING(2 * number_of_hostiles / number_of_bosses, 1)
 
 /datum/round_event/portal_storm/announce(fake)
 	set waitfor = 0
@@ -117,14 +117,14 @@
 /datum/round_event/portal_storm/proc/spawn_hostile()
 	if(!hostile_types || !hostile_types.len)
 		return 0
-	return IsMultiple(activeFor, 2)
+	return ISMULTIPLE(activeFor, 2)
 
 /datum/round_event/portal_storm/proc/spawn_boss()
 	if(!boss_types || !boss_types.len)
 		return 0
 
 	if(activeFor == next_boss_spawn)
-		next_boss_spawn += Ceiling(number_of_hostiles / number_of_bosses)
+		next_boss_spawn += CEILING(number_of_hostiles / number_of_bosses, 1)
 		return 1
 
 /datum/round_event/portal_storm/proc/time_to_end()

code/modules/events/wizard/departmentrevolt.dm

@@ -44,6 +44,7 @@
 						citizens += H
 						SSticker.mode.traitors += M
 						M.special_role = "separatist"
+						M.add_antag_datum(/datum/antagonist/auto_custom)
 						H.log_message("<font color='red'>Was made into a separatist, long live [nation]!</font>", INDIVIDUAL_ATTACK_LOG)
 						to_chat(H, "<B>You are a separatist! [nation] forever! Protect the sovereignty of your newfound land with your comrades in arms!</B>")
 	if(citizens.len)

code/modules/events/wizard/greentext.dm

@@ -67,6 +67,7 @@
 		O.completed = 1 //YES!
 		O.owner = new_holder.mind
 		new_holder.mind.objectives += O
+		new_holder.mind.add_antag_datum(/datum/antagonist/auto_custom)
 		new_holder.log_message("<font color='green'>Won with greentext!!!</font>", INDIVIDUAL_ATTACK_LOG)
 		color_altered_mobs -= new_holder
 		resistance_flags |= ON_FIRE

code/modules/flufftext/Hallucination.dm

@@ -80,6 +80,7 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
 
 /obj/effect/hallucination
 	invisibility = INVISIBILITY_OBSERVER
+	anchored = TRUE
 	var/mob/living/carbon/target = null
 
 /obj/effect/hallucination/simple

code/modules/food_and_drinks/kitchen_machinery/food_cart.dm

@@ -123,7 +123,7 @@
 					break
 
 	if(href_list["portion"])
-		portion = Clamp(input("How much drink do you want to dispense per glass?") as num, 0, 50)
+		portion = CLAMP(input("How much drink do you want to dispense per glass?") as num, 0, 50)
 
 	if(href_list["pour"] || href_list["m_pour"])
 		if(glasses-- <= 0)

code/modules/food_and_drinks/pizzabox.dm

@@ -124,7 +124,7 @@
 				return
 			else
 				bomb_timer = input(user, "Set the [bomb] timer from [BOMB_TIMER_MIN] to [BOMB_TIMER_MAX].", bomb, bomb_timer) as num
-				bomb_timer = Clamp(Ceiling(bomb_timer / 2), BOMB_TIMER_MIN, BOMB_TIMER_MAX)
+				bomb_timer = CLAMP(CEILING(bomb_timer / 2, 1), BOMB_TIMER_MIN, BOMB_TIMER_MAX)
 				bomb_defused = FALSE
 
 				var/message = "[ADMIN_LOOKUPFLW(user)] has trapped a [src] with [bomb] set to [bomb_timer * 2] seconds."

code/modules/goonchat/browserOutput.dm

@@ -132,7 +132,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
 
 /datum/chatOutput/proc/setMusicVolume(volume = "")
 	if(volume)
-		adminMusicVolume = Clamp(text2num(volume), 0, 100)
+		adminMusicVolume = CLAMP(text2num(volume), 0, 100)
 
 //Sends client connection details to the chat to handle and save
 /datum/chatOutput/proc/sendClientData()

code/modules/hydroponics/gene_modder.dm

@@ -42,7 +42,7 @@
 
 	for(var/obj/item/stock_parts/micro_laser/ML in component_parts)
 		var/wratemod = ML.rating * 2.5
-		min_wrate = Floor(10-wratemod,1) // 7,5,2,0	Clamps at 0 and 10	You want this low
+		min_wrate = FLOOR(10-wratemod,1) // 7,5,2,0	Clamps at 0 and 10	You want this low
 		min_wchance = 67-(ML.rating*16) // 48,35,19,3 	Clamps at 0 and 67	You want this low
 	for(var/obj/item/circuitboard/machine/plantgenes/vaultcheck in component_parts)
 		if(istype(vaultcheck, /obj/item/circuitboard/machine/plantgenes/vault)) // DUMB BOTANY TUTS

code/modules/hydroponics/grown.dm

@@ -37,7 +37,7 @@
 		for(var/datum/plant_gene/trait/T in seed.genes)
 			T.on_new(src, loc)
 		seed.prepare_result(src)
-		transform *= TransformUsingVariable(seed.potency, 100, 0.5) //Makes the resulting produce's sprite larger or smaller based on potency!
+		transform *= TRANSFORM_USING_VARIABLE(seed.potency, 100) + 0.5 //Makes the resulting produce's sprite larger or smaller based on potency!
 		add_juice()
 
 

code/modules/hydroponics/grown/towercap.dm

@@ -154,8 +154,8 @@
 				if(!click_params || !click_params["icon-x"] || !click_params["icon-y"])
 					return
 				//Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
-				W.pixel_x = Clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2)
-				W.pixel_y = Clamp(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2)
+				W.pixel_x = CLAMP(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2)
+				W.pixel_y = CLAMP(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2)
 		else
 			return ..()
 

code/modules/hydroponics/growninedible.dm

@@ -28,7 +28,7 @@
 
 		if(istype(src, seed.product)) // no adding reagents if it is just a trash item
 			seed.prepare_result(src)
-		transform *= TransformUsingVariable(seed.potency, 100, 0.5)
+		transform *= TRANSFORM_USING_VARIABLE(seed.potency, 100) + 0.5
 		add_juice()
 
 

code/modules/hydroponics/hydroponics.dm

@@ -881,26 +881,26 @@
 
 /// Tray Setters - The following procs adjust the tray or plants variables, and make sure that the stat doesn't go out of bounds.///
 /obj/machinery/hydroponics/proc/adjustNutri(adjustamt)
-	nutrilevel = Clamp(nutrilevel + adjustamt, 0, maxnutri)
+	nutrilevel = CLAMP(nutrilevel + adjustamt, 0, maxnutri)
 
 /obj/machinery/hydroponics/proc/adjustWater(adjustamt)
-	waterlevel = Clamp(waterlevel + adjustamt, 0, maxwater)
+	waterlevel = CLAMP(waterlevel + adjustamt, 0, maxwater)
 
 	if(adjustamt>0)
 		adjustToxic(-round(adjustamt/4))//Toxicity dilutation code. The more water you put in, the lesser the toxin concentration.
 
 /obj/machinery/hydroponics/proc/adjustHealth(adjustamt)
 	if(myseed && !dead)
-		plant_health = Clamp(plant_health + adjustamt, 0, myseed.endurance)
+		plant_health = CLAMP(plant_health + adjustamt, 0, myseed.endurance)
 
 /obj/machinery/hydroponics/proc/adjustToxic(adjustamt)
-	toxic = Clamp(toxic + adjustamt, 0, 100)
+	toxic = CLAMP(toxic + adjustamt, 0, 100)
 
 /obj/machinery/hydroponics/proc/adjustPests(adjustamt)
-	pestlevel = Clamp(pestlevel + adjustamt, 0, 10)
+	pestlevel = CLAMP(pestlevel + adjustamt, 0, 10)
 
 /obj/machinery/hydroponics/proc/adjustWeeds(adjustamt)
-	weedlevel = Clamp(weedlevel + adjustamt, 0, 10)
+	weedlevel = CLAMP(weedlevel + adjustamt, 0, 10)
 
 /obj/machinery/hydroponics/proc/spawnplant() // why would you put strange reagent in a hydro tray you monster I bet you also feed them blood
 	var/list/livingplants = list(/mob/living/simple_animal/hostile/tree, /mob/living/simple_animal/hostile/killertomato)

code/modules/hydroponics/seeds.dm

@@ -170,7 +170,7 @@
 /// Setters procs ///
 /obj/item/seeds/proc/adjust_yield(adjustamt)
 	if(yield != -1) // Unharvestable shouldn't suddenly turn harvestable
-		yield = Clamp(yield + adjustamt, 0, 10)
+		yield = CLAMP(yield + adjustamt, 0, 10)
 
 		if(yield <= 0 && get_gene(/datum/plant_gene/trait/plant_type/fungal_metabolism))
 			yield = 1 // Mushrooms always have a minimum yield of 1.
@@ -179,39 +179,39 @@
 			C.value = yield
 
 /obj/item/seeds/proc/adjust_lifespan(adjustamt)
-	lifespan = Clamp(lifespan + adjustamt, 10, 100)
+	lifespan = CLAMP(lifespan + adjustamt, 10, 100)
 	var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/lifespan)
 	if(C)
 		C.value = lifespan
 
 /obj/item/seeds/proc/adjust_endurance(adjustamt)
-	endurance = Clamp(endurance + adjustamt, 10, 100)
+	endurance = CLAMP(endurance + adjustamt, 10, 100)
 	var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/endurance)
 	if(C)
 		C.value = endurance
 
 /obj/item/seeds/proc/adjust_production(adjustamt)
 	if(yield != -1)
-		production = Clamp(production + adjustamt, 1, 10)
+		production = CLAMP(production + adjustamt, 1, 10)
 		var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/production)
 		if(C)
 			C.value = production
 
 /obj/item/seeds/proc/adjust_potency(adjustamt)
 	if(potency != -1)
-		potency = Clamp(potency + adjustamt, 0, 100)
+		potency = CLAMP(potency + adjustamt, 0, 100)
 		var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/potency)
 		if(C)
 			C.value = potency
 
 /obj/item/seeds/proc/adjust_weed_rate(adjustamt)
-	weed_rate = Clamp(weed_rate + adjustamt, 0, 10)
+	weed_rate = CLAMP(weed_rate + adjustamt, 0, 10)
 	var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/weed_rate)
 	if(C)
 		C.value = weed_rate
 
 /obj/item/seeds/proc/adjust_weed_chance(adjustamt)
-	weed_chance = Clamp(weed_chance + adjustamt, 0, 67)
+	weed_chance = CLAMP(weed_chance + adjustamt, 0, 67)
 	var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/weed_chance)
 	if(C)
 		C.value = weed_chance
@@ -220,7 +220,7 @@
 
 /obj/item/seeds/proc/set_yield(adjustamt)
 	if(yield != -1) // Unharvestable shouldn't suddenly turn harvestable
-		yield = Clamp(adjustamt, 0, 10)
+		yield = CLAMP(adjustamt, 0, 10)
 
 		if(yield <= 0 && get_gene(/datum/plant_gene/trait/plant_type/fungal_metabolism))
 			yield = 1 // Mushrooms always have a minimum yield of 1.
@@ -229,39 +229,39 @@
 			C.value = yield
 
 /obj/item/seeds/proc/set_lifespan(adjustamt)
-	lifespan = Clamp(adjustamt, 10, 100)
+	lifespan = CLAMP(adjustamt, 10, 100)
 	var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/lifespan)
 	if(C)
 		C.value = lifespan
 
 /obj/item/seeds/proc/set_endurance(adjustamt)
-	endurance = Clamp(adjustamt, 10, 100)
+	endurance = CLAMP(adjustamt, 10, 100)
 	var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/endurance)
 	if(C)
 		C.value = endurance
 
 /obj/item/seeds/proc/set_production(adjustamt)
 	if(yield != -1)
-		production = Clamp(adjustamt, 1, 10)
+		production = CLAMP(adjustamt, 1, 10)
 		var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/production)
 		if(C)
 			C.value = production
 
 /obj/item/seeds/proc/set_potency(adjustamt)
 	if(potency != -1)
-		potency = Clamp(adjustamt, 0, 100)
+		potency = CLAMP(adjustamt, 0, 100)
 		var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/potency)
 		if(C)
 			C.value = potency
 
 /obj/item/seeds/proc/set_weed_rate(adjustamt)
-	weed_rate = Clamp(adjustamt, 0, 10)
+	weed_rate = CLAMP(adjustamt, 0, 10)
 	var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/weed_rate)
 	if(C)
 		C.value = weed_rate
 
 /obj/item/seeds/proc/set_weed_chance(adjustamt)
-	weed_chance = Clamp(adjustamt, 0, 67)
+	weed_chance = CLAMP(adjustamt, 0, 67)
 	var/datum/plant_gene/core/C = get_gene(/datum/plant_gene/core/weed_chance)
 	if(C)
 		C.value = weed_chance

code/modules/integrated_electronics/core/special_pins/index_pin.dm

@@ -14,7 +14,7 @@
 		new_data = 1
 
 	if(isnum(new_data))
-		data = Clamp(round(new_data), 1, IC_MAX_LIST_LENGTH)
+		data = CLAMP(round(new_data), 1, IC_MAX_LIST_LENGTH)
 		holder.on_data_written()
 
 /datum/integrated_io/index/display_pin_type()

code/modules/integrated_electronics/subtypes/converters.dm

@@ -265,7 +265,7 @@
 	pull_data()
 	var/incoming = get_pin_data(IC_INPUT, 1)
 	if(!isnull(incoming))
-		result = ToDegrees(incoming)
+		result = TODEGREES(incoming)
 
 	set_pin_data(IC_OUTPUT, 1, result)
 	push_data()
@@ -283,7 +283,7 @@
 	pull_data()
 	var/incoming = get_pin_data(IC_INPUT, 1)
 	if(!isnull(incoming))
-		result = ToRadians(incoming)
+		result = TORADIANS(incoming)
 
 	set_pin_data(IC_OUTPUT, 1, result)
 	push_data()

code/modules/integrated_electronics/subtypes/data_transfer.dm

@@ -123,7 +123,7 @@
 /obj/item/integrated_circuit/transfer/pulsedemultiplexer/do_work()
 	var/output_index = get_pin_data(IC_INPUT, 1)
 
-	if(output_index == Clamp(output_index, 1, number_of_pins))
+	if(output_index == CLAMP(output_index, 1, number_of_pins))
 		activate_pin(round(output_index + 1 ,1))
 
 /obj/item/integrated_circuit/transfer/pulsedemultiplexer/medium

code/modules/integrated_electronics/subtypes/input.dm

@@ -373,7 +373,7 @@
 	var/rad = get_pin_data(IC_INPUT, 2)
 
 	if(isnum(rad))
-		rad = Clamp(rad, 0, 8)
+		rad = CLAMP(rad, 0, 8)
 		radius = rad
 
 /obj/item/integrated_circuit/input/advanced_locator_list/do_work()
@@ -426,7 +426,7 @@
 /obj/item/integrated_circuit/input/advanced_locator/on_data_written()
 	var/rad = get_pin_data(IC_INPUT, 2)
 	if(isnum(rad))
-		rad = Clamp(rad, 0, 8)
+		rad = CLAMP(rad, 0, 8)
 		radius = rad
 
 /obj/item/integrated_circuit/input/advanced_locator/do_work()

code/modules/integrated_electronics/subtypes/manipulation.dm

@@ -93,8 +93,8 @@
 			yo.data = round(yo.data, 1)
 
 		var/turf/T = get_turf(assembly)
-		var/target_x = Clamp(T.x + xo.data, 0, world.maxx)
-		var/target_y = Clamp(T.y + yo.data, 0, world.maxy)
+		var/target_x = CLAMP(T.x + xo.data, 0, world.maxx)
+		var/target_y = CLAMP(T.y + yo.data, 0, world.maxy)
 
 		shootAt(locate(target_x, target_y, T.z))
 
@@ -210,7 +210,7 @@
 		var/datum/integrated_io/detonation_time = inputs[1]
 		var/dt
 		if(isnum(detonation_time.data) && detonation_time.data > 0)
-			dt = Clamp(detonation_time.data, 1, 12)*10
+			dt = CLAMP(detonation_time.data, 1, 12)*10
 		else
 			dt = 15
 		addtimer(CALLBACK(attached_grenade, /obj/item/grenade.proc/prime), dt)
@@ -389,9 +389,9 @@
 		if(!M.temporarilyRemoveItemFromInventory(A))
 			return
 
-	var/x_abs = Clamp(T.x + target_x_rel, 0, world.maxx)
-	var/y_abs = Clamp(T.y + target_y_rel, 0, world.maxy)
-	var/range = round(Clamp(sqrt(target_x_rel*target_x_rel+target_y_rel*target_y_rel),0,8),1)
+	var/x_abs = CLAMP(T.x + target_x_rel, 0, world.maxx)
+	var/y_abs = CLAMP(T.y + target_y_rel, 0, world.maxy)
+	var/range = round(CLAMP(sqrt(target_x_rel*target_x_rel+target_y_rel*target_y_rel),0,8),1)
 
 	A.forceMove(drop_location())
 	A.throw_at(locate(x_abs, y_abs, T.z), range, 3)

code/modules/integrated_electronics/subtypes/output.dm

@@ -88,7 +88,7 @@
 	var/brightness = get_pin_data(IC_INPUT, 2)
 
 	if(new_color && isnum(brightness))
-		brightness = Clamp(brightness, 0, 6)
+		brightness = CLAMP(brightness, 0, 6)
 		light_rgb = new_color
 		light_brightness = brightness
 
@@ -146,7 +146,7 @@
 		var/selected_sound = sounds[ID]
 		if(!selected_sound)
 			return
-		vol = Clamp(vol ,0 , 100)
+		vol = CLAMP(vol ,0 , 100)
 		playsound(get_turf(src), selected_sound, vol, freq, -1)
 
 /obj/item/integrated_circuit/output/sound/on_data_written()

code/modules/integrated_electronics/subtypes/reagents.dm

@@ -111,7 +111,7 @@
 	else
 		direction_mode = SYRINGE_INJECT
 	if(isnum(new_amount))
-		new_amount = Clamp(new_amount, 0, volume)
+		new_amount = CLAMP(new_amount, 0, volume)
 		transfer_amount = new_amount
 
 // Hydroponics trays have no reagents holder and handle reagents in their own snowflakey way.
@@ -181,7 +181,7 @@
 			activate_pin(3)
 			return
 
-		var/tramount = Clamp(transfer_amount, 0, reagents.total_volume)
+		var/tramount = CLAMP(transfer_amount, 0, reagents.total_volume)
 
 		if(isliving(AM))
 			var/mob/living/L = AM
@@ -232,7 +232,7 @@
 	else
 		direction_mode = SYRINGE_INJECT
 	if(isnum(new_amount))
-		new_amount = Clamp(new_amount, 0, 50)
+		new_amount = CLAMP(new_amount, 0, 50)
 		transfer_amount = new_amount
 
 /obj/item/integrated_circuit/reagent/pump/do_work()
@@ -379,7 +379,7 @@
 	else
 		direction_mode = SYRINGE_INJECT
 	if(isnum(new_amount))
-		new_amount = Clamp(new_amount, 0, 50)
+		new_amount = CLAMP(new_amount, 0, 50)
 		transfer_amount = new_amount
 
 /obj/item/integrated_circuit/reagent/filter/do_work()

code/modules/integrated_electronics/subtypes/time.dm

@@ -62,7 +62,7 @@
 /obj/item/integrated_circuit/time/delay/custom/do_work()
 	var/delay_input = get_pin_data(IC_INPUT, 1)
 	if(delay_input && isnum(delay_input) )
-		var/new_delay = Clamp(delay_input ,1 ,36000) //An hour.
+		var/new_delay = CLAMP(delay_input ,1 ,36000) //An hour.
 		delay = new_delay
 
 	..()

code/modules/integrated_electronics/subtypes/trig.dm

@@ -71,7 +71,7 @@
 	var/result = null
 	var/A = get_pin_data(IC_INPUT, 1)
 	if(!isnull(A))
-		result = Tan(A)
+		result = TAN(A)
 
 	set_pin_data(IC_OUTPUT, 1, result)
 	push_data()
@@ -91,7 +91,7 @@
 	var/result = null
 	var/A = get_pin_data(IC_INPUT, 1)
 	if(!isnull(A))
-		result = Csc(A)
+		result = CSC(A)
 
 	set_pin_data(IC_OUTPUT, 1, result)
 	push_data()
@@ -111,7 +111,7 @@
 	var/result = null
 	var/A = get_pin_data(IC_INPUT, 1)
 	if(!isnull(A))
-		result = Sec(A)
+		result = SEC(A)
 
 	set_pin_data(IC_OUTPUT, 1, result)
 	push_data()
@@ -131,7 +131,7 @@
 	var/result = null
 	var/A = get_pin_data(IC_INPUT, 1)
 	if(!isnull(A))
-		result = Cot(A)
+		result = COT(A)
 
 	set_pin_data(IC_OUTPUT, 1, result)
 	push_data()

code/modules/language/aphasia.dm

@@ -0,0 +1,13 @@
+/datum/language/aphasia
+	name = "Gibbering"
+	desc = "It is theorized that any sufficiently brain-damaged person can speak this language."
+	speech_verb = "garbles"
+	ask_verb = "mumbles"
+	whisper_verb = "mutters"
+	exclaim_verb = "screams incoherently"
+	flags_1 = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD
+	key = "i"
+	syllables = list("m","n","gh","h","l","s","r","a","e","i","o","u")
+	space_chance = 20
+	default_priority = 10
+	icon_state = "aphasia"

code/modules/language/language.dm

@@ -49,7 +49,7 @@
 
 	for(var/i in 0 to name_count)
 		new_name = ""
-		var/Y = rand(Floor(syllable_count/syllable_divisor), syllable_count)
+		var/Y = rand(FLOOR(syllable_count/syllable_divisor, 1), syllable_count)
 		for(var/x in Y to 0)
 			new_name += pick(syllables)
 		full_name += " [capitalize(lowertext(new_name))]"

code/modules/library/lib_machines.dm

@@ -263,7 +263,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
 				dat += "<A href='?src=[REF(src)];orderbyid=1'>(Order book by SS<sup>13</sup>BN)</A><BR><BR>"
 				dat += "<table>"
 				dat += "<tr><td>AUTHOR</td><td>TITLE</td><td>CATEGORY</td><td></td></tr>"
-				dat += libcomp_menu[Clamp(page,1,libcomp_menu.len)]
+				dat += libcomp_menu[CLAMP(page,1,libcomp_menu.len)]
 				dat += "<tr><td><A href='?src=[REF(src)];page=[(max(1,page-1))]'>&lt;&lt;&lt;&lt;</A></td> <td></td> <td></td> <td><span style='text-align:right'><A href='?src=[REF(src)];page=[(min(libcomp_menu.len,page+1))]'>&gt;&gt;&gt;&gt;</A></span></td></tr>"
 				dat += "</table>"
 			dat += "<BR><A href='?src=[REF(src)];switchscreen=0'>(Return to main menu)</A><BR>"
@@ -444,7 +444,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
 		else
 			var/orderid = input("Enter your order:") as num|null
 			if(orderid)
-				if(isnum(orderid) && IsInteger(orderid))
+				if(isnum(orderid) && ISINTEGER(orderid))
 					href_list["targetid"] = num2text(orderid)
 
 	if(href_list["targetid"])

code/modules/lighting/lighting_source.dm

@@ -232,8 +232,8 @@
 	var/turf/T
 	if (source_turf)
 		var/oldlum = source_turf.luminosity
-		source_turf.luminosity = Ceiling(light_range)
-		for(T in view(Ceiling(light_range), source_turf))
+		source_turf.luminosity = CEILING(light_range, 1)
+		for(T in view(CEILING(light_range, 1), source_turf))
 			for (thing in T.get_corners(source_turf))
 				C = thing
 				corners[C] = 0

code/modules/mapping/reader.dm

@@ -102,7 +102,7 @@ GLOBAL_DATUM_INIT(_preloader, /dmm_suite/preloader, new)
 				if(!no_changeturf)
 					WARNING("Z-level expansion occurred without no_changeturf set, this may cause problems when /turf/AfterChange is called")
 
-			bounds[MAP_MINX] = min(bounds[MAP_MINX], Clamp(xcrdStart, x_lower, x_upper))
+			bounds[MAP_MINX] = min(bounds[MAP_MINX], CLAMP(xcrdStart, x_lower, x_upper))
 			bounds[MAP_MINZ] = min(bounds[MAP_MINZ], zcrd)
 			bounds[MAP_MAXZ] = max(bounds[MAP_MAXZ], zcrd)
 
@@ -119,15 +119,15 @@ GLOBAL_DATUM_INIT(_preloader, /dmm_suite/preloader, new)
 			if(gridLines.len && gridLines[gridLines.len] == "")
 				gridLines.Cut(gridLines.len) // Remove only one blank line at the end.
 
-			bounds[MAP_MINY] = min(bounds[MAP_MINY], Clamp(ycrd, y_lower, y_upper))
+			bounds[MAP_MINY] = min(bounds[MAP_MINY], CLAMP(ycrd, y_lower, y_upper))
 			ycrd += gridLines.len - 1 // Start at the top and work down
 
 			if(!cropMap && ycrd > world.maxy)
 				if(!measureOnly)
 					world.maxy = ycrd // Expand Y here.  X is expanded in the loop below
-				bounds[MAP_MAXY] = max(bounds[MAP_MAXY], Clamp(ycrd, y_lower, y_upper))
+				bounds[MAP_MAXY] = max(bounds[MAP_MAXY], CLAMP(ycrd, y_lower, y_upper))
 			else
-				bounds[MAP_MAXY] = max(bounds[MAP_MAXY], Clamp(min(ycrd, world.maxy), y_lower, y_upper))
+				bounds[MAP_MAXY] = max(bounds[MAP_MAXY], CLAMP(min(ycrd, world.maxy), y_lower, y_upper))
 
 			var/maxx = xcrdStart
 			if(measureOnly)
@@ -166,7 +166,7 @@ GLOBAL_DATUM_INIT(_preloader, /dmm_suite/preloader, new)
 							++xcrd
 					--ycrd
 
-			bounds[MAP_MAXX] = Clamp(max(bounds[MAP_MAXX], cropMap ? min(maxx, world.maxx) : maxx), x_lower, x_upper)
+			bounds[MAP_MAXX] = CLAMP(max(bounds[MAP_MAXX], cropMap ? min(maxx, world.maxx) : maxx), x_lower, x_upper)
 
 		CHECK_TICK
 

code/modules/mining/lavaland/necropolis_chests.dm

@@ -799,13 +799,13 @@
 	force = 0
 	var/ghost_counter = ghost_check()
 
-	force = Clamp((ghost_counter * 4), 0, 75)
+	force = CLAMP((ghost_counter * 4), 0, 75)
 	user.visible_message("<span class='danger'>[user] strikes with the force of [ghost_counter] vengeful spirits!</span>")
 	..()
 
 /obj/item/melee/ghost_sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	var/ghost_counter = ghost_check()
-	final_block_chance += Clamp((ghost_counter * 5), 0, 75)
+	final_block_chance += CLAMP((ghost_counter * 5), 0, 75)
 	owner.visible_message("<span class='danger'>[owner] is protected by a ring of [ghost_counter] ghosts!</span>")
 	return ..()
 

code/modules/mining/machine_redemption.dm

@@ -82,7 +82,7 @@
 		if(!M || !redemption_mat)
 			return FALSE
 
-		var/smeltable_sheets = Floor(redemption_mat.amount / M)
+		var/smeltable_sheets = FLOOR(redemption_mat.amount / M, 1)
 
 		if(!smeltable_sheets)
 			return FALSE

code/modules/mining/mint.dm

@@ -68,7 +68,7 @@
 		if(materials.materials[href_list["choose"]])
 			chosen = href_list["choose"]
 	if(href_list["chooseAmt"])
-		coinsToProduce = Clamp(coinsToProduce + text2num(href_list["chooseAmt"]), 0, 1000)
+		coinsToProduce = CLAMP(coinsToProduce + text2num(href_list["chooseAmt"]), 0, 1000)
 	if(href_list["makeCoins"])
 		var/temp_coins = coinsToProduce
 		processing = TRUE

code/modules/mob/dead/new_player/new_player.dm

@@ -185,7 +185,7 @@
 		var/pollid = href_list["pollid"]
 		if(istext(pollid))
 			pollid = text2num(pollid)
-		if(isnum(pollid) && IsInteger(pollid))
+		if(isnum(pollid) && ISINTEGER(pollid))
 			src.poll_player(pollid)
 		return
 
@@ -223,7 +223,7 @@
 							rating = null
 						else
 							rating = text2num(href_list["o[optionid]"])
-							if(!isnum(rating) || !IsInteger(rating))
+							if(!isnum(rating) || !ISINTEGER(rating))
 								return
 
 						if(!vote_on_numval_poll(pollid, optionid, rating))

code/modules/mob/dead/observer/observer.dm

@@ -462,7 +462,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 			views |= i
 		var/new_view = input("Choose your new view", "Modify view range", 7) as null|anything in views
 		if(new_view)
-			client.change_view(Clamp(new_view, 7, max_view))
+			client.change_view(CLAMP(new_view, 7, max_view))
 	else
 		client.change_view(CONFIG_GET(string/default_view))
 
@@ -471,7 +471,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set hidden = TRUE
 	var/max_view = client.prefs.unlock_content ? GHOST_MAX_VIEW_RANGE_MEMBER : GHOST_MAX_VIEW_RANGE_DEFAULT
 	if(input)
-		client.change_view(Clamp(client.view + input, 7, max_view))
+		client.change_view(CLAMP(client.view + input, 7, max_view))
 
 /mob/dead/observer/verb/boo()
 	set category = "Ghost"

code/modules/mob/living/brain/brain_item.dm

@@ -154,7 +154,7 @@
 	var/adjusted_amount
 	if(amount >= 0 && maximum)
 		var/brainloss = get_brain_damage()
-		var/new_brainloss = Clamp(brainloss + amount, 0, maximum)
+		var/new_brainloss = CLAMP(brainloss + amount, 0, maximum)
 		if(brainloss > new_brainloss) //brainloss is over the cap already
 			return 0
 		adjusted_amount = new_brainloss - brainloss

code/modules/mob/living/carbon/alien/status_procs.dm

@@ -17,4 +17,4 @@
 /mob/living/carbon/alien/AdjustStun(amount, updating = 1, ignore_canstun = 0)
 	. = ..()
 	if(!.)
-		move_delay_add = Clamp(move_delay_add + round(amount/2), 0, 10)
+		move_delay_add = CLAMP(move_delay_add + round(amount/2), 0, 10)

code/modules/mob/living/carbon/carbon.dm

@@ -157,6 +157,8 @@
 			if(!throwable_mob.buckled)
 				thrown_thing = throwable_mob
 				stop_pulling()
+				if(disabilities & PACIFISM)
+					to_chat(src, "<span class='notice'>You gently let go of [throwable_mob].</span>")
 				var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
 				var/turf/end_T = get_turf(target)
 				if(start_T && end_T)
@@ -168,6 +170,10 @@
 		thrown_thing = I
 		dropItemToGround(I)
 
+		if(disabilities & PACIFISM && I.throwforce)
+			to_chat(src, "<span class='notice'>You set [I] down gently on the ground.</span>")
+			return
+
 	if(thrown_thing)
 		visible_message("<span class='danger'>[src] has thrown [thrown_thing].</span>")
 		add_logs(src, thrown_thing, "has thrown")

code/modules/mob/living/carbon/damage_procs.dm

@@ -185,7 +185,7 @@
 /mob/living/carbon/adjustStaminaLoss(amount, updating_stamina = 1)
 	if(status_flags & GODMODE)
 		return 0
-	staminaloss = Clamp(staminaloss + amount, 0, maxHealth*2)
+	staminaloss = CLAMP(staminaloss + amount, 0, maxHealth*2)
 	if(updating_stamina)
 		update_stamina()
 
@@ -198,7 +198,7 @@
 		update_stamina()
 
 /mob/living/carbon/getBrainLoss()
-	. = BRAIN_DAMAGE_DEATH
+	. = 0
 	var/obj/item/organ/brain/B = getorganslot(ORGAN_SLOT_BRAIN)
 	if(B)
 		. = B.get_brain_damage()
@@ -207,6 +207,7 @@
 /mob/living/carbon/adjustBrainLoss(amount, maximum = BRAIN_DAMAGE_DEATH)
 	if(status_flags & GODMODE)
 		return 0
+	var/prev_brainloss = getBrainLoss()
 	var/obj/item/organ/brain/B = getorganslot(ORGAN_SLOT_BRAIN)
 	if(!B)
 		return
@@ -224,6 +225,13 @@
 			else
 				gain_trauma_type(BRAIN_TRAUMA_SEVERE)
 
+	if(prev_brainloss < 40 && brainloss >= 40)
+		to_chat(src, "<span class='warning'>You feel lightheaded.</span>")
+	else if(prev_brainloss < 120 && brainloss >= 120)
+		to_chat(src, "<span class='warning'>You feel less in control of your thoughts.</span>")
+	else if(prev_brainloss < 180 && brainloss >= 180)
+		to_chat(src, "<span class='warning'>You can feel your mind flickering on and off...</span>")
+
 /mob/living/carbon/setBrainLoss(amount)
 	var/obj/item/organ/brain/B = getorganslot(ORGAN_SLOT_BRAIN)
 	if(B)

code/modules/mob/living/carbon/examine.dm

@@ -43,31 +43,32 @@
 
 	msg += "<span class='warning'>"
 	var/temp = getBruteLoss()
-	if(temp)
-		if (temp < 25)
-			msg += "[t_He] [t_has] minor bruising.\n"
-		else if (temp < 50)
-			msg += "[t_He] [t_has] <b>moderate</b> bruising!\n"
-		else
-			msg += "<B>[t_He] [t_has] severe bruising!</B>\n"
+	if(!(user == src && src.hal_screwyhud == SCREWYHUD_HEALTHY)) //fake healthy
+		if(temp)
+			if (temp < 25)
+				msg += "[t_He] [t_has] minor bruising.\n"
+			else if (temp < 50)
+				msg += "[t_He] [t_has] <b>moderate</b> bruising!\n"
+			else
+				msg += "<B>[t_He] [t_has] severe bruising!</B>\n"
 
-	temp = getFireLoss()
-	if(temp)
-		if (temp < 25)
-			msg += "[t_He] [t_has] minor burns.\n"
-		else if (temp < 50)
-			msg += "[t_He] [t_has] <b>moderate</b> burns!\n"
-		else
-			msg += "<B>[t_He] [t_has] severe burns!</B>\n"
+		temp = getFireLoss()
+		if(temp)
+			if (temp < 25)
+				msg += "[t_He] [t_has] minor burns.\n"
+			else if (temp < 50)
+				msg += "[t_He] [t_has] <b>moderate</b> burns!\n"
+			else
+				msg += "<B>[t_He] [t_has] severe burns!</B>\n"
 
-	temp = getCloneLoss()
-	if(temp)
-		if(temp < 25)
-			msg += "[t_He] [t_is] slightly deformed.\n"
-		else if (temp < 50)
-			msg += "[t_He] [t_is] <b>moderately</b> deformed!\n"
-		else
-			msg += "<b>[t_He] [t_is] severely deformed!</b>\n"
+		temp = getCloneLoss()
+		if(temp)
+			if(temp < 25)
+				msg += "[t_He] [t_is] slightly deformed.\n"
+			else if (temp < 50)
+				msg += "[t_He] [t_is] <b>moderately</b> deformed!\n"
+			else
+				msg += "<b>[t_He] [t_is] severely deformed!</b>\n"
 
 	if(disabilities & DUMB)
 		msg += "[t_He] seem[p_s()] to be clumsy and unable to think.\n"

code/modules/mob/living/carbon/human/examine.dm

@@ -187,31 +187,32 @@
 	else if(l_limbs_missing >= 2 && r_limbs_missing >= 2)
 		msg += "[t_He] [p_do()]n't seem all there.\n"
 
-	if(temp)
-		if(temp < 25)
-			msg += "[t_He] [t_has] minor bruising.\n"
-		else if(temp < 50)
-			msg += "[t_He] [t_has] <b>moderate</b> bruising!\n"
-		else
-			msg += "<B>[t_He] [t_has] severe bruising!</B>\n"
+	if(!(user == src && src.hal_screwyhud == SCREWYHUD_HEALTHY)) //fake healthy
+		if(temp)
+			if(temp < 25)
+				msg += "[t_He] [t_has] minor bruising.\n"
+			else if(temp < 50)
+				msg += "[t_He] [t_has] <b>moderate</b> bruising!\n"
+			else
+				msg += "<B>[t_He] [t_has] severe bruising!</B>\n"
 
-	temp = getFireLoss()
-	if(temp)
-		if(temp < 25)
-			msg += "[t_He] [t_has] minor burns.\n"
-		else if (temp < 50)
-			msg += "[t_He] [t_has] <b>moderate</b> burns!\n"
-		else
-			msg += "<B>[t_He] [t_has] severe burns!</B>\n"
+		temp = getFireLoss()
+		if(temp)
+			if(temp < 25)
+				msg += "[t_He] [t_has] minor burns.\n"
+			else if (temp < 50)
+				msg += "[t_He] [t_has] <b>moderate</b> burns!\n"
+			else
+				msg += "<B>[t_He] [t_has] severe burns!</B>\n"
 
-	temp = getCloneLoss()
-	if(temp)
-		if(temp < 25)
-			msg += "[t_He] [t_has] minor cellular damage.\n"
-		else if(temp < 50)
-			msg += "[t_He] [t_has] <b>moderate</b> cellular damage!\n"
-		else
-			msg += "<b>[t_He] [t_has] severe cellular damage!</b>\n"
+		temp = getCloneLoss()
+		if(temp)
+			if(temp < 25)
+				msg += "[t_He] [t_has] minor cellular damage.\n"
+			else if(temp < 50)
+				msg += "[t_He] [t_has] <b>moderate</b> cellular damage!\n"
+			else
+				msg += "<b>[t_He] [t_has] severe cellular damage!</b>\n"
 
 
 	if(fire_stacks > 0)

code/modules/mob/living/carbon/human/human_defense.dm

@@ -89,15 +89,15 @@
 
 	for(var/obj/item/I in held_items)
 		if(!istype(I, /obj/item/clothing))
-			var/final_block_chance = I.block_chance - (Clamp((armour_penetration-I.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
+			var/final_block_chance = I.block_chance - (CLAMP((armour_penetration-I.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example
 			if(I.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
 				return 1
 	if(wear_suit)
-		var/final_block_chance = wear_suit.block_chance - (Clamp((armour_penetration-wear_suit.armour_penetration)/2,0,100)) + block_chance_modifier
+		var/final_block_chance = wear_suit.block_chance - (CLAMP((armour_penetration-wear_suit.armour_penetration)/2,0,100)) + block_chance_modifier
 		if(wear_suit.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
 			return 1
 	if(w_uniform)
-		var/final_block_chance = w_uniform.block_chance - (Clamp((armour_penetration-w_uniform.armour_penetration)/2,0,100)) + block_chance_modifier
+		var/final_block_chance = w_uniform.block_chance - (CLAMP((armour_penetration-w_uniform.armour_penetration)/2,0,100)) + block_chance_modifier
 		if(w_uniform.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type))
 			return 1
 	return 0

code/modules/mob/living/carbon/human/species.dm

@@ -1315,11 +1315,14 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 
 
 /datum/species/proc/harm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
+	if(user.disabilities & PACIFISM)
+		to_chat(user, "<span class='warning'>You don't want to harm [target]!</span>")
+		return FALSE
 	if(target.check_block())
 		target.visible_message("<span class='warning'>[target] blocks [user]'s attack!</span>")
-		return 0
+		return FALSE
 	if(attacker_style && attacker_style.harm_act(user,target))
-		return 1
+		return TRUE
 	else
 
 		var/atk_verb = user.dna.species.attack_verb
@@ -1344,7 +1347,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			playsound(target.loc, user.dna.species.miss_sound, 25, 1, -1)
 			target.visible_message("<span class='danger'>[user] has attempted to [atk_verb] [target]!</span>",\
 			"<span class='userdanger'>[user] has attempted to [atk_verb] [target]!</span>", null, COMBAT_MESSAGE_RANGE)
-			return 0
+			return FALSE
 
 
 		var/armor_block = target.run_armor_check(affecting, "melee")
@@ -1366,8 +1369,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		else if(target.lying)
 			target.forcesay(GLOB.hit_appends)
 
-
-
 /datum/species/proc/disarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
 	var/aim_for_mouth  = user.zone_selected == "mouth"
 	var/target_on_help_and_unarmed = target.a_intent == INTENT_HELP && !target.get_active_held_item()
@@ -1387,10 +1388,12 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		return 1
 	else
 		user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
-
+		
 		if(target.w_uniform)
 			target.w_uniform.add_fingerprint(user)
-		var/obj/item/bodypart/affecting = target.get_bodypart(ran_zone(user.zone_selected))
+		var/randomized_zone = ran_zone(user.zone_selected)
+		target.SendSignal(COMSIG_HUMAN_DISARM_HIT, user, user.zone_selected)
+		var/obj/item/bodypart/affecting = target.get_bodypart(randomized_zone)
 		var/randn = rand(1, 100)
 		if(randn <= 25)
 			playsound(target, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
@@ -1511,8 +1514,11 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 						H.confused = max(H.confused, 20)
 						H.adjustBrainLoss(20)
 						H.adjust_blurriness(10)
-						if(prob(20))
+						if(prob(10))
 							H.gain_trauma(/datum/brain_trauma/mild/concussion)
+					else
+						if(!I.is_sharp())
+							H.adjustBrainLoss(I.force / 5)
 
 					if(prob(I.force + ((100 - H.health)/2)) && H != user)
 						var/datum/antagonist/rev/rev = H.mind.has_antag_datum(/datum/antagonist/rev)

code/modules/mob/living/carbon/human/species_types/golems.dm

@@ -369,7 +369,7 @@
 				var/new_y = P.starting.y + pick(0, 0, 0, 0, 0, -1, 1, -2, 2)
 				var/turf/target = get_turf(P.starting)
 				// redirect the projectile
-				P.preparePixelProjectile(locate(Clamp(target.x + new_x, 1, world.maxx), Clamp(target.y + new_y, 1, world.maxy), H.z), H)
+				P.preparePixelProjectile(locate(CLAMP(target.x + new_x, 1, world.maxx), CLAMP(target.y + new_y, 1, world.maxy), H.z), H)
 			return -1
 	return 0
 

code/modules/mob/living/carbon/human/species_types/humans.dm

@@ -19,6 +19,11 @@
 	if(H)
 		H.endTailWag()
 
+/datum/species/human/spec_stun(mob/living/carbon/human/H,amount)
+	if(H)
+		H.endTailWag()
+	. = ..()
+
 /datum/species/human/space_move(mob/living/carbon/human/H)
 	var/obj/item/device/flightpack/F = H.get_flightpack()
 	if(istype(F) && (F.flight) && F.allow_thrust(0.01, src))

code/modules/mob/living/carbon/human/species_types/lizardpeople.dm

@@ -42,6 +42,11 @@
 	if(H)
 		H.endTailWag()
 
+/datum/species/lizard/spec_stun(mob/living/carbon/human/H,amount)
+	if(H)
+		H.endTailWag()
+	. = ..()
+
 /*
  Lizard subspecies: ASHWALKERS
 */

code/modules/mob/living/carbon/human/species_types/vampire.dm

@@ -94,8 +94,8 @@
 			to_chat(victim, "<span class='danger'>[H] is draining your blood!</span>")
 			to_chat(H, "<span class='notice'>You drain some blood!</span>")
 			playsound(H, 'sound/items/drink.ogg', 30, 1, -2)
-			victim.blood_volume = Clamp(victim.blood_volume - drained_blood, 0, BLOOD_VOLUME_MAXIMUM)
-			H.blood_volume = Clamp(H.blood_volume + drained_blood, 0, BLOOD_VOLUME_MAXIMUM)
+			victim.blood_volume = CLAMP(victim.blood_volume - drained_blood, 0, BLOOD_VOLUME_MAXIMUM)
+			H.blood_volume = CLAMP(H.blood_volume + drained_blood, 0, BLOOD_VOLUME_MAXIMUM)
 			if(!victim.blood_volume)
 				to_chat(H, "<span class='warning'>You finish off [victim]'s blood supply!</span>")
 

code/modules/mob/living/carbon/life.dm

@@ -182,7 +182,7 @@
 	//TOXINS/PLASMA
 	if(Toxins_partialpressure > safe_tox_max)
 		var/ratio = (breath_gases[/datum/gas/plasma][MOLES]/safe_tox_max) * 10
-		adjustToxLoss(Clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
+		adjustToxLoss(CLAMP(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
 		throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
 	else
 		clear_alert("too_much_tox")

code/modules/mob/living/carbon/monkey/combat.dm

@@ -120,16 +120,19 @@
 /mob/living/carbon/monkey/proc/should_target(var/mob/living/L)
 
 	if(L == src)
-		return 0
+		return FALSE
+
+	if(disabilities & PACIFISM)
+		return FALSE
 
 	if(enemies[L])
-		return 1
+		return TRUE
 
 	// target non-monkey mobs when aggressive, with a small probability of monkey v monkey
 	if(aggressive && (!istype(L, /mob/living/carbon/monkey/) || prob(MONKEY_AGGRESSIVE_MVM_PROB)))
-		return 1
+		return TRUE
 
-	return 0
+	return FALSE
 
 /mob/living/carbon/monkey/proc/handle_combat()
 	// Don't do any AI if inside another mob (devoured)

code/modules/mob/living/carbon/status_procs.dm

@@ -59,10 +59,10 @@
 		clear_alert("high")
 
 /mob/living/carbon/adjust_disgust(amount)
-	disgust = Clamp(disgust+amount, 0, DISGUST_LEVEL_MAXEDOUT)
+	disgust = CLAMP(disgust+amount, 0, DISGUST_LEVEL_MAXEDOUT)
 
 /mob/living/carbon/set_disgust(amount)
-	disgust = Clamp(amount, 0, DISGUST_LEVEL_MAXEDOUT)
+	disgust = CLAMP(amount, 0, DISGUST_LEVEL_MAXEDOUT)
 
 /mob/living/carbon/cure_blind()
 	if(disabilities & BLIND)

code/modules/mob/living/damage_procs.dm

@@ -157,7 +157,7 @@
 /mob/living/proc/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE)
 	if(!forced && (status_flags & GODMODE))
 		return FALSE
-	bruteloss = Clamp((bruteloss + (amount * CONFIG_GET(number/damage_multiplier))), 0, maxHealth * 2)
+	bruteloss = CLAMP((bruteloss + (amount * CONFIG_GET(number/damage_multiplier))), 0, maxHealth * 2)
 	if(updating_health)
 		updatehealth()
 	return amount
@@ -168,7 +168,7 @@
 /mob/living/proc/adjustOxyLoss(amount, updating_health = TRUE, forced = FALSE)
 	if(!forced && (status_flags & GODMODE))
 		return FALSE
-	oxyloss = Clamp((oxyloss + (amount * CONFIG_GET(number/damage_multiplier))), 0, maxHealth * 2)
+	oxyloss = CLAMP((oxyloss + (amount * CONFIG_GET(number/damage_multiplier))), 0, maxHealth * 2)
 	if(updating_health)
 		updatehealth()
 	return amount
@@ -187,7 +187,7 @@
 /mob/living/proc/adjustToxLoss(amount, updating_health = TRUE, forced = FALSE)
 	if(!forced && (status_flags & GODMODE))
 		return FALSE
-	toxloss = Clamp((toxloss + (amount * CONFIG_GET(number/damage_multiplier))), 0, maxHealth * 2)
+	toxloss = CLAMP((toxloss + (amount * CONFIG_GET(number/damage_multiplier))), 0, maxHealth * 2)
 	if(updating_health)
 		updatehealth()
 	return amount
@@ -206,7 +206,7 @@
 /mob/living/proc/adjustFireLoss(amount, updating_health = TRUE, forced = FALSE)
 	if(!forced && (status_flags & GODMODE))
 		return FALSE
-	fireloss = Clamp((fireloss + (amount * CONFIG_GET(number/damage_multiplier))), 0, maxHealth * 2)
+	fireloss = CLAMP((fireloss + (amount * CONFIG_GET(number/damage_multiplier))), 0, maxHealth * 2)
 	if(updating_health)
 		updatehealth()
 	return amount
@@ -217,7 +217,7 @@
 /mob/living/proc/adjustCloneLoss(amount, updating_health = TRUE, forced = FALSE)
 	if(!forced && (status_flags & GODMODE))
 		return FALSE
-	cloneloss = Clamp((cloneloss + (amount * CONFIG_GET(number/damage_multiplier))), 0, maxHealth * 2)
+	cloneloss = CLAMP((cloneloss + (amount * CONFIG_GET(number/damage_multiplier))), 0, maxHealth * 2)
 	if(updating_health)
 		updatehealth()
 	return amount

code/modules/mob/living/life.dm

@@ -137,6 +137,9 @@
 		eye_blurry = max(eye_blurry-1, 0)
 		if(client && !eye_blurry)
 			clear_fullscreen("blurry")
+	if(disabilities & PACIFISM && a_intent == INTENT_HARM)
+		to_chat(src, "<span class='notice'>You don't feel like harming anybody.</span>")
+		a_intent_change(INTENT_HELP)
 
 /mob/living/proc/update_damage_hud()
 	return

code/modules/mob/living/living.dm

@@ -816,9 +816,12 @@
 		to_chat(src, "<span class='warning'>You don't have the dexterity to do this!</span>")
 	return
 /mob/living/proc/can_use_guns(obj/item/G)
-	if (G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser())
+	if(G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser())
 		to_chat(src, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return FALSE
+	if(disabilities & PACIFISM)
+		to_chat(src, "<span class='notice'>You don't want to risk harming anyone!</span>")
+		return FALSE
 	return TRUE
 
 /mob/living/carbon/proc/update_stamina()
@@ -925,7 +928,7 @@
 		update_fire()
 
 /mob/living/proc/adjust_fire_stacks(add_fire_stacks) //Adjusting the amount of fire_stacks we have on person
-	fire_stacks = Clamp(fire_stacks + add_fire_stacks, -20, 20)
+	fire_stacks = CLAMP(fire_stacks + add_fire_stacks, -20, 20)
 	if(on_fire && fire_stacks <= 0)
 		ExtinguishMob()
 

code/modules/mob/living/living_defense.dm

@@ -55,9 +55,9 @@
 
 /obj/item/proc/get_volume_by_throwforce_and_or_w_class()
 		if(throwforce && w_class)
-				return Clamp((throwforce + w_class) * 5, 30, 100)// Add the item's throwforce to its weight class and multiply by 5, then clamp the value between 30 and 100
+				return CLAMP((throwforce + w_class) * 5, 30, 100)// Add the item's throwforce to its weight class and multiply by 5, then clamp the value between 30 and 100
 		else if(w_class)
-				return Clamp(w_class * 8, 20, 100) // Multiply the item's weight class by 8, then clamp the value between 20 and 100
+				return CLAMP(w_class * 8, 20, 100) // Multiply the item's weight class by 8, then clamp the value between 20 and 100
 		else
 				return 0
 
@@ -127,14 +127,19 @@
 
 /mob/living/proc/grabbedby(mob/living/carbon/user, supress_message = 0)
 	if(user == src || anchored || !isturf(user.loc))
-		return 0
+		return FALSE
 	if(!user.pulling || user.pulling != src)
 		user.start_pulling(src, supress_message)
 		return
 
 	if(!(status_flags & CANPUSH))
 		to_chat(user, "<span class='warning'>[src] can't be grabbed more aggressively!</span>")
-		return 0
+		return FALSE
+
+	if(user.disabilities & PACIFISM)
+		to_chat(user, "<span class='notice'>You don't want to risk hurting [src]!</span>")
+		return FALSE
+
 	grippedby(user)
 
 //proc to upgrade a simple pull into a more aggressive grab.
@@ -188,83 +193,101 @@
 			M.Feedstop()
 		return // can't attack while eating!
 
+	if(disabilities & PACIFISM)
+		to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
+		return FALSE
+
 	if (stat != DEAD)
 		add_logs(M, src, "attacked")
 		M.do_attack_animation(src)
 		visible_message("<span class='danger'>The [M.name] glomps [src]!</span>", \
 				"<span class='userdanger'>The [M.name] glomps [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-		return 1
+		return TRUE
 
 /mob/living/attack_animal(mob/living/simple_animal/M)
 	M.face_atom(src)
 	if(M.melee_damage_upper == 0)
 		M.visible_message("<span class='notice'>\The [M] [M.friendly] [src]!</span>")
-		return 0
+		return FALSE
 	else
+		if(M.disabilities & PACIFISM)
+			to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
+			return FALSE
+
 		if(M.attack_sound)
 			playsound(loc, M.attack_sound, 50, 1, 1)
 		M.do_attack_animation(src)
 		visible_message("<span class='danger'>\The [M] [M.attacktext] [src]!</span>", \
 						"<span class='userdanger'>\The [M] [M.attacktext] [src]!</span>", null, COMBAT_MESSAGE_RANGE)
 		add_logs(M, src, "attacked")
-		return 1
+		return TRUE
 
 
 /mob/living/attack_paw(mob/living/carbon/monkey/M)
 	if(isturf(loc) && istype(loc.loc, /area/start))
 		to_chat(M, "No attacking people at spawn, you jackass.")
-		return 0
+		return FALSE
 
 	if (M.a_intent == INTENT_HARM)
+		if(M.disabilities & PACIFISM)
+			to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
+			return FALSE
+
 		if(M.is_muzzled() || (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSMOUTH))
 			to_chat(M, "<span class='warning'>You can't bite with your mouth covered!</span>")
-			return 0
+			return FALSE
 		M.do_attack_animation(src, ATTACK_EFFECT_BITE)
 		if (prob(75))
 			add_logs(M, src, "attacked")
 			playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
 			visible_message("<span class='danger'>[M.name] bites [src]!</span>", \
 					"<span class='userdanger'>[M.name] bites [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-			return 1
+			return TRUE
 		else
 			visible_message("<span class='danger'>[M.name] has attempted to bite [src]!</span>", \
 				"<span class='userdanger'>[M.name] has attempted to bite [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-	return 0
+	return FALSE
 
 /mob/living/attack_larva(mob/living/carbon/alien/larva/L)
 	switch(L.a_intent)
 		if("help")
 			visible_message("<span class='notice'>[L.name] rubs its head against [src].</span>")
-			return 0
+			return FALSE
 
 		else
+			if(L.disabilities & PACIFISM)
+				to_chat(L, "<span class='notice'>You don't want to hurt anyone!</span>")
+				return
+
 			L.do_attack_animation(src)
 			if(prob(90))
 				add_logs(L, src, "attacked")
 				visible_message("<span class='danger'>[L.name] bites [src]!</span>", \
 					"<span class='userdanger'>[L.name] bites [src]!</span>", null, COMBAT_MESSAGE_RANGE)
 				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
-				return 1
+				return TRUE
 			else
 				visible_message("<span class='danger'>[L.name] has attempted to bite [src]!</span>", \
 					"<span class='userdanger'>[L.name] has attempted to bite [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-	return 0
+	return FALSE
 
 /mob/living/attack_alien(mob/living/carbon/alien/humanoid/M)
 	switch(M.a_intent)
 		if ("help")
 			visible_message("<span class='notice'>[M] caresses [src] with its scythe like arm.</span>")
-			return 0
-
+			return FALSE
 		if ("grab")
 			grabbedby(M)
-			return 0
+			return FALSE
 		if("harm")
+			if(M.disabilities & PACIFISM)
+				to_chat(M, "<span class='notice'>You don't want to hurt anyone!</span>")
+				return FALSE
 			M.do_attack_animation(src)
-			return 1
+			return TRUE
 		if("disarm")
 			M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
-			return 1
+			return TRUE
 
 /mob/living/ex_act(severity, target, origin)
 	if(origin && istype(origin, /datum/spacevine_mutation) && isvineimmune(src))

code/modules/mob/living/silicon/pai/pai.dm

@@ -138,7 +138,7 @@
 /mob/living/silicon/pai/proc/process_hack()
 
 	if(cable && cable.machine && istype(cable.machine, /obj/machinery/door) && cable.machine == hackdoor && get_dist(src, hackdoor) <= 1)
-		hackprogress = Clamp(hackprogress + 4, 0, 100)
+		hackprogress = CLAMP(hackprogress + 4, 0, 100)
 	else
 		temp = "Door Jack: Connection to airlock has been lost. Hack aborted."
 		hackprogress = 0
@@ -283,8 +283,8 @@
 
 
 /mob/living/silicon/pai/process()
-	emitterhealth = Clamp((emitterhealth + emitterregen), -50, emittermaxhealth)
-	hit_slowdown = Clamp((hit_slowdown - 1), 0, 100)
+	emitterhealth = CLAMP((emitterhealth + emitterregen), -50, emittermaxhealth)
+	hit_slowdown = CLAMP((hit_slowdown - 1), 0, 100)
 
 /mob/living/silicon/pai/generateStaticOverlay()
 	return

code/modules/mob/living/silicon/pai/pai_defense.dm

@@ -57,7 +57,7 @@
 	return FALSE //No we're not flammable
 
 /mob/living/silicon/pai/proc/take_holo_damage(amount)
-	emitterhealth = Clamp((emitterhealth - amount), -50, emittermaxhealth)
+	emitterhealth = CLAMP((emitterhealth - amount), -50, emittermaxhealth)
 	if(emitterhealth < 0)
 		fold_in(force = TRUE)
 	to_chat(src, "<span class='userdanger'>The impact degrades your holochassis!</span>")

code/modules/mob/living/silicon/robot/life.dm

@@ -23,7 +23,7 @@
 	if(cell && cell.charge)
 		if(cell.charge <= 100)
 			uneq_all()
-		var/amt = Clamp((lamp_intensity - 2) * 2,1,cell.charge) //Always try to use at least one charge per tick, but allow it to completely drain the cell.
+		var/amt = CLAMP((lamp_intensity - 2) * 2,1,cell.charge) //Always try to use at least one charge per tick, but allow it to completely drain the cell.
 		cell.use(amt) //Usage table: 1/tick if off/lowest setting, 4 = 4/tick, 6 = 8/tick, 8 = 12/tick, 10 = 16/tick
 	else
 		uneq_all()
@@ -50,6 +50,7 @@
 			if(!mind.special_role)
 				mind.special_role = "traitor"
 				SSticker.mode.traitors += mind
+				mind.add_antag_datum(/datum/antagonist/auto_custom) // ????
 
 
 /mob/living/silicon/robot/update_health_hud()