Merge branch 'master' into Pizza

code/modules/VR/vr_human.dm

@@ -35,6 +35,7 @@
 
 /mob/living/carbon/human/virtual_reality/proc/revert_to_reality(deathchecks = TRUE)
 	if(real_mind && mind)
+		real_mind.current.audiovisual_redirect = null
 		real_mind.current.ckey = ckey
 		real_mind.current.stop_sound_channel(CHANNEL_HEARTBEAT)
 		if(deathchecks && vr_sleeper)

code/modules/VR/vr_sleeper.dm

@@ -93,6 +93,7 @@
 				to_chat(occupant, "<span class='warning'>Transferring to virtual reality...</span>")
 				if(vr_human && vr_human.stat == CONSCIOUS && !vr_human.real_mind)
 					SStgui.close_user_uis(occupant, src)
+					human_occupant.audiovisual_redirect = vr_human
 					vr_human.real_mind = human_occupant.mind
 					vr_human.ckey = human_occupant.ckey
 					to_chat(vr_human, "<span class='notice'>Transfer successful! You are now playing as [vr_human] in VR!</span>")
@@ -166,11 +167,13 @@
 		vr_human.undershirt = H.undershirt
 		vr_human.underwear = H.underwear
 		vr_human.updateappearance(TRUE, TRUE, TRUE)
+		vr_human.give_genitals(TRUE) //CITADEL ADD
 		if(outfit)
 			var/datum/outfit/O = new outfit()
 			O.equip(vr_human)
 		if(transfer && H.mind)
 			SStgui.close_user_uis(H, src)
+			H.audiovisual_redirect = vr_human
 			vr_human.ckey = H.ckey
 
 /obj/machinery/vr_sleeper/proc/cleanup_vr_human()
@@ -227,4 +230,4 @@
 		for (var/mob/living/carbon/human/virtual_reality/H in vr_area)
 			if (H.stat == DEAD && !H.vr_sleeper && !H.real_mind)
 				qdel(H)
-		addtimer(CALLBACK(src, .proc/clean_up), 3 MINUTES)
+		addtimer(CALLBACK(src, .proc/clean_up), 3 MINUTES)

code/modules/admin/admin.dm

@@ -605,6 +605,24 @@
 	world.update_status()
 	SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle AI", "[!alai ? "Disabled" : "Enabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/datum/admins/proc/toggleMulticam()
+	set category = "Server"
+	set desc="Turns mutlicam on and off."
+	set name="Toggle Multicam"
+	var/almcam = CONFIG_GET(flag/allow_ai_multicam)
+	CONFIG_SET(flag/allow_ai_multicam, !almcam)
+	if (almcam)
+		to_chat(world, "<B>The AI no longer has multicam.</B>")
+		for(var/i in GLOB.ai_list)
+			var/mob/living/silicon/ai/aiPlayer = i
+			if(aiPlayer.multicam_on)
+				aiPlayer.end_multicam()
+	else
+		to_chat(world, "<B>The AI now has multicam.</B>")
+	log_admin("[key_name(usr)] toggled AI multicam.")
+	world.update_status()
+	SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Multicam", "[!almcam ? "Disabled" : "Enabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /datum/admins/proc/toggleaban()
 	set category = "Server"
 	set desc="Respawn basically"

code/modules/admin/admin_verbs.dm

@@ -70,6 +70,8 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
 	/client/proc/cmd_admin_pm_context,	/*right-click adminPM interface*/
 	/client/proc/cmd_admin_pm_panel,		/*admin-pm list*/
 	/client/proc/panicbunker,
+	/client/proc/addbunkerbypass,
+	/client/proc/revokebunkerbypass,
 	/client/proc/stop_sounds,
 	/client/proc/hide_verbs,			/*hides all our adminverbs*/
 	/client/proc/hide_most_verbs,		/*hides all our hideable adminverbs*/
@@ -118,6 +120,7 @@ GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer())
 	/datum/admins/proc/toggleaban,
 	/client/proc/everyone_random,
 	/datum/admins/proc/toggleAI,
+	/datum/admins/proc/toggleMulticam,
 	/client/proc/cmd_admin_delete,		/*delete an instance/object/mob/etc*/
 	/client/proc/cmd_debug_del_all,
 	/client/proc/toggle_random_events,
@@ -232,6 +235,8 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	/proc/release,
 	/client/proc/reload_admins,
 	/client/proc/panicbunker,
+	/client/proc/addbunkerbypass,
+	/client/proc/revokebunkerbypass,
 	/client/proc/admin_change_sec_level,
 	/client/proc/toggle_nuke,
 	/client/proc/cmd_display_del_log,

code/modules/admin/chat_commands.dm

@@ -102,6 +102,15 @@ GLOBAL_LIST(round_end_notifiees)
 		return "Query produced no output"
 	var/list/text_res = results.Copy(1, 3)
 	var/list/refs = results.len > 3 ? results.Copy(4) : null
+	if(refs)
+		var/list/L = list()
+		for(var/ref in refs)
+			var/atom/A = locate(ref)
+			if(A)
+				L += "[A]"
+			else
+				L += "[ref]"
+		refs = L
 	. = "[text_res.Join("\n")][refs ? "\nRefs: [refs.Join(" ")]" : ""]"
 
 /datum/tgs_chat_command/reload_admins

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

@@ -7,36 +7,34 @@
 //
 //	query				:	select_query | delete_query | update_query | call_query | explain
 //	explain				:	'EXPLAIN' query
+//	select_query		:	'SELECT' object_selectors
+//	delete_query		:	'DELETE' object_selectors
+//	update_query		:	'UPDATE' object_selectors 'SET' assignments
+//	call_query			:	'CALL' variable 'ON' object_selectors // Note here: 'variable' does function calls. This simplifies parsing.
 //
-//	select_query		:	'SELECT' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
-//	delete_query		:	'DELETE' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
-//	update_query		:	'UPDATE' select_list [('FROM' | 'IN') from_list] 'SET' assignments ['WHERE' bool_expression]
-//	call_query			:	'CALL' call_function ['ON' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]]
+//	select_item			:	'*' | object_type
 //
-//	select_list			:	select_item [',' select_list]
-//	select_item			:	'*' | select_function | object_type
-//	select_function		:	count_function
-//	count_function		:	'COUNT' '(' '*' ')' | 'COUNT' '(' object_types ')'
+//  object_selectors    :   select_item [('FROM' | 'IN') from_item] [modifier_list]
+//  modifier_list       :   ('WHERE' bool_expression | 'MAP' expression) [modifier_list]
 //
-//	from_list			:	from_item [',' from_list]
-//	from_item			:	'world' | object_type
+//	from_item			:	'world' | expression
 //
-//	call_function		:	<function name> ['(' [arguments] ')']
+//	call_function		:	<function name> '(' [arguments] ')'
 //	arguments			:	expression [',' arguments]
 //
-//	object_type			:	<type path> | string
+//	object_type			:	<type path>
 //
-//	assignments			:	assignment, [',' assignments]
+//	assignments			:	assignment [',' assignments]
 //	assignment			:	<variable name> '=' expression
-//	variable			:	<variable name> | <variable name> '.' variable
+//	variable			:	<variable name> | <variable name> '.' variable | '[' <hex number> ']' | '[' <hex number> ']' '.' variable
 //
 //	bool_expression		:	expression comparitor expression  [bool_operator bool_expression]
 //	expression			:	( unary_expression | '(' expression ')' | value ) [binary_operator expression]
 //	unary_expression	:	unary_operator ( unary_expression | value | '(' expression ')' )
 //	comparitor			:	'=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>='
-//	value				:	variable | string | number | 'null'
+//	value				:	variable | string | number | 'null' | object_type
 //	unary_operator		:	'!' | '-' | '~'
-//	binary_operator		:	comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^'
+//	binary_operator		:	comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%'
 //	bool_operator		:	'AND' | '&&' | 'OR' | '||'
 //
 //	string				:	''' <some text> ''' | '"' <some text > '"'
@@ -51,10 +49,9 @@
 	var/list/query
 	var/list/tree
 
-	var/list/select_functions = list("count")
 	var/list/boolean_operators = list("and", "or", "&&", "||")
 	var/list/unary_operators = list("!", "-", "~")
-	var/list/binary_operators = list("+", "-", "/", "*", "&", "|", "^")
+	var/list/binary_operators = list("+", "-", "/", "*", "&", "|", "^", "%")
 	var/list/comparitors = list("=", "==", "!=", "<>", "<", "<=", ">", ">=")
 
 /datum/SDQL_parser/New(query_list)
@@ -62,12 +59,12 @@
 
 /datum/SDQL_parser/proc/parse_error(error_message)
 	error = 1
-	to_chat(usr, "<span class='danger'>SQDL2 Parsing Error: [error_message]</span>")
+	to_chat(usr, "<span class='warning'>SQDL2 Parsing Error: [error_message]</span>")
 	return query.len + 1
 
 /datum/SDQL_parser/proc/parse()
 	tree = list()
-	query(1, tree)
+	query_options(1, tree)
 
 	if(error)
 		return list()
@@ -91,354 +88,547 @@
 /datum/SDQL_parser/proc/tokenl(i)
 	return lowertext(token(i))
 
+/datum/SDQL_parser/proc/query_options(i, list/node)
+	var/list/options = list()
+	if(tokenl(i) == "using")
+		i = option_assignments(i + 1, node, options)
+	query(i, node)
+	if(length(options))
+		node["options"] = options
+
+//option_assignment:	query_option '=' define
+/datum/SDQL_parser/proc/option_assignment(i, list/node, list/assignment_list = list())
+	var/type = tokenl(i)
+	if(!(type in SDQL2_VALID_OPTION_TYPES))
+		parse_error("Invalid option type: [type]")
+	if(!(token(i + 1) == "="))
+		parse_error("Invalid option assignment symbol: [token(i + 1)]")
+	var/val = tokenl(i + 2)
+	if(!(val in SDQL2_VALID_OPTION_VALUES))
+		parse_error("Invalid optoin value: [val]")
+	assignment_list[type] = val
+	return (i + 3)
+
+//option_assignments: option_assignment, [',' option_assignments]
+/datum/SDQL_parser/proc/option_assignments(i, list/node, list/store)
+	i = option_assignment(i, node, store)
+
+	if(token(i) == ",")
+		i = option_assignments(i + 1, node, store)
+
+	return i
 
 //query:	select_query | delete_query | update_query
 /datum/SDQL_parser/proc/query(i, list/node)
 	query_type = tokenl(i)
+
 	switch(query_type)
 		if("select")
 			select_query(i, node)
+
 		if("delete")
 			delete_query(i, node)
+
 		if("update")
 			update_query(i, node)
+
 		if("call")
 			call_query(i, node)
+
 		if("explain")
 			node += "explain"
 			node["explain"] = list()
 			query(i + 1, node["explain"])
 
 
-//	select_query:	'SELECT' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
+//	select_query:	'SELECT' object_selectors
 /datum/SDQL_parser/proc/select_query(i, list/node)
 	var/list/select = list()
-	i = select_list(i + 1, select)
-	node += "select"
+	i = object_selectors(i + 1, select)
+
 	node["select"] = select
-	selectors(i, node)
 	return i
 
-//delete_query:	'DELETE' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
+
+//delete_query:	'DELETE' object_selectors
 /datum/SDQL_parser/proc/delete_query(i, list/node)
 	var/list/select = list()
-	i = select_list(i + 1, select)
-	node += "delete"
+	i = object_selectors(i + 1, select)
+
 	node["delete"] = select
-	selectors(i, node)
+
 	return i
 
-//update_query:	'UPDATE' select_list [('FROM' | 'IN') from_list] 'SET' assignments ['WHERE' bool_expression]
+
+//update_query:	'UPDATE' object_selectors 'SET' assignments
 /datum/SDQL_parser/proc/update_query(i, list/node)
 	var/list/select = list()
-	i = select_list(i + 1, select)
-	node += "update"
+	i = object_selectors(i + 1, select)
+
 	node["update"] = select
+
 	if(tokenl(i) != "set")
 		i = parse_error("UPDATE has misplaced SET")
+
 	var/list/set_assignments = list()
 	i = assignments(i + 1, set_assignments)
-	node += "set"
+
 	node["set"] = set_assignments
-	selectors(i, node)
+
 	return i
 
-//call_query:	'CALL' call_function ['ON' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]]
+
+//call_query:	'CALL' call_function ['ON' object_selectors]
 /datum/SDQL_parser/proc/call_query(i, list/node)
 	var/list/func = list()
 	i = variable(i + 1, func) // Yes technically does anything variable() matches but I don't care, if admins fuck up this badly then they shouldn't be allowed near SDQL.
-	node += "call"
+
 	node["call"] = func
+
 	if(tokenl(i) != "on")
-		return i
+		return parse_error("You need to specify what to call ON.")
+
 	var/list/select = list()
-	i = select_list(i + 1, select)
-	node += "on"
+	i = object_selectors(i + 1, select)
+
 	node["on"] = select
-	selectors(i, node)
+
 	return i
 
-//select_list:	select_item [',' select_list]
+// object_selectors: select_item [('FROM' | 'IN') from_item] [modifier_list]
+/datum/SDQL_parser/proc/object_selectors(i, list/node)
+	i = select_item(i, node)
+
+	if (tokenl(i) == "from" || tokenl(i) == "in")
+		i++
+		var/list/from = list()
+		i = from_item(i, from)
+		node[++node.len] = from
+
+	else
+		node[++node.len] = list("world")
+
+	i = modifier_list(i, node)
+	return i
+
+// modifier_list: ('WHERE' bool_expression | 'MAP' expression) [modifier_list]
+/datum/SDQL_parser/proc/modifier_list(i, list/node)
+	while (TRUE)
+		if (tokenl(i) == "where")
+			i++
+			node += "where"
+			var/list/expr = list()
+			i = bool_expression(i, expr)
+			node[++node.len] = expr
+
+		else if (tokenl(i) == "map")
+			i++
+			node += "map"
+			var/list/expr = list()
+			i = expression(i, expr)
+			node[++node.len] = expr
+
+		else
+			return i
+
+//select_list:select_item [',' select_list]
 /datum/SDQL_parser/proc/select_list(i, list/node)
 	i = select_item(i, node)
+
 	if(token(i) == ",")
 		i = select_list(i + 1, node)
+
 	return i
 
 //assignments:	assignment, [',' assignments]
 /datum/SDQL_parser/proc/assignments(i, list/node)
 	i = assignment(i, node)
+
 	if(token(i) == ",")
 		i = assignments(i + 1, node)
+
 	return i
 
+
 //select_item:	'*' | select_function | object_type
 /datum/SDQL_parser/proc/select_item(i, list/node)
-	if(token(i) == "*")
+	if (token(i) == "*")
 		node += "*"
 		i++
-	else if(tokenl(i) in select_functions)
-		i = select_function(i, node)
-	else
+
+	else if (copytext(token(i), 1, 2) == "/")
 		i = object_type(i, node)
+
+	else
+		i = parse_error("Expected '*' or type path for select item")
+
 	return i
 
 // Standardized method for handling the IN/FROM and WHERE options.
 /datum/SDQL_parser/proc/selectors(i, list/node)
 	while (token(i))
 		var/tok = tokenl(i)
-		if(tok in list("from", "in"))
+		if (tok in list("from", "in"))
 			var/list/from = list()
 			i = from_item(i + 1, from)
+
 			node["from"] = from
 			continue
-		if(tok == "where")
+
+		if (tok == "where")
 			var/list/where = list()
 			i = bool_expression(i + 1, where)
+
 			node["where"] = where
 			continue
+
 		parse_error("Expected either FROM, IN or WHERE token, found [token(i)] instead.")
 		return i + 1
-	if(!node.Find("from"))
+
+	if (!node.Find("from"))
 		node["from"] = list("world")
+
 	return i
 
-//from_item:	'world' | object_type
+//from_item:	'world' | expression
 /datum/SDQL_parser/proc/from_item(i, list/node)
 	if(token(i) == "world")
 		node += "world"
 		i++
+
 	else
 		i = expression(i, node)
+
 	return i
 
+
 //bool_expression:	expression [bool_operator bool_expression]
 /datum/SDQL_parser/proc/bool_expression(i, list/node)
+
 	var/list/bool = list()
 	i = expression(i, bool)
+
 	node[++node.len] = bool
+
 	if(tokenl(i) in boolean_operators)
 		i = bool_operator(i, node)
 		i = bool_expression(i, node)
+
 	return i
 
+
 //assignment:	<variable name> '=' expression
 /datum/SDQL_parser/proc/assignment(var/i, var/list/node, var/list/assignment_list = list())
 	assignment_list += token(i)
+
 	if(token(i + 1) == ".")
 		i = assignment(i + 2, node, assignment_list)
+
 	else if(token(i + 1) == "=")
 		var/exp_list = list()
 		node[assignment_list] = exp_list
+
 		i = expression(i + 2, exp_list)
+
 	else
 		parse_error("Assignment expected, but no = found")
+
 	return i
 
-//variable:	<variable name> | <variable name> '.' variable
+
+//variable:	<variable name> | <variable name> '.' variable | '[' <hex number> ']' | '[' <hex number> ']' '.' variable
 /datum/SDQL_parser/proc/variable(i, list/node)
 	var/list/L = list(token(i))
 	node[++node.len] = L
+
 	if(token(i) == "{")
-		L += token(i+1)
+		L += token(i + 1)
 		i += 2
+
 		if(token(i) != "}")
 			parse_error("Missing } at end of pointer.")
+
 	if(token(i + 1) == ".")
 		L += "."
 		i = variable(i + 2, L)
-	else if(token(i + 1) == "(") // OH BOY PROC
+
+	else if (token(i + 1) == "(") // OH BOY PROC
 		var/list/arguments = list()
 		i = call_function(i, null, arguments)
 		L += ":"
 		L[++L.len] = arguments
-	else if(token(i + 1) == "\[")
+
+	else if (token(i + 1) == "\[")
 		var/list/expression = list()
 		i = expression(i + 2, expression)
 		if (token(i) != "]")
 			parse_error("Missing ] at the end of list access.")
+
 		L += "\["
 		L[++L.len] = expression
 		i++
+
 	else
 		i++
+
 	return i
 
+
+//object_type:	<type path>
+/datum/SDQL_parser/proc/object_type(i, list/node)
+
+	if (copytext(token(i), 1, 2) != "/")
+		return parse_error("Expected type, but it didn't begin with /")
+
+	var/path = text2path(token(i))
+	if (path == null)
+		return parse_error("Nonexistant type path: [token(i)]")
+
+	node += path
+
+	return i + 1
+
+
+//comparitor:	'=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>='
+/datum/SDQL_parser/proc/comparitor(i, list/node)
+
+	if(token(i) in list("=", "==", "!=", "<>", "<", "<=", ">", ">="))
+		node += token(i)
+
+	else
+		parse_error("Unknown comparitor [token(i)]")
+
+	return i + 1
+
+
+//bool_operator:	'AND' | '&&' | 'OR' | '||'
+/datum/SDQL_parser/proc/bool_operator(i, list/node)
+
+	if(tokenl(i) in list("and", "or", "&&", "||"))
+		node += token(i)
+
+	else
+		parse_error("Unknown comparitor [token(i)]")
+
+	return i + 1
+
+
+//string:	''' <some text> ''' | '"' <some text > '"'
+/datum/SDQL_parser/proc/string(i, list/node)
+
+	if(copytext(token(i), 1, 2) in list("'", "\""))
+		node += token(i)
+
+	else
+		parse_error("Expected string but found '[token(i)]'")
+
+	return i + 1
+
 //array:	'[' expression, expression, ... ']'
-/datum/SDQL_parser/proc/array(i, list/node)
+/datum/SDQL_parser/proc/array(var/i, var/list/node)
+	// Arrays get turned into this: list("[", list(exp_1a = exp_1b, ...), ...), "[" is to mark the next node as an array.
 	if(copytext(token(i), 1, 2) != "\[")
 		parse_error("Expected an array but found '[token(i)]'")
 		return i + 1
-	node += token(i)
+
+	node += token(i) // Add the "["
+
 	var/list/expression_list = list()
+
 	i++
 	if(token(i) != "]")
 		var/list/temp_expression_list = list()
 		var/tok
 		do
 			tok = token(i)
-			if(tok == "," || tok == ":")
-				if(temp_expression_list == null)
+			if (tok == "," || tok == ":")
+				if (temp_expression_list == null)
 					parse_error("Found ',' or ':' without expression in an array.")
 					return i + 1
+
 				expression_list[++expression_list.len] = temp_expression_list
 				temp_expression_list = null
-				if(tok == ":")
+				if (tok == ":")
 					temp_expression_list = list()
 					i = expression(i + 1, temp_expression_list)
 					expression_list[expression_list[expression_list.len]] = temp_expression_list
 					temp_expression_list = null
 					tok = token(i)
-					if(tok != ",")
-						if(tok == "]")
+					if (tok != ",")
+						if (tok == "]")
 							break
+
 						parse_error("Expected ',' or ']' after array assoc value, but found '[token(i)]'")
 						return i
+
+
 				i++
 				continue
+
 			temp_expression_list = list()
 			i = expression(i, temp_expression_list)
+
+			// Ok, what the fuck BYOND?
+			// Not having these lines here causes the parser to die
+			// on an error saying that list/token() doesn't exist as a proc.
+			// These lines prevent that.
+			// I assume the compiler/VM is shitting itself and swapping out some variables internally?
+			// While throwing in debug logging it disappeared
+			// And these 3 lines prevent it from happening while being quiet.
+			// So.. it works.
+			// Don't touch it.
+			var/whatthefuck = i
+			whatthefuck = src.type
+			whatthefuck = whatthefuck
+
 		while(token(i) && token(i) != "]")
-		if(temp_expression_list)
+
+		if (temp_expression_list)
 			expression_list[++expression_list.len] = temp_expression_list
+
 	node[++node.len] = expression_list
-	return i + 1
 
-//object_type:	<type path> | string
-/datum/SDQL_parser/proc/object_type(i, list/node)
-	if(copytext(token(i), 1, 2) == "/")
-		node += token(i)
-	else
-		i = string(i, node)
-	return i + 1
-
-//comparitor:	'=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>='
-/datum/SDQL_parser/proc/comparitor(i, list/node)
-	if(token(i) in list("=", "==", "!=", "<>", "<", "<=", ">", ">="))
-		node += token(i)
-	else
-		parse_error("Unknown comparitor [token(i)]")
-	return i + 1
-
-//bool_operator:	'AND' | '&&' | 'OR' | '||'
-/datum/SDQL_parser/proc/bool_operator(i, list/node)
-	if(tokenl(i) in list("and", "or", "&&", "||"))
-		node += token(i)
-	else
-		parse_error("Unknown comparitor [token(i)]")
-	return i + 1
-
-//string:	''' <some text> ''' | '"' <some text > '"'
-/datum/SDQL_parser/proc/string(i, list/node)
-	if(copytext(token(i), 1, 2) in list("'", "\""))
-		node += token(i)
-	else
-		parse_error("Expected string but found '[token(i)]'")
 	return i + 1
 
 //call_function:	<function name> ['(' [arguments] ')']
 /datum/SDQL_parser/proc/call_function(i, list/node, list/arguments)
 	if(length(tokenl(i)))
 		var/procname = ""
-		if(token(i) == "global" && token(i+1) == ".")
+		if(tokenl(i) == "global" && token(i + 1) == ".") // Global proc.
 			i += 2
 			procname = "global."
 		node += procname + token(i++)
 		if(token(i) != "(")
 			parse_error("Expected ( but found '[token(i)]'")
+
 		else if(token(i + 1) != ")")
-			var/list/expression_list_temp = list()
+			var/list/temp_expression_list = list()
 			do
-				i = expression(i + 1, expression_list_temp)
+				i = expression(i + 1, temp_expression_list)
 				if(token(i) == ",")
-					arguments[++arguments.len] = expression_list_temp
-					expression_list_temp = list()
+					arguments[++arguments.len] = temp_expression_list
+					temp_expression_list = list()
 					continue
+
 			while(token(i) && token(i) != ")")
-			arguments[++arguments.len] = expression_list_temp
+
+			arguments[++arguments.len] = temp_expression_list // The code this is copy pasted from won't be executed when it's the last param, this fixes that.
 		else
 			i++
 	else
 		parse_error("Expected a function but found nothing")
 	return i + 1
 
-//select_function:	count_function
-/datum/SDQL_parser/proc/select_function(i, list/node)
-	parse_error("Sorry, function calls aren't available yet")
-	return i
 
 //expression:	( unary_expression | '(' expression ')' | value ) [binary_operator expression]
 /datum/SDQL_parser/proc/expression(i, list/node)
+
 	if(token(i) in unary_operators)
 		i = unary_expression(i, node)
+
 	else if(token(i) == "(")
 		var/list/expr = list()
+
 		i = expression(i + 1, expr)
+
 		if(token(i) != ")")
 			parse_error("Missing ) at end of expression.")
+
 		else
 			i++
+
 		node[++node.len] = expr
+
 	else
 		i = value(i, node)
+
 	if(token(i) in binary_operators)
 		i = binary_operator(i, node)
 		i = expression(i, node)
+
 	else if(token(i) in comparitors)
 		i = binary_operator(i, node)
+
 		var/list/rhs = list()
 		i = expression(i, rhs)
+
 		node[++node.len] = rhs
+
+
 	return i
 
+
 //unary_expression:	unary_operator ( unary_expression | value | '(' expression ')' )
 /datum/SDQL_parser/proc/unary_expression(i, list/node)
+
 	if(token(i) in unary_operators)
 		var/list/unary_exp = list()
+
 		unary_exp += token(i)
 		i++
+
 		if(token(i) in unary_operators)
 			i = unary_expression(i, unary_exp)
+
 		else if(token(i) == "(")
 			var/list/expr = list()
+
 			i = expression(i + 1, expr)
+
 			if(token(i) != ")")
 				parse_error("Missing ) at end of expression.")
+
 			else
 				i++
+
 			unary_exp[++unary_exp.len] = expr
+
 		else
 			i = value(i, unary_exp)
+
 		node[++node.len] = unary_exp
+
+
 	else
 		parse_error("Expected unary operator but found '[token(i)]'")
+
 	return i
 
-//binary_operator:	comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^'
+
+//binary_operator:	comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%'
 /datum/SDQL_parser/proc/binary_operator(i, list/node)
+
 	if(token(i) in (binary_operators + comparitors))
 		node += token(i)
+
 	else
 		parse_error("Unknown binary operator [token(i)]")
+
 	return i + 1
 
-//value:	variable | string | number | 'null'
+
+//value:	variable | string | number | 'null' | object_type
 /datum/SDQL_parser/proc/value(i, list/node)
 	if(token(i) == "null")
 		node += "null"
 		i++
-	else if(lowertext(copytext(token(i),1,3)) == "0x" && isnum(hex2num(copytext(token(i),3))))
-		node += hex2num(copytext(token(i),3))
+
+	else if(lowertext(copytext(token(i), 1, 3)) == "0x" && isnum(hex2num(copytext(token(i), 3))))
+		node += hex2num(copytext(token(i), 3))
 		i++
+
 	else if(isnum(text2num(token(i))))
 		node += text2num(token(i))
 		i++
+
 	else if(copytext(token(i), 1, 2) in list("'", "\""))
 		i = string(i, node)
+
 	else if(copytext(token(i), 1, 2) == "\[") // Start a list.
 		i = array(i, node)
+	else if(copytext(token(i), 1, 2) == "/")
+		i = object_type(i, node)
 	else
 		i = variable(i, node)
-	return i
 
-/*EXPLAIN SELECT * WHERE 42 = 6 * 9 OR val = - 5 == 7*/
+	return i

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

@@ -48,6 +48,12 @@
 /proc/_image(icon, loc, icon_state, layer, dir)
 	return image(icon, loc, icon_state, layer, dir)
 
+/proc/_istype(object, type)
+	return istype(object, type)
+
+/proc/_ispath(path, type)
+	return ispath(path, type)
+
 /proc/_length(E)
 	return length(E)
 
@@ -178,6 +184,9 @@
 /proc/_list_swap(list/L, Index1, Index2)
 	L.Swap(Index1, Index2)
 
+/proc/_list_get(list/L, index)
+	return L[index]
+
 /proc/_walk(ref, dir, lag)
 	walk(ref, dir, lag)
 
@@ -208,4 +217,3 @@
 /proc/_step_away(ref, trg, max)
 	step_away(ref, trg, max)
 
-

code/modules/admin/verbs/panicbunker.dm

@@ -13,3 +13,28 @@
 	if (new_pb && !SSdbcore.Connect())
 		message_admins("The Database is not connected! Panic bunker will not work until the connection is reestablished.")
 	SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Panic Bunker", "[new_pb ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/proc/addbunkerbypass(ckeytobypass as text)
+	set category = "Special Verbs"
+	set name = "Add PB Bypass"
+	set desc = "Allows a given ckey to connect despite the panic bunker for a given round."
+	if(!CONFIG_GET(flag/sql_enabled))
+		to_chat(usr, "<span class='adminnotice'>The Database is not enabled!</span>")
+		return
+
+	GLOB.bunker_passthrough |= ckey(ckeytobypass)
+	log_admin("[key_name(usr)] has added [ckeytobypass] to the current round's bunker bypass list.")
+	message_admins("[key_name(usr)] has added [ckeytobypass] to the current round's bunker bypass list.")
+
+/client/proc/revokebunkerbypass(ckeytobypass as text)
+	set category = "Special Verbs"
+	set name = "Revoke PB Bypass"
+	set desc = "Revoke's a ckey's permission to bypass the panic bunker for a given round."
+	if(!CONFIG_GET(flag/sql_enabled))
+		to_chat(usr, "<span class='adminnotice'>The Database is not enabled!</span>")
+		return
+
+	GLOB.bunker_passthrough -= ckey(ckeytobypass)
+	log_admin("[key_name(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")
+	message_admins("[key_name(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")
+

code/modules/admin/verbs/playsound.dm

@@ -4,10 +4,12 @@
 	if(!check_rights(R_SOUNDS))
 		return
 
-	var/freq = 1
 	var/vol = input(usr, "What volume would you like the sound to play at?",, 100) as null|num
 	if(!vol)
 		return
+	var/freq = input(usr, "What frequency would you like the sound to play at?",, 1) as null|num
+	if(!freq)
+		freq = 1
 	vol = CLAMP(vol, 1, 100)
 
 	var/sound/admin_sound = new()
@@ -96,13 +98,17 @@
 					if (data["webpage_url"])
 						webpage_url = "<a href=\"[data["webpage_url"]]\">[title]</a>"
 
+					var/freq = input(usr, "What frequency would you like the sound to play at?",, 1) as null|num
+					if(!freq)
+						freq = 1
+					pitch = freq
+
 					var/res = alert(usr, "Show the title of and link to this song to the players?\n[title]",, "No", "Yes", "Cancel")
 					switch(res)
 						if("Yes")
 							to_chat(world, "<span class='boldannounce'>An admin played: [webpage_url]</span>")
 						if("Cancel")
 							return
-
 					SSblackbox.record_feedback("nested tally", "played_url", 1, list("[ckey]", "[web_sound_input]"))
 					log_admin("[key_name(src)] played web sound: [web_sound_input]")
 					message_admins("[key_name(src)] played web sound: [web_sound_input]")

code/modules/admin/verbs/randomverbs.dm

@@ -845,7 +845,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(!check_rights(R_ADMIN))
 		return
 
-	var/level = input("Select security level to change to","Set Security Level") as null|anything in list("green","blue","red","delta")
+	var/level = input("Select security level to change to","Set Security Level") as null|anything in list("green","blue","amber","red","delta")
 	if(level)
 		set_security_level(level)
 

code/modules/antagonists/changeling/changeling.dm

@@ -34,6 +34,8 @@
 	var/mimicing = ""
 	var/canrespec = 0
 	var/changeling_speak = 0
+	var/loudfactor = 0 //Used for blood tests. At 4, blood tests will succeed. At 10, blood tests will result in an explosion.
+	var/bloodtestwarnings = 0 //Used to track if the ling has been notified that they will pass blood tests.
 	var/datum/dna/chosen_dna
 	var/obj/effect/proc_holder/changeling/sting/chosen_sting
 	var/datum/cellular_emporium/cellular_emporium
@@ -71,8 +73,6 @@
 	reset_powers()
 	create_initial_profile()
 	if(give_objectives)
-		if(team_mode)
-			forge_team_objectives()
 		forge_objectives()
 	remove_clownmut()
 	. = ..()
@@ -123,6 +123,8 @@
 /datum/antagonist/changeling/proc/reset_powers()
 	if(purchasedpowers)
 		remove_changeling_powers()
+	loudfactor = 0
+	bloodtestwarnings = 0
 	//Repurchase free powers.
 	for(var/path in all_powers)
 		var/obj/effect/proc_holder/changeling/S = new path()
@@ -174,6 +176,13 @@
 	geneticpoints -= thepower.dna_cost
 	purchasedpowers += thepower
 	thepower.on_purchase(owner.current)
+	loudfactor += thepower.loudness
+	if(loudfactor >= 4 && !bloodtestwarnings)
+		to_chat(owner.current, "<span class='warning'>Our blood is growing flammable. Our blood will react violently to heat.</span>")
+		bloodtestwarnings = 1
+	if(loudfactor >= 10 && bloodtestwarnings < 2)
+		to_chat(owner.current, "<span class='warning'>Our blood has grown extremely flammable. Our blood will react explosively to heat.</span>")
+		bloodtestwarnings = 2
 
 /datum/antagonist/changeling/proc/readapt()
 	if(!ishuman(owner.current))
@@ -182,6 +191,7 @@
 	if(canrespec)
 		to_chat(owner.current, "<span class='notice'>We have removed our evolutions from this form, and are now ready to readapt.</span>")
 		reset_powers()
+		playsound(get_turf(owner.current), 'sound/effects/lingreadapt.ogg', 75, TRUE, 5, soundenvwet = 0)
 		canrespec = 0
 		SSblackbox.record_feedback("tally", "changeling_power_purchase", 1, "Readapt")
 		return 1

code/modules/antagonists/changeling/changeling_power.dm

@@ -16,6 +16,7 @@
 	var/req_stat = CONSCIOUS // CONSCIOUS, UNCONSCIOUS or DEAD
 	var/always_keep = 0 // important for abilities like revive that screw you if you lose them.
 	var/ignores_fakedeath = FALSE // usable with the FAKEDEATH flag
+	var/loudness = 0 //Determines how much having this ability will affect changeling blood tests. At 4, the blood will react violently and turn to ash, creating a unique message in the process. At 10, the blood will explode when heated.
 
 
 /obj/effect/proc_holder/changeling/proc/on_purchase(mob/user, is_respec)

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

@@ -1,8 +1,9 @@
 /obj/effect/proc_holder/changeling/biodegrade
 	name = "Biodegrade"
 	desc = "Dissolves restraints or other objects preventing free movement."
-	helptext = "This is obvious to nearby people, and can destroy standard restraints and closets."
+	helptext = "This is obvious to nearby people, and can destroy standard restraints and closets. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
 	chemical_cost = 30 //High cost to prevent spam
+	loudness = 1
 	dna_cost = 2
 	req_human = 1
 

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

@@ -1,8 +1,9 @@
 /obj/effect/proc_holder/changeling/digitalcamo
 	name = "Digital Camouflage"
 	desc = "By evolving the ability to distort our form and proportions, we defeat common algorithms used to detect lifeforms on cameras."
-	helptext = "We cannot be tracked by camera or seen by AI units while using this skill. However, humans looking at us will find us... uncanny."
+	helptext = "We cannot be tracked by camera or seen by AI units while using this skill. However, humans looking at us will find us... uncanny. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
 	dna_cost = 1
+	loudness = 1
 
 //Prevents AIs tracking you but makes you easily detectable to the human-eye.
 /obj/effect/proc_holder/changeling/digitalcamo/sting_action(mob/user)

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

@@ -1,9 +1,10 @@
 /obj/effect/proc_holder/changeling/headcrab
 	name = "Last Resort"
 	desc = "We sacrifice our current body in a moment of need, placing us in control of a vessel."
-	helptext = "We will be placed in control of a small, fragile creature. We may attack a corpse like this to plant an egg which will slowly mature into a new form for us."
+	helptext = "We will be placed in control of a small, fragile creature. We may attack a corpse like this to plant an egg which will slowly mature into a new form for us. This ability is loud, and might cause our blood to react violently to heat."
 	chemical_cost = 20
 	dna_cost = 1
+	loudness = 2
 	req_human = 1
 
 /obj/effect/proc_holder/changeling/headcrab/sting_action(mob/user)

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

@@ -3,7 +3,7 @@
 	name = "Hivemind Communication"
 	desc = "We tune our senses to the airwaves to allow us to discreetly communicate and exchange DNA with other changelings."
 	helptext = "We will be able to talk with other changelings with :g. Exchanged DNA do not count towards absorb objectives."
-	dna_cost = 0
+	dna_cost = 1
 	chemical_cost = -1
 
 /obj/effect/proc_holder/changeling/hivemind_comms/on_purchase(mob/user, is_respec)
@@ -17,6 +17,9 @@
 	var/obj/effect/proc_holder/changeling/hivemind_download/S2 = new
 	if(!changeling.has_sting(S2))
 		changeling.purchasedpowers+=S2
+	var/obj/effect/proc_holder/changeling/linglink/S3 = new
+	if(!changeling.has_sting(S3))
+		changeling.purchasedpowers+=S3
 
 // HIVE MIND UPLOAD/DOWNLOAD DNA
 GLOBAL_LIST_EMPTY(hivemind_bank)

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

@@ -1,8 +1,9 @@
 /obj/effect/proc_holder/changeling/lesserform
 	name = "Lesser Form"
-	desc = "We debase ourselves and become lesser. We become a monkey."
+	desc = "We debase ourselves and become lesser. We become a monkey. This ability is loud, and might cause our blood to react violently to heat."
 	chemical_cost = 5
 	dna_cost = 1
+	loudness = 2
 	req_human = 1
 
 //Transform into a monkey.

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

@@ -2,7 +2,7 @@
 	name = "Hivemind Link"
 	desc = "Link your victim's mind into the hivemind for personal interrogation."
 	chemical_cost = 0
-	dna_cost = 0
+	dna_cost = -1
 	req_human = 1
 
 /obj/effect/proc_holder/changeling/linglink/can_sting(mob/living/carbon/user)

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

@@ -134,9 +134,10 @@
 /obj/effect/proc_holder/changeling/weapon/arm_blade
 	name = "Arm Blade"
 	desc = "We reform one of our arms into a deadly blade."
-	helptext = "We may retract our armblade in the same manner as we form it. Cannot be used while in lesser form."
+	helptext = "We may retract our armblade in the same manner as we form it. Cannot be used while in lesser form. This ability is loud, and might cause our blood to react violently to heat."
 	chemical_cost = 20
 	dna_cost = 2
+	loudness = 2
 	req_human = 1
 	weapon_type = /obj/item/melee/arm_blade
 	weapon_name_simple = "blade"
@@ -215,9 +216,11 @@
 	desc = "We ready a tentacle to grab items or victims with."
 	helptext = "We can use it once to retrieve a distant item. If used on living creatures, the effect depends on the intent: \
 	Help will simply drag them closer, Disarm will grab whatever they're holding instead of them, Grab will put the victim in our hold after catching it, \
-	and Harm will stun it, and stab it if we're also holding a sharp weapon. Cannot be used while in lesser form."
+	and Harm will stun it, and stab it if we're also holding a sharp weapon. Cannot be used while in lesser form.\
+	This ability is loud, and might cause our blood to react violently to heat."
 	chemical_cost = 10
 	dna_cost = 2
+	loudness = 2
 	req_human = 1
 	weapon_type = /obj/item/gun/magic/tentacle
 	weapon_name_simple = "tentacle"
@@ -393,9 +396,10 @@
 /obj/effect/proc_holder/changeling/weapon/shield
 	name = "Organic Shield"
 	desc = "We reform one of our arms into a hard shield."
-	helptext = "Organic tissue cannot resist damage forever; the shield will break after it is hit too much. The more genomes we absorb, the stronger it is. Cannot be used while in lesser form."
+	helptext = "Organic tissue cannot resist damage forever; the shield will break after it is hit too much. The more genomes we absorb, the stronger it is. Cannot be used while in lesser form. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
 	chemical_cost = 20
 	dna_cost = 1
+	loudness = 1
 	req_human = 1
 
 	weapon_type = /obj/item/shield/changeling
@@ -445,9 +449,10 @@
 /obj/effect/proc_holder/changeling/suit/organic_space_suit
 	name = "Organic Space Suit"
 	desc = "We grow an organic suit to protect ourselves from space exposure."
-	helptext = "We must constantly repair our form to make it space-proof, reducing chemical production while we are protected. Cannot be used in lesser form."
+	helptext = "We must constantly repair our form to make it space-proof, reducing chemical production while we are protected. Cannot be used in lesser form. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
 	chemical_cost = 20
 	dna_cost = 2
+	loudness = 1
 	req_human = 1
 
 	suit_type = /obj/item/clothing/suit/space/changeling
@@ -492,9 +497,10 @@
 /obj/effect/proc_holder/changeling/suit/armor
 	name = "Chitinous Armor"
 	desc = "We turn our skin into tough chitin to protect us from damage."
-	helptext = "Upkeep of the armor requires a low expenditure of chemicals. The armor is strong against brute force, but does not provide much protection from lasers. Cannot be used in lesser form."
+	helptext = "Upkeep of the armor requires a low expenditure of chemicals. The armor is strong against brute force, but does not provide much protection from lasers. Cannot be used in lesser form. This ability is loud, and might cause our blood to react violently to heat."
 	chemical_cost = 20
 	dna_cost = 1
+	loudness = 2
 	req_human = 1
 	recharge_slowdown = 0.25
 

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

@@ -1,9 +1,10 @@
 /obj/effect/proc_holder/changeling/resonant_shriek
 	name = "Resonant Shriek"
 	desc = "Our lungs and vocal cords shift, allowing us to briefly emit a noise that deafens and confuses the weak-minded."
-	helptext = "Emits a high-frequency sound that confuses and deafens humans, blows out nearby lights and overloads cyborg sensors."
+	helptext = "Emits a high-frequency sound that confuses and deafens humans, blows out nearby lights and overloads cyborg sensors. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
 	chemical_cost = 20
 	dna_cost = 1
+	loudness = 1
 	req_human = 1
 
 //A flashy ability, good for crowd control and sewing chaos.
@@ -25,13 +26,16 @@
 	for(var/obj/machinery/light/L in range(4, user))
 		L.on = 1
 		L.break_light_tube()
+	playsound(get_turf(user), 'sound/effects/lingscreech.ogg', 75, TRUE, 5, soundenvwet = 0)
 	return TRUE
 
 /obj/effect/proc_holder/changeling/dissonant_shriek
 	name = "Dissonant Shriek"
 	desc = "We shift our vocal cords to release a high-frequency sound that overloads nearby electronics."
+	helptext = "Emits a high-frequency sound that overloads nearby electronics. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
 	chemical_cost = 20
 	dna_cost = 1
+	loudness = 1
 
 //A flashy ability, good for crowd control and sewing chaos.
 /obj/effect/proc_holder/changeling/dissonant_shriek/sting_action(mob/user)
@@ -39,4 +43,5 @@
 		L.on = 1
 		L.break_light_tube()
 	empulse(get_turf(user), 2, 5, 1)
+	playsound(get_turf(user), 'sound/effects/lingempscreech.ogg', 75, TRUE, 5, soundenvwet = 0)
 	return TRUE

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

@@ -1,9 +1,10 @@
 /obj/effect/proc_holder/changeling/spiders
 	name = "Spread Infestation"
 	desc = "Our form divides, creating arachnids which will grow into deadly beasts."
-	helptext = "The spiders are thoughtless creatures, and may attack their creators when fully grown. Requires at least 3 DNA gained through Absorb, and not through DNA sting."
+	helptext = "The spiders are thoughtless creatures, and may attack their creators when fully grown. Requires at least 3 DNA gained through Absorb, and not through DNA sting. This ability is very loud, and will guarantee that our blood will react violently to heat."
 	chemical_cost = 45
 	dna_cost = 1
+	loudness = 4
 	req_absorbs = 3
 
 //Makes some spiderlings. Good for setting traps and causing general trouble.

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

@@ -64,10 +64,11 @@
 /obj/effect/proc_holder/changeling/sting/transformation
 	name = "Transformation Sting"
 	desc = "We silently sting a human, injecting a retrovirus that forces them to transform."
-	helptext = "The victim will transform much like a changeling would. Does not provide a warning to others. Mutations will not be transferred, and monkeys will become human."
+	helptext = "The victim will transform much like a changeling would. Does not provide a warning to others. Mutations will not be transferred, and monkeys will become human. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
 	sting_icon = "sting_transform"
 	chemical_cost = 50
 	dna_cost = 3
+	loudness = 1
 	var/datum/changelingprofile/selected_dna = null
 
 /obj/effect/proc_holder/changeling/sting/transformation/Click()
@@ -111,10 +112,11 @@
 /obj/effect/proc_holder/changeling/sting/false_armblade
 	name = "False Armblade Sting"
 	desc = "We silently sting a human, injecting a retrovirus that mutates their arm to temporarily appear as an armblade."
-	helptext = "The victim will form an armblade much like a changeling would, except the armblade is dull and useless."
+	helptext = "The victim will form an armblade much like a changeling would, except the armblade is dull and useless. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
 	sting_icon = "sting_armblade"
 	chemical_cost = 20
 	dna_cost = 1
+	loudness = 1
 
 /obj/item/melee/arm_blade/false
 	desc = "A grotesque mass of flesh that used to be your arm. Although it looks dangerous at first, you can tell it's actually quite dull and useless."
@@ -183,10 +185,11 @@
 /obj/effect/proc_holder/changeling/sting/mute
 	name = "Mute Sting"
 	desc = "We silently sting a human, completely silencing them for a short time."
-	helptext = "Does not provide a warning to the victim that they have been stung, until they try to speak and cannot."
+	helptext = "Does not provide a warning to the victim that they have been stung, until they try to speak and cannot. This ability is loud, and might cause our blood to react violently to heat."
 	sting_icon = "sting_mute"
 	chemical_cost = 20
 	dna_cost = 2
+	loudness = 2
 
 /obj/effect/proc_holder/changeling/sting/mute/sting_action(mob/user, mob/living/carbon/target)
 	log_combat(user, target, "stung", "mute sting")
@@ -196,10 +199,11 @@
 /obj/effect/proc_holder/changeling/sting/blind
 	name = "Blind Sting"
 	desc = "Temporarily blinds the target."
-	helptext = "This sting completely blinds a target for a short time."
+	helptext = "This sting completely blinds a target for a short time. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
 	sting_icon = "sting_blind"
 	chemical_cost = 25
 	dna_cost = 1
+	loudness = 1
 
 /obj/effect/proc_holder/changeling/sting/blind/sting_action(mob/user, mob/living/carbon/target)
 	log_combat(user, target, "stung", "blind sting")
@@ -229,10 +233,11 @@
 /obj/effect/proc_holder/changeling/sting/cryo
 	name = "Cryogenic Sting"
 	desc = "We silently sting a human with a cocktail of chemicals that freeze them."
-	helptext = "Does not provide a warning to the victim, though they will likely realize they are suddenly freezing."
+	helptext = "Does not provide a warning to the victim, though they will likely realize they are suddenly freezing. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
 	sting_icon = "sting_cryo"
 	chemical_cost = 15
 	dna_cost = 2
+	loudness = 1
 
 /obj/effect/proc_holder/changeling/sting/cryo/sting_action(mob/user, mob/target)
 	log_combat(user, target, "stung", "cryo sting")

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

@@ -194,9 +194,12 @@
 		else
 			L.visible_message("<span class='warning'>[L]'s eyes blaze with brilliant light!</span>", \
 			"<span class='userdanger'>Your vision suddenly screams with white-hot light!</span>")
-			L.Knockdown(15)
+			L.Knockdown(15, TRUE, FALSE, 15)
 			L.apply_status_effect(STATUS_EFFECT_KINDLE)
 			L.flash_act(1, 1)
+			if(issilicon(target))
+				var/mob/living/silicon/S = L
+				S.emp_act(EMP_HEAVY)
 			if(iscultist(L))
 				L.adjustFireLoss(15)
 	..()

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

@@ -71,7 +71,7 @@
 	desc = "Charges your slab with divine energy, allowing you to overwhelm a target with Ratvar's light."
 	invocations = list("Divinity, show them your light!")
 	whispered = TRUE
-	channel_time = 30
+	channel_time = 20 // I think making kindle channel a third of the time less is a good make up for the fact that it silences people for such a little amount of time.
 	power_cost = 125
 	usage_tip = "The light can be used from up to two tiles away. Damage taken will GREATLY REDUCE the stun's duration."
 	tier = SCRIPTURE_DRIVER
@@ -112,21 +112,21 @@
 	quickbind_desc = "Applies handcuffs to a struck target."
 
 
-//Vanguard: Provides twenty seconds of stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed are applied to the invoker.
+//Vanguard: Provides twenty seconds of greatly increased stamina and stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed are applied to the invoker.
 /datum/clockwork_scripture/vanguard
 	descname = "Self Stun Immunity"
 	name = "Vanguard"
-	desc = "Provides twenty seconds of stun immunity. At the end of the twenty seconds, the invoker is knocked down for the equivalent of 25% of all stuns they absorbed. \
+	desc = "Provides twenty seconds of greatly increased stamina and stun immunity. At the end of the twenty seconds, the invoker is knocked down for the equivalent of 25% of all stuns they absorbed. \
 	Excessive absorption will cause unconsciousness."
 	invocations = list("Shield me...", "...from darkness!")
 	channel_time = 30
-	power_cost = 25
+	power_cost = 75
 	usage_tip = "You cannot reactivate Vanguard while still shielded by it."
 	tier = SCRIPTURE_DRIVER
 	primary_component = VANGUARD_COGWHEEL
 	sort_priority = 6
 	quickbind = TRUE
-	quickbind_desc = "Allows you to temporarily absorb stuns. All stuns absorbed will affect you when disabled."
+	quickbind_desc = "Allows you to temporarily have quickly regenerating stamina and absorb stuns. All stuns absorbed will affect you when disabled."
 
 /datum/clockwork_scripture/vanguard/check_special_requirements()
 	if(!GLOB.ratvar_awakens && islist(invoker.stun_absorption) && invoker.stun_absorption["vanguard"] && invoker.stun_absorption["vanguard"]["end_time"] > world.time)

code/modules/antagonists/cult/cult_items.dm

@@ -508,7 +508,9 @@
 			if(SEC_LEVEL_GREEN)
 				set_coefficient = 2
 			if(SEC_LEVEL_BLUE)
-				set_coefficient = 1
+				set_coefficient = 1.2
+			if(SEC_LEVEL_AMBER)
+				set_coefficient = 0.8
 			else
 				set_coefficient = 0.5
 		var/surplus = timer - (SSshuttle.emergencyCallTime * set_coefficient)

code/modules/antagonists/cult/runes.dm

@@ -185,6 +185,9 @@ structure_check() searches for nearby cultist structures required for the invoca
 	color = RUNE_COLOR_OFFER
 	req_cultists = 1
 	rune_in_use = FALSE
+	var/mob/living/currentconversionman
+	var/conversiontimeout
+	var/conversionresult
 
 /obj/effect/rune/convert/do_invoke_glow()
 	return
@@ -241,6 +244,21 @@ structure_check() searches for nearby cultist structures required for the invoca
 			to_chat(M, "<span class='warning'>Something is shielding [convertee]'s mind!</span>")
 		log_game("Offer rune failed - convertee had anti-magic")
 		return 0
+	to_chat(convertee, "<span class='cult italic'><b>Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible, truth. The veil of reality has been ripped away \
+	and something evil takes root.</b></span>")
+	to_chat(convertee, "<span class='cult italic'>Do you wish to embrace the Geometer of Blood? <a href='?src=\ref[src];signmeup=1'>Click here to stop resisting the truth.</a> Or you could choose to continue resisting...</span>")
+	currentconversionman = convertee
+	conversiontimeout = world.time + (10 SECONDS)
+	convertee.Stun(100)
+	conversionresult = FALSE
+	while(world.time < conversiontimeout && convertee && !conversionresult)
+		stoplag(1)
+	currentconversionman = null
+	if(convertee && get_turf(convertee) != get_turf(src))
+		return FALSE
+	if(!conversionresult && convertee)
+		do_sacrifice(convertee, invokers)
+		return FALSE
 	var/brutedamage = convertee.getBruteLoss()
 	var/burndamage = convertee.getFireLoss()
 	if(brutedamage || burndamage)
@@ -252,8 +270,6 @@ structure_check() searches for nearby cultist structures required for the invoca
 	SSticker.mode.add_cultist(convertee.mind, 1)
 	new /obj/item/melee/cultblade/dagger(get_turf(src))
 	convertee.mind.special_role = ROLE_CULTIST
-	to_chat(convertee, "<span class='cult italic'><b>Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible, truth. The veil of reality has been ripped away \
-	and something evil takes root.</b></span>")
 	to_chat(convertee, "<span class='cult italic'><b>Assist your new compatriots in their dark dealings. Your goal is theirs, and theirs is yours. You serve the Geometer above all else. Bring it back.\
 	</b></span>")
 	if(ishuman(convertee))
@@ -313,6 +329,12 @@ structure_check() searches for nearby cultist structures required for the invoca
 			sacrificial.gib()
 	return TRUE
 
+/obj/effect/rune/convert/Topic(href, href_list)
+	if(href_list["signmeup"])
+		if(currentconversionman == usr)
+			conversionresult = TRUE
+		else
+			to_chat(usr, "<span class='cult italic'><b>Your fate has already been set in stone.</b></span>")
 
 
 /obj/effect/rune/empower
@@ -442,9 +464,9 @@ structure_check() searches for nearby cultist structures required for the invoca
 //Ritual of Dimensional Rending: Calls forth the avatar of Nar'Sie upon the station.
 /obj/effect/rune/narsie
 	cultist_name = "Nar'Sie"
-	cultist_desc = "tears apart dimensional barriers, calling forth the Geometer. Requires 9 invokers."
+	cultist_desc = "tears apart dimensional barriers, calling forth the Geometer. Requires 9 invokers, minus one for every 3 sacrifices."
 	invocation = "TOK-LYR RQA-NAP G'OLT-ULOFT!!"
-	req_cultists = 9
+	req_cultists = 1
 	icon = 'icons/effects/96x96.dmi'
 	color = RUNE_COLOR_DARKRED
 	icon_state = "rune_large"
@@ -471,6 +493,10 @@ structure_check() searches for nearby cultist structures required for the invoca
 	if(!is_station_level(z))
 		return
 	var/mob/living/user = invokers[1]
+	if(invokers.len < 9 - (GLOB.sacrificed.len * 0.35))
+		to_chat(user, "<span class='danger'>You need at least [(9 - (GLOB.sacrificed.len * 0.35)) - invokers.len] more adjacent cultists to use this rune in such a manner.</span>")
+		fail_invoke()
+		return
 	var/datum/antagonist/cult/user_antag = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
 	var/datum/objective/eldergod/summon_objective = locate() in user_antag.cult_team.objectives
 	var/area/place = get_area(src)

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

@@ -588,12 +588,18 @@ This is here to make the tiles around the station mininuke change when it's arme
 			var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
 			if(istype(loneop))
 				loneop.weight += 1
+				if(loneop.weight % 5 == 0)
+					message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].")
+				log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].")
 	else
 		lastlocation = newturf
 		last_disk_move = world.time
 		var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
 		if(istype(loneop) && prob(loneop.weight))
 			loneop.weight = max(loneop.weight - 1, 0)
+			if(loneop.weight % 5 == 0)
+				message_admins("[src] is on the move (currently in [ADMIN_VERBOSEJMP(newturf)]). The weight of Lone Operative is now [loneop.weight].")
+			log_game("[src] being on the move has reduced the weight of the Lone Operative event to [loneop.weight].")
 
 /obj/item/disk/nuclear/examine(mob/user)
 	. = ..()

code/modules/antagonists/wizard/wizard.dm

@@ -60,50 +60,13 @@
 	owner.current.forceMove(pick(GLOB.wizardstart))
 
 /datum/antagonist/wizard/proc/create_objectives()
-	switch(rand(1,100))
-		if(1 to 30)
-			var/datum/objective/assassinate/kill_objective = new
-			kill_objective.owner = owner
-			kill_objective.find_target()
-			objectives += kill_objective
+	var/datum/objective/new_objective = new("Cause as much creative mayhem as you can aboard the station! The more outlandish your methods of achieving this, the better! Make sure there's a decent amount of crew alive to tell of your tale.")
+	new_objective.owner = owner
+	objectives += new_objective
 
-			if (!(locate(/datum/objective/escape) in owner.objectives))
-				var/datum/objective/escape/escape_objective = new
-				escape_objective.owner = owner
-				objectives += escape_objective
-
-		if(31 to 60)
-			var/datum/objective/steal/steal_objective = new
-			steal_objective.owner = owner
-			steal_objective.find_target()
-			objectives += steal_objective
-
-			if (!(locate(/datum/objective/escape) in owner.objectives))
-				var/datum/objective/escape/escape_objective = new
-				escape_objective.owner = owner
-				objectives += escape_objective
-
-		if(61 to 85)
-			var/datum/objective/assassinate/kill_objective = new
-			kill_objective.owner = owner
-			kill_objective.find_target()
-			objectives += kill_objective
-
-			var/datum/objective/steal/steal_objective = new
-			steal_objective.owner = owner
-			steal_objective.find_target()
-			objectives += steal_objective
-
-			if (!(locate(/datum/objective/survive) in owner.objectives))
-				var/datum/objective/survive/survive_objective = new
-				survive_objective.owner = owner
-				objectives += survive_objective
-
-		else
-			if (!(locate(/datum/objective/hijack) in owner.objectives))
-				var/datum/objective/hijack/hijack_objective = new
-				hijack_objective.owner = owner
-				objectives += hijack_objective
+	var/datum/objective/escape/escape_objective = new
+	escape_objective.owner = owner
+	objectives += escape_objective
 
 	for(var/datum/objective/O in objectives)
 		owner.objectives += O

code/modules/assembly/flash.dm

@@ -125,7 +125,9 @@
 				to_chat(M, "<span class='userdanger'>[user] blinds you with the flash!</span>")
 			else
 				to_chat(M, "<span class='userdanger'>You are blinded by [src]!</span>")
-			M.Knockdown(rand(80,120))
+			var/toblur = 20 - M.eye_blurry
+			if(toblur > 0)
+				M.blur_eyes(toblur)
 		else if(user)
 			visible_message("<span class='disarm'>[user] fails to blind [M] with the flash!</span>")
 			to_chat(user, "<span class='warning'>You fail to blind [M] with the flash!</span>")
@@ -141,7 +143,7 @@
 	if(!try_use_flash(user))
 		return FALSE
 	if(iscarbon(M))
-		flash_carbon(M, user, 5, 1)
+		flash_carbon(M, user, 20, 1)
 		return TRUE
 	else if(issilicon(M))
 		var/mob/living/silicon/robot/R = M

code/modules/atmospherics/environmental/LINDA_fire.dm

@@ -20,8 +20,8 @@
 	if(active_hotspot)
 		if(soh)
 			if((tox > 0.5 || trit > 0.5) && oxy > 0.5)
-				if(active_hotspot.temperature < exposed_temperature)
-					active_hotspot.temperature = exposed_temperature
+				if(active_hotspot.temperature < exposed_temperature*50)
+					active_hotspot.temperature = exposed_temperature*50
 				if(active_hotspot.volume < exposed_volume)
 					active_hotspot.volume = exposed_volume
 		return 1
@@ -36,7 +36,7 @@
 			return 0
 
 		active_hotspot = new /obj/effect/hotspot(src)
-		active_hotspot.temperature = exposed_temperature
+		active_hotspot.temperature = exposed_temperature*50
 		active_hotspot.volume = exposed_volume*25
 
 		active_hotspot.just_spawned = (current_cycle < SSair.times_fired)
@@ -47,6 +47,7 @@
 		heating.temperature = exposed_temperature
 		heating.react()
 		assume_air(heating)
+		air_update_turf()
 	return igniting
 
 //This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile

code/modules/atmospherics/machinery/airalarm.dm

@@ -650,7 +650,7 @@
 		if(0)
 			add_overlay(AALARM_OVERLAY_GREEN)
 			overlay_state = AALARM_OVERLAY_GREEN
-			light_color = LIGHT_COLOR_BLUEGREEN
+			light_color = LIGHT_COLOR_PALEBLUE
 			set_light(brightness_on)
 		if(1)
 			add_overlay(AALARM_OVERLAY_WARN)

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

@@ -61,6 +61,8 @@
 		//Actually transfer the gas
 		var/datum/gas_mixture/removed = air2.remove(transfer_moles)
 
+		removed.react(src)
+
 		update_parents()
 
 		return removed

code/modules/awaymissions/mission_code/snowdin.dm

@@ -10,6 +10,10 @@
 	name = "Snowdin Tundra Plains"
 	icon_state = "awaycontent25"
 
+/area/awaymission/snowdin/outside/vip
+	name = "Snowdin Tundra Plains"
+	icon_state = "awaycontent25"
+
 /area/awaymission/snowdin/post
 	name = "Snowdin Outpost"
 	icon_state = "awaycontent2"
@@ -116,7 +120,7 @@
 	name = "Snowdin Main Base"
 	icon_state = "awaycontent16"
 	dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-	requires_power = TRUE
+	requires_power = FALSE
 
 /area/awaymission/snowdin/dungeon1
 	name = "Snowdin Depths"

code/modules/cargo/bounties/engineering.dm

@@ -24,6 +24,19 @@
 	description = "Station 49 is looking to kickstart their research program. Ship them a tank full of Tritium."
 	gas_type = /datum/gas/tritium
 
+/datum/bounty/item/engineering/pacman
+	name = "P.A.C.M.A.N.-type portable generator"
+	description = "A neighboring station had a problem with their SMES, and now need something to power their communications console. Can you send them a P.AC.M.A.N.?"
+	reward = 3500 //2500 for the cargo one
+	wanted_types = list(/obj/machinery/power/port_gen/pacman)
+
+/datum/bounty/item/engineering/canisters
+	name = "Gas Canisters"
+	description = "After a recent debacle in a nearby sector, 10 gas canisters are needed for containing an experimental aerosol before it kills all the local fauna."
+	reward = 5000
+	required_count = 10 //easy to make
+	wanted_types = list(/obj/machinery/portable_atmospherics/canister)
+
 /datum/bounty/item/engineering/energy_ball
 	name = "Contained Tesla Ball"
 	description = "Station 24 is being overrun by hordes of angry Mothpeople. They are requesting the ultimate bug zapper."

code/modules/cargo/bounties/medical.dm

@@ -57,3 +57,71 @@
 	description = "Central Command has run out of heavy duty pipe cleaners. Can you ship over a cat tail to help us out?"
 	reward = 3000
 	wanted_types = list(/obj/item/organ/tail/cat)
+
+/datum/bounty/item/medical/blood
+	name = "Generic Blood"
+	description = "Nanotrasen's annual blood drive is back up to full speed, following the garlic incident. Good blood in good volumes accepted for Credit returns."
+	reward = 3500
+	required_count = 600
+	wanted_types = list(/datum/reagent/blood)
+
+/* If anyone wants to try and fix/work, go for it
+/datum/bounty/item/medical/medibot // Mob so this dosn't work yet*
+	name = "Medibot"
+	description = "A sister station is dealing with um problem, they need a medibot to help treat their wounded..."
+	reward = 3000
+	wanted_types = list(/mob/living/simple_animal/bot/medbot)
+
+/datum/bounty/item/medical/bloodl //Dosnt work do to how blood is yet*
+	name = "L-type Blood"
+	description = "After a small scuffle, a few of our lizard employees need another blood transfusion."
+	reward = 4000
+	required_count = 200
+	wanted_types = (L,/datum/reagent/blood)
+	if(istype(L,/datum/reagent/blood))
+	wanted_types += L 
+
+/datum/bounty/item/medical/bloodu //Dosnt work do to how blood is yet*
+	name = "U-Type Blood"
+	description = "After dealing with a small revolt in a local penal colony, the colony's anemic CMO needs blood, urgently. With his compromised immune system, only the best blood can be used."
+	reward = 5500 // Rarer blood
+	required_count = 200
+	wanted_types = (U,/datum/reagent/blood)
+	if(istype(U,/datum/reagent/blood))
+	wanted_types += U 
+
+*/
+
+/datum/bounty/item/medical/surgery
+	name = "Surgery tool implants"
+	description = "Our medical interns keep dropping their Shambler's Juice while they're performing open heart surgery. One of them even had the audacity to say he only had two hands!"
+	reward = 10000
+	required_count = 3
+	wanted_types = list(/obj/item/organ/cyberimp/arm/surgery)
+
+/datum/bounty/item/medical/chemmaker
+	name = "Portable Chem Dispenser"
+	description = "After a new chemist mixed up some water and a banana, we lost our only chem dispenser. Please send us a replacement and you will be compensated."
+	reward = 7000
+	wanted_types = list(/obj/machinery/chem_dispenser)
+
+/datum/bounty/item/medical/advhealthscaner
+	name = "Advanced Health Analyzer"
+	description = "A ERT Medical unit needs the new 'advanced health analyzer', for a mission at a Station 4. Can you send some?."
+	reward = 4000
+	required_count = 5
+	wanted_types = list(/obj/item/healthanalyzer/advanced)
+
+/datum/bounty/item/medical/wallmounts
+	name = "Defibrillator wall mounts"
+	description = "New Space OSHA regulation state that are new cloning medical wing needs a few 'Easy to access defibrillartors'. Can you send a few before we get a lawsuit?"
+	reward = 5000
+	required_count = 3
+	wanted_types = list(/obj/machinery/defibrillator_mount)
+
+/datum/bounty/item/medical/defibrillator
+	name = "New defibillators"
+	description = "After years of storge are defibrillator units have become more liabilities then we want. Please send us some new ones to replace these old ones."
+	reward = 5000
+	required_count = 5
+	wanted_types = list(/obj/item/defibrillator)

code/modules/cargo/bounties/mining.dm

@@ -49,3 +49,17 @@
 	reward = 5000
 	required_count = 3
 	wanted_types = list(/obj/item/kitchen/knife/combat/bone)
+
+/datum/bounty/item/mining/basalt
+	name = "Artificial Basalt Tiles"
+	description = "Central Command's Ash Walker exhibit needs to be expanded again, we just need some more basalt flooring."
+	reward = 5000
+	required_count = 60
+	wanted_types = list(/obj/item/stack/tile/basalt)
+
+/datum/bounty/item/mining/fruit
+	name = "Cactus Fruit"
+	description = "Central Command's Ash Walker habitat needs more fauna, send us some local fruit seeds!"
+	reward = 2000
+	required_count = 1
+	wanted_types = list(/obj/item/seeds/lavaland/cactus)

code/modules/cargo/bounties/science.dm

@@ -64,3 +64,55 @@
 	description = "With the price of rechargers on the rise, upper management is interested in purchasing guns that are self-powered. If you ship one, they'll pay."
 	reward = 10000
 	wanted_types = list(/obj/item/gun/energy/e_gun/nuclear)
+
+/datum/bounty/item/science/bscells
+	name = "Bluespace Power Cells"
+	description = "Someone in upper management keeps using the excuse that his tablet battery dies when he's in the middle of work. This will be the last time he doesn't have his presentation, I swear to -"
+	reward = 7000
+	required_count = 10 //Easy to make
+	wanted_types = list(/obj/item/stock_parts/cell/bluespace)
+
+/datum/bounty/item/science/t4manip
+	name = "Femto-Manipulators"
+	description = "One of our Chief Engineers has OCD. Can you send us some femto-manipulators so he stops complaining that his ID doesn't fit perfectly in the PDA slot?"
+	reward = 7000
+	required_count = 20 //Easy to make
+	wanted_types = list(/obj/item/stock_parts/manipulator/femto)
+
+/datum/bounty/item/science/t4bins
+	name = "Bluespace Matter Bins"
+	description = "The local Janitorial union has gone on strike. Can you send us some bluespace bins so we don't have to take out our own trash?"
+	reward = 7000
+	required_count = 20 //Easy to make
+	wanted_types = list(/obj/item/stock_parts/matter_bin/bluespace)
+
+/datum/bounty/item/science/t4capacitor
+	name = "Quadratic Capacitor"
+	description = "One of our linguists doesn't understand why they're called Quadratic capacitors. Can you give him a few so he leaves us alone about it?"
+	reward = 7000
+	required_count = 20 //Easy to make
+	wanted_types = list(/obj/item/stock_parts/capacitor/quadratic)
+
+/datum/bounty/item/science/t4triphasic
+	name = "Triphasic Scanning Module"
+	description = "One of our scientists got into the liberty caps and is demanding new scanning modules so he can talk to ghosts. At this point we just want him out of our office."
+	reward = 7000
+	required_count = 20 //Easy to make
+	wanted_types = list(/obj/item/stock_parts/scanning_module/triphasic)
+
+/datum/bounty/item/science/t4microlaser
+	name = "Quad-Ultra Micro-Laser"
+	description = "The cats on Vega 9 are breeding out of control. We need something to corral them into one area so we can saturation bomb it."
+	reward = 7000
+	required_count = 20 //Easy to make
+	wanted_types = list(/obj/item/stock_parts/micro_laser/quadultra)
+
+/datum/bounty/item/science/fakecrystals
+	name = "synthetic bluespace crystals"
+	description = "Don't, uh, tell anyone, but one of our BSA arrays might have had a little... accident. Send us some bluespace crystals so we can recalibrate it before anyone realizes. The whole set uses artificial bluespace crystals, so we need and not any other type of bluespace crystals..."
+	reward = 10000
+	required_count = 5
+	wanted_types = list(/obj/item/stack/ore/bluespace_crystal/artificial)
+	exclude_types = list(/obj/item/stack/ore/bluespace_crystal,
+						 /obj/item/stack/sheet/bluespace_crystal,
+						 /obj/item/stack/ore/bluespace_crystal/refined)

code/modules/cargo/bounties/security.dm

@@ -11,3 +11,44 @@
 	reward = 2000
 	required_count = 3
 	wanted_types = list(/obj/machinery/recharger)
+
+/datum/bounty/item/security/practice
+	name = "Practice Laser Gun"
+	description = "Nanotrasen Military Academy is conducting routine marksmanship exercises. The clown hid all the practice lasers, and we're not using live weapons after last time."
+	reward = 3000
+	required_count = 3
+	wanted_types = list(/obj/item/gun/energy/laser/practice)
+
+/datum/bounty/item/security/flashshield
+	name = "Strobe Shield"
+	description = "One of our Emergency Response Agents thinks there's vampires in a local station. Send him something to help with his fear of the dark and protect him, too."
+	reward = 5000
+	wanted_types = list(/obj/item/assembly/flash/shield)
+
+/datum/bounty/item/security/sechuds
+	name = "Sec HUDs"
+	description = "Nanotrasen military academy has started to train officers how to use Sec HUDs to the fullest affect. Please send spare Sec HUDs so we can teach the men."
+	reward = 3000
+	required_count = 5
+	wanted_types = list(/obj/item/clothing/glasses/hud/security)
+
+/datum/bounty/item/security/techslugs
+	name = "Tech Slugs"
+	description = "Nanotrasen Military Academy is conducting an ammo loading and use lessons, on the new 'Tech Slugs'. Problem is we don't have any, please fix this..."
+	reward = 7500
+	required_count = 15
+	wanted_types = list(/obj/item/ammo_casing/shotgun/techshell)
+
+/datum/bounty/item/security/WT550
+	name = "Spare WT-550 clips"
+	description = "Nanotrasen Military Academy's ammunition is running low, please send in spare ammo for practice."
+	reward = 7500
+	required_count = 5
+	wanted_types = list(/obj/item/ammo_box/magazine/wt550m9)
+
+/datum/bounty/item/security/pins
+	name = "Test range firing pins"
+	description = "Nanotrasen Military Academy just got a new set of guns, sadly they didn't come with any pins. Can you send us some Test range locked firing pins?"
+	reward = 5000
+	required_count = 3
+	wanted_types = list(/obj/item/firing_pin/test_range)

code/modules/cargo/exports/manifest.dm

@@ -76,3 +76,17 @@
 /datum/export/manifest_correct_denied/get_cost(obj/O)
 	var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
 	return ..() - M.order_cost
+
+// Paper work done correctly
+
+/datum/export/paperwork_correct
+	cost = 50
+	unit_name = "correct paperwork"
+	export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct)
+
+// Paper work not done retruned
+
+/datum/export/paperwork_incorrect
+	cost = -500 // Failed to meet NT standers
+	unit_name = "returned incorrect paperwork"
+	export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork)

code/modules/cargo/order.dm

@@ -95,3 +95,14 @@
 			while(--lost >= 0)
 				qdel(pick(C.contents))
 	return C
+
+//Paperwork for NT
+/obj/item/paper/fluff/jobs/cargo/manifest/paperwork
+	name = "Incomplete Paperwork"
+	desc = "These should've been filled out four months ago! Unfinished grant papers issued by Nanotrasen's finance department. Complete this page for additional funding."
+	icon = 'icons/obj/bureaucracy.dmi'
+
+/obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct
+	name = "Finished Paperwork"
+	desc = "A neat stack of filled-out forms, in triplicate and signed. Is there anything more satisfying? Make sure they get stamped."
+	icon = 'icons/obj/bureaucracy.dmi'

code/modules/cargo/packs.dm

@@ -81,10 +81,19 @@
 	crate_name = "emergency crate"
 	crate_type = /obj/structure/closet/crate/internals
 
+/datum/supply_pack/emergency/rcds
+	name = "Emergency RCDs"
+	desc = "Bombs going off on station? SME blown and now you need to fix the hole it left behind? Well this crate has a pare of Rcds to be able to easily fix up any problem you may have!"
+	cost = 1500
+	contains = list(/obj/item/construction/rcd,
+					/obj/item/construction/rcd)
+	crate_name = "emergency rcds"
+	crate_type = /obj/structure/closet/crate/internals
+
 /datum/supply_pack/emergency/soft_suit
 	name = "Emergency Space Suit "
 	desc = "Is there bombs going off left and right? Is there meteors shooting around the station? Well we have two fragile space suit for emergencys as well as air and masks."
-	cost = 1000 
+	cost = 1000
 	contains = list(/obj/item/tank/internals/air,
 					/obj/item/tank/internals/air,
 					/obj/item/clothing/mask/gas,
@@ -256,6 +265,26 @@
 	crate_name = "weed control crate"
 	crate_type = /obj/structure/closet/crate/secure/hydroponics
 
+/datum/supply_pack/medical/anitvirus
+	name = "Virus Containment Crate"
+	desc = "Viro let out a death plague Mk II again? Someone didnt wash there hands? Old plagues born anew? Well this crate is for you! Hope you cure it before it brakes out of the station... This crate needs medical access to open and has two bio suits, a box of needles and beakers, five spaceacillin needles, and a medibot."
+	cost = 3000
+	access = ACCESS_MEDICAL
+	contains = list(/mob/living/simple_animal/bot/medbot,
+					/obj/item/clothing/head/bio_hood,
+					/obj/item/clothing/head/bio_hood,
+					/obj/item/clothing/suit/bio_suit,
+					/obj/item/clothing/suit/bio_suit,
+					/obj/item/reagent_containers/syringe/antiviral,
+					/obj/item/reagent_containers/syringe/antiviral,
+					/obj/item/reagent_containers/syringe/antiviral,
+					/obj/item/reagent_containers/syringe/antiviral,
+					/obj/item/reagent_containers/syringe/antiviral,
+					/obj/item/storage/box/syringes,
+					/obj/item/storage/box/beakers)
+	crate_name = "virus containment unit crate"
+	crate_type = /obj/structure/closet/crate/secure/plasma
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Security ////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@@ -386,6 +415,29 @@
 					/obj/item/melee/baton/loaded)
 	crate_name = "stun baton crate"
 
+/datum/supply_pack/security/russianclothing
+	name = "Russian Surplus Clothing"
+	desc = "An old russian crate full of surplus armor that they used to use! Has two sets of bulletproff armor, a few union suits and some warm hats!"
+	hidden = TRUE
+	contraband = TRUE
+	cost = 5000 // Its basicly sec suits, good boots/gloves
+	contains = list(/obj/item/clothing/suit/security/officer/russian,
+					/obj/item/clothing/suit/security/officer/russian,
+					/obj/item/clothing/shoes/combat,
+					/obj/item/clothing/shoes/combat,
+					/obj/item/clothing/head/ushanka,
+					/obj/item/clothing/head/ushanka,
+					/obj/item/clothing/suit/armor/bulletproof,
+					/obj/item/clothing/suit/armor/bulletproof,
+					/obj/item/clothing/head/helmet/alt,
+					/obj/item/clothing/head/helmet/alt,
+					/obj/item/clothing/gloves/combat,
+					/obj/item/clothing/gloves/combat,
+					/obj/item/clothing/mask/gas,
+					/obj/item/clothing/mask/gas)
+	crate_name = "surplus russian clothing"
+	crate_type = /obj/structure/closet/crate/internals
+
 /datum/supply_pack/security/taser
 	name = "Taser Crate"
 	desc = "From the depths of stunbased combat, this order rises above, supreme. Contains three hybrid tasers, capable of firing both electrodes and disabling shots. Requires Security access to open."
@@ -570,7 +622,7 @@
 
 
 /datum/supply_pack/security/armory/wt550
-	name = "WT-550 Auto Rifle Crate"
+	name = "WT-550 Semi-Auto Rifle Crate"
 	desc = "Contains two high-powered, semiautomatic rifles chambered in 4.6x30mm. Requires Armory access to open."
 	cost = 3500
 	contains = list(/obj/item/gun/ballistic/automatic/wt550,
@@ -578,8 +630,8 @@
 	crate_name = "auto rifle crate"
 
 /datum/supply_pack/security/armory/wt550ammo
-	name = "WT-550 Auto Rifle Ammo Crate"
-	desc = "Contains four 20-round magazines for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
+	name = "WT-550 Semi-Auto SMG Ammo Crate"
+	desc = "Contains four 20-round magazines for the WT-550 Semi-Auto SMG. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
 	cost = 2500
 	contains = list(/obj/item/ammo_box/magazine/wt550m9,
 					/obj/item/ammo_box/magazine/wt550m9,
@@ -587,9 +639,9 @@
 					/obj/item/ammo_box/magazine/wt550m9)
 	crate_name = "auto rifle ammo crate"
 
-/datum/supply_pack/security/armory/wt550ammo_nonlethal // Takes around 11 shots to stun crit someone
-	name = "WT-550 Auto Rifle Non-Lethal Ammo Crate"
-	desc = "Contains four 20-round magazines for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
+/datum/supply_pack/security/armory/wt550ammo_nonlethal // Takes around 12 shots to stun crit someone
+	name = "WT-550 Semi-Auto SMG Non-Lethal Ammo Crate"
+	desc = "Contains four 20-round magazines for the WT-550 Semi-Auto SMG. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
 	cost = 1500
 	contains = list(/obj/item/ammo_box/magazine/wt550m9/wtrubber,
 					/obj/item/ammo_box/magazine/wt550m9/wtrubber,
@@ -598,8 +650,8 @@
 	crate_name = "auto rifle ammo crate"
 
 /datum/supply_pack/security/armory/wt550ammo_special
-	name = "WT-550 Auto Rifle Special Ammo Crate"
-	desc = "Contains 2 20-round Armour Piercing and Incendiary magazines for the WT-550 Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
+	name = "WT-550 Semi-Auto SMG Special Ammo Crate"
+	desc = "Contains 2 20-round Armour Piercing and Incendiary magazines for the WT-550 Semi-Auto SMG. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
 	cost = 4500
 	contains = list(/obj/item/ammo_box/magazine/wt550m9/wtap,
 					/obj/item/ammo_box/magazine/wt550m9/wtap,
@@ -666,6 +718,15 @@
 					/obj/item/clothing/suit/space/hardsuit/engine)
 	crate_name = "engineering hardsuit"
 
+/datum/supply_pack/engineering/industrialrcd
+	name = "Industrial RCD"
+	desc = "A industrial RCD in case the station has gone through more then one meteor storm and the CE needs to bring out the somthing a bit more reliable. Dose not contain spare ammo for the industrial RCD or any other RCD modles."
+	cost = 4500
+	access = ACCESS_CE
+	contains = list(/obj/item/construction/rcd/industrial)
+	crate_name = "industrial rcd"
+	crate_type = /obj/structure/closet/crate/secure/engineering
+
 /datum/supply_pack/engineering/powergamermitts
 	name = "Insulated Gloves Crate"
 	desc = "The backbone of modern society. Barely ever ordered for actual engineering. Contains three insulated gloves."
@@ -1011,6 +1072,28 @@
 	contains = list(/obj/item/stack/sheet/mineral/wood/fifty)
 	crate_name = "wood planks crate"
 
+/datum/supply_pack/materials/rcdammo
+	name = "Spare RDC ammo"
+	desc = "This crate contains sixteen RCD ammo packs, to help with any holes or projects people mite be working on."
+	cost = 3750
+	contains = list(/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo)
+	crate_name = "rcd ammo"
+
 /datum/supply_pack/materials/bz
 	name = "BZ Canister Crate"
 	desc = "Contains a canister of BZ. Requires Toxins access to open."
@@ -1153,6 +1236,24 @@
 					/obj/item/storage/firstaid/regular)
 	crate_name = "first aid kit crate"
 
+/datum/supply_pack/medical/iv_drip
+	name = "IV Drip Crate"
+	desc = "Contains a single IV drip stand for intravenous delivery."
+	cost = 700
+	contains = list(/obj/machinery/iv_drip)
+	crate_name = "iv drip crate"
+
+/datum/supply_pack/science/adv_surgery_tools
+	name = "Med-Co Advanced surgery tools"
+	desc = "A full set of Med-Co advanced surgery tools, this crate also comes with a spay of synth flesh as well as a can of . Requires Surgery access to open."
+	cost = 5000
+	access = ACCESS_SURGERY
+	contains = list(/obj/item/storage/belt/medical/surgery_belt_adv,
+					/obj/item/reagent_containers/medspray/synthflesh,
+					/obj/item/reagent_containers/medspray/sterilizine)
+	crate_name = "medco newest surgery tools"
+	crate_type = /obj/structure/closet/crate/medical
+
 /datum/supply_pack/medical/medicalhardsuit
 	name = "Medical Hardsuit"
 	desc = "Got people being spaced left and right? Hole in the same room as the dead body of Hos or cap? Fear not, now you can buy one medical hardsuit with a mask and air tank to save your fellow crewmembers."
@@ -1162,13 +1263,6 @@
 					/obj/item/clothing/suit/space/hardsuit/medical)
 	crate_name = "medical hardsuit"
 
-/datum/supply_pack/medical/iv_drip
-	name = "IV Drip Crate"
-	desc = "Contains a single IV drip for administering blood to patients."
-	cost = 700
-	contains = list(/obj/machinery/iv_drip)
-	crate_name = "iv drip crate"
-
 /datum/supply_pack/medical/supplies
 	name = "Medical Supplies Crate"
 	desc = "Contains seven beakers, syringes, and bodybags. Three morphine bottles, four insulin pills. Two charcoal bottles, epinephrine bottles, antitoxin bottles, and large beakers. Finally, a single roll of medical gauze, as well as a bottle of stimulant pills for long, hard work days. German doctor not included."
@@ -1280,6 +1374,7 @@
 	crate_type = /obj/structure/closet/crate/secure/plasma
 	dangerous = TRUE
 
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Science /////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@@ -1395,6 +1490,19 @@
 /datum/supply_pack/service
 	group = "Service"
 
+
+/datum/supply_pack/service/advlighting
+	name = "Advanced Lighting crate"
+	desc = "Thanks to advanced lighting tech we here at the Lamp Factory have be able to produce more lamps and lamp items! This crate has three lamps, a box of lights and a state of the art rapid-light-device!"
+	cost = 2500 //Fair
+	contains = list(/obj/item/construction/rld,
+					/obj/item/flashlight/lamp,
+					/obj/item/flashlight/lamp,
+					/obj/item/flashlight/lamp/green,
+					/obj/item/storage/box/lights/mixed)
+	crate_name = "advanced lighting crate"
+	crate_type = /obj/structure/closet/crate/secure
+
 /datum/supply_pack/service/cargo_supples
 	name = "Cargo Supplies Crate"
 	desc = "Sold everything that wasn't bolted down? You can get right back to work with this crate containing stamps, an export scanner, destination tagger, hand labeler and some package wrapping."
@@ -1453,6 +1561,20 @@
 	crate_name = "janitor backpack crate"
 	crate_type = /obj/structure/closet/crate/secure
 
+/datum/supply_pack/service/janitor/janpremium
+	name = "Janitor Premium Supplies"
+	desc = "Do to the union for better supplies, we have desided to make a deal for you, In this crate you can get a brand new chem, Drying Angent this stuff is the work of slimes or magic! This crate also contains a rag to test out the Drying Angent magic, three wet floor signs, and some spare bottles of ammonia."
+	cost = 3000
+	access = ACCESS_JANITOR
+	contains = list(/obj/item/caution,
+					/obj/item/caution,
+					/obj/item/caution,
+					/obj/item/reagent_containers/glass/rag,
+					/obj/item/reagent_containers/glass/bottle/ammonia,
+					/obj/item/reagent_containers/glass/bottle/ammonia,
+					/obj/item/reagent_containers/spray/drying_agent)
+	crate_name = "janitor backpack crate"
+
 /datum/supply_pack/service/mule
 	name = "MULEbot Crate"
 	desc = "Pink-haired Quartermaster not doing her job? Replace her with this tireless worker, today!"
@@ -1602,11 +1724,44 @@
 	crate_name = "beekeeping starter crate"
 	crate_type = /obj/structure/closet/crate/hydroponics
 
+/datum/supply_pack/organic/candy
+	name = "Candy Crate"
+	desc = "For people that have a insatiable sweet tooth! Has ten candies to be eaten up.."
+	cost = 2500
+	var/num_contained = 10 //number of items picked to be contained in a randomised crate
+	contains = list(/obj/item/reagent_containers/food/snacks/candy,
+					/obj/item/reagent_containers/food/snacks/lollipop,
+					/obj/item/reagent_containers/food/snacks/gumball,
+					/obj/item/reagent_containers/food/snacks/chocolateegg,
+					/obj/item/reagent_containers/food/snacks/donut,
+					/obj/item/reagent_containers/food/snacks/cookie,
+					/obj/item/reagent_containers/food/snacks/sugarcookie,
+					/obj/item/reagent_containers/food/snacks/chococornet,
+					/obj/item/reagent_containers/food/snacks/mint,
+					/obj/item/reagent_containers/food/snacks/spiderlollipop,
+					/obj/item/reagent_containers/food/snacks/chococoin,
+					/obj/item/reagent_containers/food/snacks/fudgedice,
+					/obj/item/reagent_containers/food/snacks/chocoorange,
+					/obj/item/reagent_containers/food/snacks/honeybar,
+					/obj/item/reagent_containers/food/snacks/tinychocolate,
+					/obj/item/reagent_containers/food/snacks/spacetwinkie,
+					/obj/item/reagent_containers/food/snacks/syndicake,
+					/obj/item/reagent_containers/food/snacks/cheesiehonkers,
+					/obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull,
+					/obj/item/reagent_containers/food/snacks/sugarcookie/spookycoffin,
+					/obj/item/reagent_containers/food/snacks/candy_corn,
+					/obj/item/reagent_containers/food/snacks/candiedapple,
+					/obj/item/reagent_containers/food/snacks/chocolatebar,
+					/obj/item/reagent_containers/food/snacks/candyheart,
+					/obj/item/storage/fancy/heart_box,
+					/obj/item/storage/fancy/donut_box)
+	crate_name = "candy crate"
+
 /datum/supply_pack/organic/cutlery
 	name = "Kitchen Cutlery Deluxe Set"
 	desc = "Need to slice and dice away those ''Tomatos'' well we got what you need! From a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal."
 	cost = 10000
-	contraband = TRUE 
+	contraband = TRUE
 	contains = list(/obj/item/sharpener,
 					/obj/item/kitchen/fork,
 					/obj/item/kitchen/fork,
@@ -1663,6 +1818,22 @@
 	access = ACCESS_THEATRE
 	crate_type = /obj/structure/closet/crate/secure
 
+/datum/supply_pack/organic/hunting
+	name = "Huntting gear"
+	desc = "Even in space, we can fine prey to hunt, this crate contains everthing a fine hunter needs to have a sporting time. This crate needs armory access to open. A true huntter only needs a fine bottle of cognac, a nice coat, some good o' cigars, and of cource a huntting shotgun. "
+	cost = 3500
+	contraband = TRUE
+	contains = list(/obj/item/clothing/head/flatcap,
+					/obj/item/clothing/suit/hooded/wintercoat/captain,
+					/obj/item/reagent_containers/food/drinks/bottle/cognac,
+					/obj/item/storage/fancy/cigarettes/cigars/havana,
+					/obj/item/clothing/gloves/color/white,
+					/obj/item/clothing/under/rank/curator,
+					/obj/item/gun/ballistic/shotgun/lethal)
+	access = ACCESS_ARMORY
+	crate_name = "sporting crate"
+	crate_type = /obj/structure/closet/crate/secure // Would have liked a wooden crate but access >:(
+
 /datum/supply_pack/organic/hydroponics
 	name = "Hydroponics Crate"
 	desc = "Supplies for growing a great garden! Contains two bottles of ammonia, two Plant-B-Gone spray bottles, a hatchet, cultivator, plant analyzer, as well as a pair of leather gloves and a botanist's apron."
@@ -1754,6 +1925,27 @@
 	crate_name = "seeds crate"
 	crate_type = /obj/structure/closet/crate/hydroponics
 
+/datum/supply_pack/organic/vday
+	name = "Surplus Valentine Crate"
+	desc = "Turns out we got warehouses of this love-y dove-y crap. Were sending out small barged buddle of Valentine gear. This crate has two boxes of chocolate, three poppy flowers, five candy hearts, and three cards."
+	cost = 3000
+	contraband = TRUE
+	contains = list(/obj/item/storage/fancy/heart_box,
+					/obj/item/storage/fancy/heart_box,
+					/obj/item/reagent_containers/food/snacks/grown/poppy,
+					/obj/item/reagent_containers/food/snacks/grown/poppy,
+					/obj/item/reagent_containers/food/snacks/grown/poppy,
+					/obj/item/reagent_containers/food/snacks/candyheart,
+					/obj/item/reagent_containers/food/snacks/candyheart,
+					/obj/item/reagent_containers/food/snacks/candyheart,
+					/obj/item/reagent_containers/food/snacks/candyheart,
+					/obj/item/reagent_containers/food/snacks/candyheart,
+					/obj/item/valentine,
+					/obj/item/valentine,
+					/obj/item/valentine)
+	crate_name = "valentine crate"
+	crate_type = /obj/structure/closet/crate/secure
+
 /datum/supply_pack/organic/exoticseeds
 	name = "Exotic Seeds Crate"
 	desc = "Any entrepreneuring botanist's dream. Contains twelve different seeds, including three replica-pod seeds and two mystery seeds!"
@@ -2106,8 +2298,7 @@
 /datum/supply_pack/costumes_toys/randomised/toys
 	name = "Toy Crate"
 	desc = "Who cares about pride and accomplishment? Skip the gaming and get straight to the sweet rewards with this product! Contains five random toys. Warranty void if used to prank research directors."
-	cost = 5000 // or play the arcade machines ya lazy bum
-	// TODID make this actually just use the arcade machine loot list
+	cost = 1500 // or play the arcade machines ya lazy bum
 	num_contained = 5
 	contains = list(/obj/item/storage/box/snappops,
 					/obj/item/toy/talking/AI,
@@ -2161,6 +2352,19 @@
 	crate_name = "toy crate"
 	crate_type = /obj/structure/closet/crate/wooden
 
+/datum/supply_pack/costumes_toys/randomised/plush
+	name = "Plush Crate"
+	desc = "Plush tide station wide. Contains 5 random plushies for you to love. Warranty void if your love violates the terms of use."
+	cost = 1500 // or play the arcade machines ya lazy bum
+	num_contained = 5
+	contains = list(/obj/item/toy/plush/random,
+					/obj/item/toy/plush/random,
+					/obj/item/toy/plush/random,
+					/obj/item/toy/plush/random,
+					/obj/item/toy/plush/random) //I'm lazy
+	crate_name = "plushie crate"
+	crate_type = /obj/structure/closet/crate/wooden
+
 /datum/supply_pack/costumes_toys/wizard
 	name = "Wizard Costume Crate"
 	desc = "Pretend to join the Wizard Federation with this full wizard outfit! Nanotrasen would like to remind its employees that actually joining the Wizard Federation is subject to termination of job and life."
@@ -2404,7 +2608,7 @@
 	crate_type = /obj/structure/closet/crate
 
 /datum/supply_pack/misc/lewdkeg
-	name = "Lewd Deluxe Keg" 
+	name = "Lewd Deluxe Keg"
 	desc = "That other stuff not getting you ready? Well I have a Chemslut making tons of the good stuff."
 	cost = 7000 //It can be a weapon
 	contraband = TRUE
@@ -2412,6 +2616,27 @@
 	crate_name = "deluxe keg"
 	crate_type = /obj/structure/closet/crate
 
+/datum/supply_pack/misc/paper_work
+	name = "Freelance Paper work"
+	desc = "The Nanotrasen Primary Bureaucratic Database Intelligence (PDBI) reports that the station has not completed its funding and grant paperwork this solar cycle. In order to gain further funding, your station is required to fill out (10) ten of these forms or no additional capital will be disbursed. We have sent you ten copies of the following form and we expect every one to be up to Nanotrasen Standards." // Disbursement. It's not a typo, look it up.
+	cost = 400 // Net of 0 credits
+	contains = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/pen/fountain,
+					/obj/item/pen/fountain,
+					/obj/item/pen/fountain,
+					/obj/item/pen/fountain,
+					/obj/item/pen/fountain)
+	crate_name = "Paperwork"
+
 /datum/supply_pack/misc/toner
 	name = "Toner Crate"
 	desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'"

code/modules/client/client_defines.dm

@@ -72,4 +72,6 @@
 
 	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.
+	var/datum/player_details/player_details //these persist between logins/logouts during the same round.
+
+	var/list/char_render_holders			//Should only be a key-value list of north/south/east/west = obj/screen.

code/modules/client/client_procs.dm

@@ -454,6 +454,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 	GLOB.ahelp_tickets.ClientLogout(src)
 	GLOB.directory -= ckey
 	GLOB.clients -= src
+	QDEL_LIST_ASSOC_VAL(char_render_holders)
 	if(movingmob != null)
 		movingmob.client_mobs_in_contents -= mob
 		UNSETEMPTY(movingmob.client_mobs_in_contents)
@@ -498,7 +499,7 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 		qdel(query_client_in_db)
 		return
 	if(!query_client_in_db.NextRow())
-		if (CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey])
+		if (CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey] && !(ckey in GLOB.bunker_passthrough))
 			log_access("Failed Login: [key] - New account attempting to connect during panic bunker")
 			message_admins("<span class='adminnotice'>Failed Login: [key] - New account attempting to connect during panic bunker</span>")
 			to_chat(src, "<span class='notice'>You must first join the Discord to verify your account before joining this server.<br>To do so, read the rules and post a request in the #station-access-requests channel under the \"Main server\" category in the Discord server linked here: <a href='https://discord.gg/E6SQuhz'>https://discord.gg/E6SQuhz</a></span>") //CIT CHANGE - makes the panic bunker disconnect message point to the discord
@@ -877,3 +878,23 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 /client/proc/AnnouncePR(announcement)
 	if(prefs && prefs.chat_toggles & CHAT_PULLR)
 		to_chat(src, announcement)
+
+/client/proc/show_character_previews(mutable_appearance/MA)
+	var/pos = 0
+	for(var/D in GLOB.cardinals)
+		pos++
+		var/obj/screen/O = LAZYACCESS(char_render_holders, "[D]")
+		if(!O)
+			O = new
+			LAZYSET(char_render_holders, "[D]", O)
+			screen |= O
+		O.appearance = MA
+		O.dir = D
+		O.screen_loc = "character_preview_map:0,[pos]"
+
+/client/proc/clear_character_previews()
+	for(var/index in char_render_holders)
+		var/obj/screen/S = char_render_holders[index]
+		screen -= S
+		qdel(S)
+	char_render_holders = null

code/modules/client/preferences_savefile.dm

@@ -235,6 +235,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 
 	//Character
 	S["real_name"]			>> real_name
+	S["nameless"]			>> nameless
 	S["name_is_always_random"] >> be_random_name
 	S["body_is_always_random"] >> be_random_body
 	S["gender"]				>> gender
@@ -301,6 +302,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_mam_ears"]				>> features["mam_ears"]
 	S["feature_mam_tail_animated"]		>> features["mam_tail_animated"]
 	S["feature_taur"]					>> features["taur"]
+	S["feature_mam_snouts"]				>> features["mam_snouts"]
 	//Xeno features
 	S["feature_xeno_tail"]				>> features["xenotail"]
 	S["feature_xeno_dors"]				>> features["xenodorsal"]
@@ -362,6 +364,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	if(!features["mcolor"] || features["mcolor"] == "#000")
 		features["mcolor"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")
 
+	nameless = sanitize_integer(nameless, 0, 1, initial(nameless))
 	be_random_name	= sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
 	be_random_body	= sanitize_integer(be_random_body, 0, 1, initial(be_random_body))
 
@@ -427,6 +430,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 
 	//Character
 	WRITE_FILE(S["real_name"]			, real_name)
+	WRITE_FILE(S["nameless"]			, nameless)
 	WRITE_FILE(S["name_is_always_random"] , be_random_name)
 	WRITE_FILE(S["body_is_always_random"] , be_random_body)
 	WRITE_FILE(S["gender"]				, gender)

code/modules/client/verbs/aooc.dm

@@ -61,7 +61,7 @@
 		antaglisting |= M.current.client
 
 	for(var/mob/M in GLOB.player_list)
-		if(M.client && (M.stat == DEAD || M.client.holder))
+		if(M.client && (M.stat == DEAD || M.client.holder) && !istype(M, /mob/dead/new_player))
 			antaglisting |= M.client
 
 	for(var/client/C in antaglisting)

code/modules/clothing/clothing.dm

@@ -24,6 +24,8 @@
 	var/can_flashlight = 0
 	var/scan_reagents = 0 //Can the wearer see reagents while it's equipped?
 
+	var/blocks_shove_knockdown = FALSE //Whether wearing the clothing item blocks the ability for shove to knock down.
+
 	var/clothing_flags = NONE
 
 	//Var modification - PLEASE be careful with this I know who you are and where you live

code/modules/clothing/glasses/_glasses.dm

@@ -67,6 +67,11 @@
 	user.visible_message("<span class='suicide'>[user] is putting \the [src] to [user.p_their()] eyes and overloading the brightness! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return BRUTELOSS
 
+/obj/item/clothing/glasses/meson/prescription
+	name = "prescription optical meson scanner"
+	desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This one has prescription lens fitted in."
+	vision_correction = 1
+
 /obj/item/clothing/glasses/meson/night
 	name = "night vision meson scanner"
 	desc = "An optical meson scanner fitted with an amplified visible light spectrum overlay, providing greater visual clarity in darkness."
@@ -159,6 +164,7 @@
 	attack_verb = list("sliced")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharpness = IS_SHARP
+	vision_correction = 1
 	glass_colour_type = /datum/client_colour/glass_colour/lightgreen
 
 /obj/item/clothing/glasses/regular

code/modules/clothing/glasses/engine_goggles.dm

@@ -21,6 +21,11 @@
 	var/mode = MODE_NONE
 	var/range = 1
 
+/obj/item/clothing/glasses/meson/engine/prescription
+	name = "prescription engineering scanner goggles"
+	desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, the T-ray Scanner mode lets you see underfloor objects such as cables and pipes, and the Radiation Scanner mode let's you see objects contaminated by radiation. Each lens has been replaced with a corrective lens."
+	vision_correction = 1
+
 /obj/item/clothing/glasses/meson/engine/Initialize()
 	. = ..()
 	START_PROCESSING(SSobj, src)
@@ -137,6 +142,11 @@
 
 	modes = list(MODE_NONE = MODE_TRAY, MODE_TRAY = MODE_NONE)
 
+/obj/item/clothing/glasses/meson/engine/tray/prescription
+	name = "prescription optical t-ray scanner"
+	desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, the T-ray Scanner mode lets you see underfloor objects such as cables and pipes, and the Radiation Scanner mode let's you see objects contaminated by radiation. This one has a lens that help correct eye sight."
+	vision_correction = 1
+
 /obj/item/clothing/glasses/meson/engine/shuttle
 	name = "shuttle region scanner"
 	icon_state = "trayson-shuttle"

code/modules/clothing/glasses/hud.dm

@@ -37,6 +37,14 @@
 	hud_type = DATA_HUD_MEDICAL_ADVANCED
 	glass_colour_type = /datum/client_colour/glass_colour/lightblue
 
+/obj/item/clothing/glasses/hud/health/prescription
+	name = "prescription health scanner HUD"
+	desc = "A heads-up display, made with a prescription lens, that scans the humans in view and provides accurate data about their health status."
+	icon_state = "healthhud"
+	hud_type = DATA_HUD_MEDICAL_ADVANCED
+	vision_correction = 1
+	glass_colour_type = /datum/client_colour/glass_colour/lightblue
+
 /obj/item/clothing/glasses/hud/health/night
 	name = "night vision health scanner HUD"
 	desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
@@ -62,6 +70,14 @@
 	hud_type = DATA_HUD_DIAGNOSTIC_BASIC
 	glass_colour_type = /datum/client_colour/glass_colour/lightorange
 
+/obj/item/clothing/glasses/hud/diagnostic/prescription
+	name = "prescription diagnostic HUD"
+	desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits. This one has a prescription lens."
+	icon_state = "diagnostichud"
+	hud_type = DATA_HUD_DIAGNOSTIC_BASIC
+	vision_correction = 1
+	glass_colour_type = /datum/client_colour/glass_colour/lightorange
+
 /obj/item/clothing/glasses/hud/diagnostic/night
 	name = "night vision diagnostic HUD"
 	desc = "A robotics diagnostic HUD fitted with a light amplifier."
@@ -78,6 +94,14 @@
 	hud_type = DATA_HUD_SECURITY_ADVANCED
 	glass_colour_type = /datum/client_colour/glass_colour/red
 
+/obj/item/clothing/glasses/hud/security/prescription
+	name = "prescription security HUD"
+	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records. This one has a prescription lens so you can see the banana peal that slipped you."
+	icon_state = "securityhud"
+	hud_type = DATA_HUD_SECURITY_ADVANCED
+	vision_correction = 1
+	glass_colour_type = /datum/client_colour/glass_colour/red
+
 /obj/item/clothing/glasses/hud/security/chameleon
 	name = "chameleon security HUD"
 	desc = "A stolen security HUD integrated with Syndicate chameleon technology. Provides flash protection."

code/modules/clothing/head/helmet.dm

@@ -3,7 +3,7 @@
 	desc = "Standard Security gear. Protects the head from impacts."
 	icon_state = "helmet"
 	item_state = "helmet"
-	armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	flags_inv = HIDEEARS
 	cold_protection = HEAD
 	min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT

code/modules/clothing/head/jobs.dm

@@ -139,7 +139,7 @@
 	name = "security beret"
 	desc = "A robust beret with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
 	icon_state = "beret_badge"
-	armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50)
+	armor = list("melee" = 40, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	strip_delay = 60
 	dog_fashion = null
 
@@ -152,7 +152,7 @@
 	name = "warden's beret"
 	desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
 	icon_state = "wardenberet"
-	armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 50)
+	armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	strip_delay = 60
 
 /obj/item/clothing/head/beret/sec/navyofficer

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -168,6 +168,7 @@ Contains:
 	strip_delay = 130
 	item_flags = NODROP
 	brightness_on = 7
+	resistance_flags = ACID_PROOF
 
 /obj/item/clothing/suit/space/hardsuit/ert
 	name = "emergency response team suit"
@@ -179,6 +180,7 @@ Contains:
 	armor = list("melee" = 65, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80)
 	slowdown = 0
 	strip_delay = 130
+	resistance_flags = ACID_PROOF
 
 	//ERT Security
 /obj/item/clothing/head/helmet/space/hardsuit/ert/sec

code/modules/clothing/suits/armor.dm

@@ -110,13 +110,14 @@
 
 /obj/item/clothing/suit/armor/riot
 	name = "riot suit"
-	desc = "A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks."
+	desc = "A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Helps the wearer resist shoving in close quarters."
 	icon_state = "riot"
 	item_state = "swat_suit"
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	armor = list("melee" = 50, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
+	blocks_shove_knockdown = TRUE
 	strip_delay = 80
 	equip_delay_other = 60
 

code/modules/clothing/suits/bio.dm

@@ -5,7 +5,7 @@
 	desc = "A hood that protects the head and face from biological contaminants."
 	permeability_coefficient = 0.01
 	clothing_flags = THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 80, "fire" = 30, "acid" = 100)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 60, "fire" = 30, "acid" = 100)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE
 	resistance_flags = ACID_PROOF
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
@@ -22,7 +22,7 @@
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	slowdown = 1
 	allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/pen, /obj/item/flashlight/pen, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray)
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 80, "fire" = 30, "acid" = 100)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 60, "fire" = 30, "acid" = 100)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAUR
 	strip_delay = 70
 	equip_delay_other = 70

code/modules/clothing/suits/reactive_armour.dm

@@ -37,6 +37,7 @@
 	actions_types = list(/datum/action/item_action/toggle)
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	hit_reaction_chance = 50 // Only on the chest yet blocks all attacks?
+	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
 
 /obj/item/clothing/suit/armor/reactive/attack_self(mob/user)
 	active = !(active)
@@ -64,8 +65,9 @@
 /obj/item/clothing/suit/armor/reactive/teleport
 	name = "reactive teleport armor"
 	desc = "Someone separated our Research Director from his own head!"
-	var/tele_range = 6
-	var/rad_amount= 15
+	var/tele_range = 8
+	var/rad_amount = 60
+	var/rad_amount_before = 120
 	reactivearmor_cooldown_duration = 100
 
 /obj/item/clothing/suit/armor/reactive/teleport/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
@@ -79,6 +81,7 @@
 		owner.visible_message("<span class='danger'>The reactive teleport system flings [H] clear of [attack_text], shutting itself off in the process!</span>")
 		playsound(get_turf(owner),'sound/magic/blink.ogg', 100, 1)
 		var/list/turfs = new/list()
+		var/turf/old = get_turf(src)
 		for(var/turf/T in orange(tele_range, H))
 			if(T.density)
 				continue
@@ -93,7 +96,8 @@
 		if(!isturf(picked))
 			return
 		H.forceMove(picked)
-		H.rad_act(rad_amount)
+		radiation_pulse(old, rad_amount_before)
+		radiation_pulse(src, rad_amount)
 		reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration
 		return 1
 	return 0
@@ -157,6 +161,8 @@
 	var/tesla_power = 25000
 	var/tesla_range = 20
 	var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE
+	var/legacy = FALSE
+	var/legacy_dmg = 30
 
 /obj/item/clothing/suit/armor/reactive/tesla/dropped(mob/user)
 	..()
@@ -179,7 +185,15 @@
 			owner.visible_message("<span class='danger'>The tesla capacitors on [owner]'s reactive tesla armor are still recharging! The armor merely emits some sparks.</span>")
 			return
 		owner.visible_message("<span class='danger'>[src] blocks [attack_text], sending out arcs of lightning!</span>")
-		tesla_zap(owner, tesla_range, tesla_power, tesla_flags)
+		if(!legacy)
+			tesla_zap(owner, tesla_range, tesla_power, tesla_flags)
+		else
+			for(var/mob/living/M in view(7, owner))
+				if(M == owner)
+					continue
+				owner.Beam(M,icon_state="purple_lightning",icon='icons/effects/effects.dmi',time=5)
+				M.adjustFireLoss(legacy_dmg)
+				playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1)
 		reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration
 		return TRUE
 

code/modules/clothing/under/accessories.dm

@@ -158,14 +158,14 @@
 	icon_state = "bronze_heart"
 
 /obj/item/clothing/accessory/medal/engineer
-	name	=	"\"Shift's Best Electrician\" award"
-	desc	=	"An award bestowed upon engineers who have excelled at keeping the station running in the best possible condition against all odds."
-	icon_state	=	"engineer"
+	name = "\"Shift's Best Electrician\" award"
+	desc = "An award bestowed upon engineers who have excelled at keeping the station running in the best possible condition against all odds."
+	icon_state = "engineer"
 
 /obj/item/clothing/accessory/medal/greytide
-	name	=	"\"Greytider of the shift\" award"
-	desc	=	"An award for only the most annoying of assistants.  Locked doors mean nothing to you and behaving is not in your vocabulary"
-	icon_state	=	"greytide"
+	name = "\"Greytider of the shift\" award"
+	desc = "An award for only the most annoying of assistants.  Locked doors mean nothing to you and behaving is not in your vocabulary"
+	icon_state = "greytide"
 
 /obj/item/clothing/accessory/medal/ribbon
 	name = "ribbon"
@@ -178,9 +178,9 @@
 	desc = "An award bestowed only upon those cargotechs who have exhibited devotion to their duty in keeping with the highest traditions of Cargonia."
 
 /obj/item/clothing/accessory/medal/ribbon/medical_doctor
-	name	=	"\"doctor of the shift\" award"
-	desc	=	"An award bestowed only upon the most capable doctors who have upheld the Hippocratic Oath to the best of their ability"
-	icon_state	=	"medical_doctor"
+	name = "\"doctor of the shift\" award"
+	desc = "An award bestowed only upon the most capable doctors who have upheld the Hippocratic Oath to the best of their ability"
+	icon_state = "medical_doctor"
 
 /obj/item/clothing/accessory/medal/silver
 	name = "silver medal"
@@ -211,6 +211,12 @@
 	desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to Nanotrasen, and their undisputable authority over their crew."
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 
+/obj/item/clothing/accessory/medal/gold/captain/family
+	name = "old medal of captaincy"
+	desc = "A rustic badge pure gold, has been through hell and back by the looks, the syndcate have been after these by the looks of it for generations..."
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 10) //Pure gold
+	materials = list(MAT_GOLD=2000)
+
 /obj/item/clothing/accessory/medal/gold/heroism
 	name = "medal of exceptional heroism"
 	desc = "An extremely rare golden medal awarded only by CentCom. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
@@ -234,8 +240,6 @@
 	name = "nobel sciences award"
 	desc = "A plasma medal which represents significant contributions to the field of science or engineering."
 
-
-
 ////////////
 //Armbands//
 ////////////

code/modules/clothing/under/vg_under.dm

@@ -1,3 +1,6 @@
+// Fixed to work with Citadel code. Apparently none of them had NO_MUTANTRACE flags.
+// I was pissy when I realised how to fix this because it's so fucking easy and nobody apparently had done it.
+
 /obj/item/clothing/under/stripper_pink
 	name = "pink stripper outfit"
 	icon_state = "stripper_p"
@@ -6,7 +9,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/stripper_green
 	name = "green stripper outfit"
@@ -16,8 +19,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/wedding/bride_orange
 	name = "orange wedding dress"
@@ -28,7 +30,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/wedding/bride_purple
 	name = "purple wedding dress"
@@ -39,7 +41,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/wedding/bride_blue
 	name = "blue wedding dress"
@@ -50,7 +52,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/wedding/bride_red
 	name = "red wedding dress"
@@ -61,7 +63,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/wedding/bride_white
 	name = "white wedding dress"
@@ -72,7 +74,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/mankini
 	name = "pink mankini"
@@ -82,6 +84,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 /*
 
 /obj/item/clothing/under/psysuit
@@ -126,7 +129,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/russobluecamooutfit
 	name = "russian blue camo"
@@ -137,7 +140,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/stilsuit
 	name = "stillsuit"
@@ -148,7 +151,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/aviatoruniform
 	name = "aviator uniform"
@@ -159,7 +162,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/bikersuit
 	name = "biker's outfit"
@@ -169,7 +172,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/jacketsuit
 	name = "richard's outfit"
@@ -180,7 +183,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 obj/item/clothing/under/mega
 	name = "\improper DRN-001 suit"
@@ -191,7 +194,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/proto
 	name = "The Prototype Suit"
@@ -202,7 +205,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/megax
 	name = "\improper Maverick Hunter regalia"
@@ -213,7 +216,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/joe
 	name = "The Sniper Suit"
@@ -224,7 +227,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/roll
 	name = "\improper DRN-002 Dress"
@@ -235,7 +238,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/gokugidown
 	name = "turtle hermit undershirt"
@@ -246,7 +249,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/gokugi
 	name = "turtle hermit outfit"
@@ -257,7 +260,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/doomguy
 	name = "\improper Doomguy's pants"
@@ -268,7 +271,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/vault13
 	name = "vault 13 Jumpsuit"
@@ -279,7 +282,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/vault
 	name = "vault jumpsuit"
@@ -290,7 +293,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/clownpiece
 	name = "Clownpiece's Pierrot suit"
@@ -301,7 +304,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/cia
 	name = "casual IAA outfit"
@@ -312,7 +315,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/greaser
 	name = "greaser outfit"
@@ -322,7 +325,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/greaser/New()
 	var/greaser_colour = "default"
@@ -341,6 +344,8 @@ obj/item/clothing/under/mega
 	item_color = "greaser_[greaser_colour]"
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+
 
 /obj/item/clothing/under/wintercasualwear
 	name = "winter casualwear"
@@ -351,8 +356,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/casualwear
 	name = "spring casualwear"
@@ -363,7 +367,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/keyholesweater
 	name = "keyhole sweater"
@@ -374,7 +378,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/casualhoodie
 	name = "casual hoodie"
@@ -385,8 +389,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/casualhoodie/skirt
 	icon_state = "hoodieskirt"
@@ -394,6 +397,8 @@ obj/item/clothing/under/mega
 	item_color = "hoodieskirt"
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+
 /*
 /obj/item/clothing/under/mummy_rags
 	name = "mummy rags"
@@ -427,3 +432,5 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+

code/modules/crafting/recipes.dm

@@ -694,10 +694,18 @@
 					/obj/item/reagent_containers/food/snacks/grown/potato = 1)
 	category = CAT_MISC
 
+/datum/crafting_recipe/paperwork
+	name = "Filed Paper Work"
+	result =  /obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct
+	time = 90 //Takes time for people to file and complete paper work!
+	reqs = list(/obj/item/pen = 1,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork = 2)
+	category = CAT_MISC
+
 /datum/crafting_recipe/ghettojetpack
 	name = "Improvised Jetpack"
 	result = /obj/item/tank/jetpack/improvised
 	time = 30
 	reqs = list(/obj/item/tank/internals/oxygen/red = 2, /obj/item/extinguisher = 1, /obj/item/pipe = 3, /obj/item/stack/cable_coil = 30)//red oxygen tank so it looks right
 	category = CAT_MISC
-	tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER)
+	tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER)

code/modules/detectivework/detective_work.dm

@@ -93,6 +93,15 @@
 	else if(length(blood_dna))
 		AddComponent(/datum/component/forensics, null, null, blood_dna)
 		bloody_hands = rand(2, 4)
+	if(head)
+		head.add_blood_DNA(blood_dna)
+		update_inv_head()
+	else if(wear_mask)
+		wear_mask.add_blood_DNA(blood_dna)
+		update_inv_wear_mask()
+	if(wear_neck)
+		wear_neck.add_blood_DNA(blood_dna)
+		update_inv_neck()
 	update_inv_gloves()	//handles bloody hands overlays and updating
 	return TRUE
 

code/modules/events/brand_intelligence.dm

@@ -18,7 +18,14 @@
 									 "Your money can buy happiness!", \
 									 "Engage direct marketing!", \
 									 "Advertising is legalized lying! But don't let that put you off our great deals!", \
-									 "You don't want to buy anything? Yeah, well, I didn't want to buy your mom either.")
+									 "You don't want to buy anything? Yeah, well, I didn't want to buy your mom either.",
+									 "Gamers, rise up!",
+									 "Ok, now, this is epic.",
+									 "HUMAN FUNNY.",
+									 "But I'm already tracer!",
+									 "How do I vore people?",
+									 "ERP?",
+									 "Not epic bros...")
 
 
 /datum/round_event/brand_intelligence/announce(fake)

code/modules/events/devil.dm

@@ -39,6 +39,7 @@
 	var/datum/job/jobdatum = SSjob.GetJob("Assistant")
 	devil.job = jobdatum.title
 	jobdatum.equip(devil)
+	success_spawn = TRUE
 	return SUCCESSFUL_SPAWN
 
 

code/modules/events/ion_storm.dm

@@ -12,7 +12,7 @@
 	var/removeDontImproveChance = 10 //chance the randomly created law replaces a random law instead of simply being added
 	var/shuffleLawsChance = 10 //chance the AI's laws are shuffled afterwards
 	var/botEmagChance = 10
-	var/announceEvent = ION_RANDOM // -1 means don't announce, 0 means have it randomly announce, 1 means
+	var/announceEvent = ION_RANDOM // -1 means don't announce, 0 means have it randomly announce, 1 means it is announced
 	var/ionMessage = null
 	var/ionAnnounceChance = 33
 	announceWhen	= 1
@@ -30,7 +30,7 @@
 
 
 /datum/round_event/ion_storm/start()
-	//AI laws
+	//Generate AI law change
 	for(var/mob/living/silicon/ai/M in GLOB.alive_mob_list)
 		M.laws_sanity_check()
 		if(M.stat != DEAD && M.see_in_dark != 0)
@@ -53,6 +53,31 @@
 			log_game("Ion storm changed laws of [key_name(M)] to [english_list(M.laws.get_law_list(TRUE, TRUE))]")
 			M.post_lawchange()
 
+	//Generate Cyborg law change
+	for(var/mob/living/silicon/robot/M in GLOB.alive_mob_list)
+		M.laws_sanity_check()
+		if(M.stat != DEAD && M.see_in_dark != 0)
+			if(prob(replaceLawsetChance))
+				M.laws.pick_weighted_lawset()
+
+			if(prob(removeRandomLawChance))
+				M.remove_law(rand(1, M.laws.get_law_amount(list(LAW_INHERENT, LAW_SUPPLIED))))
+
+			var/message = ionMessage || generate_ion_law()
+			if(message)
+				if(prob(removeDontImproveChance))
+					M.replace_random_law(message, list(LAW_INHERENT, LAW_SUPPLIED, LAW_ION))
+				else
+					M.add_ion_law(message)
+
+			if(prob(shuffleLawsChance))
+				M.shuffle_laws(list(LAW_INHERENT, LAW_SUPPLIED, LAW_ION))
+
+			log_game("Ion storm changed laws of [key_name(M)] to [english_list(M.laws.get_law_list(TRUE, TRUE))]")
+			M.post_lawchange()
+
+
+	//Chance to emag a Bot
 	if(botEmagChance)
 		for(var/mob/living/simple_animal/bot/bot in GLOB.alive_mob_list)
 			if(prob(botEmagChance))

code/modules/events/vent_clog.dm

@@ -79,12 +79,28 @@
 	typepath = /datum/round_event/vent_clog/beer
 	max_occurrences = 0
 
+/datum/round_event/vent_clog/beer
+	reagentsAmount = 100
+
 /datum/round_event_control/vent_clog/plasma_decon
 	name = "Plasma decontamination"
 	typepath = /datum/round_event/vent_clog/plasma_decon
 	max_occurrences = 0
 
-/datum/round_event/vent_clog/beer
+/datum/round_event_control/vent_clog/female
+	name = "FemCum stationwide"
+	typepath = /datum/round_event/vent_clog/female
+	max_occurrences = 0
+
+/datum/round_event/vent_clog/female
+	reagentsAmount = 100
+
+/datum/round_event_control/vent_clog/male
+	name = "Semen stationwide"
+	typepath = /datum/round_event/vent_clog/male
+	max_occurrences = 0
+
+/datum/round_event/vent_clog/male
 	reagentsAmount = 100
 
 /datum/round_event/vent_clog/beer/announce()
@@ -102,6 +118,30 @@
 			foam.start()
 		CHECK_TICK
 
+/datum/round_event/vent_clog/male/start()
+	for(var/obj/machinery/atmospherics/components/unary/vent in vents)
+		if(vent && vent.loc)
+			var/datum/reagents/R = new/datum/reagents(1000)
+			R.my_atom = vent
+			R.add_reagent("semen", reagentsAmount)
+
+			var/datum/effect_system/foam_spread/foam = new
+			foam.set_up(200, get_turf(vent), R)
+			foam.start()
+		CHECK_TICK
+
+/datum/round_event/vent_clog/female/start()
+	for(var/obj/machinery/atmospherics/components/unary/vent in vents)
+		if(vent && vent.loc)
+			var/datum/reagents/R = new/datum/reagents(1000)
+			R.my_atom = vent
+			R.add_reagent("femcum", reagentsAmount)
+
+			var/datum/effect_system/foam_spread/foam = new
+			foam.set_up(200, get_turf(vent), R)
+			foam.start()
+		CHECK_TICK
+
 /datum/round_event/vent_clog/plasma_decon/announce()
 	priority_announce("We are deploying an experimental plasma decontamination system. Please stand away from the vents and do not breathe the smoke that comes out.", "Central Command Update")
 

code/modules/food_and_drinks/drinks/drinks.dm

@@ -120,6 +120,12 @@
 	I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
 	B.icon = I
 	B.name = "broken [name]"
+	if(ranged)
+		var/matrix/M = matrix(B.transform)
+		M.Turn(rand(-170, 170))
+		B.transform = M
+		B.pixel_x = rand(-12, 12)
+		B.pixel_y = rand(-12, 12)
 	if(prob(33))
 		new/obj/item/shard(drop_location())
 	playsound(src, "shatter", 70, 1)
@@ -296,6 +302,12 @@
 	B.force = 0
 	B.throwforce = 0
 	B.desc = "A carton with the bottom half burst open. Might give you a papercut."
+	if(ranged)
+		var/matrix/M = matrix(B.transform)
+		M.Turn(rand(-170, 170))
+		B.transform = M
+		B.pixel_x = rand(-12, 12)
+		B.pixel_y = rand(-12, 12)
 	transfer_fingerprints_to(B)
 	qdel(src)
 

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -23,6 +23,12 @@
 	var/obj/item/broken_bottle/B = new (loc)
 	if(!ranged)
 		thrower.put_in_hands(B)
+	else
+		var/matrix/M = matrix(B.transform)
+		M.Turn(rand(-170, 170))
+		B.transform = M
+		B.pixel_x = rand(-12, 12)
+		B.pixel_y = rand(-12, 12)
 	B.icon_state = icon_state
 
 	var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)

code/modules/food_and_drinks/food/snacks_bread.dm

@@ -185,6 +185,17 @@
 	icon_state = ""
 	bitesize = 2
 
+GLOBAL_VAR_INIT(frying_hardmode, TRUE)
+GLOBAL_VAR_INIT(frying_bad_chem_add_volume, TRUE)
+GLOBAL_LIST_INIT(frying_bad_chems, list(
+"bad_food" = 10,
+"clf3" = 2,
+"aranesp" = 2,
+"blackpowder" = 10,
+"phlogiston" = 3,
+"cyanide" = 3,
+))
+
 /obj/item/reagent_containers/food/snacks/deepfryholder/Initialize(mapload, obj/item/fried)
 	. = ..()
 	name = fried.name //We'll determine the other stuff when it's actually removed
@@ -210,6 +221,13 @@
 	else
 		fried.forceMove(src)
 		trash = fried
+		if(!istype(fried, /obj/item/reagent_containers/food) && GLOB.frying_hardmode && GLOB.frying_bad_chems.len)
+			var/R = rand(1, GLOB.frying_bad_chems.len)
+			var/bad_chem = GLOB.frying_bad_chems[R]
+			var/bad_chem_amount = GLOB.frying_bad_chems[bad_chem]
+			if(GLOB.frying_bad_chem_add_volume)
+				reagents.maximum_volume += bad_chem_amount
+			reagents.add_reagent(bad_chem, bad_chem_amount)
 
 /obj/item/reagent_containers/food/snacks/deepfryholder/Destroy()
 	if(trash)

code/modules/food_and_drinks/food/snacks_other.dm

@@ -563,9 +563,9 @@
 
 /obj/item/reagent_containers/food/snacks/tinychocolate
 	name = "chocolate"
-	desc = "A tiny and sweet chocolate."
+	desc = "A tiny and sweet chocolate. Has a 'strawberry' filling!"
 	icon_state = "tiny_chocolate"
-	list_reagents = list("nutriment" = 1, "sugar" = 1, "cocoa" = 1)
+	list_reagents = list("nutriment" = 1, "sugar" = 1, "cocoa" = 1, "aphro" = 1)
 	filling_color = "#A0522D"
 	tastes = list("chocolate" = 1)
-	foodtype = JUNKFOOD | SUGAR
+	foodtype = JUNKFOOD | SUGAR

code/modules/food_and_drinks/food/snacks_pastry.dm

@@ -89,13 +89,24 @@
 	icon_state = "jdonut1"
 	extra_reagent = "cherryjelly"
 	foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT
-	
+
 /obj/item/reagent_containers/food/snacks/donut/meat
 	bonus_reagents = list("ketchup" = 1)
 	list_reagents = list("nutriment" = 3, "ketchup" = 2)
 	tastes = list("meat" = 1)
 	foodtype = JUNKFOOD | MEAT | GROSS | FRIED
-	
+
+/obj/item/reagent_containers/food/snacks/donut/semen
+	name = "\"cream\" donut"
+	desc = "That cream looks a little runny..."
+	icon_state = "donut3"
+	bitesize = 10
+	bonus_reagents = list("semen" = 1)
+	list_reagents = list("nutriment" = 3, "sugar" = 2, "semen" = 5)
+	filling_color = "#FFFFFF"
+	tastes = list("donut" = 1, "salt" = 3)
+	foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR
+
 
 ////////////////////////////////////////////MUFFINS////////////////////////////////////////////
 

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -1,6 +1,5 @@
 ////////////////////////////////////////// COCKTAILS //////////////////////////////////////
 
-
 /datum/chemical_reaction/goldschlager
 	name = "Goldschlager"
 	id = "goldschlager"
@@ -676,7 +675,6 @@
 	results = list("fernet_cola" = 2)
 	required_reagents = list("fernet" = 1, "cola" = 1)
 
-
 /datum/chemical_reaction/fanciulli
 	name = "Fanciulli"
 	id = "fanciulli"
@@ -688,3 +686,9 @@
 	id = "branca_menta"
 	results = list("branca_menta" = 3)
 	required_reagents = list("fernet" = 1, "creme_de_menthe" = 1, "ice" = 1)
+
+/datum/chemical_reaction/pwrgame
+	name = "Power Gamer"
+	id = "pwr_game"
+	results = list("pwr_game" = 5)
+	required_reagents = list("sodawater" = 1, "blackcrayonpowder" = 1, "sodiumchloride" = 1)

code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm

@@ -23,6 +23,16 @@
 	result = /obj/item/reagent_containers/food/snacks/donut
 	subcategory = CAT_PASTRY
 	
+/datum/crafting_recipe/food/donut
+	time = 15
+	name = "Semen donut"
+	reqs = list(
+		/datum/reagent/consumable/semen = 10,
+		/obj/item/reagent_containers/food/snacks/pastrybase = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/donut/semen
+	subcategory = CAT_PASTRY
+
 datum/crafting_recipe/food/donut/meat
 	time = 15
 	name = "Meat donut"

code/modules/holodeck/turfs.dm

@@ -122,7 +122,7 @@
 /turf/open/floor/holofloor/wood
 	icon_state = "wood"
 	tiled_dirt = FALSE
-	
+
 /turf/open/floor/holofloor/snow
 	gender = PLURAL
 	name = "snow"
@@ -133,6 +133,15 @@
 	bullet_sizzle = TRUE
 	bullet_bounce_sound = null
 	tiled_dirt = FALSE
+	baseturfs = /turf/open/floor/holofloor/snow
+
+/turf/open/floor/holofloor/snow/attack_hand(mob/living/user)
+	. = ..()
+	if(.)
+		return
+	user.visible_message("<span class='notice'>[user] scroops up some snow from [src].</span>", "<span class='notice'>You scoop up some snow from [src].</span>")
+	var/obj/item/toy/snowball/S = new(get_turf(src))
+	user.put_in_hands(S)
 
 /turf/open/floor/holofloor/snow/cold
 	initial_gas_mix = "nob=7500;TEMP=2.7"
@@ -143,3 +152,22 @@
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "asteroid"
 	tiled_dirt = FALSE
+
+/turf/open/floor/holofloor/ice
+	name = "ice sheet"
+	desc = "A sheet of solid ice. Looks slippery."
+	icon = 'icons/turf/floors/ice_turf.dmi'
+	icon_state = "unsmooth"
+	baseturfs = /turf/open/floor/holofloor/ice
+	slowdown = 1
+	footstep = FOOTSTEP_FLOOR
+
+/turf/open/floor/holofloor/ice/smooth
+	icon_state = "smooth"
+	smooth = SMOOTH_MORE | SMOOTH_BORDER
+	canSmoothWith = list(/turf/open/floor/plating/ice/smooth, /turf/open/floor/plating/ice, /turf/open/floor/holofloor/ice)
+	baseturfs = /turf/open/floor/holofloor/ice/smooth
+
+/turf/open/floor/holofloor/ice/Initialize()
+	. = ..()
+	MakeSlippery(TURF_WET_PERMAFROST, INFINITY, 0, INFINITY, TRUE)

code/modules/hydroponics/grown/tomato.dm

@@ -136,7 +136,7 @@
 
 	spawn(30)
 		if(!QDELETED(src))
-			investigate_log(INVESTIGATE_BOTANY, "[key_name(user)] released a killer tomato at [COORD(src)]")
+			investigate_log("[key_name(user)] released a killer tomato at [COORD(src)]", INVESTIGATE_BOTANY)
 			var/mob/living/simple_animal/hostile/killertomato/K = new /mob/living/simple_animal/hostile/killertomato(get_turf(src.loc))
 			K.maxHealth += round(seed.endurance / 3)
 			K.melee_damage_lower += round(seed.potency / 10)

code/modules/hydroponics/hydroitemdefines.dm

@@ -24,10 +24,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
 	volume = 100
-
-/obj/item/reagent_containers/spray/weedspray/Initialize()
-	. = ..()
-	reagents.add_reagent("weedkiller", 100)
+	list_reagents = list("weedkiller" = 100)
 
 /obj/item/reagent_containers/spray/weedspray/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -42,10 +39,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
 	volume = 100
-
-/obj/item/reagent_containers/spray/pestspray/Initialize()
-	. = ..()
-	reagents.add_reagent("pestkiller", 100)
+	list_reagents = list("pestkiller" = 100)
 
 /obj/item/reagent_containers/spray/pestspray/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -157,71 +151,45 @@
 
 /obj/item/reagent_containers/glass/bottle/nutrient
 	name = "bottle of nutrient"
-	icon = 'icons/obj/chemical.dmi'
 	volume = 50
-	w_class = WEIGHT_CLASS_TINY
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(1,2,5,10,15,25,50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/Initialize()
 	. = ..()
-	src.pixel_x = rand(-5, 5)
-	src.pixel_y = rand(-5, 5)
+	pixel_x = rand(-5, 5)
+	pixel_y = rand(-5, 5)
 
 
 /obj/item/reagent_containers/glass/bottle/nutrient/ez
 	name = "bottle of E-Z-Nutrient"
 	desc = "Contains a fertilizer that causes mild mutations with each harvest."
-	icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/nutrient/ez/Initialize()
-	. = ..()
-	reagents.add_reagent("eznutriment", 50)
+	list_reagents = list("eznutriment" = 50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/l4z
 	name = "bottle of Left 4 Zed"
 	desc = "Contains a fertilizer that limits plant yields to no more than one and causes significant mutations in plants."
-	icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/nutrient/l4z/Initialize()
-	. = ..()
-	reagents.add_reagent("left4zednutriment", 50)
+	list_reagents = list("left4zednutriment" = 50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/rh
 	name = "bottle of Robust Harvest"
 	desc = "Contains a fertilizer that increases the yield of a plant by 30% while causing no mutations."
-	icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/nutrient/rh/Initialize()
-	. = ..()
-	reagents.add_reagent("robustharvestnutriment", 50)
+	list_reagents = list("robustharvestnutriment" = 50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/empty
 	name = "bottle"
-	icon = 'icons/obj/chemical.dmi'
 
 /obj/item/reagent_containers/glass/bottle/killer
-	name = "bottle"
-	icon = 'icons/obj/chemical.dmi'
 	volume = 50
-	w_class = WEIGHT_CLASS_TINY
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(1,2,5,10,15,25,50)
 
 /obj/item/reagent_containers/glass/bottle/killer/weedkiller
 	name = "bottle of weed killer"
 	desc = "Contains a herbicide."
-	icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/killer/weedkiller/Initialize()
-	. = ..()
-	reagents.add_reagent("weedkiller", 50)
+	list_reagents = list("weedkiller" = 50)
 
 /obj/item/reagent_containers/glass/bottle/killer/pestkiller
 	name = "bottle of pest spray"
 	desc = "Contains a pesticide."
-	icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/killer/pestkiller/Initialize()
-	. = ..()
-	reagents.add_reagent("pestkiller", 50)
+	list_reagents = list("pestkiller" = 50)

code/modules/jobs/job_types/captain.dm

@@ -26,7 +26,7 @@ Captain
 
 /datum/job/captain/announce(mob/living/carbon/human/H)
 	..()
-	SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "Captain [H.real_name] on deck!"))
+	SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "Captain [H.nameless ? "" : "[H.real_name] "]on deck!"))
 
 /datum/outfit/job/captain
 	name = "Captain"

code/modules/jobs/job_types/job.dm

@@ -127,6 +127,8 @@
 		return 0
 	if(!CONFIG_GET(flag/use_age_restriction_for_jobs))
 		return 0
+	if(C.prefs.db_flags & DB_FLAG_EXEMPT)
+		return 0
 	if(!isnum(C.player_age))
 		return 0 //This is only a number if the db connection is established, otherwise it is text: "Requires database", meaning these restrictions cannot be enforced
 	if(!isnum(minimal_player_age))
@@ -191,6 +193,12 @@
 	if(!J)
 		J = SSjob.GetJob(H.job)
 
+	if(H.nameless && J.dresscodecompliant)
+		if(J.title in GLOB.command_positions)
+			H.real_name = J.title
+		else
+			H.real_name = "[J.title] #[rand(10000, 99999)]"
+
 	var/obj/item/card/id/C = H.wear_id
 	if(istype(C))
 		C.access = J.get_access()

code/modules/mapping/space_management/space_reservation.dm

@@ -9,9 +9,11 @@
 	var/top_right_coords[3]
 	var/wipe_reservation_on_release = TRUE
 	var/turf_type = /turf/open/space
+	var/borderturf
 
 /datum/turf_reservation/transit
 	turf_type = /turf/open/space/transit
+	borderturf = /turf/open/space/transit/border
 
 /datum/turf_reservation/proc/Release()
 	var/v = reserved_turfs.Copy()
@@ -20,6 +22,12 @@
 		SSmapping.used_turfs -= i
 	SSmapping.reserve_turfs(v)
 
+/datum/turf_reservation/transit/Release()
+	for(var/turf/open/space/transit/T in reserved_turfs)
+		for(var/atom/movable/AM in T)
+			T.throw_atom(AM)
+	. = ..()
+
 /datum/turf_reservation/proc/Reserve(width, height, zlevel)
 	if(width > world.maxx || height > world.maxy || width < 1 || height < 1)
 		return FALSE
@@ -60,7 +68,10 @@
 		T.flags_1 &= ~UNUSED_RESERVATION_TURF_1
 		SSmapping.unused_turfs["[T.z]"] -= T
 		SSmapping.used_turfs[T] = src
-		T.ChangeTurf(turf_type, turf_type)
+		if(borderturf && (T.x == BL.x || T.x == TR.x || T.y == BL.y || T.y == TR.y))
+			T.ChangeTurf(borderturf, borderturf)
+		else
+			T.ChangeTurf(turf_type, turf_type)
 	src.width = width
 	src.height = height
 	return TRUE

code/modules/mining/equipment/kinetic_crusher.dm

@@ -239,10 +239,10 @@
 	if(ishostile(target))
 		var/mob/living/simple_animal/hostile/H = target
 		if(H.ranged) //briefly delay ranged attacks
-			if(H.ranged_cooldown_time >= world.time)
-				H.ranged_cooldown_time += bonus_value
+			if(H.ranged_cooldown >= world.time)
+				H.ranged_cooldown += bonus_value
 			else
-				H.ranged_cooldown_time = bonus_value + world.time
+				H.ranged_cooldown = bonus_value + world.time
 
 //magmawing watcher
 /obj/item/crusher_trophy/blaster_tubes/magma_wing

code/modules/mining/machine_vending.dm

@@ -11,6 +11,7 @@
 	var/obj/item/card/id/inserted_id
 	var/list/prize_list = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces.
 		new /datum/data/mining_equipment("1 Marker Beacon",				/obj/item/stack/marker_beacon,										10),
+		new /datum/data/mining_equipment("50 Point Transfer Card",		/obj/item/card/mining_point_card,									50),
 		new /datum/data/mining_equipment("10 Marker Beacons",			/obj/item/stack/marker_beacon/ten,									100),
 		new /datum/data/mining_equipment("30 Marker Beacons",			/obj/item/stack/marker_beacon/thirty,								300),
 		new /datum/data/mining_equipment("Whiskey",						/obj/item/reagent_containers/food/drinks/bottle/whiskey,			100),
@@ -19,26 +20,31 @@
 		new /datum/data/mining_equipment("Soap",						/obj/item/soap/nanotrasen,											200),
 		new /datum/data/mining_equipment("Laser Pointer",				/obj/item/laser_pointer,											300),
 		new /datum/data/mining_equipment("Alien Toy",					/obj/item/clothing/mask/facehugger/toy,								300),
-		new /datum/data/mining_equipment("Stabilizing Serum",			/obj/item/hivelordstabilizer,										400),
 		new /datum/data/mining_equipment("Fulton Beacon",				/obj/item/fulton_core,												400),
 		new /datum/data/mining_equipment("Shelter Capsule",				/obj/item/survivalcapsule,											400),
 		new /datum/data/mining_equipment("GAR Meson Scanners",			/obj/item/clothing/glasses/meson/gar,								500),
 		new /datum/data/mining_equipment("Explorer's Webbing",			/obj/item/storage/belt/mining,										500),
-		new /datum/data/mining_equipment("Point Transfer Card",			/obj/item/card/mining_point_card,									500),
-		new /datum/data/mining_equipment("Survival Medipen",			/obj/item/reagent_containers/hypospray/medipen/survival,			500),
+		new /datum/data/mining_equipment("500 Point Transfer Card",		/obj/item/card/mining_point_card/mp500,								500),
+		new /datum/data/mining_equipment("Brute First-Aid Kit",			/obj/item/storage/firstaid/brute,									600),
 		new /datum/data/mining_equipment("Tracking Implant Kit", 		/obj/item/storage/box/minertracker,									600),
+		new /datum/data/mining_equipment("Survival Medipen",			/obj/item/reagent_containers/hypospray/medipen/survival,			750),
+		new /datum/data/mining_equipment("Stabilizing Serum",			/obj/item/hivelordstabilizer,										750),
 		new /datum/data/mining_equipment("Jaunter",						/obj/item/wormhole_jaunter,											750),
 		new /datum/data/mining_equipment("Kinetic Crusher",				/obj/item/twohanded/required/kinetic_crusher,						750),
 		new /datum/data/mining_equipment("Kinetic Accelerator",			/obj/item/gun/energy/kinetic_accelerator,							750),
 		new /datum/data/mining_equipment("Brute First-Aid Kit",			/obj/item/storage/firstaid/brute,									800),
 		new /datum/data/mining_equipment("Burn First-Aid Kit",			/obj/item/storage/firstaid/fire,									800),
-		new /datum/data/mining_equipment("First-Aid Kit",				/obj/item/storage/firstaid/regular,											800),
+		new /datum/data/mining_equipment("First-Aid Kit",				/obj/item/storage/firstaid/regular,									800),
 		new /datum/data/mining_equipment("Advanced Scanner",			/obj/item/t_scanner/adv_mining_scanner,								800),
 		new /datum/data/mining_equipment("Resonator",					/obj/item/resonator,												800),
+		new /datum/data/mining_equipment("Mini Extinguisher",			/obj/item/extinguisher/mini,										1000),
 		new /datum/data/mining_equipment("Fulton Pack",					/obj/item/extraction_pack,											1000),
 		new /datum/data/mining_equipment("Lazarus Injector",			/obj/item/lazarus_injector,											1000),
 		new /datum/data/mining_equipment("Silver Pickaxe",				/obj/item/pickaxe/silver,											1000),
 		new /datum/data/mining_equipment("Mining Conscription Kit",		/obj/item/storage/backpack/duffelbag/mining_conscript,				1000),
+		new /datum/data/mining_equipment("1000 Point Transfer Card",	/obj/item/card/mining_point_card/mp1000,								1000),
+		new /datum/data/mining_equipment("1500 Point Transfer Card",	/obj/item/card/mining_point_card/mp1500,								1500),
+		new /datum/data/mining_equipment("2000 Point Transfer Card",	/obj/item/card/mining_point_card/mp2000,								2000),
 		new /datum/data/mining_equipment("Jetpack Upgrade",				/obj/item/tank/jetpack/suit,										2000),
 		new /datum/data/mining_equipment("Space Cash",					/obj/item/stack/spacecash/c1000,									2000),
 		new /datum/data/mining_equipment("Mining Hardsuit",				/obj/item/clothing/suit/space/hardsuit/mining,						2000),
@@ -243,12 +249,30 @@
 	w_class = WEIGHT_CLASS_TINY
 
 /**********************Mining Point Card**********************/
-
+//mp = Miner Pointers
+//c  =  Cash
+//TODO add in cr = Credits for cargo
 /obj/item/card/mining_point_card
 	name = "mining points card"
-	desc = "A small card preloaded with mining points. Swipe your ID card over it to transfer the points, then discard."
+	desc = "A small card preloaded with mining points. Swipe your ID card over it to transfer the points, then discard. This one only holds a small 50 points on it."
 	icon_state = "data_1"
-	var/points = 500
+	var/points = 50
+
+/obj/item/card/mining_point_card/mp500
+	desc = "A small card preloaded with 500 mining points. Swipe your ID card over it to transfer the points, then discard."
+	points = 500
+
+/obj/item/card/mining_point_card/mp1000
+	desc = "A small card preloaded with 1000 mining points. Swipe your ID card over it to transfer the points, then discard."
+	points = 1000
+
+/obj/item/card/mining_point_card/mp1500
+	desc = "A small card preloaded with 1500 mining points. Swipe your ID card over it to transfer the points, then discard."
+	points = 1500
+
+/obj/item/card/mining_point_card/mp2000
+	desc = "A small card preloaded with 2000 mining points. Swipe your ID card over it to transfer the points, then discard."
+	points = 2000
 
 /obj/item/card/mining_point_card/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/card/id))
@@ -315,4 +339,4 @@
 			new /obj/item/clothing/mask/gas/seva(drop_location)
 
 	SSblackbox.record_feedback("tally", "suit_voucher_redeemed", 1, selection)
-	qdel(voucher)
+	qdel(voucher)

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

@@ -33,7 +33,8 @@
 	return
 
 /mob/dead/new_player/proc/new_player_panel()
-	var/output = "<center><p><a href='byond://?src=[REF(src)];show_preferences=1'>Setup Character</a></p>"
+	var/output = "<center><p>Welcome, <b>[client ? client.prefs.real_name : "Unknown User"]</b></p>"
+	output += "<p><a href='byond://?src=[REF(src)];show_preferences=1'>Setup Character</a></p>"
 
 	if(SSticker.current_state <= GAME_STATE_PREGAME)
 		switch(ready)
@@ -441,58 +442,87 @@
 	var/available_job_count = 0
 	for(var/datum/job/job in SSjob.occupations)
 		if(job && IsJobUnavailable(job.title, TRUE) == JOB_AVAILABLE)
-			available_job_count++;
+			available_job_count++
 	for(var/spawner in GLOB.mob_spawners)
 		available_job_count++
+		break
 
-	for(var/datum/job/prioritized_job in SSjob.prioritized_jobs)
-		if(prioritized_job.current_positions >= prioritized_job.total_positions)
-			SSjob.prioritized_jobs -= prioritized_job
+	if(!available_job_count)
+		dat += "<div class='notice red'>There are currently no open positions!</div>"
 
-	if(length(SSjob.prioritized_jobs))
-		dat += "<div class='notice red'>The station has flagged these jobs as high priority:<br>"
-		var/amt = length(SSjob.prioritized_jobs)
-		var/amt_count
-		for(var/datum/job/a in SSjob.prioritized_jobs)
-			amt_count++
-			if(amt_count != amt) // checks for the last job added.
-				dat += " [a.title], "
-			else
-				dat += " [a.title]. </div>"
+	else
+		dat += "<div class='clearBoth'>Choose from the following open positions:</div><br>"
+		var/list/categorizedJobs = list(
+			"Command" = list(jobs = list(), titles = GLOB.command_positions, color = "#aac1ee"),
+			"Engineering" = list(jobs = list(), titles = GLOB.engineering_positions, color = "#ffd699"),
+			"Supply" = list(jobs = list(), titles = GLOB.supply_positions, color = "#ead4ae"),
+			"Miscellaneous" = list(jobs = list(), titles = list(), color = "#ffffff", colBreak = TRUE),
+			"Ghost Role" = list(jobs = list(), titles = GLOB.mob_spawners, color = "#ffffff"),
+			"Synthetic" = list(jobs = list(), titles = GLOB.nonhuman_positions, color = "#ccffcc"),
+			"Service" = list(jobs = list(), titles = GLOB.civilian_positions, color = "#cccccc"),
+			"Medical" = list(jobs = list(), titles = GLOB.medical_positions, color = "#99ffe6", colBreak = TRUE),
+			"Science" = list(jobs = list(), titles = GLOB.science_positions, color = "#e6b3e6"),
+			"Security" = list(jobs = list(), titles = GLOB.security_positions, color = "#ff9999"),
+		)
+		for(var/spawner in GLOB.mob_spawners)
+			categorizedJobs["Ghost Role"]["jobs"] += spawner
 
-	dat += "<div class='clearBoth'>Choose from the following open positions:</div><br>"
-	dat += "<small>(G) - Ghost Role</small><br>"
-	dat += "<div class='jobs'><div class='jobsColumn'>"
-	var/job_count = 0
-	for(var/datum/job/job in SSjob.occupations)
-		if(job && IsJobUnavailable(job.title, TRUE) == JOB_AVAILABLE)
-			job_count++;
-			if (job_count > round(available_job_count / 2))
-				dat += "</div><div class='jobsColumn'>"
-			var/position_class = "otherPosition"
-			if (job.title in GLOB.command_positions)
-				position_class = "commandPosition"
-			dat += "<a class='[position_class]' href='byond://?src=[REF(src)];SelectedJob=[job.title]'>[job.title] ([job.current_positions])</a><br>"
-	if(!job_count) //if there's nowhere to go, overflow opens up.
 		for(var/datum/job/job in SSjob.occupations)
-			if(job.title != SSjob.overflow_role)
+			if(job && IsJobUnavailable(job.title, TRUE) == JOB_AVAILABLE)
+				var/categorized = FALSE
+				for(var/jobcat in categorizedJobs)
+					var/list/jobs = categorizedJobs[jobcat]["jobs"]
+					if(job.title in categorizedJobs[jobcat]["titles"])
+						categorized = TRUE
+						if(jobcat == "Command")
+
+							if(job.title == "Captain") // Put captain at top of command jobs
+								jobs.Insert(1, job)
+							else
+								jobs += job
+						else // Put heads at top of non-command jobs
+							if(job.title in GLOB.command_positions)
+								jobs.Insert(1, job)
+							else
+								jobs += job
+				if(!categorized)
+					categorizedJobs["Miscellaneous"]["jobs"] += job
+
+
+		dat += "<table><tr><td valign='top'>"
+		for(var/jobcat in categorizedJobs)
+			if(categorizedJobs[jobcat]["colBreak"])
+				dat += "</td><td valign='top'>"
+			if(!length(categorizedJobs[jobcat]["jobs"]))
 				continue
-			dat += "<a class='otherPosition' href='byond://?src=[REF(src)];SelectedJob=[job.title]'>[job.title] ([job.current_positions])</a><br>"
-			break
-	for(var/spawner in GLOB.mob_spawners)
-		job_count++
-		if(job_count > round(available_job_count / 2))
-			dat += "<a class='otherPosition' href='byond://?src=[REF(src)];JoinAsGhostRole=[spawner]'>[spawner] (G)</a><br>"
-	dat += "</div></div>"
+			var/color = categorizedJobs[jobcat]["color"]
+			dat += "<fieldset style='border: 2px solid [color]; display: inline'>"
+			dat += "<legend align='center' style='color: [color]'>[jobcat]</legend>"
+			for(var/datum/job/job in categorizedJobs[jobcat]["jobs"])
+				var/position_class = "otherPosition"
+				if(job.title in GLOB.command_positions)
+					position_class = "commandPosition"
+				if(job in SSjob.prioritized_jobs)
+					dat += "<a class='[position_class]' style='display:block;width:170px' href='byond://?src=[REF(src)];SelectedJob=[job.title]'><font color='lime'><b>[job.title] ([job.current_positions])</b></font></a>"
+				else
+					dat += "<a class='[position_class]' style='display:block;width:170px' href='byond://?src=[REF(src)];SelectedJob=[job.title]'>[job.title] ([job.current_positions])</a>"
+				categorizedJobs[jobcat]["jobs"] -= job
+
+			for(var/spawner in categorizedJobs[jobcat]["jobs"])
+				dat += "<a class='otherPosition' style='display:block;width:170px' href='byond://?src=[REF(src)];JoinAsGhostRole=[spawner]'>[spawner]</a>"
+
+			dat += "</fieldset><br>"
+		dat += "</td></tr></table></center>"
+		dat += "</div></div>"
 
 	// Removing the old window method but leaving it here for reference
 	//src << browse(dat, "window=latechoices;size=300x640;can_close=1")
 
 	// Added the new browser window method
-	var/datum/browser/popup = new(src, "latechoices", "Choose Profession", 440, 500)
+	var/datum/browser/popup = new(src, "latechoices", "Choose Profession", 680, 580)
 	popup.add_stylesheet("playeroptions", 'html/browser/playeroptions.css')
 	popup.set_content(dat)
-	popup.open(0) // 0 is passed to open so that it doesn't use the onclose() proc
+	popup.open(FALSE) // FALSE is passed to open so that it doesn't use the onclose() proc
 
 
 /mob/dead/new_player/proc/create_character(transfer_after)

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

@@ -20,17 +20,19 @@
 	features = random_features()
 	age = rand(AGE_MIN,AGE_MAX)
 
-/datum/preferences/proc/update_preview_icon(nude = FALSE)
+/datum/preferences/proc/update_preview_icon()
 	// Silicons only need a very basic preview since there is no customization for them.
+//	var/wide_icon = FALSE //CITDEL THINGS
+//	if(features["taur"] != "None")
+//		wide_icon = TRUE
+
 	if(job_engsec_high)
 		switch(job_engsec_high)
 			if(AI_JF)
-				preview_icon = icon('icons/mob/ai.dmi', "AI", SOUTH)
-				preview_icon.Scale(64, 64)
+				parent.show_character_previews(image('icons/mob/ai.dmi', icon_state = "AI", dir = SOUTH))
 				return
 			if(CYBORG)
-				preview_icon = icon('icons/mob/robots.dmi', "robot", SOUTH)
-				preview_icon.Scale(64, 64)
+				parent.show_character_previews(image('icons/mob/robots.dmi', icon_state = "robot", dir = SOUTH))
 				return
 
 	// Set up the dummy for its photoshoot
@@ -57,30 +59,11 @@
 				previewJob = job
 				break
 
-	if(previewJob && !nude)
-		mannequin.job = previewJob.title
-		previewJob.equip(mannequin, TRUE)
-	COMPILE_OVERLAYS(mannequin)
-	CHECK_TICK
-	preview_icon = icon('icons/effects/effects.dmi', "nothing")
-	preview_icon.Scale(48+32, 16+32)
-	CHECK_TICK
-	mannequin.setDir(NORTH)
+	if(previewJob)
+		if(current_tab != 2)
+			mannequin.job = previewJob.title
+			previewJob.equip(mannequin, TRUE)
 
-	var/icon/stamp = getFlatIcon(mannequin)
-	CHECK_TICK
-	preview_icon.Blend(stamp, ICON_OVERLAY, 25, 17)
-	CHECK_TICK
-	mannequin.setDir(WEST)
-	stamp = getFlatIcon(mannequin)
-	CHECK_TICK
-	preview_icon.Blend(stamp, ICON_OVERLAY, 1, 9)
-	CHECK_TICK
-	mannequin.setDir(SOUTH)
-	stamp = getFlatIcon(mannequin)
-	CHECK_TICK
-	preview_icon.Blend(stamp, ICON_OVERLAY, 49, 1)
-	CHECK_TICK
-	preview_icon.Scale(preview_icon.Width() * 2, preview_icon.Height() * 2) // Scaling here to prevent blurring in the browser.
-	CHECK_TICK
+	COMPILE_OVERLAYS(mannequin)
+	parent.show_character_previews(new /mutable_appearance(mannequin))
 	unset_busy_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)

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

@@ -364,6 +364,12 @@
 	name = "Over Eye"
 	icon_state = "hair_shortovereye"
 
+//Donator item - fractious
+/datum/sprite_accessory/hair/over_eye_fr
+	name = "Over Eye (fract)"
+	icon_state = "hair_shortovereye_1f"
+	ckeys_allowed = list("fractious")
+
 /datum/sprite_accessory/hair/parted
 	name = "Parted"
 	icon_state = "hair_parted"
@@ -1516,18 +1522,3 @@
 /datum/sprite_accessory/moth_wings/snow
 	name = "Snow"
 	icon_state = "snow"
-
-//Lunasune
-/datum/sprite_accessory/mam_ears/lunasune
-	name = "lunasune"
-	icon_state = "lunasune"
-	hasinner = 1
-	extra = TRUE
-	extra_color_src = MUTCOLORS2
-	ckeys_allowed = list("invader4352")
-
-/datum/sprite_accessory/mam_tails/lunasune
-	name = "lunasune"
-	icon_state = "lunasune"
-	extra = TRUE
-	ckeys_allowed = list("invader4352")

code/modules/mob/inventory.dm

@@ -188,6 +188,7 @@
 		update_inv_hands()
 		I.pixel_x = initial(I.pixel_x)
 		I.pixel_y = initial(I.pixel_y)
+		I.transform = initial(I.transform)
 		return hand_index || TRUE
 	return FALSE
 

code/modules/mob/living/blood.dm

@@ -198,6 +198,11 @@
 		for(var/V in roundstart_quirks)
 			var/datum/quirk/T = V
 			blood_data["quirks"] += T.type
+		blood_data["changeling_loudness"] = 0
+		if(mind)
+			var/datum/antagonist/changeling/ling = mind.has_antag_datum(/datum/antagonist/changeling)
+			if(istype(ling))
+				blood_data["changeling_loudness"] = ling.loudfactor
 		return blood_data
 
 //get the id of the substance this mob use as blood.

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

@@ -15,7 +15,6 @@
 		OB.brainmob = src
 		forceMove(OB)
 
-
 /mob/living/brain/proc/create_dna()
 	stored_dna = new /datum/dna/stored(src)
 	if(!stored_dna.species)
@@ -28,6 +27,7 @@
 			death(1)	//Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA
 		if(mind)	//You aren't allowed to return to brains that don't exist
 			mind.current = null
+			mind.active = FALSE		//No one's using it anymore.
 		ghostize()		//Ghostize checks for key so nothing else is necessary.
 	container = null
 	return ..()

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

@@ -62,8 +62,9 @@
 
 /obj/item/organ/brain/proc/transfer_identity(mob/living/L)
 	name = "[L.name]'s brain"
-	if(brainmob || decoy_override)
+	if(brainmob)
 		return
+		
 	if(!L.mind)
 		return
 	brainmob = new(src)
@@ -80,7 +81,7 @@
 		var/obj/item/organ/zombie_infection/ZI = L.getorganslot(ORGAN_SLOT_ZOMBIE)
 		if(ZI)
 			brainmob.set_species(ZI.old_species)	//For if the brain is cloned
-	if(L.mind && L.mind.current)
+	if(!decoy_override && L.mind && L.mind.current)
 		L.mind.transfer_to(brainmob)
 	to_chat(brainmob, "<span class='notice'>You feel slightly disoriented. That's normal when you're just a brain.</span>")
 

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

@@ -36,7 +36,7 @@ GLOBAL_VAR(posibrain_notify_cooldown)
 
 /obj/item/mmi/posibrain/proc/ping_ghosts(msg, newlymade)
 	if(newlymade || GLOB.posibrain_notify_cooldown <= world.time)
-		notify_ghosts("[name] [msg] in [get_area(src)]!", ghost_sound = !newlymade ? 'sound/effects/ghost2.ogg':null, enter_link = "<a href=?src=[REF(src)];activate=1>(Click to enter)</a>", source = src, action = NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_POSIBRAIN)
+		notify_ghosts("[name] [msg] in [get_area(src)]!", ghost_sound = !newlymade ? 'sound/misc/server-ready.ogg':null, enter_link = "<a href=?src=[REF(src)];activate=1>(Click to enter)</a>", source = src, action = NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_POSIBRAIN)
 		if(!newlymade)
 			GLOB.posibrain_notify_cooldown = world.time + askDelay
 

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

@@ -188,6 +188,8 @@
 	if(thrown_thing)
 		visible_message("<span class='danger'>[src] has thrown [thrown_thing].</span>")
 		src.log_message("has thrown [thrown_thing]", LOG_ATTACK)
+		do_attack_animation(target, no_effect = 1)
+		playsound(loc, 'sound/weapons/punchmiss.ogg', 50, 1, -1)
 		newtonian_move(get_dir(target, src))
 		thrown_thing.throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed, src)
 

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

@@ -87,21 +87,21 @@
 	//CIT CHANGES END HERE
 		apply_damage(totitemdamage, I.damtype, affecting) //CIT CHANGE - replaces I.force with totitemdamage
 		if(I.damtype == BRUTE && affecting.status == BODYPART_ORGANIC)
-			if(prob(33))
+			var/basebloodychance = affecting.brute_dam + totitemdamage
+			if(prob(basebloodychance))
 				I.add_mob_blood(src)
-				var/turf/location = get_turf(src)
-				add_splatter_floor(location)
-				if(get_dist(user, src) <= 1)	//people with TK won't get smeared with blood
+				bleed(totitemdamage)
+				if(totitemdamage >= 10 && get_dist(user, src) <= 1)	//people with TK won't get smeared with blood
 					user.add_mob_blood(src)
 
 				if(affecting.body_zone == BODY_ZONE_HEAD)
-					if(wear_mask)
+					if(wear_mask && prob(basebloodychance))
 						wear_mask.add_mob_blood(src)
 						update_inv_wear_mask()
-					if(wear_neck)
+					if(wear_neck && prob(basebloodychance))
 						wear_neck.add_mob_blood(src)
 						update_inv_neck()
-					if(head)
+					if(head && prob(basebloodychance))
 						head.add_mob_blood(src)
 						update_inv_head()
 

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

@@ -88,6 +88,9 @@
 
 		if(digitalcamo)
 			msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly unsimian manner.\n"
+	
+	if(combatmode)
+		msg += "[t_He] [t_is] visibly tense[resting ? "." : ", and [t_is] standing in combative stance."]\n"
 
 	GET_COMPONENT_FROM(mood, /datum/component/mood, src)
 	if(mood)

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

@@ -146,4 +146,31 @@
 		var/turf/T = loc
 		T.Entered(src)
 
-//Ayy lmao
+/datum/emote/sound/human
+	mob_type_allowed_typecache = list(/mob/living/carbon/human)
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/sound/human/buzz
+	key = "buzz"
+	key_third_person = "buzzes"
+	message = "buzzes."
+	message_param = "buzzes at %t."
+	sound = 'sound/machines/buzz-sigh.ogg'
+
+/datum/emote/sound/human/buzz2
+	key = "buzz2"
+	message = "buzzes twice."
+	sound = 'sound/machines/buzz-two.ogg'
+
+/datum/emote/sound/human/ping
+	key = "ping"
+	key_third_person = "pings"
+	message = "pings."
+	message_param = "pings at %t."
+	sound = 'sound/machines/ping.ogg'
+
+/datum/emote/sound/human/chime
+	key = "chime"
+	key_third_person = "chimes"
+	message = "chimes."
+	sound = 'sound/machines/chime.ogg'

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

@@ -264,6 +264,8 @@
 				if(pocket_item)
 					if(pocket_item == (pocket_id == SLOT_R_STORE ? r_store : l_store)) //item still in the pocket we search
 						dropItemToGround(pocket_item)
+						if(!usr.can_hold_items() || !usr.put_in_hands(pocket_item))
+							pocket_item.forceMove(drop_location())
 				else
 					if(place_item)
 						if(place_item.mob_can_equip(src, usr, pocket_id, FALSE, TRUE))
@@ -493,11 +495,11 @@
 /mob/living/carbon/human/proc/canUseHUD()
 	return !(src.stat || IsKnockdown() || IsStun() || src.restrained())
 
-/mob/living/carbon/human/can_inject(mob/user, error_msg, target_zone, var/penetrate_thick = 0)
+/mob/living/carbon/human/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, bypass_immunity = FALSE)
 	. = 1 // Default to returning true.
 	if(user && !target_zone)
 		target_zone = user.zone_selected
-	if(has_trait(TRAIT_PIERCEIMMUNE))
+	if(has_trait(TRAIT_PIERCEIMMUNE) && !bypass_immunity)
 		. = 0
 	// If targeting the head, see if the head item is thin enough.
 	// If targeting anything else, see if the wear suit is thin enough.
@@ -599,11 +601,7 @@
 
 	//Check for dresscode violations
 	if(istype(head, /obj/item/clothing/head/wizard) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/wizard) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/syndi) || istype(head, /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi))
-		threatcount += 6 //fuk u antags <3
-
-	//Check for nonhuman scum
-	if(dna && dna.species.id && dna.species.id != "human")
-		threatcount += 1
+		threatcount += 4 //fuk u antags <3			//no you
 
 	//mindshield implants imply trustworthyness
 	if(has_trait(TRAIT_MINDSHIELD))
@@ -894,6 +892,21 @@
 		. = ..(M,force,check_loc)
 		stop_pulling()
 
+/mob/living/carbon/human/proc/is_shove_knockdown_blocked() //If you want to add more things that block shove knockdown, extend this
+	var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform, back, gloves, shoes, belt, s_store, glasses, ears, wear_id) //Everything but pockets. Pockets are l_store and r_store. (if pockets were allowed, putting something armored, gloves or hats for example, would double up on the armor)
+	for(var/bp in body_parts)
+		if(istype(bp, /obj/item/clothing))
+			var/obj/item/clothing/C = bp
+			if(C.blocks_shove_knockdown)
+				return TRUE
+	return FALSE
+
+/mob/living/carbon/human/proc/clear_shove_slowdown()
+	remove_movespeed_modifier(SHOVE_SLOWDOWN_ID)
+	var/active_item = get_active_held_item()
+	if(is_type_in_typecache(active_item, GLOB.shove_disarming_types))
+		visible_message("<span class='warning'>[src.name] regains their grip on \the [active_item]!</span>", "<span class='warning'>You regain your grip on \the [active_item]</span>", null, COMBAT_MESSAGE_RANGE)
+
 /mob/living/carbon/human/do_after_coefficent()
 	. = ..()
 	. *= physiology.do_after_speed

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

@@ -273,7 +273,7 @@
 			else
 				playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
 				if(!lying)				//CITADEL EDIT
-					Knockdown(100, override_duration = 30, override_stam = 25)
+					Knockdown(100, TRUE, FALSE, 30, 25)
 				else
 					Knockdown(100)
 				log_combat(M, src, "tackled")

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

@@ -45,6 +45,8 @@
 
 	var/name_override //For temporary visible name changes
 
+	var/nameless = FALSE //For drones of both the insectoid and robotic kind. And other types of nameless critters.
+
 	var/datum/personal_crafting/handcrafting
 	var/datum/physiology/physiology
 

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

@@ -56,7 +56,7 @@
 	if( head && (head.flags_inv&HIDEFACE) )
 		return if_no_face		//Likewise for hats
 	var/obj/item/bodypart/O = get_bodypart(BODY_ZONE_HEAD)
-	if( !O || (has_trait(TRAIT_DISFIGURED)) || (O.brutestate+O.burnstate)>2 || cloneloss>50 || !real_name )	//disfigured. use id-name if possible
+	if( !O || (has_trait(TRAIT_DISFIGURED)) || (O.brutestate+O.burnstate)>2 || cloneloss>50 || !real_name || nameless)	//disfigured. use id-name if possible
 		return if_no_face
 	return real_name
 

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

@@ -317,9 +317,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	var/obj/item/bodypart/head/HD = H.get_bodypart(BODY_ZONE_HEAD)
 	if(!HD) //Decapitated
 		return
-
 	if(H.has_trait(TRAIT_HUSK))
 		return
+
 	var/datum/sprite_accessory/S
 	var/list/standing = list()
 
@@ -351,7 +351,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	if(H.facial_hair_style && (FACEHAIR in species_traits) && (!facialhair_hidden || dynamic_fhair_suffix))
 		S = GLOB.facial_hair_styles_list[H.facial_hair_style]
 		if(S)
-
 			//List of all valid dynamic_fhair_suffixes
 			var/static/list/fextensions
 			if(!fextensions)
@@ -410,7 +409,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		else if(H.hair_style && (HAIR in species_traits))
 			S = GLOB.hair_styles_list[H.hair_style]
 			if(S)
-
 				//List of all valid dynamic_hair_suffixes
 				var/static/list/extensions
 				if(!extensions)
@@ -612,6 +610,10 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		if(!H.dna.features["mam_ears"] || H.dna.features["mam_ears"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD || HD.status == BODYPART_ROBOTIC)
 			bodyparts_to_add -= "mam_ears"
 
+	if("mam_snouts" in mutant_bodyparts) //Take a closer look at that snout!
+		if((H.wear_mask && (H.wear_mask.flags_inv & HIDEFACE)) || (H.head && (H.head.flags_inv & HIDEFACE)) || !HD || HD.status == BODYPART_ROBOTIC)
+			bodyparts_to_add -= "mam_snouts"
+
 	if("taur" in mutant_bodyparts)
 		if(!H.dna.features["taur"] || H.dna.features["taur"] == "None" || (H.wear_suit && (H.wear_suit.flags_inv & HIDETAUR)))
 			bodyparts_to_add -= "taur"
@@ -696,13 +698,19 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 
 			var/mutable_appearance/accessory_overlay = mutable_appearance(S.icon, layer = -layer)
 
+			accessory_overlay.color = null //just because. reee.
+
 			//A little rename so we don't have to use tail_lizard or tail_human when naming the sprites.
 			if(bodypart == "tail_lizard" || bodypart == "tail_human" || bodypart == "mam_tail" || bodypart == "xenotail")
 				bodypart = "tail"
-			else if(bodypart == "waggingtail_lizard" || bodypart == "waggingtail_human" || bodypart == "mam_waggingtail")
+			else if(bodypart == "waggingtail_lizard" || bodypart == "waggingtail_human")
 				bodypart = "waggingtail"
+			if(bodypart == "mam_waggingtail")
+				bodypart = "tailwag"
 			if(bodypart == "mam_ears" || bodypart == "ears")
 				bodypart = "ears"
+			if(bodypart == "mam_snouts" || bodypart == "snout")
+				bodypart = "snout"
 			if(bodypart == "xenohead")
 				bodypart = "xhead"
 
@@ -714,6 +722,15 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			if(S.center)
 				accessory_overlay = center_image(accessory_overlay, S.dimension_x, S.dimension_y)
 
+			var/list/colorlist = list()
+			colorlist.Cut()
+			colorlist += ReadRGB(H.dna.features["mcolor"])
+			colorlist += ReadRGB(H.dna.features["mcolor2"])
+			colorlist += ReadRGB(H.dna.features["mcolor3"])
+			colorlist += list(0,0,0)
+			for(var/index=1, index<=colorlist.len, index++)
+				colorlist[index] = colorlist[index]/255
+
 			if(!(H.has_trait(TRAIT_HUSK)))
 				if(!forced_colour)
 					switch(S.color_src)
@@ -732,6 +749,10 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 								accessory_overlay.color = "#[fixed_mut_color3]"
 							else
 								accessory_overlay.color = "#[H.dna.features["mcolor3"]]"
+
+						if(MATRIXED)
+							accessory_overlay.color = list(colorlist)
+
 						if(HAIR)
 							if(hair_color == "mutcolor")
 								accessory_overlay.color = "#[H.dna.features["mcolor"]]"
@@ -743,6 +764,21 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 							accessory_overlay.color = "#[H.eye_color]"
 				else
 					accessory_overlay.color = forced_colour
+			else
+				if(bodypart == "ears")
+					accessory_overlay.icon_state = "m_ears_none_[layertext]"
+				if(bodypart == "tail")
+					accessory_overlay.icon_state = "m_tail_husk_[layertext]"
+				if(MATRIXED)
+					var/list/husklist = list()
+					husklist += ReadRGB("#a3a3a3")
+					husklist += ReadRGB("#a3a3a3")
+					husklist += ReadRGB("#a3a3a3")
+					husklist += list(0,0,0)
+					for(var/index=1, index<=husklist.len, index++)
+						husklist[index] = husklist[index]/255
+					accessory_overlay.color = husklist
+
 			standing += accessory_overlay
 
 			if(S.hasinner)
@@ -1221,6 +1257,9 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		. += speedmod
 		. += H.physiology.speed_mod
 
+	if (H.m_intent == MOVE_INTENT_WALK && H.has_trait(TRAIT_SPEEDY_STEP))
+		. -= 1
+
 	if(H.has_trait(TRAIT_IGNORESLOWDOWN))
 		ignoreslow = 1
 
@@ -1552,7 +1591,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 				bloody = 1
 				var/turf/location = H.loc
 				if(istype(location))
-					H.add_splatter_floor(location)
+					H.bleed(totitemdamage)
 				if(get_dist(user, H) <= 1)	//people with TK won't get smeared with blood
 					user.add_mob_blood(H)
 
@@ -1703,6 +1742,21 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 				H.adjust_bodytemperature((thermal_protection+1)*natural + min(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX))
 			else //we're sweating, insulation hinders out ability to reduce heat - but will reduce the amount of heat we get from the environment
 				H.adjust_bodytemperature(natural*(1/(thermal_protection+1)) + min(thermal_protection * (loc_temp - H.bodytemperature) / BODYTEMP_HEAT_DIVISOR, BODYTEMP_HEATING_MAX))
+		switch((loc_temp - H.bodytemperature)*thermal_protection)
+			if(-INFINITY to -50)
+				H.throw_alert("temp", /obj/screen/alert/cold, 3)
+			if(-50 to -35)
+				H.throw_alert("temp", /obj/screen/alert/cold, 2)
+			if(-35 to -20)
+				H.throw_alert("temp", /obj/screen/alert/cold, 1)
+			if(-20 to 0) //This is the sweet spot where air is considered normal
+				H.clear_alert("temp")
+			if(0 to 15) //When the air around you matches your body's temperature, you'll start to feel warm.
+				H.throw_alert("temp", /obj/screen/alert/hot, 1)
+			if(15 to 30)
+				H.throw_alert("temp", /obj/screen/alert/hot, 2)
+			if(30 to INFINITY)
+				H.throw_alert("temp", /obj/screen/alert/hot, 3)
 
 	// +/- 50 degrees from 310K is the 'safe' zone, where no damage is dealt.
 	if(H.bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT && !H.has_trait(TRAIT_RESISTHEAT))
@@ -1718,14 +1772,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		else
 			firemodifier = min(firemodifier, 0)
 			burn_damage = max(log(2-firemodifier,(H.bodytemperature-BODYTEMP_NORMAL))-5,0) // this can go below 5 at log 2.5
-		if (burn_damage)
-			switch(burn_damage)
-				if(0 to 2)
-					H.throw_alert("temp", /obj/screen/alert/hot, 1)
-				if(2 to 4)
-					H.throw_alert("temp", /obj/screen/alert/hot, 2)
-				else
-					H.throw_alert("temp", /obj/screen/alert/hot, 3)
 		burn_damage = burn_damage * heatmod * H.physiology.heat_mod
 		if (H.stat < UNCONSCIOUS && (prob(burn_damage) * 10) / 4) //40% for level 3 damage on humans
 			H.emote("scream")
@@ -1736,17 +1782,13 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 		SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "cold", /datum/mood_event/cold)
 		switch(H.bodytemperature)
 			if(200 to BODYTEMP_COLD_DAMAGE_LIMIT)
-				H.throw_alert("temp", /obj/screen/alert/cold, 1)
 				H.apply_damage(COLD_DAMAGE_LEVEL_1*coldmod*H.physiology.cold_mod, BURN)
 			if(120 to 200)
-				H.throw_alert("temp", /obj/screen/alert/cold, 2)
 				H.apply_damage(COLD_DAMAGE_LEVEL_2*coldmod*H.physiology.cold_mod, BURN)
 			else
-				H.throw_alert("temp", /obj/screen/alert/cold, 3)
 				H.apply_damage(COLD_DAMAGE_LEVEL_3*coldmod*H.physiology.cold_mod, BURN)
 
 	else
-		H.clear_alert("temp")
 		SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "cold")
 		SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "hot")
 

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

@@ -4,8 +4,8 @@
 	id = "felinid"
 	limbs_id = "human"
 
-	mutant_bodyparts = list("ears", "tail_human")
-	default_features = list("mcolor" = "FFF", "tail_human" = "Cat", "ears" = "Cat", "wings" = "None")
+	mutant_bodyparts = list("mam_ears", "mam_tail")
+	default_features = list("mcolor" = "FFF", "mam_tail" = "Cat", "mam_ears" = "Cat", "wings" = "None")
 
 	mutantears = /obj/item/organ/ears/cat
 	mutanttail = /obj/item/organ/tail/cat
@@ -23,38 +23,39 @@
 		stop_wagging_tail(H)
 	. = ..()
 
+
 /datum/species/human/felinid/can_wag_tail(mob/living/carbon/human/H)
-	return ("tail_human" in mutant_bodyparts) || ("waggingtail_human" in mutant_bodyparts)
+	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
 
 /datum/species/human/felinid/is_wagging_tail(mob/living/carbon/human/H)
-	return ("waggingtail_human" in mutant_bodyparts)
+	return ("mam_waggingtail" in mutant_bodyparts)
 
 /datum/species/human/felinid/start_wagging_tail(mob/living/carbon/human/H)
-	if("tail_human" in mutant_bodyparts)
-		mutant_bodyparts -= "tail_human"
-		mutant_bodyparts |= "waggingtail_human"
+	if("mam_tail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_tail"
+		mutant_bodyparts |= "mam_waggingtail"
 	H.update_body()
 
 /datum/species/human/felinid/stop_wagging_tail(mob/living/carbon/human/H)
-	if("waggingtail_human" in mutant_bodyparts)
-		mutant_bodyparts -= "waggingtail_human"
-		mutant_bodyparts |= "tail_human"
+	if("mam_waggingtail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_waggingtail"
+		mutant_bodyparts |= "mam_tail"
 	H.update_body()
 
 /datum/species/human/felinid/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load)
 	if(ishuman(C))
 		var/mob/living/carbon/human/H = C
 		if(!pref_load)			//Hah! They got forcefully purrbation'd. Force default felinid parts on them if they have no mutant parts in those areas!
-			if(H.dna.features["tail_human"] == "None")
-				H.dna.features["tail_human"] = "Cat"
-			if(H.dna.features["ears"] == "None")
-				H.dna.features["ears"] = "Cat"
-		if(H.dna.features["ears"] == "Cat")
+			if(H.dna.features["mam_tail"] == "None")
+				H.dna.features["mam_tail"] = "Cat"
+			if(H.dna.features["mam_ears"] == "None")
+				H.dna.features["mam_ears"] = "Cat"
+		if(H.dna.features["mam_ears"] == "Cat")
 			var/obj/item/organ/ears/cat/ears = new
 			ears.Insert(H, drop_if_replaced = FALSE)
 		else
 			mutantears = /obj/item/organ/ears
-		if(H.dna.features["tail_human"] == "Cat")
+		if(H.dna.features["mam_tail"] == "Cat")
 			var/obj/item/organ/tail/cat/tail = new
 			tail.Insert(H, drop_if_replaced = FALSE)
 		else

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

@@ -92,3 +92,5 @@
 	limbs_id = "lizard"
 	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,DIGITIGRADE)
 	inherent_traits = list(TRAIT_NOGUNS,TRAIT_NOBREATH)
+	burnmod = 0.9
+	brutemod = 0.9

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

@@ -359,7 +359,6 @@ There are several things that need to be remembered:
 	apply_overlay(BELT_LAYER)
 
 
-
 /mob/living/carbon/human/update_inv_wear_suit()
 	remove_overlay(SUIT_LAYER)
 
@@ -391,8 +390,6 @@ There are several things that need to be remembered:
 				else if(S.taurmode == NOT_TAURIC && S.adjusted == NORMAL_STYLE)
 					S.alternate_worn_icon = null
 
-
-
 		overlays_standing[SUIT_LAYER] = S.build_worn_icon(state = wear_suit.icon_state, default_layer = SUIT_LAYER, default_icon_file = ((wear_suit.alternate_worn_icon) ? S.alternate_worn_icon : 'icons/mob/suit.dmi'))
 		var/mutable_appearance/suit_overlay = overlays_standing[SUIT_LAYER]
 		if(OFFSET_SUIT in dna.species.offset_features)
@@ -477,7 +474,6 @@ There are several things that need to be remembered:
 			out += overlays_standing[i]
 	return out
 
-
 //human HUD updates for items in our inventory
 
 //update whether our head item appears on our hud.
@@ -614,7 +610,7 @@ generate/load female uniform sprites matching all previously decided variables
 	else if(dna.species.fixed_mut_color)
 		. += "-coloured-[dna.species.fixed_mut_color]"
 	else if(dna.features["mcolor"])
-		. += "-coloured-[dna.features["mcolor"]]"
+		. += "-coloured-[dna.features["mcolor"]]-[dna.features["mcolor2"]]-[dna.features["mcolor3"]]"
 	else
 		. += "-not_coloured"
 
@@ -644,6 +640,8 @@ generate/load female uniform sprites matching all previously decided variables
 			. += "-digitigrade[BP.use_digitigrade]"
 		if(BP.dmg_overlay_type)
 			. += "-[BP.dmg_overlay_type]"
+		if(BP.body_markings)
+			. += "-[BP.body_markings]"
 
 	if(has_trait(TRAIT_HUSK))
 		. += "-husk"