Merge branch 'master' into upstream-merge-32161

code/modules/admin/IsBanned.dm

@@ -6,8 +6,10 @@
 #define STICKYBAN_MAX_EXISTING_USER_MATCHES 5 //ie, users who were connected before the ban triggered
 #define STICKYBAN_MAX_ADMIN_MATCHES 2
 
-/world/IsBanned(key,address,computer_id)
+/world/IsBanned(key,address,computer_id,type,real_bans_only=FALSE)
 	if (!key || !address || !computer_id)
+		if(real_bans_only)
+			return FALSE
 		log_access("Failed Login (invalid data): [key] [address]-[computer_id]")
 		return list("reason"="invalid login data", "desc"="Error: Could not check ban status, Please try again. Error message: Your computer provided invalid or blank information to the server on connection (byond username, IP, and Computer ID.) Provided information for reference: Username:'[key]' IP:'[address]' Computer ID:'[computer_id]'. (If you continue to get this error, please restart byond or contact byond support.)")
 
@@ -31,7 +33,7 @@
 				return list("reason"="whitelist", "desc" = "\nReason: You are not on the white list for this server")
 
 	//Guest Checking
-	if(IsGuestKey(key))
+	if(!real_bans_only && IsGuestKey(key))
 		if (CONFIG_GET(flag/guest_ban))
 			log_access("Failed Login: [key] - Guests not allowed")
 			return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.")
@@ -41,7 +43,7 @@
 
 	//Population Cap Checking
 	var/extreme_popcap = CONFIG_GET(number/extreme_popcap)
-	if(extreme_popcap && living_player_count() >= extreme_popcap && !admin)
+	if(!real_bans_only && extreme_popcap && living_player_count() >= extreme_popcap && !admin)
 		log_access("Failed Login: [key] - Population cap reached")
 		return list("reason"="popcap", "desc"= "\nReason: [CONFIG_GET(string/extreme_popcap_message)]")
 
@@ -160,8 +162,8 @@
 
 				world.SetConfig("ban", bannedckey, null)
 
-				log_game("Stickyban on [bannedckey] detected as rogue, reverting to it's roundstart state")
-				message_admins("Stickyban on [bannedckey] detected as rogue, reverting to it's roundstart state")
+				log_game("Stickyban on [bannedckey] detected as rogue, reverting to its roundstart state")
+				message_admins("Stickyban on [bannedckey] detected as rogue, reverting to its roundstart state")
 				//do not convert to timer.
 				spawn (5)
 					world.SetConfig("ban", bannedckey, null)

code/modules/admin/sound_emitter.dm

@@ -0,0 +1,149 @@
+#define SOUND_EMITTER_LOCAL "local" //Plays the sound like a normal heard sound
+#define SOUND_EMITTER_DIRECT "direct" //Plays the sound directly to hearers regardless of pressure/proximity/et cetera
+
+#define SOUND_EMITTER_RADIUS "radius" //Plays the sound to everyone in a radius
+#define SOUND_EMITTER_ZLEVEL "zlevel" //Plays the sound to everyone on the z-level
+#define SOUND_EMITTER_GLOBAL "global" //Plays the sound to everyone in the game world
+
+//Admin sound emitters with highly customizable functions!
+/obj/effect/sound_emitter
+	name = "sound emitter"
+	desc = "Emits sounds, presumably."
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "shield2"
+	invisibility = INVISIBILITY_OBSERVER
+	anchored = TRUE
+	density = FALSE
+	opacity = FALSE
+	alpha = 175
+	var/sound_file //The sound file the emitter plays
+	var/sound_volume = 50 //The volume the sound file is played at
+	var/play_radius = 3 //Any mobs within this many tiles will hear the sounds played if it's using the appropriate mode
+	var/motus_operandi = SOUND_EMITTER_LOCAL //The mode this sound emitter is using
+	var/emitter_range = SOUND_EMITTER_ZLEVEL //The range this emitter's sound is heard at; this isn't a number, but a string (see the defines above)
+
+/obj/effect/sound_emitter/Destroy(force)
+	if(!force)
+		return QDEL_HINT_LETMELIVE
+	. = ..()
+
+/obj/effect/sound_emitter/singularity_act()
+	return
+
+/obj/effect/sound_emitter/examine(mob/user)
+	..()
+	if(!isobserver(user))
+		return
+	to_chat(user, "<span class='boldnotice'>Sound File:</span> [sound_file ? sound_file : "None chosen"]")
+	to_chat(user, "<span class='boldnotice'>Mode:</span> [motus_operandi]</span>")
+	to_chat(user, "<span class='boldnotice'>Range:</span> [emitter_range]</span>")
+	to_chat(user, "<b>Sound is playing at [sound_volume]% volume.</b>")
+	if(user.client.holder)
+		to_chat(user, "<b>Alt-click it to quickly activate it!</b>")
+
+/obj/effect/sound_emitter/attack_ghost(mob/user)
+	if(!check_rights_for(user.client, R_SOUNDS))
+		examine(user)
+		return
+	edit_emitter(user)
+
+/obj/effect/sound_emitter/AltClick(mob/user)
+	if(check_rights_for(user.client, R_SOUNDS))
+		activate(user)
+		to_chat(user, "<span class='notice'>Sound emitter activated.</span>")
+
+/obj/effect/sound_emitter/proc/edit_emitter(mob/user)
+	var/dat = ""
+	dat += "<b>Label:</b> <a href='?src=\ref[src];edit_label=1'>[maptext ? maptext : "No label set!"]</a><br>"
+	dat += "<br>"
+	dat += "<b>Sound File:</b> <a href='?src=\ref[src];edit_sound_file=1'>[sound_file ? sound_file : "No file chosen!"]</a><br>"
+	dat += "<b>Volume:</b> <a href='?src=\ref[src];edit_volume=1'>[sound_volume]%</a><br>"
+	dat += "<br>"
+	dat += "<b>Mode:</b> <a href='?src=\ref[src];edit_mode=1'>[motus_operandi]</a><br>"
+	if(motus_operandi != SOUND_EMITTER_LOCAL)
+		dat += "<b>Range:</b> <a href='?src=\ref[src];edit_range=1'>[emitter_range]</a>[emitter_range == SOUND_EMITTER_RADIUS ? "<a href='?src=\ref[src];edit_radius=1'>[play_radius]-tile radius</a>" : ""]<br>"
+	dat += "<br>"
+	dat += "<a href='?src=\ref[src];play=1'>Play Sound</a> (interrupts other sound emitter sounds)"
+	var/datum/browser/popup = new(user, "emitter", "", 500, 600)
+	popup.set_content(dat)
+	popup.open()
+
+/obj/effect/sound_emitter/Topic(href, href_list)
+	..()
+	if(!ismob(usr) || !usr.client || !check_rights_for(usr.client, R_SOUNDS))
+		return
+	var/mob/user = usr
+	if(href_list["edit_label"])
+		var/new_label = stripped_input(user, "Choose a new label.", "Sound Emitter")
+		if(!new_label)
+			return
+		maptext = new_label
+		to_chat(user, "<span class='notice'>Label set to [maptext].</span>")
+	if(href_list["edit_sound_file"])
+		var/new_file = input(user, "Choose a sound file.", "Sound Emitter") as null|sound
+		if(!new_file)
+			return
+		sound_file = new_file
+		to_chat(user, "<span class='notice'>New sound file set to [sound_file].</span>")
+	if(href_list["edit_volume"])
+		var/new_volume = input(user, "Choose a volume.", "Sound Emitter", sound_volume) as null|num
+		if(isnull(new_volume))
+			return
+		new_volume = Clamp(new_volume, 0, 100)
+		sound_volume = new_volume
+		to_chat(user, "<span class='notice'>Volume set to [sound_volume]%.</span>")
+	if(href_list["edit_mode"])
+		var/new_mode
+		var/mode_list = list("Local (normal sound)" = SOUND_EMITTER_LOCAL, "Direct (not affected by environment/location)" = SOUND_EMITTER_DIRECT)
+		new_mode = input(user, "Choose a new mode.", "Sound Emitter") as null|anything in mode_list
+		if(!new_mode)
+			return
+		motus_operandi = mode_list[new_mode]
+		to_chat(user, "<span class='notice'>Mode set to [motus_operandi].</span>")
+	if(href_list["edit_range"])
+		var/new_range
+		var/range_list = list("Radius (all mobs within a radius)" = SOUND_EMITTER_RADIUS, "Z-Level (all mobs on the same z)" = SOUND_EMITTER_ZLEVEL, "Global (all players)" = SOUND_EMITTER_GLOBAL)
+		new_range = input(user, "Choose a new range.", "Sound Emitter") as null|anything in range_list
+		if(!new_range)
+			return
+		emitter_range = range_list[new_range]
+		to_chat(user, "<span class='notice'>Range set to [emitter_range].</span>")
+	if(href_list["edit_radius"])
+		var/new_radius = input(user, "Choose a radius.", "Sound Emitter", sound_volume) as null|num
+		if(isnull(new_radius))
+			return
+		new_radius = Clamp(new_radius, 0, 127)
+		play_radius = new_radius
+		to_chat(user, "<span class='notice'>Audible radius set to [play_radius].</span>")
+	if(href_list["play"])
+		activate(user)
+	edit_emitter(user) //Refresh the UI to see our changes
+
+/obj/effect/sound_emitter/proc/activate(mob/user)
+	var/list/hearing_mobs = list()
+	if(motus_operandi == SOUND_EMITTER_LOCAL)
+		playsound(src, sound_file, sound_volume, FALSE)
+		return
+	switch(emitter_range)
+		if(SOUND_EMITTER_RADIUS)
+			for(var/mob/M in GLOB.player_list)
+				if(get_dist(src, M) <= play_radius)
+					hearing_mobs += M
+		if(SOUND_EMITTER_ZLEVEL)
+			for(var/mob/M in GLOB.player_list)
+				if(M.z == z)
+					hearing_mobs += M
+		if(SOUND_EMITTER_GLOBAL)
+			hearing_mobs = GLOB.player_list.Copy()
+	for(var/mob/M in hearing_mobs)
+		if(M.client.prefs.toggles & SOUND_MIDI)
+			M.playsound_local(M, sound_file, sound_volume, FALSE, channel = CHANNEL_ADMIN, pressure_affected = FALSE)
+	if(user)
+		log_admin("[ADMIN_LOOKUPFLW(user)] activated a sound emitter with file \"[sound_file]\" at [COORD(src)]")
+	flick("shield1", src)
+
+#undef SOUND_EMITTER_LOCAL
+#undef SOUND_EMITTER_DIRECT
+#undef SOUND_EMITTER_RADIUS
+#undef SOUND_EMITTER_ZLEVEL
+#undef SOUND_EMITTER_GLOBAL

code/modules/admin/stickyban.dm

@@ -142,8 +142,8 @@
 				to_chat(usr, "<span class='adminnotice'>Error: No cached sticky ban for [ckey] found!</span>")
 			world.SetConfig("ban",ckey,null)
 
-			log_admin_private("[key_name(usr)] has reverted [ckey]'s sticky ban to it's state at round start.")
-			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has reverted [ckey]'s sticky ban to it's state at round start.</span>")
+			log_admin_private("[key_name(usr)] has reverted [ckey]'s sticky ban to its state at round start.")
+			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has reverted [ckey]'s sticky ban to its state at round start.</span>")
 			//revert is mostly used when shit goes rouge, so we have to set it to null
 			//	and wait a byond tick before assigning it to ensure byond clears its shit.
 			sleep(world.tick_lag)

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

@@ -3,9 +3,11 @@
 /proc/_abs(A)
 	return abs(A)
 
-/*/proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags_1 = null)
-	animate(A, set_vars, time, loop, easing, flags_1)
-	Borked. If anyone wants to fix this be my guest.*/
+/proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags = null)
+	var/mutable_appearance/MA = new()
+	for(var/v in set_vars)
+		MA.vars[v] = set_vars[v]
+	animate(A, appearance = MA, time, loop, easing, flags)
 
 /proc/_acrccos(A)
 	return arccos(A)

code/modules/admin/verbs/adminhelp.dm

@@ -614,8 +614,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 
 
 /proc/send2irc(msg,msg2)
-	if(SERVER_TOOLS_PRESENT)
-		SERVER_TOOLS_RELAY_BROADCAST("[msg] | [msg2]")
+	msg = replacetext(replacetext(msg, "\proper", ""), "\improper", "")
+	msg2 = replacetext(replacetext(msg2, "\proper", ""), "\improper", "")
+	SERVER_TOOLS_RELAY_BROADCAST("[msg] | [msg2]")
 
 /proc/send2otherserver(source,msg,type = "Ahelp")
 	var/comms_key = CONFIG_GET(string/comms_key)

code/modules/admin/verbs/debug.dm

@@ -780,7 +780,7 @@ GLOBAL_PROTECT(LastAdminCalledProc)
 
 /client/proc/cmd_display_init_log()
 	set category = "Debug"
-	set name = "Display Initialzie() Log"
+	set name = "Display Initialize() Log"
 	set desc = "Displays a list of things that didn't handle Initialize() properly"
 
 	usr << browse(replacetext(SSatoms.InitLog(), "\n", "<br>"), "window=initlog")
@@ -873,3 +873,42 @@ GLOBAL_PROTECT(LastAdminCalledProc)
 	message_admins("<span class='adminnotice'>[key_name_admin(src)] pumped a random event.</span>")
 	SSblackbox.add_details("admin_verb","Pump Random Event")
 	log_admin("[key_name(src)] pumped a random event.")
+
+/client/proc/start_line_profiling()
+	set category = "Profile"
+	set name = "Start Line Profiling"
+	set desc = "Starts tracking line by line profiling for code lines that support it"
+
+	PROFILE_START
+
+	message_admins("<span class='adminnotice'>[key_name_admin(src)] started line by line profiling.</span>")
+	SSblackbox.add_details("admin_verb","Start Line Profiling")
+	log_admin("[key_name(src)] started line by line profiling.")
+
+/client/proc/stop_line_profiling()
+	set category = "Profile"
+	set name = "Stops Line Profiling"
+	set desc = "Stops tracking line by line profiling for code lines that support it"
+
+	PROFILE_STOP
+
+	message_admins("<span class='adminnotice'>[key_name_admin(src)] stopped line by line profiling.</span>")
+	SSblackbox.add_details("admin_verb","stop Line Profiling")
+	log_admin("[key_name(src)] stopped line by line profiling.")
+
+/client/proc/show_line_profiling()
+	set category = "Profile"
+	set name = "Show Line Profiling"
+	set desc = "Shows tracked profiling info from code lines that support it"
+
+	var/sortlist = list(
+		"Avg time"		=	/proc/cmp_profile_avg_time_dsc,
+		"Total Time"	=	/proc/cmp_profile_time_dsc,
+		"Call Count"	=	/proc/cmp_profile_count_dsc
+	)
+	var/sort = input(src, "Sort type?", "Sort Type", "Avg time") as null|anything in sortlist
+	if (!sort)
+		return
+	sort = sortlist[sort]
+	profile_show(src, sort)
+

code/modules/admin/verbs/mapping.dm

@@ -42,7 +42,10 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
 	/client/proc/print_pointers,
 	/client/proc/cmd_show_at_list,
 	/client/proc/cmd_show_at_markers,
-	/client/proc/manipulate_organs
+	/client/proc/manipulate_organs,
+	/client/proc/start_line_profiling,
+	/client/proc/stop_line_profiling,
+	/client/proc/show_line_profiling
 ))
 
 /obj/effect/debugging/mapfix_marker

code/modules/admin/verbs/modifyvariables.dm

@@ -416,7 +416,7 @@ GLOBAL_PROTECT(VVpixelmovement)
 	if (index == null)
 		return
 	var/assoc = 0
-	var/prompt = alert(src, "Do you want to edit the key or it's assigned value?", "Associated List", "Key", "Assigned Value", "Cancel")
+	var/prompt = alert(src, "Do you want to edit the key or its assigned value?", "Associated List", "Key", "Assigned Value", "Cancel")
 	if (prompt == "Cancel")
 		return
 	if (prompt == "Assigned Value")
@@ -610,8 +610,8 @@ GLOBAL_PROTECT(VVpixelmovement)
 	if (O.vv_edit_var(variable, var_new) == FALSE)
 		to_chat(src, "Your edit was rejected by the object.")
 		return
-	log_world("### VarEdit by [src]: [O.type] [variable]=[html_encode("[var_new]")]")
-	log_admin("[key_name(src)] modified [original_name]'s [variable] to [var_new]")
-	var/msg = "[key_name_admin(src)] modified [original_name]'s [variable] to [var_new]"
+	log_world("### VarEdit by [key_name(src)]: [O.type] [variable]=[var_value] => [var_new]")
+	log_admin("[key_name(src)] modified [original_name]'s [variable] to from [html_encode("[var_value]")] to [html_encode("[var_new]")]")
+	var/msg = "[key_name_admin(src)] modified [original_name]'s [variable] from [var_value] to [var_new]"
 	message_admins(msg)
 	admin_ticket_log(O, msg)

code/modules/admin/verbs/one_click_antag.dm

@@ -213,7 +213,6 @@
 
 
 /datum/admins/proc/makeNukeTeam()
-
 	var/datum/game_mode/nuclear/temp = new
 	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered for a nuke team being sent in?", "operative", temp)
 	var/list/mob/dead/observer/chosen = list()
@@ -246,24 +245,18 @@
 			nuke.r_code = nuke_code
 
 		//Let's find the spawn locations
-		var/list/turf/synd_spawn = list()
-		for(var/obj/effect/landmark/A in GLOB.landmarks_list)
-			if(A.name == "Syndicate-Spawn")
-				synd_spawn += get_turf(A)
-				continue
-
-		var/leader_chosen
+		var/leader_chosen = FALSE
 		var/spawnpos = 1 //Decides where they'll spawn. 1=leader.
 
 		for(var/mob/c in chosen)
-			if(spawnpos > synd_spawn.len)
-				spawnpos = 2 //Ran out of spawns. Let's loop back to the first non-leader position
+			if(spawnpos > GLOB.nukeop_start.len)
+				spawnpos = 1 //Ran out of spawns. Let's loop back to the first non-leader position
 			var/mob/living/carbon/human/new_character=makeBody(c)
 			if(!leader_chosen)
-				leader_chosen = 1
-				new_character.mind.make_Nuke(synd_spawn[spawnpos],nuke_code,1)
+				leader_chosen = TRUE
+				new_character.mind.make_Nuke(pick(GLOB.nukeop_leader_start), nuke_code, TRUE)
 			else
-				new_character.mind.make_Nuke(synd_spawn[spawnpos],nuke_code)
+				new_character.mind.make_Nuke(GLOB.nukeop_start[spawnpos], nuke_code)
 			spawnpos++
 		return 1
 	else

code/modules/admin/verbs/randomverbs.dm

@@ -399,7 +399,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		else//They may also be a cyborg or AI.
 			switch(new_character.mind.assigned_role)
 				if("Cyborg")//More rigging to make em' work and check if they're traitor.
-					new_character = new_character.Robotize()
+					new_character = new_character.Robotize(TRUE)
 				if("AI")
 					new_character = new_character.AIize()
 				else

code/modules/assembly/bomb.dm

@@ -14,12 +14,13 @@
 	var/obj/item/tank/bombtank = null //the second part of the bomb is a plasma tank
 	origin_tech = "materials=1;engineering=1"
 
+
 /obj/item/device/onetankbomb/examine(mob/user)
-	..()
-	user.examinate(bombtank)
+	bombtank.examine(user)
 
 /obj/item/device/onetankbomb/update_icon()
 	if(bombtank)
+		icon = bombtank.icon
 		icon_state = bombtank.icon_state
 	if(bombassembly)
 		add_overlay(bombassembly.icon_state)
@@ -34,11 +35,11 @@
 
 		to_chat(user, "<span class='notice'>You disassemble [src].</span>")
 
-		bombassembly.forceMove(user.drop_location())
+		bombassembly.forceMove(drop_location())
 		bombassembly.master = null
 		bombassembly = null
 
-		bombtank.forceMove(user.drop_location())
+		bombtank.forceMove(drop_location())
 		bombtank.master = null
 		bombtank = null
 
@@ -80,26 +81,35 @@
 
 // ---------- Procs below are for tanks that are used exclusively in 1-tank bombs ----------
 
-/obj/item/tank/proc/bomb_assemble(W,user)	//Bomb assembly proc. This turns assembly+tank into a bomb
-	var/obj/item/device/assembly_holder/S = W
-	var/mob/M = user
-	if(isigniter(S.a_left) == isigniter(S.a_right))		//Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
-		return
-	if(!M.temporarilyRemoveItemFromInventory(src))			//Remove the assembly from your hands
+//Bomb assembly proc. This turns assembly+tank into a bomb
+/obj/item/tank/proc/bomb_assemble(obj/item/device/assembly_holder/assembly, mob/living/user)
+	//Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
+	if(isigniter(assembly.a_left) == isigniter(assembly.a_right))
 		return
 
-	var/obj/item/device/onetankbomb/R = new
+	if((src in user.get_equipped_items()) && !user.canUnEquip(src))
+		to_chat(user, "<span class='warning'>[src] is stuck to you!</span>")
+		return
 
-	M.put_in_hands(R)		//Equips the bomb if possible, or puts it on the floor.
+	if(!user.canUnEquip(assembly))
+		to_chat(user, "<span class='warning'>[assembly] is stuck to your hand!</span>")
+		return
 
-	R.bombassembly = S	//Tell the bomb about its assembly part
-	S.master = R		//Tell the assembly about its new owner
-	S.forceMove(R)			//Move the assembly out of the fucking way
+	var/obj/item/device/onetankbomb/bomb = new
+	user.transferItemToLoc(src, bomb)
+	user.transferItemToLoc(assembly, bomb)
 
-	R.bombtank = src	//Same for tank
-	master = R
-	forceMove(R)
-	R.update_icon()
+	bomb.bombassembly = assembly	//Tell the bomb about its assembly part
+	assembly.master = bomb			//Tell the assembly about its new owner
+
+	bomb.bombtank = src	//Same for tank
+	master = bomb
+
+	forceMove(bomb)
+	bomb.update_icon()
+
+	user.put_in_hands(bomb)		//Equips the bomb if possible, or puts it on the floor.
+	to_chat(user, "<span class='notice'>You attach [assembly] to [src].</span>")
 	return
 
 /obj/item/tank/proc/ignite()	//This happens when a bomb is told to explode

code/modules/atmospherics/environmental/LINDA_fire.dm

@@ -54,11 +54,11 @@
 
 	var/volume = 125
 	var/temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST
-	var/just_spawned = 1
-	var/bypassing = 0
+	var/just_spawned = TRUE
+	var/bypassing = FALSE
 
-/obj/effect/hotspot/New()
-	..()
+/obj/effect/hotspot/Initialize()
+	. = ..()
 	SSair.hotspots += src
 	perform_exposure()
 	setDir(pick(GLOB.cardinals))
@@ -67,14 +67,14 @@
 /obj/effect/hotspot/proc/perform_exposure()
 	var/turf/open/location = loc
 	if(!istype(location) || !(location.air))
-		return 0
+		return
 
 	location.active_hotspot = src
 
 	if(volume > CELL_VOLUME*0.95)
-		bypassing = 1
+		bypassing = TRUE
 	else
-		bypassing = 0
+		bypassing = FALSE
 
 	if(bypassing)
 		if(!just_spawned)
@@ -88,17 +88,17 @@
 		volume = affected.reaction_results["fire"]*FIRE_GROWTH_RATE
 		location.assume_air(affected)
 
-	for(var/A in loc)
+	for(var/A in location)
 		var/atom/AT = A
 		if(AT && AT != src) // It's possible that the item is deleted in temperature_expose
 			AT.fire_act(temperature, volume)
-	return 0
+	return
 
 
 /obj/effect/hotspot/process()
 	if(just_spawned)
-		just_spawned = 0
-		return 0
+		just_spawned = FALSE
+		return
 
 	var/turf/open/location = loc
 	if(!istype(location))
@@ -112,7 +112,13 @@
 		qdel(src)
 		return
 
-	if(!(location.air) || !(location.air.gases[/datum/gas/plasma] || location.air.gases[/datum/gas/tritium]) || !location.air.gases[/datum/gas/oxygen] || (location.air.gases[/datum/gas/plasma][MOLES] < 0.5 && location.air.gases[/datum/gas/tritium][MOLES] < 0.5) || location.air.gases[/datum/gas/oxygen][MOLES] < 0.5)
+	//Nothing to burn
+	if(!(location.air) || !(location.air.gases[/datum/gas/plasma] || location.air.gases[/datum/gas/tritium]) || !location.air.gases[/datum/gas/oxygen])
+		qdel(src)
+		return
+
+	//Not enough to burn
+	if(((!location.air.gases[/datum/gas/plasma] || location.air.gases[/datum/gas/plasma][MOLES] < 0.5) && (!location.air.gases[/datum/gas/tritium] || location.air.gases[/datum/gas/tritium][MOLES] < 0.5)) || location.air.gases[/datum/gas/oxygen][MOLES] < 0.5)
 		qdel(src)
 		return
 
@@ -140,11 +146,8 @@
 		location.max_fire_temperature_sustained = temperature
 
 	if(location.heat_capacity && temperature > location.heat_capacity)
-		location.to_be_destroyed = 1
-		/*if(prob(25))
-			location.ReplaceWithSpace()
-			return 0*/
-	return 1
+		location.to_be_destroyed = TRUE
+	return TRUE
 
 /obj/effect/hotspot/Destroy()
 	set_light(0)
@@ -153,8 +156,7 @@
 	if(istype(T) && T.active_hotspot == src)
 		T.active_hotspot = null
 	DestroyTurf()
-	loc = null
-	. = ..()
+	return ..()
 
 /obj/effect/hotspot/proc/DestroyTurf()
 	if(isturf(loc))
@@ -168,12 +170,13 @@
 			if(prob(chance_of_deletion))
 				T.ChangeTurf(T.baseturf)
 			else
-				T.to_be_destroyed = 0
+				T.to_be_destroyed = FALSE
 				T.max_fire_temperature_sustained = 0
 
-/obj/effect/hotspot/Crossed(mob/living/L)
+/obj/effect/hotspot/Crossed(atom/movable/AM, oldLoc)
 	..()
-	if(isliving(L))
+	if(isliving(AM))
+		var/mob/living/L = AM
 		L.fire_act(temperature, volume)
 
 /obj/effect/dummy/fire
@@ -186,4 +189,4 @@
 /obj/effect/dummy/fire/Initialize()
 	. = ..()
 	if(!isliving(loc))
-		qdel(src)
+		return INITIALIZE_HINT_QDEL

code/modules/atmospherics/environmental/LINDA_system.dm

@@ -43,7 +43,7 @@
 		var/turf/T = get_step(src, direction)
 		if(!T)
 			continue
-		if(CANATMOSPASS(T, src))
+		if( !(blocks_air || T.blocks_air) && CANATMOSPASS(T, src) )
 			LAZYINITLIST(atmos_adjacent_turfs)
 			LAZYINITLIST(T.atmos_adjacent_turfs)
 			atmos_adjacent_turfs[T] = TRUE

code/modules/atmospherics/gasmixtures/gas_types.dm

@@ -84,11 +84,11 @@ GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /
 	moles_visible = 1
 	dangerous = TRUE
 
-/datum/gas/brown_gas //This is nitric oxide, but given generic name to avoid confusion with nitrous oxide(N20 vs. NO2)
-	id = "browns"
+/datum/gas/nitryl
+	id = "no2"
 	specific_heat = 20
-	name = "Brown Gas"
-	gas_overlay = "browns"
+	name = "Nitryl"
+	gas_overlay = "nitryl"
 	moles_visible = MOLES_GAS_VISIBLE
 	dangerous = TRUE
 

code/modules/atmospherics/gasmixtures/reactions.dm

@@ -11,7 +11,7 @@
 #define FIRE_PLASMA_ENERGY_RELEASED			3000000	//Amount of heat released per mole of burnt plasma into the tile
 //General assmos defines.
 #define WATER_VAPOR_FREEZE					200
-#define BROWNS_FORMATION_ENERGY				100000
+#define NITRYL_FORMATION_ENERGY				100000
 #define TRITIUM_BURN_OXY_FACTOR				100
 #define TRITIUM_BURN_TRIT_FACTOR			10
 #define SUPER_SATURATION_THRESHOLD			96
@@ -216,7 +216,7 @@
 	var/waste_added = (plasma_fused-oxygen_added)-((air.total_moles()*air.heat_capacity())/PLASMA_BINDING_ENERGY)
 	reaction_energy = max(reaction_energy+((catalyst_efficency*cached_gases[/datum/gas/plasma][MOLES])/((moles_impurities/catalyst_efficency)+2)*10)+((plasma_fused/((moles_impurities/catalyst_efficency)))*PLASMA_BINDING_ENERGY),0)
 
-	air.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/water_vapor, /datum/gas/nitrous_oxide, /datum/gas/brown_gas)
+	air.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/water_vapor, /datum/gas/nitrous_oxide, /datum/gas/nitryl)
 	//Fusion produces an absurd amount of waste products now, requiring active filtration.
 	cached_gases[/datum/gas/plasma][MOLES] = max(cached_gases[/datum/gas/plasma][MOLES] - plasma_fused,0)
 	cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES] - tritium_catalyzed,0)
@@ -224,7 +224,7 @@
 	cached_gases[/datum/gas/nitrogen][MOLES] += waste_added
 	cached_gases[/datum/gas/water_vapor][MOLES] += waste_added
 	cached_gases[/datum/gas/nitrous_oxide][MOLES] += waste_added
-	cached_gases[/datum/gas/brown_gas][MOLES] += waste_added
+	cached_gases[/datum/gas/nitryl][MOLES] += waste_added
 
 	if(reaction_energy > 0)
 		var/new_heat_capacity = air.heat_capacity()
@@ -233,12 +233,12 @@
 			//Prevents whatever mechanism is causing it to hit negative temperatures.
 		return REACTING
 
-/datum/gas_reaction/brownsformation //The formation of brown gas. Endothermic. Requires N2O as a catalyst.
+/datum/gas_reaction/nitrylformation //The formation of nitryl. Endothermic. Requires N2O as a catalyst.
 	priority = 3
-	name = "Brown Gas formation"
-	id = "brownsformation"
+	name = "Nitryl formation"
+	id = "nitrylformation"
 
-/datum/gas_reaction/brownsformation/init_reqs()
+/datum/gas_reaction/nitrylformation/init_reqs()
 	min_requirements = list(
 		/datum/gas/oxygen = 20,
 		/datum/gas/nitrogen = 20,
@@ -246,18 +246,18 @@
 		"TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*400
 	)
 
-/datum/gas_reaction/brownsformation/react(datum/gas_mixture/air)
+/datum/gas_reaction/nitrylformation/react(datum/gas_mixture/air)
 	var/list/cached_gases = air.gases
 	var/temperature = air.temperature
 
 	var/old_heat_capacity = air.heat_capacity()
 	var/heat_efficency = temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*100)
-	var/energy_used = heat_efficency*BROWNS_FORMATION_ENERGY
-	ASSERT_GAS(/datum/gas/brown_gas,air)
+	var/energy_used = heat_efficency*NITRYL_FORMATION_ENERGY
+	ASSERT_GAS(/datum/gas/nitryl,air)
 
 	cached_gases[/datum/gas/oxygen][MOLES] -= heat_efficency
 	cached_gases[/datum/gas/nitrogen][MOLES] -= heat_efficency
-	cached_gases[/datum/gas/brown_gas][MOLES] += heat_efficency*2
+	cached_gases[/datum/gas/nitryl][MOLES] += heat_efficency*2
 
 	if(energy_used > 0)
 		var/new_heat_capacity = air.heat_capacity()
@@ -307,7 +307,7 @@
 		/datum/gas/tritium = 30,
 		/datum/gas/plasma = 10,
 		/datum/gas/bz = 20,
-		/datum/gas/brown_gas = 30,
+		/datum/gas/nitryl = 30,
 		"TEMP" = STIMULUM_HEAT_SCALE/2)
 
 /datum/gas_reaction/stimformation/react(datum/gas_mixture/air)
@@ -322,7 +322,7 @@
 	cached_gases[/datum/gas/stimulum][MOLES]+= heat_scale/10
 	cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES]- heat_scale,0)
 	cached_gases[/datum/gas/plasma][MOLES] = max(cached_gases[/datum/gas/plasma][MOLES]- heat_scale,0)
-	cached_gases[/datum/gas/brown_gas][MOLES] = max(cached_gases[/datum/gas/brown_gas][MOLES]- heat_scale,0)
+	cached_gases[/datum/gas/nitryl][MOLES] = max(cached_gases[/datum/gas/nitryl][MOLES]- heat_scale,0)
 
 	if(stim_energy_change)
 		var/new_heat_capacity = air.heat_capacity()
@@ -367,7 +367,7 @@
 #undef FIRE_CARBON_ENERGY_RELEASED
 #undef FIRE_PLASMA_ENERGY_RELEASED
 #undef WATER_VAPOR_FREEZE
-#undef BROWNS_FORMATION_ENERGY
+#undef NITRYL_FORMATION_ENERGY
 #undef TRITIUM_BURN_OXY_FACTOR
 #undef SUPER_SATURATION_THRESHOLD
 #undef STIMULUM_HEAT_SCALE

code/modules/atmospherics/machinery/airalarm.dm

@@ -93,11 +93,11 @@
 		/datum/gas/plasma			= new/datum/tlv/dangerous, // Partial pressure, kpa
 		/datum/gas/nitrous_oxide	= new/datum/tlv/dangerous, // Partial pressure, kpa
 		/datum/gas/bz				= new/datum/tlv/dangerous,
-		/datum/gas/hypernoblium			= new/datum/tlv/dangerous,
+		/datum/gas/hypernoblium		= new/datum/tlv/dangerous,
 		/datum/gas/water_vapor		= new/datum/tlv/dangerous,
 		/datum/gas/tritium			= new/datum/tlv/dangerous,
 		/datum/gas/stimulum			= new/datum/tlv/dangerous,
-		/datum/gas/brown_gas			= new/datum/tlv/dangerous,
+		/datum/gas/nitryl			= new/datum/tlv/dangerous,
 		/datum/gas/pluoxium			= new/datum/tlv/dangerous
 	)
 
@@ -111,11 +111,11 @@
 		/datum/gas/plasma			= new/datum/tlv/no_checks,
 		/datum/gas/nitrous_oxide	= new/datum/tlv/no_checks,
 		/datum/gas/bz				= new/datum/tlv/no_checks,
-		/datum/gas/hypernoblium			= new/datum/tlv/no_checks,
+		/datum/gas/hypernoblium		= new/datum/tlv/no_checks,
 		/datum/gas/water_vapor		= new/datum/tlv/no_checks,
 		/datum/gas/tritium			= new/datum/tlv/no_checks,
 		/datum/gas/stimulum			= new/datum/tlv/no_checks,
-		/datum/gas/brown_gas			= new/datum/tlv/no_checks,
+		/datum/gas/nitryl			= new/datum/tlv/no_checks,
 		/datum/gas/pluoxium			= new/datum/tlv/no_checks
 	)
 
@@ -133,7 +133,7 @@
 		/datum/gas/water_vapor		= new/datum/tlv/dangerous,
 		/datum/gas/tritium			= new/datum/tlv/dangerous,
 		/datum/gas/stimulum			= new/datum/tlv/dangerous,
-		/datum/gas/brown_gas		= new/datum/tlv/dangerous,
+		/datum/gas/nitryl			= new/datum/tlv/dangerous,
 		/datum/gas/pluoxium			= new/datum/tlv/dangerous
 	)
 

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

@@ -124,7 +124,7 @@
 																	datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "atmos_filter", name, 475, 155, master_ui, state)
+		ui = new(user, src, ui_key, "atmos_filter", name, 475, 180, master_ui, state)
 		ui.open()
 
 /obj/machinery/atmospherics/components/trinary/filter/ui_data()

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

@@ -230,10 +230,10 @@
 				filtered_gases[/datum/gas/pluoxium][MOLES] = removed_gases[/datum/gas/pluoxium][MOLES]
 				removed_gases[/datum/gas/pluoxium][MOLES] = 0
 
-			if(scrub_Rare && removed_gases[/datum/gas/brown_gas])
-				ADD_GAS(/datum/gas/brown_gas, filtered_gases)
-				filtered_gases[/datum/gas/brown_gas][MOLES] = removed_gases[/datum/gas/brown_gas][MOLES]
-				removed_gases[/datum/gas/brown_gas][MOLES] = 0
+			if(scrub_Rare && removed_gases[/datum/gas/nitryl])
+				ADD_GAS(/datum/gas/nitryl, filtered_gases)
+				filtered_gases[/datum/gas/nitryl][MOLES] = removed_gases[/datum/gas/nitryl][MOLES]
+				removed_gases[/datum/gas/nitryl][MOLES] = 0
 
 			if(scrub_Rare && removed_gases[/datum/gas/tritium])
 				ADD_GAS(/datum/gas/tritium, filtered_gases)

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

@@ -41,9 +41,14 @@
 		"co2" = /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
 		"plasma" = /obj/machinery/portable_atmospherics/canister/toxins,
 		"n2o" = /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
+		"no2" = /obj/machinery/portable_atmospherics/canister/nitryl,
 		"bz" = /obj/machinery/portable_atmospherics/canister/bz,
 		"air" = /obj/machinery/portable_atmospherics/canister/air,
 		"water vapor" = /obj/machinery/portable_atmospherics/canister/water_vapor,
+		"tritium" = /obj/machinery/portable_atmospherics/canister/tritium,
+		"hyper-noblium" = /obj/machinery/portable_atmospherics/canister/nob,
+		"stimulum" = /obj/machinery/portable_atmospherics/canister/stimulum,
+		"pluoxium" = /obj/machinery/portable_atmospherics/canister/pluoxium,
 		"caution" = /obj/machinery/portable_atmospherics/canister,
 	)
 
@@ -98,26 +103,31 @@
 /obj/machinery/portable_atmospherics/canister/tritium
 	name = "tritium canister"
 	desc = "Tritium. Inhalation might cause irradiation."
+	icon_state = "green"
 	gas_type = /datum/gas/tritium
 
 /obj/machinery/portable_atmospherics/canister/nob
 	name = "hyper-noblium canister"
 	desc = "Hyper-Noblium. More noble than all other gases."
+	icon_state = "freon"
 	gas_type = /datum/gas/hypernoblium
 
-/obj/machinery/portable_atmospherics/canister/browns
-	name = "brown gas canister"
-	desc = "Browns gas. Feels great 'til the acid eats your lungs."
-	gas_type = /datum/gas/brown_gas
+/obj/machinery/portable_atmospherics/canister/nitryl
+	name = "nitryl canister"
+	desc = "Nitryl gas. Feels great 'til the acid eats your lungs."
+	icon_state = "brown"
+	gas_type = /datum/gas/nitryl
 
 /obj/machinery/portable_atmospherics/canister/stimulum
 	name = "stimulum canister"
 	desc = "Stimulum. High energy gas, high energy people."
+	icon_state = "darkpurple"
 	gas_type = /datum/gas/stimulum
 
 /obj/machinery/portable_atmospherics/canister/pluoxium
 	name = "pluoxium canister"
 	desc = "Pluoxium. Like oxygen, but more bang for your buck."
+	icon_state = "darkblue"
 	gas_type = /datum/gas/pluoxium
 
 /obj/machinery/portable_atmospherics/canister/water_vapor
@@ -127,7 +137,6 @@
 	gas_type = /datum/gas/water_vapor
 	filled = 1
 
-
 /obj/machinery/portable_atmospherics/canister/proc/get_time_left()
 	if(timing)
 		. = round(max(0, valve_timer - world.time) / 10, 1)

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

@@ -7,7 +7,7 @@
 	var/volume_rate = 1000
 	volume = 1000
 
-	var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/brown_gas, /datum/gas/tritium, /datum/gas/hypernoblium, /datum/gas/water_vapor)
+	var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitryl, /datum/gas/tritium, /datum/gas/hypernoblium, /datum/gas/water_vapor)
 
 /obj/machinery/portable_atmospherics/scrubber/Destroy()
 	var/turf/T = get_turf(src)

code/modules/awaymissions/corpse.dm

@@ -130,6 +130,10 @@
 	var/backpack_contents = -1
 	var/suit_store = -1
 
+	var/hair_style
+	var/facial_hair_style
+	var/skin_tone
+
 /obj/effect/mob_spawn/human/Initialize()
 	if(ispath(outfit))
 		outfit = new outfit()
@@ -147,6 +151,20 @@
 	H.underwear = "Nude"
 	H.undershirt = "Nude"
 	H.socks = "Nude"
+	if(hair_style)
+		H.hair_style = hair_style
+	else
+		H.hair_style = random_hair_style(gender)
+	if(facial_hair_style)
+		H.facial_hair_style = facial_hair_style
+	else
+		H.facial_hair_style = random_facial_hair_style(gender)
+	if(skin_tone)
+		H.skin_tone = skin_tone
+	else
+		H.skin_tone = random_skin_tone()
+	H.update_hair()
+	H.update_body()
 	if(outfit)
 		var/static/list/slots = list("uniform", "r_hand", "l_hand", "suit", "shoes", "gloves", "ears", "glasses", "mask", "head", "belt", "r_pocket", "l_pocket", "back", "id", "neck", "backpack_contents", "suit_store")
 		for(var/slot in slots)

code/modules/awaymissions/gateway.dm

@@ -170,7 +170,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 	density = TRUE
 	icon_state = "offcenter"
 	use_power = NO_POWER_USE
-	var/obj/machinery/gateway/centeraway/stationgate = null
+	var/obj/machinery/gateway/centerstation/stationgate = null
 	can_link = TRUE
 
 
@@ -233,6 +233,18 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
 			M.client.move_delay = max(world.time + 5, M.client.move_delay)
 
 
+/obj/machinery/gateway/centeraway/admin
+	desc = "A mysterious gateway built by unknown hands, this one seems more compact."
+
+/obj/machinery/gateway/centeraway/admin/Initialize()
+	. = ..()
+	if(stationgate && !stationgate.awaygate)
+		stationgate.awaygate = src
+
+/obj/machinery/gateway/centeraway/admin/detect()
+	return TRUE
+
+
 /obj/item/paper/fluff/gateway
 	info = "Congratulations,<br><br>Your station has been selected to carry out the Gateway Project.<br><br>The equipment will be shipped to you at the start of the next quarter.<br> You are to prepare a secure location to house the equipment as outlined in the attached documents.<br><br>--Nanotrasen Blue Space Research"
 	name = "Confidential Correspondence, Pg 1"

code/modules/cargo/exports/seeds.dm

@@ -26,12 +26,12 @@
 	export_types = list(/obj/item/seeds)
 	needs_discovery = TRUE // Only for already discovered species
 
-/datum/export/seed/potency.get_cost(obj/O)
+/datum/export/seed/potency/get_cost(obj/O)
 	var/obj/item/seeds/S = O
 	var/cost = ..()
 	if(!cost)
 		return 0
 
 	var/potDiff = (S.potency - discoveredPlants[S.type])
-		
+
 	return round(..() * potDiff)

code/modules/client/client_procs.dm

@@ -672,6 +672,9 @@ GLOBAL_LIST(external_rsc_urls)
 
 	view = new_size
 	apply_clickcatcher()
+	if (isliving(mob))
+		var/mob/living/M = mob
+		M.update_damage_hud()
 
 /client/proc/generate_clickcatcher()
 	if(!void)

code/modules/client/preferences.dm

@@ -228,7 +228,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	dat += "<HR>"
 
 	switch(current_tab)
-		if (0) // Character Settings#
+		if (0) // Character Settings
 			if(path)
 				var/savefile/S = new /savefile(path)
 				if(S)
@@ -279,163 +279,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 //			dat += "<b>Size:</b> <a href='?_src_=prefs;preference=character_size;task=input'>[character_size]</a><BR>"
 			dat += "<br>"
 
-			dat += "<h2>Body</h2>"
-			dat += "<a href='?_src_=prefs;preference=all;task=random'>Random Body</A> "
-			dat += "<a href='?_src_=prefs;preference=all'>Always Random Body: [be_random_body ? "Yes" : "No"]</A><br>"
-
-			dat += "<table width='100%'><tr><td width='24%' valign='top'>"
-
-			dat += "<b>Species:</b><BR><a href='?_src_=prefs;preference=species;task=input'>[pref_species.name]</a><BR>"
-
 			dat += "<b>Underwear:</b><BR><a href ='?_src_=prefs;preference=underwear;task=input'>[underwear]</a><BR>"
 			dat += "<b>Undershirt:</b><BR><a href ='?_src_=prefs;preference=undershirt;task=input'>[undershirt]</a><BR>"
 			dat += "<b>Socks:</b><BR><a href ='?_src_=prefs;preference=socks;task=input'>[socks]</a><BR>"
 			dat += "<b>Backpack:</b><BR><a href ='?_src_=prefs;preference=bag;task=input'>[backbag]</a><BR>"
 			dat += "<b>Uplink Spawn Location:</b><BR><a href ='?_src_=prefs;preference=uplink_loc;task=input'>[uplink_spawn_loc]</a><BR></td>"
 
-			if(pref_species.use_skintones)
-
-				dat += "<td valign='top' width='21%'>"
-
-				dat += "<h3>Skin Tone</h3>"
-
-				dat += "<a href='?_src_=prefs;preference=s_tone;task=input'>[skin_tone]</a><BR>"
-
-				dat += "</td>"
-
-			if(HAIR in pref_species.species_traits)
-
-				dat += "<td valign='top' width='21%'>"
-
-				dat += "<h3>Hair Style</h3>"
-
-				dat += "<a href='?_src_=prefs;preference=hair_style;task=input'>[hair_style]</a><BR>"
-				dat += "<a href='?_src_=prefs;preference=previous_hair_style;task=input'>&lt;</a> <a href='?_src_=prefs;preference=next_hair_style;task=input'>&gt;</a><BR>"
-				dat += "<span style='border:1px solid #161616; background-color: #[hair_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=hair;task=input'>Change</a><BR>"
-
-
-				dat += "</td><td valign='top' width='21%'>"
-
-				dat += "<h3>Facial Hair Style</h3>"
-
-				dat += "<a href='?_src_=prefs;preference=facial_hair_style;task=input'>[facial_hair_style]</a><BR>"
-				dat += "<a href='?_src_=prefs;preference=previous_facehair_style;task=input'>&lt;</a> <a href='?_src_=prefs;preference=next_facehair_style;task=input'>&gt;</a><BR>"
-				dat += "<span style='border: 1px solid #161616; background-color: #[facial_hair_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=facial;task=input'>Change</a><BR>"
-
-				dat += "</td>"
-
-			if(EYECOLOR in pref_species.species_traits)
-
-				dat += "<td valign='top' width='21%'>"
-
-				dat += "<h3>Eye Color</h3>"
-
-				dat += "<span style='border: 1px solid #161616; background-color: #[eye_color];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=eyes;task=input'>Change</a><BR>"
-
-				dat += "</td>"
-
-
-			if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits))
-
-				dat += "<td valign='top' width='14%'>"
-
-				dat += "<h3>Mutant Color</h3>"
-
-				dat += "<span style='border: 1px solid #161616; background-color: #[features["mcolor"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=mutant_color;task=input'>Change</a><BR>"
-
-				dat += "</td>"
-
-			if("tail_lizard" in pref_species.mutant_bodyparts)
-				dat += "<td valign='top' width='7%'>"
-
-				dat += "<h3>Tail</h3>"
-
-				dat += "<a href='?_src_=prefs;preference=tail_lizard;task=input'>[features["tail_lizard"]]</a><BR>"
-
-				dat += "</td>"
-
-			if("snout" in pref_species.mutant_bodyparts)
-				dat += "<td valign='top' width='7%'>"
-
-				dat += "<h3>Snout</h3>"
-
-				dat += "<a href='?_src_=prefs;preference=snout;task=input'>[features["snout"]]</a><BR>"
-
-				dat += "</td>"
-
-			if("horns" in pref_species.mutant_bodyparts)
-				dat += "<td valign='top' width='7%'>"
-
-				dat += "<h3>Horns</h3>"
-
-				dat += "<a href='?_src_=prefs;preference=horns;task=input'>[features["horns"]]</a><BR>"
-
-				dat += "</td>"
-
-			if("frills" in pref_species.mutant_bodyparts)
-				dat += "<td valign='top' width='7%'>"
-
-				dat += "<h3>Frills</h3>"
-
-				dat += "<a href='?_src_=prefs;preference=frills;task=input'>[features["frills"]]</a><BR>"
-
-				dat += "</td>"
-
-			if("spines" in pref_species.mutant_bodyparts)
-				dat += "<td valign='top' width='7%'>"
-
-				dat += "<h3>Spines</h3>"
-
-				dat += "<a href='?_src_=prefs;preference=spines;task=input'>[features["spines"]]</a><BR>"
-
-				dat += "</td>"
-
-			if("body_markings" in pref_species.mutant_bodyparts)
-				dat += "<td valign='top' width='7%'>"
-
-				dat += "<h3>Body Markings</h3>"
-
-				dat += "<a href='?_src_=prefs;preference=body_markings;task=input'>[features["body_markings"]]</a><BR>"
-
-				dat += "</td>"
-			if("legs" in pref_species.mutant_bodyparts)
-				dat += "<td valign='top' width='7%'>"
-
-				dat += "<h3>Legs</h3>"
-
-				dat += "<a href='?_src_=prefs;preference=legs;task=input'>[features["legs"]]</a><BR>"
-
-				dat += "</td>"
-
-			if(CONFIG_GET(flag/join_with_mutant_humans))
-
-				if("tail_human" in pref_species.mutant_bodyparts)
-					dat += "<td valign='top' width='7%'>"
-
-					dat += "<h3>Tail</h3>"
-
-					dat += "<a href='?_src_=prefs;preference=tail_human;task=input'>[features["tail_human"]]</a><BR>"
-
-					dat += "</td>"
-
-				if("ears" in pref_species.mutant_bodyparts)
-					dat += "<td valign='top' width='7%'>"
-
-					dat += "<h3>Ears</h3>"
-
-					dat += "<a href='?_src_=prefs;preference=ears;task=input'>[features["ears"]]</a><BR>"
-
-					dat += "</td>"
-
-				if("wings" in pref_species.mutant_bodyparts && GLOB.r_wings_list.len >1)
-					dat += "<td valign='top' width='7%'>"
-
-					dat += "<h3>Wings</h3>"
-
-					dat += "<a href='?_src_=prefs;preference=wings;task=input'>[features["wings"]]</a><BR>"
-
-					dat += "</td>"
-
 			dat += "</tr></table>"
 
 		if (1) // Game Preferences

code/modules/client/verbs/ooc.dm

@@ -259,9 +259,19 @@ GLOBAL_VAR_INIT(normal_ooc_colour, OOC_COLOR)
 	set category = "OOC"
 	set desc ="Ignore a player's messages on the OOC channel"
 
-	var/selection = input("Please, select a player!", "Ignore", null, null) as null|anything in sortKey(GLOB.clients)
-	if(!selection)
+	
+	var/see_ghost_names = isobserver(mob)
+	var/list/choices = list()
+	for(var/client/C in GLOB.clients)
+		if(isobserver(C.mob) && see_ghost_names)
+			choices["[C.mob]([C])"] = C
+		else
+			choices[C] = C
+	choices = sortList(choices)
+	var/selection = input("Please, select a player!", "Ignore", null, null) as null|anything in choices
+	if(!selection || !(selection in choices))
 		return
+	selection = choices[selection]
 	if(selection == src)
 		to_chat(src, "You can't ignore yourself.")
 		return

code/modules/clothing/head/jobs.dm

@@ -86,17 +86,17 @@
 	..()
 	to_chat(user, "<span class='notice'>Alt-click to take a candy corn.</span>")
 
-/obj/item/clothing/head/fedora/det_hat/AltClick()
-	..()
-	if(ismob(loc))
-		var/mob/M = loc
-		if(candy_cooldown < world.time)
-			var/obj/item/reagent_containers/food/snacks/candy_corn/CC = new /obj/item/reagent_containers/food/snacks/candy_corn(src)
-			M.put_in_hands(CC)
-			to_chat(M, "You slip a candy corn from your hat.")
-			candy_cooldown = world.time+1200
-		else
-			to_chat(M, "You just took a candy corn! You should wait a couple minutes, lest you burn through your stash.")
+/obj/item/clothing/head/fedora/det_hat/AltClick(mob/user)
+	if(user.canUseTopic(src, be_close=TRUE))
+		..()
+		if(loc == user)
+			if(candy_cooldown < world.time)
+				var/obj/item/reagent_containers/food/snacks/candy_corn/CC = new /obj/item/reagent_containers/food/snacks/candy_corn(src)
+				user.put_in_hands(CC)
+				to_chat(user, "You slip a candy corn from your hat.")
+				candy_cooldown = world.time+1200
+			else
+				to_chat(user, "You just took a candy corn! You should wait a couple minutes, lest you burn through your stash.")
 
 
 //Mime

code/modules/clothing/masks/miscellaneous.dm

@@ -78,6 +78,41 @@
 		message = pick("Oink!","Squeeeeeeee!","Oink Oink!")
 	return message
 
+///frog mask - reeee!!
+obj/item/clothing/mask/frog
+	name = "frog mask"
+	desc = "An ancient mask carved in the shape of a frog.<br> Sanity is like gravity, all it needs is a push."
+	icon_state = "frog"
+	item_state = "frog"
+	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	w_class = WEIGHT_CLASS_SMALL
+	var/voicechange = TRUE
+
+/obj/item/clothing/mask/frog/attack_self(mob/user)
+	voicechange = !voicechange
+	to_chat(user, "<span class='notice'>You turn the voice box [voicechange ? "on" : "off"]!</span>")
+
+/obj/item/clothing/mask/frog/speechModification(message) //whenever you speak
+	if(voicechange)
+		if(prob(5)) //sometimes, the angry spirit finds others words to speak.
+			message = pick("HUUUUU!!","SMOOOOOKIN'!!","Hello my baby, hello my honey, hello my rag-time gal.", "Feels bad, man.", "GIT DIS GUY OFF ME!!" ,"SOMEBODY STOP ME!!", "NORMIES, GET OUT!!")
+		else
+			message = pick("Ree!!", "Reee!!","REEE!!","REEEEE!!") //but its usually just angry gibberish,
+	return message
+
+obj/item/clothing/mask/frog/cursed
+	flags_1 = NODROP_1 //reee!!
+
+/obj/item/clothing/mask/frog/cursed/attack_self(mob/user)
+	return //no voicebox to alter.
+
+/obj/item/clothing/mask/frog/cursed/equipped(mob/user, slot)
+	var/mob/living/carbon/C = user
+	if(C.wear_mask == src)
+		to_chat(user, "<span class='warning'><B>[src] was cursed! Ree!!</B></span>")
+	return ..()
+
+
 /obj/item/clothing/mask/cowmask
 	name = "Cowface"
 	desc = "It looks like a mask, but closer inspection reveals it's melded onto this persons face!"
@@ -214,4 +249,4 @@
 	desc = "A burlap sack with eyeholes."
 	icon_state = "scarecrow_sack"
 	item_state = "scarecrow_sack"
-	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR

code/modules/clothing/spacesuits/flightsuit.dm

@@ -76,8 +76,8 @@
 
 	//This is probably too much code just for EMP damage.
 	var/emp_damage = 0	//One hit should make it hard to control, continuous hits will cripple it and then simply shut it off/make it crash. Direct hits count more.
-	var/emp_strong_damage = 2
-	var/emp_weak_damage = 1.1
+	var/emp_strong_damage = 4
+	var/emp_weak_damage = 2.5
 	var/emp_heal_amount = 0.06		//How much emp damage to heal per process.
 	var/emp_disable_threshold = 3	//3 weak ion, 2 strong ion hits.
 	var/emp_disabled = FALSE
@@ -757,7 +757,6 @@
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/flightsuit
 	jetpack = null
-	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/gun, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs)
 	actions_types = list(/datum/action/item_action/flightsuit/toggle_helmet, /datum/action/item_action/flightsuit/toggle_boots, /datum/action/item_action/flightsuit/toggle_flightpack, /datum/action/item_action/flightsuit/lock_suit)
 	armor = list(melee = 20, bullet = 20, laser = 20, energy = 10, bomb = 30, bio = 100, rad = 75, fire = 100, acid = 100)
 	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
@@ -772,6 +771,10 @@
 	var/flight = FALSE
 	var/maint_panel = FALSE
 
+/obj/item/clothing/suit/space/hardsuit/flightsuit/Initialize()
+	. = ..()
+	allowed = GLOB.advanced_hardsuit_allowed
+
 /obj/item/clothing/suit/space/hardsuit/flightsuit/full/Initialize()
 	makepack()
 	makeshoes()
@@ -1077,7 +1080,7 @@
 	armor = list(melee = 20, bullet = 20, laser = 20, energy = 10, bomb = 30, bio = 100, rad = 75, fire = 100, acid = 100)
 	max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
 	var/list/datahuds = list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC)
-	var/zoom_range = 14
+	var/zoom_range = 12
 	var/zoom = FALSE
 	actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/flightpack/zoom)
 

code/modules/clothing/spacesuits/hardsuit.dm

@@ -499,10 +499,13 @@
 	name = "security hardsuit"
 	desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor."
 	item_state = "sec_hardsuit"
-	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs)
 	armor = list(melee = 30, bullet = 15, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 50, fire = 75, acid = 75)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security
 
+/obj/item/clothing/suit/space/hardsuit/security/Initialize()
+	. = ..()
+	allowed = GLOB.security_hardsuit_allowed
+
 	//Head of Security hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/security/hos
 	name = "head of security's hardsuit helmet"
@@ -541,13 +544,16 @@
 	desc = "A MK.II SWAT suit with streamlined joints and armor made out of superior materials, insulated against intense heat. The most advanced tactical armor available Usually reserved for heavy hitter corporate security, this one has a regal finish in Nanotrasen company colors. Better not let the assistants get a hold of it."
 	icon_state = "caparmor"
 	item_state = "capspacesuit"
-	allowed = list(/obj/item/tank/internals, /obj/item/device/flashlight, /obj/item/gun/energy, /obj/item/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs)
 	armor = list(melee = 40, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50, fire = 100, acid = 100)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT //this needed to be added a long fucking time ago
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/captain
 
+/obj/item/clothing/suit/space/hardsuit/captain/Initialize()
+	. = ..()
+	allowed = GLOB.security_hardsuit_allowed
+
 	//Clown
 /obj/item/clothing/head/helmet/space/hardsuit/clown
 	name = "cosmohonk hardsuit helmet"
@@ -612,7 +618,7 @@
 	desc = "A hardsuit with built in energy shielding. Will rapidly recharge when not under fire."
 	icon_state = "hardsuit-hos"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/hos
-	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/gun, /obj/item/reagent_containers/spray/pepper, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs)
+	allowed = null
 	armor = list(melee = 30, bullet = 15, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 50, fire = 100, acid = 100)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	var/current_charges = 3
@@ -623,6 +629,11 @@
 	var/shield_state = "shield-old"
 	var/shield_on = "shield-old"
 
+/obj/item/clothing/suit/space/hardsuit/shielded/Initialize()
+	. = ..()
+	if(!allowed)
+		allowed = GLOB.advanced_hardsuit_allowed
+
 /obj/item/clothing/suit/space/hardsuit/shielded/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
 	recharge_cooldown = world.time + recharge_delay
 	if(current_charges > 0)

code/modules/clothing/spacesuits/plasmamen.dm

@@ -3,7 +3,7 @@
 
 /obj/item/clothing/suit/space/eva/plasmaman
 	name = "EVA plasma envirosuit"
-	desc = "A special plasma containment suit designed to be space-worthy, as well as worn over other clothing. Like it's smaller counterpart, it can automatically extinguish the wearer in a crisis, and holds twice as many charges."
+	desc = "A special plasma containment suit designed to be space-worthy, as well as worn over other clothing. Like its smaller counterpart, it can automatically extinguish the wearer in a crisis, and holds twice as many charges."
 	allowed = list(/obj/item/gun, /obj/item/ammo_casing, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank)
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 0, fire = 100, acid = 75)
 	resistance_flags = FIRE_PROOF

code/modules/clothing/suits/armor.dm

@@ -1,5 +1,5 @@
 /obj/item/clothing/suit/armor
-	allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/melee/classic_baton/telescopic, /obj/item/kitchen/knife/combat, /obj/item/tank/internals/emergency_oxygen)
+	allowed = null
 	body_parts_covered = CHEST
 	cold_protection = CHEST|GROIN
 	min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
@@ -11,6 +11,11 @@
 	resistance_flags = 0
 	armor = list(melee = 30, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 50, acid = 50)
 
+/obj/item/clothing/suit/armor/Initialize()
+	. = ..()
+	if(!allowed)
+		allowed = GLOB.security_vest_allowed
+
 /obj/item/clothing/suit/armor/vest
 	name = "armor vest"
 	desc = "A slim Type I armored vest that provides decent protection against most types of damage."
@@ -153,10 +158,12 @@
 	name = "detective's armor vest"
 	desc = "An armored vest with a detective's badge on it."
 	icon_state = "detective-armor"
-	allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/reagent_containers/spray/pepper, /obj/item/device/flashlight, /obj/item/gun/energy, /obj/item/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/device/detective_scanner, /obj/item/device/taperecorder, /obj/item/melee/classic_baton)
 	resistance_flags = FLAMMABLE
 	dog_fashion = null
 
+/obj/item/clothing/suit/armor/vest/det_suit/Initialize()
+	. = ..()
+	allowed = GLOB.detective_vest_allowed
 
 //Reactive armor
 /obj/item/clothing/suit/armor/reactive

code/modules/clothing/suits/cloaks.dm

@@ -24,7 +24,7 @@
 
 /obj/item/clothing/neck/cloak/hos
 	name = "head of security's cloak"
-	desc = "Worn by Securistan, ruling the station with an iron fist. It's slightly armored."
+	desc = "Worn by Securistan, ruling the station with an iron fist."
 	icon_state = "hoscloak"
 
 /obj/item/clothing/neck/cloak/qm
@@ -33,17 +33,17 @@
 
 /obj/item/clothing/neck/cloak/cmo
 	name = "chief medical officer's cloak"
-	desc = "Worn by Meditopia, the valiant men and women keeping pestilence at bay. It's slightly shielded from contaminants."
+	desc = "Worn by Meditopia, the valiant men and women keeping pestilence at bay."
 	icon_state = "cmocloak"
 
 /obj/item/clothing/neck/cloak/ce
 	name = "chief engineer's cloak"
-	desc = "Worn by Engitopia, wielders of an unlimited power. It's slightly shielded against radiation."
+	desc = "Worn by Engitopia, wielders of an unlimited power."
 	icon_state = "cecloak"
 
 /obj/item/clothing/neck/cloak/rd
 	name = "research director's cloak"
-	desc = "Worn by Sciencia, thaumaturges and researchers of the universe. It's slightly shielded from contaminants."
+	desc = "Worn by Sciencia, thaumaturges and researchers of the universe."
 	icon_state = "rdcloak"
 
 /obj/item/clothing/neck/cloak/cap

code/modules/clothing/suits/jobs.dm

@@ -94,11 +94,14 @@
 	item_state = "det_suit"
 	blood_overlay_type = "coat"
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/reagent_containers/spray/pepper, /obj/item/device/flashlight, /obj/item/gun/energy, /obj/item/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/device/detective_scanner, /obj/item/device/taperecorder, /obj/item/melee/classic_baton)
 	armor = list(melee = 25, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 45)
 	cold_protection = CHEST|GROIN|LEGS|ARMS
 	heat_protection = CHEST|GROIN|LEGS|ARMS
 
+/obj/item/clothing/suit/det_suit/Initialize()
+	. = ..()
+	allowed = GLOB.detective_vest_allowed
+
 /obj/item/clothing/suit/det_suit/grey
 	name = "noir trenchcoat"
 	desc = "A hard-boiled private investigator's grey trenchcoat."

code/modules/clothing/suits/miscellaneous.dm

@@ -134,9 +134,12 @@
 	item_state = "owl_wings"
 	togglename = "wings"
 	body_parts_covered = ARMS|CHEST
-	allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
 	actions_types = list(/datum/action/item_action/toggle_wings)
 
+/obj/item/clothing/suit/toggle/owlwings/Initialize()
+	. = ..()
+	allowed = GLOB.security_vest_allowed
+
 /obj/item/clothing/suit/toggle/owlwings/griffinwings
 	name = "griffon cloak"
 	desc = "A plush white cloak made of synthetic feathers. Soft to the touch, stylish, and a 2 meter wing span that will drive your captives mad."
@@ -477,9 +480,12 @@
 	icon_state = "coatcaptain"
 	item_state = "coatcaptain"
 	armor = list(melee = 25, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 0, acid = 50)
-	allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/melee/classic_baton/telescopic)
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/captain
 
+/obj/item/clothing/suit/hooded/wintercoat/captain/Initialize()
+	. = ..()
+	allowed = GLOB.security_wintercoat_allowed
+
 /obj/item/clothing/head/hooded/winterhood/captain
 	icon_state = "winterhood_captain"
 
@@ -488,9 +494,12 @@
 	icon_state = "coatsecurity"
 	item_state = "coatsecurity"
 	armor = list(melee = 25, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 0, acid = 45)
-	allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/device/flashlight, /obj/item/melee/classic_baton/telescopic)
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/security
 
+/obj/item/clothing/suit/hooded/wintercoat/security/Initialize()
+	. = ..()
+	allowed = GLOB.security_wintercoat_allowed
+
 /obj/item/clothing/head/hooded/winterhood/security
 	icon_state = "winterhood_security"
 
@@ -498,7 +507,7 @@
 	name = "medical winter coat"
 	icon_state = "coatmedical"
 	item_state = "coatmedical"
-	allowed = list(/obj/item/device/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/device/healthanalyzer, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic)
+	allowed = list(/obj/item/device/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/device/healthanalyzer, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0, fire = 0, acid = 45)
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/medical
 
@@ -509,7 +518,7 @@
 	name = "science winter coat"
 	icon_state = "coatscience"
 	item_state = "coatscience"
-	allowed = list(/obj/item/device/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/device/healthanalyzer, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic)
+	allowed = list(/obj/item/device/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/device/healthanalyzer, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/tank/internals/emergency_oxygen)
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0, fire = 0, acid = 0)
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/science
 
@@ -521,7 +530,7 @@
 	icon_state = "coatengineer"
 	item_state = "coatengineer"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20, fire = 30, acid = 45)
-	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/device/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser)
+	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/device/t_scanner, /obj/item/construction/rcd, /obj/item/pipe_dispenser, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering
 
 /obj/item/clothing/head/hooded/winterhood/engineering
@@ -540,7 +549,7 @@
 	name = "hydroponics winter coat"
 	icon_state = "coathydro"
 	item_state = "coathydro"
-	allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/device/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants)
+	allowed = list(/obj/item/reagent_containers/spray/plantbgone, /obj/item/device/plant_analyzer, /obj/item/seeds, /obj/item/reagent_containers/glass/bottle, /obj/item/cultivator, /obj/item/reagent_containers/spray/pestspray, /obj/item/hatchet, /obj/item/storage/bag/plants, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/hydro
 
 /obj/item/clothing/head/hooded/winterhood/hydro

code/modules/clothing/under/accessories.dm

@@ -64,10 +64,11 @@
 /obj/item/clothing/accessory/proc/on_uniform_dropped(obj/item/clothing/under/U, user)
 	return
 
-/obj/item/clothing/accessory/AltClick()
-	if(initial(above_suit))
-		above_suit = !above_suit
-		to_chat(usr, "\The [src] will be worn [above_suit ? "above" : "below"] your suit.")
+/obj/item/clothing/accessory/AltClick(mob/user)
+	if(user.canUseTopic(src, be_close=TRUE))
+		if(initial(above_suit))
+			above_suit = !above_suit
+			to_chat(user, "[src] will be worn [above_suit ? "above" : "below"] your suit.")
 
 /obj/item/clothing/accessory/examine(mob/user)
 	..()

code/modules/crafting/recipes.dm

@@ -179,6 +179,16 @@
 	time = 40
 	category = CAT_ROBOT
 
+/datum/crafting_recipe/honkbot
+	name = "Honkbot"
+	result = /mob/living/simple_animal/bot/honkbot
+	reqs = list(/obj/item/storage/box/clown = 1,
+				/obj/item/bodypart/r_arm/robot = 1,
+				/obj/item/device/assembly/prox_sensor = 1,
+				/obj/item/bikehorn/ = 1)
+	time = 40
+	category = CAT_ROBOT
+
 /datum/crafting_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but
 	name = "Pneumatic Cannon"
 	result = /obj/item/pneumatic_cannon/ghetto

code/modules/events/_event.dm

@@ -40,7 +40,7 @@
 /datum/round_event_control/proc/canSpawnEvent(var/players_amt, var/gamemode)
 	if(occurrences >= max_occurrences)
 		return FALSE
-	if(earliest_start >= world.time)
+	if(earliest_start >= world.time-SSticker.round_start_time)
 		return FALSE
 	if(wizardevent != SSevents.wizardmode)
 		return FALSE

code/modules/events/holiday/vday.dm

@@ -124,7 +124,14 @@
 	               "You're the vomit to my flyperson.",
 	               "You must be liquid dark matter, because you're pulling me closer.",
 	               "Not even sorium can drive me away from you.",
-	               "Wanna make like a borg and do some heavy petting?" )
+	               "Wanna make like a borg and do some heavy petting?",
+	               "Are you powering the station? Because you super matter to me.",
+	               "I wish science could make me a bag of holding you.",
+	               "Let's call the emergency CUDDLE.",
+	               "I must be tripping on BZ, because I saw an angel walk by.",
+	               "Wanna empty out my tool storage?",
+	               "Did you visit the medbay after you fell from heaven?",
+	               "Are you wearing space pants? Wanna not be?" )
 
 /obj/item/valentine/attackby(obj/item/W, mob/user, params)
 	..()
@@ -174,8 +181,9 @@
                 "A heart-shaped candy that reads: WAG MY TAIL",
                 "A heart-shaped candy that reads: VALIDTINES",
                 "A heart-shaped candy that reads: FACEHUGGER",
-                "A heart-shaped candy that reads: DOMINATOR",
-                "A heart-shaped candy that reads: GET TESLA'D",
-                "A heart-shaped candy that reads: COCK CULT",
-                "A heart-shaped candy that reads: PET ME")
+                "A heart-shaped candy that reads: BOX OF HUGS",
+                "A heart-shaped candy that reads: REEBE MINE",
+                "A heart-shaped candy that reads: PET ME",
+                "A heart-shaped candy that reads: TO THE DORMS",
+                "A heart-shaped candy that reads: DIS MEMBER")
 	icon_state = pick("candyheart", "candyheart2", "candyheart3", "candyheart4")

code/modules/events/meteor_wave.dm

@@ -4,8 +4,9 @@
 	name = "Meteor Wave: Normal"
 	typepath = /datum/round_event/meteor_wave
 	weight = 4
-	min_players = 5
+	min_players = 15
 	max_occurrences = 3
+	earliest_start = 25 MINUTES
 
 /datum/round_event/meteor_wave
 	startWhen		= 6
@@ -54,9 +55,10 @@
 /datum/round_event_control/meteor_wave/threatening
 	name = "Meteor Wave: Threatening"
 	typepath = /datum/round_event/meteor_wave/threatening
-	weight = 2
-	min_players = 5
+	weight = 5
+	min_players = 20
 	max_occurrences = 3
+	earliest_start = 35 MINUTES
 
 /datum/round_event/meteor_wave/threatening
 	wave_name = "threatening"
@@ -64,9 +66,10 @@
 /datum/round_event_control/meteor_wave/catastrophic
 	name = "Meteor Wave: Catastrophic"
 	typepath = /datum/round_event/meteor_wave/catastrophic
-	weight = 1
-	min_players = 5
+	weight = 7
+	min_players = 25
 	max_occurrences = 3
+	earliest_start = 45 MINUTES
 
 /datum/round_event/meteor_wave/catastrophic
 	wave_name = "catastrophic"

code/modules/events/spacevine.dm

@@ -169,7 +169,7 @@
 		var/datum/gas_mixture/GM = T.air
 		if(!GM.gases[/datum/gas/oxygen])
 			return
-		GM.gases[/datum/gas/oxygen][MOLES] -= severity * holder.energy
+		GM.gases[/datum/gas/oxygen][MOLES] = max(GM.gases[/datum/gas/oxygen][MOLES] - severity * holder.energy, 0)
 		GM.garbage_collect()
 
 /datum/spacevine_mutation/nitro_eater
@@ -184,7 +184,7 @@
 		var/datum/gas_mixture/GM = T.air
 		if(!GM.gases[/datum/gas/nitrogen])
 			return
-		GM.gases[/datum/gas/nitrogen][MOLES] -= severity * holder.energy
+		GM.gases[/datum/gas/nitrogen][MOLES] = max(GM.gases[/datum/gas/nitrogen][MOLES] - severity * holder.energy, 0)
 		GM.garbage_collect()
 
 /datum/spacevine_mutation/carbondioxide_eater
@@ -199,7 +199,7 @@
 		var/datum/gas_mixture/GM = T.air
 		if(!GM.gases[/datum/gas/carbon_dioxide])
 			return
-		GM.gases[/datum/gas/carbon_dioxide][MOLES] -= severity * holder.energy
+		GM.gases[/datum/gas/carbon_dioxide][MOLES] = max(GM.gases[/datum/gas/carbon_dioxide][MOLES] - severity * holder.energy, 0)
 		GM.garbage_collect()
 
 /datum/spacevine_mutation/plasma_eater
@@ -214,7 +214,7 @@
 		var/datum/gas_mixture/GM = T.air
 		if(!GM.gases[/datum/gas/plasma])
 			return
-		GM.gases[/datum/gas/plasma][MOLES] -= severity * holder.energy
+		GM.gases[/datum/gas/plasma][MOLES] = max(GM.gases[/datum/gas/plasma][MOLES] - severity * holder.energy, 0)
 		GM.garbage_collect()
 
 /datum/spacevine_mutation/thorns

code/modules/fields/peaceborg_dampener.dm

@@ -42,7 +42,7 @@
 		if(R.has_buckled_mobs())
 			for(var/mob/living/L in R.buckled_mobs)
 				L.visible_message("<span class='warning'>[L] is knocked off of [R] by the charge in [R]'s chassis induced by [name]!</span>")	//I know it's bad.
-				L.Knockdown(60)
+				L.Knockdown(10)
 				R.unbuckle_mob(L)
 				do_sparks(5, 0, L)
 	..()

code/modules/flufftext/Hallucination.dm

@@ -905,45 +905,47 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
 		alert_type = specific
 	feedback_details += "Type: [alert_type]"
 	switch(alert_type)
-		if("oxy")
-			target.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy, override = TRUE)
+		if("not_enough_oxy")
+			target.throw_alert(alert_type, /obj/screen/alert/not_enough_oxy, override = TRUE)
 		if("not_enough_tox")
-			target.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox, override = TRUE)
+			target.throw_alert(alert_type, /obj/screen/alert/not_enough_tox, override = TRUE)
 		if("not_enough_co2")
-			target.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2, override = TRUE)
+			target.throw_alert(alert_type, /obj/screen/alert/not_enough_co2, override = TRUE)
 		if("too_much_oxy")
-			target.throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy, override = TRUE)
+			target.throw_alert(alert_type, /obj/screen/alert/too_much_oxy, override = TRUE)
 		if("too_much_co2")
-			target.throw_alert("too_much_co2", /obj/screen/alert/too_much_co2, override = TRUE)
-		if("tox_in_air")
-			target.throw_alert("too_much_tox", /obj/screen/alert/too_much_tox, override = TRUE)
+			target.throw_alert(alert_type, /obj/screen/alert/too_much_co2, override = TRUE)
+		if("too_much_tox")
+			target.throw_alert(alert_type, /obj/screen/alert/too_much_tox, override = TRUE)
 		if("nutrition")
 			if(prob(50))
-				target.throw_alert("nutrition", /obj/screen/alert/fat, override = TRUE)
+				target.throw_alert(alert_type, /obj/screen/alert/fat, override = TRUE)
 			else
-				target.throw_alert("nutrition", /obj/screen/alert/starving, override = TRUE)
+				target.throw_alert(alert_type, /obj/screen/alert/starving, override = TRUE)
 		if("weightless")
-			target.throw_alert("weightless", /obj/screen/alert/weightless, override = TRUE)
+			target.throw_alert(alert_type, /obj/screen/alert/weightless, override = TRUE)
 		if("fire")
-			target.throw_alert("fire", /obj/screen/alert/fire, override = TRUE)
+			target.throw_alert(alert_type, /obj/screen/alert/fire, override = TRUE)
 		if("temphot")
-			target.throw_alert("temp", /obj/screen/alert/hot, 3, override = TRUE)
+			alert_type = "temp"
+			target.throw_alert(alert_type, /obj/screen/alert/hot, 3, override = TRUE)
 		if("tempcold")
-			target.throw_alert("temp", /obj/screen/alert/cold, 3, override = TRUE)
+			alert_type = "temp"
+			target.throw_alert(alert_type, /obj/screen/alert/cold, 3, override = TRUE)
 		if("pressure")
 			if(prob(50))
-				target.throw_alert("pressure", /obj/screen/alert/highpressure, 2, override = TRUE)
+				target.throw_alert(alert_type, /obj/screen/alert/highpressure, 2, override = TRUE)
 			else
-				target.throw_alert("pressure", /obj/screen/alert/lowpressure, 2, override = TRUE)
+				target.throw_alert(alert_type, /obj/screen/alert/lowpressure, 2, override = TRUE)
 		//BEEP BOOP I AM A ROBOT
 		if("newlaw")
-			target.throw_alert("newlaw", /obj/screen/alert/newlaw, override = TRUE)
+			target.throw_alert(alert_type, /obj/screen/alert/newlaw, override = TRUE)
 		if("locked")
-			target.throw_alert("locked", /obj/screen/alert/locked, override = TRUE)
+			target.throw_alert(alert_type, /obj/screen/alert/locked, override = TRUE)
 		if("hacked")
-			target.throw_alert("hacked", /obj/screen/alert/hacked, override = TRUE)
+			target.throw_alert(alert_type, /obj/screen/alert/hacked, override = TRUE)
 		if("charge")
-			target.throw_alert("charge",/obj/screen/alert/emptycell, override = TRUE)
+			target.throw_alert(alert_type,/obj/screen/alert/emptycell, override = TRUE)
 	sleep(duration)
 	target.clear_alert(alert_type, clear_override = TRUE)
 	qdel(src)

code/modules/food_and_drinks/food/condiment.dm

@@ -19,7 +19,7 @@
 	 "capsaicin" = list("hotsauce", "hotsauce bottle", "You can almost TASTE the stomach ulcers now!"),
 	 "enzyme" = list("enzyme", "universal enzyme bottle", "Used in cooking various dishes"),
 	 "soysauce" = list("soysauce", "soy sauce bottle", "A salty soy-based flavoring"),
-	 "frostoil" = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in it's passage"),
+	 "frostoil" = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in its passage"),
 	 "sodiumchloride" = list("saltshakersmall", "salt shaker", "Salt. From space oceans, presumably"),
 	 "blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"),
 	 "cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),

code/modules/food_and_drinks/kitchen_machinery/processor.dm

@@ -24,8 +24,6 @@
 
 /obj/machinery/processor/process()
 	..()
-	// The irony
-	// To be clear, if it's grinding, then it can't suck them up
 	if(processing)
 		return
 	var/mob/living/simple_animal/slime/picked_slime
@@ -43,125 +41,44 @@
 		return
 
 	src.visible_message("[picked_slime] is sucked into [src].")
-	picked_slime.loc = src
+	picked_slime.forceMove(src)
 
-/datum/food_processor_process
-	var/input
-	var/output
-	var/time = 40
-/datum/food_processor_process/proc/process_food(loc, what, obj/machinery/processor/processor)
-	if (src.output && loc && processor)
-		for(var/i = 0, i < processor.rating_amount, i++)
-			new src.output(loc)
-	if (what)
-		qdel(what) // Note to self: Make this safer
-
-	/* objs */
-/datum/food_processor_process/meat
-	input = /obj/item/reagent_containers/food/snacks/meat/slab
-	output = /obj/item/reagent_containers/food/snacks/faggot
-
-/datum/food_processor_process/bacon
-	input = /obj/item/reagent_containers/food/snacks/meat/rawcutlet
-	output = /obj/item/reagent_containers/food/snacks/meat/rawbacon
-
-/datum/food_processor_process/potatowedges
-	input = /obj/item/reagent_containers/food/snacks/grown/potato/wedges
-	output = /obj/item/reagent_containers/food/snacks/fries
-
-/datum/food_processor_process/sweetpotato
-	input = /obj/item/reagent_containers/food/snacks/grown/potato/sweet
-	output = /obj/item/reagent_containers/food/snacks/yakiimo
-
-/datum/food_processor_process/potato
-	input = /obj/item/reagent_containers/food/snacks/grown/potato
-	output = /obj/item/reagent_containers/food/snacks/tatortot
-
-/datum/food_processor_process/carrot
-	input = /obj/item/reagent_containers/food/snacks/grown/carrot
-	output = /obj/item/reagent_containers/food/snacks/carrotfries
-
-/datum/food_processor_process/soybeans
-	input = /obj/item/reagent_containers/food/snacks/grown/soybeans
-	output = /obj/item/reagent_containers/food/snacks/soydope
-
-/datum/food_processor_process/spaghetti
-	input = /obj/item/reagent_containers/food/snacks/doughslice
-	output = /obj/item/reagent_containers/food/snacks/spaghetti
-
-/datum/food_processor_process/corn
-	input = /obj/item/reagent_containers/food/snacks/grown/corn
-	output = /obj/item/reagent_containers/food/snacks/tortilla
-
-/datum/food_processor_process/parsnip
-	input = /obj/item/reagent_containers/food/snacks/grown/parsnip
-	output = /obj/item/reagent_containers/food/snacks/roastparsnip
-
-/* mobs */
-/datum/food_processor_process/mob/process_food(loc, what, processor)
-	..()
+/obj/machinery/processor/proc/process_food(datum/food_processor_process/recipe, atom/movable/what)
+	if (recipe.output && loc && !QDELETED(src))
+		for(var/i = 0, i < rating_amount, i++)
+			new recipe.output(drop_location())
+	if (ismob(what))
+		var/mob/themob = what
+		themob.gib(TRUE,TRUE,TRUE)
+	else
+		qdel(what)
 
 
-/datum/food_processor_process/mob/slime/process_food(loc, what, obj/machinery/processor/processor)
+/obj/machinery/processor/slime/process_food(datum/food_processor_process/recipe, atom/movable/what)
 	var/mob/living/simple_animal/slime/S = what
-	var/C = S.cores
-	if(S.stat != DEAD)
-		S.loc = loc
-		S.visible_message("<span class='notice'>[C] crawls free of the processor!</span>")
-		return
-	for(var/i in 1 to (C+processor.rating_amount-1))
-		new S.coretype(loc)
-		SSblackbox.add_details("slime_core_harvested","[replacetext(S.colour," ","_")]")
+	if (istype(S))
+		var/C = S.cores
+		if(S.stat != DEAD)
+			S.forceMove(drop_location())
+			S.visible_message("<span class='notice'>[C] crawls free of the processor!</span>")
+			return
+		for(var/i in 1 to (C+rating_amount-1))
+			var/atom/movable/item = new S.coretype(drop_location())
+			adjust_item_drop_location(item)
+			SSblackbox.add_details("slime_core_harvested","[replacetext(S.colour," ","_")]")
 	..()
 
-/datum/food_processor_process/mob/slime/input = /mob/living/simple_animal/slime
-/datum/food_processor_process/mob/slime/output = null
-
-/datum/food_processor_process/mob/monkey/process_food(loc, what, processor)
-	var/mob/living/carbon/monkey/O = what
-	if (O.client) //grief-proof
-		O.loc = loc
-		O.visible_message("<span class='notice'>Suddenly [O] jumps out from the processor!</span>", \
-				"<span class='notice'>You jump out from the processor!</span>", \
-				"<span class='italics'>You hear chimpering.</span>")
-		return
-	var/obj/bucket = new /obj/item/reagent_containers/glass/bucket(loc)
-
-	var/datum/reagent/blood/B = new()
-	B.holder = bucket
-	B.volume = 70
-	//set reagent data
-	B.data["donor"] = O
-
-	for(var/thing in O.viruses)
-		var/datum/disease/D = thing
-		if(!(D.spread_flags & VIRUS_SPREAD_SPECIAL))
-			B.data["viruses"] += D.Copy()
-	if(O.has_dna())
-		B.data["blood_DNA"] = O.dna.unique_enzymes
-
-	if(O.resistances&&O.resistances.len)
-		B.data["resistances"] = O.resistances.Copy()
-	bucket.reagents.reagent_list += B
-	bucket.reagents.update_total()
-	bucket.on_reagent_change()
-	//bucket_of_blood.reagents.handle_reactions() //blood doesn't react
-	..()
-
-/datum/food_processor_process/mob/monkey/input = /mob/living/carbon/monkey
-/datum/food_processor_process/mob/monkey/output = null
 
 /obj/machinery/processor/proc/select_recipe(X)
-	for (var/Type in subtypesof(/datum/food_processor_process) - /datum/food_processor_process/mob)
-		var/datum/food_processor_process/P = new Type()
-		if (!istype(X, P.input))
+	for (var/type in subtypesof(/datum/food_processor_process) - /datum/food_processor_process/mob)
+		var/datum/food_processor_process/recipe = new type()
+		if (!istype(X, recipe.input) || !istype(src, recipe.required_machine))
 			continue
-		return P
-	return 0
+		return recipe
 
 /obj/machinery/processor/attackby(obj/item/O, mob/user, params)
 	if(src.processing)
-		to_chat(user, "<span class='warning'>The processor is in the process of processing!</span>")
+		to_chat(user, "<span class='warning'>[src] is in the process of processing!</span>")
 		return 1
 	if(default_deconstruction_screwdriver(user, "processor", "processor1", O))
 		return
@@ -205,12 +122,12 @@
 			return ..()
 
 /obj/machinery/processor/attack_hand(mob/user)
-	if (src.stat != 0) //NOPOWER etc
+	if(stat & (NOPOWER|BROKEN))
 		return
 	if(src.processing)
-		to_chat(user, "<span class='warning'>The processor is in the process of processing!</span>")
+		to_chat(user, "<span class='warning'>[src] is in the process of processing!</span>")
 		return 1
-	if(user.a_intent == INTENT_GRAB && user.pulling && (isslime(user.pulling) || ismonkey(user.pulling)))
+	if(user.a_intent == INTENT_GRAB && user.pulling && select_recipe(user.pulling))
 		if(user.grab_state < GRAB_AGGRESSIVE)
 			to_chat(user, "<span class='warning'>You need a better grip to do that!</span>")
 			return
@@ -220,7 +137,7 @@
 		user.stop_pulling()
 		return
 	if(src.contents.len == 0)
-		to_chat(user, "<span class='warning'>The processor is empty!</span>")
+		to_chat(user, "<span class='warning'>[src] is empty!</span>")
 		return 1
 	processing = TRUE
 	user.visible_message("[user] turns on [src].", \
@@ -238,12 +155,12 @@
 	var/offset = prob(50) ? -2 : 2
 	animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = (total_time / rating_speed)*5) //start shaking
 	sleep(total_time / rating_speed)
-	for(var/O in src.contents)
+	for(var/atom/movable/O in src.contents)
 		var/datum/food_processor_process/P = select_recipe(O)
 		if (!P)
-			log_admin("DEBUG: [O] in processor havent suitable recipe. How do you put it in?") //-rastaf0
+			log_admin("DEBUG: [O] in processor havent suitable recipe. How do you put it in?")
 			continue
-		P.process_food(src.loc, O, src)
+		process_food(P, O)
 	pixel_x = initial(pixel_x) //return to its spot after shaking
 	processing = FALSE
 	src.visible_message("\The [src] finishes processing.")
@@ -267,10 +184,24 @@
 	return
 
 /obj/machinery/processor/slime
-	name = "Slime processor"
+	name = "slime processor"
 	desc = "An industrial grinder with a sticker saying appropriated for science department. Keep hands clear of intake area while operating."
 
 /obj/machinery/processor/slime/Initialize()
 	. = ..()
 	var/obj/item/circuitboard/machine/B = new /obj/item/circuitboard/machine/processor/slime(null)
-	B.apply_default_parts(src)
+	B.apply_default_parts(src)
+
+/obj/machinery/processor/slime/adjust_item_drop_location(atom/movable/AM)
+	var/static/list/slimecores = subtypesof(/obj/item/slime_extract)
+	var/i = 0
+	if(!(i = slimecores.Find(AM.type))) // If the item is not found
+		return
+	if (i <= 16) // If in the first 12 slots
+		AM.pixel_x = -12 + ((i%4)*8)
+		AM.pixel_y = -12 + (round(i/4)*8)
+		return i
+	var/ii = i - 16
+	AM.pixel_x = -8 + ((ii%3)*8)
+	AM.pixel_y = -8 + (round(ii/3)*8)
+	return i

code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm

@@ -194,6 +194,7 @@
 					break
 				if(O.name == params["name"])
 					O.forceMove(drop_location())
+					adjust_item_drop_location(O)
 					desired--
 			return TRUE
 	return FALSE

code/modules/food_and_drinks/recipes/processor_recipes.dm

@@ -0,0 +1,50 @@
+/datum/food_processor_process
+	var/input
+	var/output
+	var/time = 40
+	var/required_machine = /obj/machinery/processor
+
+/datum/food_processor_process/meat
+	input = /obj/item/reagent_containers/food/snacks/meat/slab
+	output = /obj/item/reagent_containers/food/snacks/faggot
+
+/datum/food_processor_process/bacon
+	input = /obj/item/reagent_containers/food/snacks/meat/rawcutlet
+	output = /obj/item/reagent_containers/food/snacks/meat/rawbacon
+
+/datum/food_processor_process/potatowedges
+	input = /obj/item/reagent_containers/food/snacks/grown/potato/wedges
+	output = /obj/item/reagent_containers/food/snacks/fries
+
+/datum/food_processor_process/sweetpotato
+	input = /obj/item/reagent_containers/food/snacks/grown/potato/sweet
+	output = /obj/item/reagent_containers/food/snacks/yakiimo
+
+/datum/food_processor_process/potato
+	input = /obj/item/reagent_containers/food/snacks/grown/potato
+	output = /obj/item/reagent_containers/food/snacks/tatortot
+
+/datum/food_processor_process/carrot
+	input = /obj/item/reagent_containers/food/snacks/grown/carrot
+	output = /obj/item/reagent_containers/food/snacks/carrotfries
+
+/datum/food_processor_process/soybeans
+	input = /obj/item/reagent_containers/food/snacks/grown/soybeans
+	output = /obj/item/reagent_containers/food/snacks/soydope
+
+/datum/food_processor_process/spaghetti
+	input = /obj/item/reagent_containers/food/snacks/doughslice
+	output = /obj/item/reagent_containers/food/snacks/spaghetti
+
+/datum/food_processor_process/corn
+	input = /obj/item/reagent_containers/food/snacks/grown/corn
+	output = /obj/item/reagent_containers/food/snacks/tortilla
+
+/datum/food_processor_process/parsnip
+	input = /obj/item/reagent_containers/food/snacks/grown/parsnip
+	output = /obj/item/reagent_containers/food/snacks/roastparsnip
+
+/datum/food_processor_process/mob/slime
+	input = /mob/living/simple_animal/slime
+	output = null
+	required_machine = /obj/machinery/processor/slime

code/modules/goonchat/browserOutput.dm

@@ -158,7 +158,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
 				var/list/row = src.connectionHistory[i]
 				if (!row || row.len < 3 || (!row["ckey"] || !row["compid"] || !row["ip"])) //Passed malformed history object
 					return
-				if (world.IsBanned(row["ckey"], row["compid"], row["ip"]))
+				if (world.IsBanned(row["ckey"], row["compid"], row["ip"], real_bans_only=TRUE))
 					found = row
 					break
 

code/modules/holiday/holidays.dm

@@ -33,7 +33,7 @@
 	if(!end_month)
 		end_month = begin_month
 	if(begin_week && begin_weekday)
-		if(begin_week == ww && begin_weekday == ddd)
+		if(begin_week == ww && begin_weekday == ddd && begin_month == mm)
 			return TRUE
 	if(end_month > begin_month) //holiday spans multiple months in one year
 		if(mm == end_month) //in final month

code/modules/holodeck/computer.dm

@@ -176,7 +176,7 @@
 /obj/machinery/computer/holodeck/proc/generate_program_list()
 	for(var/typekey in subtypesof(program_type))
 		var/area/holodeck/A = locate(typekey) in GLOB.sortedAreas
-		if(!A || A == offline_program || !A.contents.len)
+		if(!A || !A.contents.len)
 			continue
 		var/list/info_this = list()
 		info_this["name"] = A.name

code/modules/jobs/job_types/security.dm

@@ -48,7 +48,7 @@ Head of Security
 	gloves = /obj/item/clothing/gloves/color/black/hos
 	head = /obj/item/clothing/head/HoS/beret
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
-	suit_store = /obj/item/gun/energy/e_gun
+	suit_store = /obj/item/gun/energy/e_gun/cx
 	r_pocket = /obj/item/device/assembly/flash/handheld
 	l_pocket = /obj/item/restraints/handcuffs
 	backpack_contents = list(/obj/item/melee/baton/loaded=1)

code/modules/mapping/map_template.dm

@@ -74,7 +74,7 @@
 	if(T.y+height > world.maxy)
 		return
 
-	var/list/bounds = maploader.load_map(file(mappath), T.x, T.y, T.z, cropMap=TRUE)
+	var/list/bounds = maploader.load_map(file(mappath), T.x, T.y, T.z, cropMap=TRUE, no_changeturf=(SSatoms.initialized == INITIALIZATION_INSSATOMS))
 	if(!bounds)
 		return
 

code/modules/mining/aux_base.dm

@@ -319,6 +319,11 @@ obj/docking_port/stationary/public_mining_dock
 		return
 
 	for(var/L in landing_turfs) //You land NEAR the base, not IN it.
+		if(!L) //This happens at map edges
+			to_chat(user, "<span class='warning'>Unable to secure a valid docking zone. Please try again in an open area near, but not within the aux. mining base.</span>")
+			SSshuttle.stationary.Remove(Mport)
+			qdel(Mport)
+			return
 		if(istype(get_area(L), /area/shuttle/auxillary_base))
 			to_chat(user, "<span class='warning'>The mining shuttle must not land within the mining base itself.</span>")
 			SSshuttle.stationary.Remove(Mport)

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

@@ -31,6 +31,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	var/mob/observetarget = null	//The target mob that the ghost is observing. Used as a reference in logout()
 	var/ghost_hud_enabled = 1 //did this ghost disable the on-screen HUD?
 	var/data_huds_on = 0 //Are data HUDs currently enabled?
+	var/health_scan = FALSE //Are health scans currently enabled?
 	var/list/datahuds = list(DATA_HUD_SECURITY_ADVANCED, DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC) //list of data HUDs shown to ghosts.
 	var/ghost_orbit = GHOST_ORBIT_CIRCLE
 
@@ -671,6 +672,18 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		to_chat(src, "<span class='notice'>Data HUDs enabled.</span>")
 		data_huds_on = 1
 
+/mob/dead/observer/verb/toggle_health_scan()
+	set name = "Toggle Health Scan"
+	set desc = "Toggles whether you health-scan living beings on click"
+	set category = "Ghost"
+
+	if(health_scan) //remove old huds
+		to_chat(src, "<span class='notice'>Health scan disabled.</span>")
+		health_scan = FALSE
+	else
+		to_chat(src, "<span class='notice'>Health scan enabled.</span>")
+		health_scan = TRUE
+
 /mob/dead/observer/verb/restore_ghost_appearance()
 	set name = "Restore Ghost Character"
 	set desc = "Sets your deadchat name and ghost appearance to your \

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

@@ -130,10 +130,12 @@
 
 
 /mob/living/carbon/attack_paw(mob/living/carbon/monkey/M)
-	for(var/thing in viruses)
-		var/datum/disease/D = thing
-		if(D.spread_flags & VIRUS_SPREAD_CONTACT_SKIN)
-			M.ContactContractDisease(D)
+
+	if(can_inject(M, TRUE))
+		for(var/thing in viruses)
+			var/datum/disease/D = thing
+			if((D.spread_flags & VIRUS_SPREAD_CONTACT_SKIN) && prob(85))
+				M.ContactContractDisease(D)
 
 	for(var/thing in M.viruses)
 		var/datum/disease/D = thing

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

@@ -75,24 +75,54 @@
 /datum/emote/living/carbon/human/wag/run_emote(mob/user, params)
 	. = ..()
 	var/mob/living/carbon/human/H = user
-	if(.)
+	if(!H.is_wagging_tail())
 		H.startTailWag()
 	else
 		H.endTailWag()
 
+/mob/living/carbon/human/proc/is_wagging_tail()
+	return (dna && dna.species && ("waggingtail_lizard" in dna.species.mutant_bodyparts || "waggingtail_human" in dna.species.mutant_bodyparts))
+
 /datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check = TRUE)
 	if(!..())
 		return FALSE
 	var/mob/living/carbon/human/H = user
-	if(H.dna && H.dna.species && ((H.dna.features["tail_lizard"] != "None") || (H.dna.features["tail_human"] != "None") || ("mam_tail" in H.dna.species.mutant_bodyparts)))
+	if(H.dna && H.dna.species && (("tail_lizard" in H.dna.species.mutant_bodyparts) || ("waggingtail_lizard" in H.dna.species.mutant_bodyparts) || (H.dna.features["tail_human"] != "None")))
 		return TRUE
 
 /datum/emote/living/carbon/human/wag/select_message_type(mob/user)
 	. = ..()
 	var/mob/living/carbon/human/H = user
-	if(("waggingtail_lizard" in H.dna.species.mutant_bodyparts) || ("waggingtail_human" in H.dna.species.mutant_bodyparts) || ("mam_waggingtail" in H.dna.species.mutant_bodyparts))
+	if(("waggingtail_lizard" in H.dna.species.mutant_bodyparts) || ("waggingtail_human" in H.dna.species.mutant_bodyparts))
 		. = null
 
+//Don't know where else to put this, it's basically an emote
+/mob/living/carbon/human/proc/startTailWag()
+	if(!dna || !dna.species)
+		return
+	if("tail_lizard" in dna.species.mutant_bodyparts)
+		dna.species.mutant_bodyparts -= "tail_lizard"
+		dna.species.mutant_bodyparts -= "spines"
+		dna.species.mutant_bodyparts |= "waggingtail_lizard"
+		dna.species.mutant_bodyparts |= "waggingspines"
+	if("tail_human" in dna.species.mutant_bodyparts)
+		dna.species.mutant_bodyparts -= "tail_human"
+		dna.species.mutant_bodyparts |= "waggingtail_human"
+	update_body()
+
+/mob/living/carbon/human/proc/endTailWag()
+	if(!dna || !dna.species)
+		return
+	if("waggingtail_lizard" in dna.species.mutant_bodyparts)
+		dna.species.mutant_bodyparts -= "waggingtail_lizard"
+		dna.species.mutant_bodyparts -= "waggingspines"
+		dna.species.mutant_bodyparts |= "tail_lizard"
+		dna.species.mutant_bodyparts |= "spines"
+	if("waggingtail_human" in dna.species.mutant_bodyparts)
+		dna.species.mutant_bodyparts -= "waggingtail_human"
+		dna.species.mutant_bodyparts |= "tail_human"
+	update_body()
+
 /datum/emote/living/carbon/human/wing
 	key = "wing"
 	key_third_person = "wings"
@@ -121,41 +151,7 @@
 	var/mob/living/carbon/human/H = user
 	if(H.dna && H.dna.species && (H.dna.features["wings"] != "None"))
 		return TRUE
-
-//Don't know where else to put this, it's basically an emote
-/mob/living/carbon/human/proc/startTailWag()
-	if(!dna || !dna.species)
-		return
-	if("tail_lizard" in dna.species.mutant_bodyparts)
-		dna.species.mutant_bodyparts -= "tail_lizard"
-		dna.species.mutant_bodyparts -= "spines"
-		dna.species.mutant_bodyparts |= "waggingtail_lizard"
-		dna.species.mutant_bodyparts |= "waggingspines"
-	if("tail_human" in dna.species.mutant_bodyparts)
-		dna.species.mutant_bodyparts -= "tail_human"
-		dna.species.mutant_bodyparts |= "waggingtail_human"
-	if("mam_tail" in dna.species.mutant_bodyparts)
-		dna.species.mutant_bodyparts -= "mam_tail"
-		dna.species.mutant_bodyparts |= "mam_waggingtail"
-	update_body()
-
-
-/mob/living/carbon/human/proc/endTailWag()
-	if(!dna || !dna.species)
-		return
-	if("waggingtail_lizard" in dna.species.mutant_bodyparts)
-		dna.species.mutant_bodyparts -= "waggingtail_lizard"
-		dna.species.mutant_bodyparts -= "waggingspines"
-		dna.species.mutant_bodyparts |= "tail_lizard"
-		dna.species.mutant_bodyparts |= "spines"
-	if("waggingtail_human" in dna.species.mutant_bodyparts)
-		dna.species.mutant_bodyparts -= "waggingtail_human"
-		dna.species.mutant_bodyparts |= "tail_human"
-	if("mam_waggingtail" in dna.species.mutant_bodyparts)
-		dna.species.mutant_bodyparts -= "mam_waggingtail"
-		dna.species.mutant_bodyparts |= "mam_tail"
-	update_body()
-
+		
 /mob/living/carbon/human/proc/OpenWings()
 	if(!dna || !dna.species)
 		return

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

@@ -0,0 +1,140 @@
+/datum/species/dullahan
+	name = "dullahan"
+	id = "dullahan"
+	default_color = "FFFFFF"
+	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,NOBREATH,NOHUNGER)
+	mutant_bodyparts = list("tail_human", "ears", "wings")
+	default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "None")
+	use_skintones = TRUE
+	mutant_brain = /obj/item/organ/brain/dullahan
+	mutanteyes = /obj/item/organ/eyes/dullahan
+	mutanttongue = /obj/item/organ/tongue/dullahan
+	mutantears = /obj/item/organ/ears/dullahan
+	blacklisted = TRUE
+	limbs_id = "human"
+	skinned_type = /obj/item/stack/sheet/animalhide/human
+
+	var/obj/item/dullahan_relay/myhead
+
+
+/datum/species/dullahan/check_roundstart_eligible()
+	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+		return TRUE
+	return FALSE
+
+/datum/species/dullahan/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
+	. = ..()
+	H.flags_1 &= ~HEAR_1
+	var/obj/item/bodypart/head/head = H.get_bodypart("head")
+	if(head)
+		head.drop_limb()
+		head.flags_1 = HEAR_1
+		head.throwforce = 25
+		myhead = new /obj/item/dullahan_relay (head, H)
+		H.put_in_hands(head)
+
+/datum/species/dullahan/on_species_loss(mob/living/carbon/human/H)
+	H.flags_1 |= ~HEAR_1
+	H.reset_perspective(H)
+	if(myhead)
+		var/obj/item/dullahan_relay/DR = myhead
+		myhead = null
+		DR.owner = null
+		qdel(DR)
+	H.regenerate_limb("head",FALSE)
+	..()
+
+/datum/species/dullahan/spec_life(mob/living/carbon/human/H)
+	if(QDELETED(myhead))
+		myhead = null
+		H.gib()
+	var/obj/item/bodypart/head/head2 = H.get_bodypart("head")
+	if(head2)
+		myhead = null
+		H.gib()
+
+/datum/species/dullahan/proc/update_vision_perspective(mob/living/carbon/human/H)
+	var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES)
+	if(eyes)
+		H.update_tint()
+		if(eyes.tint)
+			H.reset_perspective(H)
+		else
+			H.reset_perspective(myhead)
+
+/obj/item/organ/brain/dullahan
+	decoy_override = TRUE
+	vital = FALSE
+
+/obj/item/organ/tongue/dullahan
+	zone = "abstract"
+
+/obj/item/organ/tongue/dullahan/TongueSpeech(var/message)
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		if(H.dna.species.id == "dullahan")
+			var/datum/species/dullahan/D = H.dna.species
+			if(isobj(D.myhead.loc))
+				var/obj/O = D.myhead.loc
+				O.say(message)
+	message = ""
+	return message
+
+/obj/item/organ/ears/dullahan
+	zone = "abstract"
+
+/obj/item/organ/eyes/dullahan
+	name = "head vision"
+	desc = "An abstraction."
+	actions_types = list(/datum/action/item_action/organ_action/dullahan)
+	zone = "abstract"
+
+/datum/action/item_action/organ_action/dullahan
+	name = "Toggle Perspective"
+	desc = "Switch between seeing normally from your head, or blindly from your body."
+
+/datum/action/item_action/organ_action/dullahan/Trigger()
+	. = ..()
+	var/obj/item/organ/eyes/dullahan/DE = target
+	if(DE.tint)
+		DE.tint = 0
+	else
+		DE.tint = INFINITY
+
+	if(ishuman(owner))
+		var/mob/living/carbon/human/H = owner
+		if(H.dna.species.id == "dullahan")
+			var/datum/species/dullahan/D = H.dna.species
+			D.update_vision_perspective(H)
+
+/obj/item/dullahan_relay
+	var/mob/living/owner
+	flags_1 = HEAR_1
+
+/obj/item/dullahan_relay/Initialize(mapload,new_owner)
+	. = ..()
+	owner = new_owner
+	START_PROCESSING(SSobj, src)
+
+/obj/item/dullahan_relay/process()
+	if(!istype(loc, /obj/item/bodypart/head) || QDELETED(owner))
+		. = PROCESS_KILL
+		qdel(src)
+
+/obj/item/dullahan_relay/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode)
+	if(!QDELETED(owner))
+		message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode)
+		to_chat(owner,message)
+	else
+		qdel(src)
+
+
+/obj/item/dullahan_relay/Destroy()
+	if(!QDELETED(owner))
+		var/mob/living/carbon/human/H = owner
+		if(H.dna.species.id == "dullahan")
+			var/datum/species/dullahan/D = H.dna.species
+			D.myhead = null
+			owner.gib()
+	owner = null
+	..()

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

@@ -22,6 +22,7 @@
 	limbs_id = "golem"
 	fixed_mut_color = "aaa"
 	var/info_text = "As an <span class='danger'>Iron Golem</span>, you don't have any special traits."
+	var/random_eligible = TRUE //If false, the golem subtype can't be made through golem mutation toxin
 
 	var/prefix = "Iron"
 	var/list/special_names
@@ -44,11 +45,20 @@
 	name = "Random Golem"
 	blacklisted = FALSE
 	dangerous_existence = FALSE
+	var/static/list/random_golem_types
 
 /datum/species/golem/random/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	..()
-	var/list/golem_types = typesof(/datum/species/golem) - src.type
-	var/datum/species/golem/golem_type = pick(golem_types)
+	if(!random_golem_types)
+		random_golem_types = subtypesof(/datum/species/golem) - type
+		for(var/V in random_golem_types)
+			var/datum/species/golem/G = V
+			if(!initial(G.random_eligible))
+				random_golem_types -= G
+				to_chat(world, "Excluding golem type [initial(G.id)]")
+			else
+				to_chat(world, "Allowing golem type [initial(G.id)]")
+	var/datum/species/golem/golem_type = pick(random_golem_types)
 	var/mob/living/carbon/human/H = C
 	H.set_species(golem_type)
 	to_chat(H, "[initial(golem_type.info_text)]")
@@ -241,7 +251,7 @@
 	heatmod = 1.5
 	info_text = "As a <span class='danger'>Wooden Golem</span>, you have plant-like traits: you take damage from extreme temperatures, can be set on fire, and have lower armor than a normal golem. You regenerate when in the light and wither in the darkness."
 	prefix = "Wooden"
-	special_names = list("Tomato", "Potato", "Broccoli", "Carrot", "Ambrosia", "Pumpkin", "Ivy", "Kudzu", "Banana", "Moss", "Flower", "Bloom", "Root", "Bark", "Glowshroom", "Petal", "Leaf", "Venus", "Sprout","Cocoa", "Strawberry", "Citrus", "Oak", "Cactus", "Pepper", "Juniper")
+	special_names = list("Bark", "Willow", "Catalpa", "Woody", "Oak", "Sap", "Twig", "Branch", "Maple", "Birch", "Elm", "Basswood", "Cottonwood", "Larch", "Aspen", "Ash", "Beech", "Buckeye", "Cedar", "Chestnut", "Cypress", "Fir", "Hawthorn", "Hazel", "Hickory", "Ironwood", "Juniper", "Leaf", "Mangrove", "Palm", "Pawpaw", "Pine", "Poplar", "Redwood", "Redbud", "Sassafras", "Spruce", "Sumac", "Trunk", "Walnut", "Yew")
 	human_surname_chance = 0
 	special_name_chance = 100
 
@@ -596,7 +606,7 @@
 	info_text = "<span class='bold alloy'>As a </span><span class='bold brass'>clockwork golem</span><span class='bold alloy'>, you are faster than \
 	other types of golem (being a machine), and are immune to electric shocks.</span>"
 	species_traits = list(NO_UNDERWEAR, NOTRANSSTING, NOBREATH, NOZOMBIE, VIRUSIMMUNE, RADIMMUNE, NOBLOOD, RESISTCOLD, RESISTPRESSURE, PIERCEIMMUNE)
-	armor = 40 //Reinforced, but also slim to allow for fast movement
+	armor = 20 //Reinforced, but much less so to allow for fast movement
 	attack_verb = "smash"
 	attack_sound = 'sound/magic/clockwork/anima_fragment_attack.ogg'
 	sexes = FALSE
@@ -638,7 +648,8 @@
 	has_corpse = TRUE
 	blacklisted = TRUE
 	dangerous_existence = TRUE
-  
+	random_eligible = FALSE
+
 /datum/species/golem/cloth
 	name = "Cloth Golem"
 	id = "cloth golem"

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

@@ -24,9 +24,8 @@
 	to_chat(C, "[info_text]")
 	C.skin_tone = "albino"
 	C.update_body(0)
-	if(C.mind)
-		var/obj/effect/proc_holder/spell/targeted/shapeshift/bat/B = new
-		C.mind.AddSpell(B)
+	var/obj/effect/proc_holder/spell/targeted/shapeshift/bat/B = new
+	C.AddSpell(B)
 
 /datum/species/vampire/on_species_loss(mob/living/carbon/C)
 	. = ..()
@@ -45,7 +44,7 @@
 		C.adjustOxyLoss(-4)
 		C.adjustCloneLoss(-4)
 		return
-	C.blood_volume -= 1.5
+	C.blood_volume -= 0.75
 	if(C.blood_volume <= BLOOD_VOLUME_SURVIVE)
 		to_chat(C, "<span class='danger'>You ran out of blood!</span>")
 		C.dust()
@@ -123,8 +122,4 @@
 	invocation = "Squeak!"
 	charge_max = 50
 	cooldown_min = 50
-
 	shapeshift_type = /mob/living/simple_animal/hostile/retaliate/bat
-	current_shapes = list(/mob/living/simple_animal/hostile/retaliate/bat)
-	current_casters = list()
-	possible_shapes = list(/mob/living/simple_animal/hostile/retaliate/bat)

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

@@ -207,10 +207,10 @@
 	if(breath_gases[/datum/gas/tritium])
 		var/tritium_partialpressure = (breath_gases[/datum/gas/tritium][MOLES]/breath.total_moles())*breath_pressure
 		radiation += tritium_partialpressure/10
-	//Brown Gas
-	if (breath_gases[/datum/gas/brown_gas])
-		var/browns_partialpressure = (breath_gases[/datum/gas/brown_gas][MOLES]/breath.total_moles())*breath_pressure
-		adjustFireLoss(browns_partialpressure/4)
+	//NITRYL
+	if (breath_gases[/datum/gas/nitryl])
+		var/nitryl_partialpressure = (breath_gases[/datum/gas/nitryl][MOLES]/breath.total_moles())*breath_pressure
+		adjustFireLoss(nitryl_partialpressure/4)
 
 
 

code/modules/mob/living/living.dm

@@ -105,7 +105,8 @@
 
 //Called when we bump onto a mob
 /mob/living/proc/MobCollide(mob/M)
-
+	//Even if we don't push/swap places, we "touched" them, so spread fire
+	spreadFire(M)
 	//Also diseases
 	for(var/thing in viruses)
 		var/datum/disease/D = thing
@@ -120,29 +121,6 @@
 	if(now_pushing)
 		return TRUE
 
-	//TODO FOR LATER PRS: Make passing tables an automatic thing for flying and passable objects be determined better to prevent huge amounts of flags being set when mobs fly.
-	if((movement_type) ^ (M.movement_type))	//Fly past each other.
-		now_pushing = TRUE
-		var/old = pass_flags & PASSMOB
-		var/old_p = pulling? (pulling.pass_flags & PASSMOB) : NONE
-		var/atom/movable/cached = pulling
-		pass_flags |= PASSMOB
-		var/obj/item/I = cached
-		if(cached && (isliving(cached) || (istype(I) && (I.w_class < WEIGHT_CLASS_BULKY))))
-			var/mob/living/l = cached
-			if(l.mob_size <= mob_size)
-				cached.pass_flags |= PASSMOB
-		Move(get_turf(M))
-		if(!old)
-			pass_flags &= ~PASSMOB
-		if(cached && !old_p)
-			cached.pass_flags &= ~PASSMOB
-		cached = null
-		now_pushing = FALSE
-		return TRUE
-
-	//Even if we don't push/swap places, we "touched" them, so spread fire
-	spreadFire(M)
 
 	//Should stop you pushing a restrained person out of the way
 	if(isliving(M))
@@ -501,21 +479,21 @@
 	if(isopenturf(loc) && !is_flying())
 		var/turf/open/T = loc
 		. += T.slowdown
-	var/static/config_run_delay
-	var/static/config_walk_delay
+	var/static/datum/config_entry/number/run_delay/config_run_delay
+	var/static/datum/config_entry/number/walk_delay/config_walk_delay
 	if(isnull(config_run_delay))
 		config_run_delay = CONFIG_GET(number/run_delay)
 		config_walk_delay = CONFIG_GET(number/walk_delay)
 	if(ignorewalk)
-		. += config_run_delay
+		. += config_run_delay.value_cache
 	else
 		switch(m_intent)
 			if(MOVE_INTENT_RUN)
 				if(drowsyness > 0)
 					. += 6
-				. += config_run_delay
+				. += config_run_delay.value_cache
 			if(MOVE_INTENT_WALK)
-				. += config_walk_delay
+				. += config_walk_delay.value_cache
 
 /mob/living/proc/makeTrail(turf/target_turf, turf/start, direction)
 	if(!has_gravity())

code/modules/mob/living/say.dm

@@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	"÷" = "cords"
 ))
 
-/mob/living/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null)
+/mob/living/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE)
 	var/static/list/crit_allowed_modes = list(MODE_WHISPER = TRUE, MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE)
 	var/static/list/unconscious_allowed_modes = list(MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE)
 
@@ -105,7 +105,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 		say_dead(original_message)
 		return
 
-	if(check_emote(original_message) || !can_speak_basic(original_message))
+	if(check_emote(original_message) || !can_speak_basic(original_message, ignore_spam))
 		return
 
 	if(in_critical)
@@ -270,12 +270,12 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	if(can_speak_basic(message) && can_speak_vocal(message))
 		return 1
 
-/mob/living/proc/can_speak_basic(message) //Check BEFORE handling of xeno and ling channels
+/mob/living/proc/can_speak_basic(message, ignore_spam = FALSE) //Check BEFORE handling of xeno and ling channels
 	if(client)
 		if(client.prefs.muted & MUTE_IC)
 			to_chat(src, "<span class='danger'>You cannot speak in IC (muted).</span>")
 			return 0
-		if(client.handle_spam_prevention(message,MUTE_IC))
+		if(!ignore_spam && client.handle_spam_prevention(message,MUTE_IC))
 			return 0
 
 	return 1

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

@@ -634,14 +634,17 @@
 		/obj/item/retractor,
 		/obj/item/hemostat,
 		/obj/item/cautery,
+		/obj/item/surgicaldrill,
 		/obj/item/scalpel,
 		/obj/item/melee/transforming/energy/sword/cyborg/saw,
 		/obj/item/roller/robo,
 		/obj/item/card/emag,
 		/obj/item/crowbar/cyborg,
+		/obj/item/extinguisher/mini,
 		/obj/item/pinpointer/syndicate_cyborg,
 		/obj/item/stack/medical/gauze/cyborg,
-		/obj/item/gun/medbeam)
+		/obj/item/gun/medbeam,
+		/obj/item/organ_storage)
 	ratvar_modules = list(
 		/obj/item/clockwork/slab/cyborg/medical,
 		/obj/item/clockwork/weapon/ratvarian_spear)

code/modules/mob/living/simple_animal/bot/construction.dm

@@ -282,11 +282,11 @@
 	var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
 	w_class = WEIGHT_CLASS_NORMAL
 
-	/obj/item/firstaid_arm_assembly/New()
-		..()
-		spawn(5)
-			if(skin)
-				add_overlay("kit_skin_[skin]")
+/obj/item/firstaid_arm_assembly/New()
+	..()
+	spawn(5)
+		if(skin)
+			add_overlay("kit_skin_[skin]")
 
 /obj/item/storage/firstaid/attackby(obj/item/bodypart/S, mob/user, params)
 

code/modules/mob/living/simple_animal/bot/floorbot.dm

@@ -8,6 +8,7 @@
 	anchored = FALSE
 	health = 25
 	maxHealth = 25
+	spacewalk = TRUE
 
 	radio_key = /obj/item/device/encryptionkey/headset_eng
 	radio_channel = "Engineering"
@@ -45,9 +46,6 @@
 	access_card.access += J.get_access()
 	prev_access = access_card.access
 
-/mob/living/simple_animal/bot/floorbot/Process_Spacemove(movement_dir = 0)
-	return 1
-
 /mob/living/simple_animal/bot/floorbot/turn_on()
 	. = ..()
 	update_icon()

code/modules/mob/living/simple_animal/bot/medbot.dm

@@ -343,7 +343,7 @@
 	if(C.stat == DEAD || (C.status_flags & FAKEDEATH))
 		return FALSE	//welp too late for them!
 	
-	if(!(loc == C.loc) || !(isturf(C.loc) && isturf(loc)))
+	if(!(loc == C.loc) && !(isturf(C.loc) && isturf(loc)))
 		return FALSE
 
 	if(C.suiciding)

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

@@ -10,6 +10,7 @@
 	speak_chance = 1
 	icon = 'icons/mob/mob.dmi'
 	speed = 0
+	spacewalk = TRUE
 	a_intent = INTENT_HARM
 	stop_automated_movement = 1
 	status_flags = CANPUSH
@@ -85,9 +86,6 @@
 	else if(src != M)
 		return ..()
 
-/mob/living/simple_animal/hostile/construct/Process_Spacemove(movement_dir = 0)
-	return 1
-
 /mob/living/simple_animal/hostile/construct/narsie_act()
 	return
 

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

@@ -12,6 +12,8 @@
 	name = "Syndicate Operative"
 	id_job = "Operative"
 	id_access_list = list(ACCESS_SYNDICATE)
+	hair_style = "Bald"
+	facial_hair_style = "Shaved"
 	outfit = /datum/outfit/syndicatesoldiercorpse
 
 /datum/outfit/syndicatesoldiercorpse
@@ -31,6 +33,8 @@
 	name = "Syndicate Commando"
 	id_job = "Operative"
 	id_access_list = list(ACCESS_SYNDICATE)
+	hair_style = "Bald"
+	facial_hair_style = "Shaved"
 	outfit = /datum/outfit/syndicatecommandocorpse
 
 /datum/outfit/syndicatecommandocorpse
@@ -50,6 +54,8 @@
 	name = "Syndicate Stormtrooper"
 	id_job = "Operative"
 	id_access_list = list(ACCESS_SYNDICATE)
+	hair_style = "Bald"
+	facial_hair_style = "Shaved"
 	outfit = /datum/outfit/syndicatestormtroopercorpse
 
 /datum/outfit/syndicatestormtroopercorpse
@@ -67,11 +73,16 @@
 /obj/effect/mob_spawn/human/clown/corpse
 	roundstart = FALSE
 	instant = TRUE
-
+	skin_tone = "caucasian1"
+	hair_style = "Bald"
+	facial_hair_style = "Shaved"
 
 /obj/effect/mob_spawn/human/corpse/pirate
 	name = "Pirate"
+	skin_tone = "Caucasian1" //all pirates are white because it's easier that way
 	outfit = /datum/outfit/piratecorpse
+	hair_style = "Bald"
+	facial_hair_style = "Shaved"
 
 /datum/outfit/piratecorpse
 	name = "Pirate Corpse"
@@ -94,12 +105,17 @@
 /obj/effect/mob_spawn/human/corpse/russian
 	name = "Russian"
 	outfit = /datum/outfit/russiancorpse
+	hair_style = "Bald"
+	facial_hair_style = "Shaved"
 
 /datum/outfit/russiancorpse
 	name = "Russian Corpse"
 	uniform = /obj/item/clothing/under/soviet
 	shoes = /obj/item/clothing/shoes/jackboots
 	head = /obj/item/clothing/head/bearpelt
+	gloves = /obj/item/clothing/gloves/color/black
+	mask = /obj/item/clothing/mask/gas
+
 
 
 /obj/effect/mob_spawn/human/corpse/russian/ranged
@@ -109,6 +125,7 @@
 	name = "Ranged Russian Corpse"
 	head = /obj/item/clothing/head/ushanka
 
+
 /obj/effect/mob_spawn/human/corpse/russian/ranged/trooper
 	outfit = /datum/outfit/russiancorpse/ranged/trooper
 
@@ -119,8 +136,8 @@
 	shoes = /obj/item/clothing/shoes/combat
 	gloves = /obj/item/clothing/gloves/combat
 	ears = /obj/item/device/radio/headset
-	mask = /obj/item/clothing/mask/balaclava
 	head = /obj/item/clothing/head/helmet/alt
+	mask = /obj/item/clothing/mask/balaclava
 
 
 /obj/effect/mob_spawn/human/corpse/russian/ranged/officer
@@ -131,7 +148,7 @@
 	name = "Russian Officer Corpse"
 	uniform = /obj/item/clothing/under/rank/security/navyblue/russian
 	suit = /obj/item/clothing/suit/security/officer/russian
-	shoes = /obj/item/clothing/shoes/laceup
+	shoes = /obj/item/clothing/shoes/combat
 	ears = /obj/item/device/radio/headset
 	head = /obj/item/clothing/head/ushanka
 
@@ -139,6 +156,9 @@
 /obj/effect/mob_spawn/human/corpse/wizard
 	name = "Space Wizard Corpse"
 	outfit = /datum/outfit/wizardcorpse
+	hair_style = "Bald"
+	facial_hair_style = "Long Beard"
+	skin_tone = "Caucasian1"
 
 /datum/outfit/wizardcorpse
 	name = "Space Wizard Corpse"
@@ -153,6 +173,8 @@
 	id_job = "Private Security Force"
 	id_access = "Security Officer"
 	outfit = /datum/outfit/nanotrasensoldiercorpse2
+	hair_style = "Bald"
+	facial_hair_style = "Shaved"
 
 /datum/outfit/nanotrasensoldiercorpse2
 	name = "NT Private Security Officer Corpse"

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

@@ -320,6 +320,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 		forceMove(summoner.loc)
 		new /obj/effect/temp_visual/guardian/phase(loc)
 		cooldown = world.time + 10
+		reset_perspective()
 		return TRUE
 	return FALSE
 

code/modules/mob/living/simple_animal/guardian/types/standard.dm

@@ -24,7 +24,7 @@
 /mob/living/simple_animal/hostile/guardian/punch/AttackingTarget()
 	. = ..()
 	if(isliving(target))
-		src.say("[src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry]!!")
+		say("[battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry]!!", ignore_spam = TRUE)
 		playsound(loc, src.attack_sound, 50, 1, 1)
 		playsound(loc, src.attack_sound, 50, 1, 1)
 		playsound(loc, src.attack_sound, 50, 1, 1)

code/modules/mob/living/simple_animal/hostile/bear.dm

@@ -20,6 +20,7 @@
 	response_harm   = "hits"
 	maxHealth = 60
 	health = 60
+	spacewalk = TRUE
 	var/armored = FALSE
 
 	obj_damage = 60
@@ -67,9 +68,6 @@
 	maxHealth = 120
 	armored = TRUE
 
-/mob/living/simple_animal/hostile/bear/Process_Spacemove(movement_dir = 0)
-	return 1	//No drifting in space for space bears!
-
 /mob/living/simple_animal/hostile/bear/update_icons()
 	..()
 	if(armored)

code/modules/mob/living/simple_animal/hostile/bees.dm

@@ -28,6 +28,7 @@
 	response_harm   = "squashes"
 	maxHealth = 10
 	health = 10
+	spacewalk = TRUE
 	faction = list("hostile")
 	move_to_delay = 0
 	obj_damage = 0
@@ -52,11 +53,6 @@
 	var/static/beehometypecache = typecacheof(/obj/structure/beebox)
 	var/static/hydroponicstypecache = typecacheof(/obj/machinery/hydroponics)
 
-
-/mob/living/simple_animal/hostile/poison/bees/Process_Spacemove(movement_dir = 0)
-	return 1
-
-
 /mob/living/simple_animal/hostile/poison/bees/Initialize()
 	. = ..()
 	generate_bee_visuals()

code/modules/mob/living/simple_animal/hostile/carp.dm

@@ -18,6 +18,7 @@
 	speed = 0
 	maxHealth = 25
 	health = 25
+	spacewalk = TRUE
 
 	harm_intent_damage = 8
 	obj_damage = 50
@@ -36,9 +37,6 @@
 	pressure_resistance = 200
 	gold_core_spawnable = 1
 
-/mob/living/simple_animal/hostile/carp/Process_Spacemove(movement_dir = 0)
-	return 1	//No drifting in space for space carp!	//original comments do not steal
-
 /mob/living/simple_animal/hostile/carp/AttackingTarget()
 	. = ..()
 	if(. && ishuman(target))

code/modules/mob/living/simple_animal/hostile/faithless.dm

@@ -1,44 +1,42 @@
-/mob/living/simple_animal/hostile/faithless
-	name = "The Faithless"
-	desc = "The Wish Granter's faith in humanity, incarnate."
-	icon_state = "faithless"
-	icon_living = "faithless"
-	icon_dead = "faithless_dead"
-	gender = MALE
-	speak_chance = 0
-	turns_per_move = 5
-	response_help = "passes through"
-	response_disarm = "shoves"
-	response_harm = "hits"
-	emote_taunt = list("wails")
-	taunt_chance = 25
-	speed = 0
-	maxHealth = 80
-	health = 80
-	stat_attack = UNCONSCIOUS
-	robust_searching = 1
-
-	harm_intent_damage = 10
-	obj_damage = 50
-	melee_damage_lower = 15
-	melee_damage_upper = 15
-	attacktext = "grips"
-	attack_sound = 'sound/hallucinations/growl1.ogg'
-	speak_emote = list("growls")
-
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 0
-
-	faction = list("faithless")
-	gold_core_spawnable = 1
-
-/mob/living/simple_animal/hostile/faithless/Process_Spacemove(movement_dir = 0)
-	return 1
-
-/mob/living/simple_animal/hostile/faithless/AttackingTarget()
-	. = ..()
-	if(. && prob(12) && iscarbon(target))
-		var/mob/living/carbon/C = target
-		C.Knockdown(60)
-		C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
-				"<span class='userdanger'>\The [src] knocks you down!</span>")
+/mob/living/simple_animal/hostile/faithless
+	name = "The Faithless"
+	desc = "The Wish Granter's faith in humanity, incarnate."
+	icon_state = "faithless"
+	icon_living = "faithless"
+	icon_dead = "faithless_dead"
+	gender = MALE
+	speak_chance = 0
+	turns_per_move = 5
+	response_help = "passes through"
+	response_disarm = "shoves"
+	response_harm = "hits"
+	emote_taunt = list("wails")
+	taunt_chance = 25
+	speed = 0
+	maxHealth = 80
+	health = 80
+	spacewalk = TRUE
+	stat_attack = UNCONSCIOUS
+	robust_searching = 1
+
+	harm_intent_damage = 10
+	obj_damage = 50
+	melee_damage_lower = 15
+	melee_damage_upper = 15
+	attacktext = "grips"
+	attack_sound = 'sound/hallucinations/growl1.ogg'
+	speak_emote = list("growls")
+
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
+
+	faction = list("faithless")
+	gold_core_spawnable = 1
+
+/mob/living/simple_animal/hostile/faithless/AttackingTarget()
+	. = ..()
+	if(. && prob(12) && iscarbon(target))
+		var/mob/living/carbon/C = target
+		C.Knockdown(60)
+		C.visible_message("<span class='danger'>\The [src] knocks down \the [C]!</span>", \
+				"<span class='userdanger'>\The [src] knocks you down!</span>")

code/modules/mob/living/simple_animal/hostile/giant_spider.dm

@@ -206,6 +206,7 @@
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minbodytemp = 0
 	maxbodytemp = 1500
+	poison_type = "frost_oil"
 	color = rgb(114,228,250)
 	gold_core_spawnable = 0
 
@@ -214,6 +215,7 @@
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minbodytemp = 0
 	maxbodytemp = 1500
+	poison_type = "frost_oil"
 	color = rgb(114,228,250)
 	gold_core_spawnable = 0
 
@@ -222,6 +224,7 @@
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minbodytemp = 0
 	maxbodytemp = 1500
+	poison_type = "frost_oil"
 	color = rgb(114,228,250)
 	gold_core_spawnable = 0
 

code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm

@@ -36,6 +36,7 @@ Difficulty: Medium
 	desc = "Guardians of the necropolis."
 	health = 2500
 	maxHealth = 2500
+	spacewalk = TRUE
 	attacktext = "chomps"
 	attack_sound = 'sound/magic/demon_attack1.ogg'
 	icon_state = "dragon"
@@ -97,9 +98,6 @@ Difficulty: Medium
 	if(!swooping)
 		..()
 
-/mob/living/simple_animal/hostile/megafauna/dragon/Process_Spacemove(movement_dir = 0)
-	return 1
-
 /mob/living/simple_animal/hostile/megafauna/dragon/OpenFire()
 	if(swooping)
 		return
@@ -385,6 +383,7 @@ Difficulty: Medium
 	melee_damage_lower = 30
 	damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
 	loot = list()
+	crusher_loot = list()
 	butcher_results = list(/obj/item/ore/diamond = 5, /obj/item/stack/sheet/sinew = 5, /obj/item/stack/sheet/bone = 30)
 
 /mob/living/simple_animal/hostile/megafauna/dragon/lesser/grant_achievement(medaltype,scoretype)

code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm

@@ -21,6 +21,7 @@ Difficulty: Medium
 	name = "Legion"
 	health = 800
 	maxHealth = 800
+	spacewalk = TRUE
 	icon_state = "legion"
 	icon_living = "legion"
 	desc = "One of many."
@@ -139,9 +140,6 @@ Difficulty: Medium
 			loot = list(/obj/structure/closet/crate/necropolis/tendril)
 		..()
 
-/mob/living/simple_animal/hostile/megafauna/legion/Process_Spacemove(movement_dir = 0)
-	return 1
-
 /obj/item/device/gps/internal/legion
 	icon_state = null
 	gpstag = "Echoing Signal"

code/modules/mob/living/simple_animal/hostile/pirate.dm

@@ -1,68 +1,66 @@
-/mob/living/simple_animal/hostile/pirate
-	name = "Pirate"
-	desc = "Does what he wants cause a pirate is free."
-	icon = 'icons/mob/simple_human.dmi'
-	icon_state = "piratemelee"
-	icon_living = "piratemelee"
-	icon_dead = "piratemelee_dead"
-	speak_chance = 0
-	turns_per_move = 5
-	response_help = "pushes"
-	response_disarm = "shoves"
-	response_harm = "hits"
-	speed = 0
-	maxHealth = 100
-	health = 100
-
-	harm_intent_damage = 5
-	obj_damage = 60
-	melee_damage_lower = 30
-	melee_damage_upper = 30
-	attacktext = "slashes"
-	attack_sound = 'sound/weapons/bladeslice.ogg'
-
-	atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
-	unsuitable_atmos_damage = 15
-	speak_emote = list("yarrs")
-	loot = list(/obj/effect/mob_spawn/human/corpse/pirate,
+/mob/living/simple_animal/hostile/pirate
+	name = "Pirate"
+	desc = "Does what he wants cause a pirate is free."
+	icon = 'icons/mob/simple_human.dmi'
+	icon_state = "piratemelee"
+	icon_living = "piratemelee"
+	icon_dead = "piratemelee_dead"
+	speak_chance = 0
+	turns_per_move = 5
+	response_help = "pushes"
+	response_disarm = "shoves"
+	response_harm = "hits"
+	speed = 0
+	maxHealth = 100
+	health = 100
+	spacewalk = TRUE
+
+	harm_intent_damage = 5
+	obj_damage = 60
+	melee_damage_lower = 30
+	melee_damage_upper = 30
+	attacktext = "slashes"
+	attack_sound = 'sound/weapons/bladeslice.ogg'
+
+	atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+	unsuitable_atmos_damage = 15
+	speak_emote = list("yarrs")
+	loot = list(/obj/effect/mob_spawn/human/corpse/pirate,
 			/obj/item/melee/transforming/energy/sword/pirate)
-	del_on_death = 1
-	faction = list("pirate")
-
-/mob/living/simple_animal/hostile/pirate/ranged
-	name = "Pirate Gunner"
-	icon_state = "pirateranged"
-	icon_living = "pirateranged"
-	icon_dead = "piratemelee_dead"
-	projectilesound = 'sound/weapons/laser.ogg'
-	ranged = 1
-	rapid = 1
-	retreat_distance = 5
-	minimum_distance = 5
-	projectiletype = /obj/item/projectile/beam/laser
-	loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged,
-			/obj/item/gun/energy/laser)
-
-/mob/living/simple_animal/hostile/pirate/space
-	name = "Space Pirate"
-	icon_state = "piratespace"
-	icon_living = "piratespace"
-	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 0
-	speed = 1
-
-/mob/living/simple_animal/hostile/pirate/space/ranged
-	name = "Space Pirate Gunner"
-	icon_state = "piratespaceranged"
-	icon_living = "piratespaceranged"
-	projectilesound = 'sound/weapons/laser.ogg'
-	ranged = 1
-	rapid = 1
-	retreat_distance = 5
-	minimum_distance = 5
-	projectiletype = /obj/item/projectile/beam/laser
-	loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged,
-			/obj/item/gun/energy/laser)
-
-/mob/living/simple_animal/hostile/pirate/space/Process_Spacemove(movement_dir = 0)
-	return 1
+	del_on_death = 1
+	faction = list("pirate")
+
+/mob/living/simple_animal/hostile/pirate/ranged
+	name = "Pirate Gunner"
+	icon_state = "pirateranged"
+	icon_living = "pirateranged"
+	icon_dead = "piratemelee_dead"
+	projectilesound = 'sound/weapons/laser.ogg'
+	ranged = 1
+	rapid = 1
+	retreat_distance = 5
+	minimum_distance = 5
+	projectiletype = /obj/item/projectile/beam/laser
+	loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged,
+			/obj/item/gun/energy/laser)
+
+/mob/living/simple_animal/hostile/pirate/space
+	name = "Space Pirate"
+	icon_state = "piratespace"
+	icon_living = "piratespace"
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 0
+	speed = 1
+
+/mob/living/simple_animal/hostile/pirate/space/ranged
+	name = "Space Pirate Gunner"
+	icon_state = "piratespaceranged"
+	icon_living = "piratespaceranged"
+	projectilesound = 'sound/weapons/laser.ogg'
+	ranged = 1
+	rapid = 1
+	retreat_distance = 5
+	minimum_distance = 5
+	projectiletype = /obj/item/projectile/beam/laser
+	loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged,
+			/obj/item/gun/energy/laser)

code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm

@@ -12,6 +12,7 @@
 	speak_chance = 0
 	maxHealth = 15
 	health = 15
+	spacewalk = TRUE
 	see_in_dark = 10
 	harm_intent_damage = 6
 	melee_damage_lower = 6
@@ -34,4 +35,5 @@
 
 	//Space bats need no air to fly in.
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
-	minbodytemp = 0
+	minbodytemp = 0
+

code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm

@@ -23,7 +23,7 @@
 	environment_smash = ENVIRONMENT_SMASH_NONE
 	del_on_death = 0
 
-/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace
+/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace //this should be in a different file
 	name = "Nanotrasen Private Security Officer"
 	desc = "An officer part of Nanotrasen's private security force."
 	icon = 'icons/mob/simple_human.dmi'

code/modules/mob/living/simple_animal/hostile/statue.dm

@@ -45,8 +45,6 @@
 	sight = SEE_SELF|SEE_MOBS|SEE_OBJS|SEE_TURFS
 	anchored = TRUE
 
-	gold_core_spawnable = 1
-
 	var/cannot_be_seen = 1
 	var/mob/living/creator = null
 

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -55,6 +55,7 @@
 	status_flags = 0
 	maxHealth = 170
 	health = 170
+	spacewalk = TRUE
 
 /mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/projectile/Proj)
 	if(!Proj)
@@ -75,9 +76,6 @@
 	loot = list(/obj/effect/gibspawner/human)
 	speed = 1
 
-/mob/living/simple_animal/hostile/syndicate/melee/space/Process_Spacemove(movement_dir = 0)
-	return 1
-
 /mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper
 	icon_state = "syndicatemeleestormtrooper"
 	icon_living = "syndicatemeleestormtrooper"
@@ -106,11 +104,9 @@
 	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
 	minbodytemp = 0
 	speed = 1
+	spacewalk = TRUE
 	loot = list(/obj/effect/gibspawner/human)
 
-/mob/living/simple_animal/hostile/syndicate/ranged/space/Process_Spacemove(movement_dir = 0)
-	return 1
-
 /mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper
 	icon_state = "syndicaterangedstormtrooper"
 	icon_living = "syndicaterangedstormtrooper"

code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm

@@ -109,7 +109,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	layer = MOB_LAYER
 	origin_tech = "biotech=6"
-	var/list/banned_mobs()
+	var/list/banned_mobs
 
 /obj/item/asteroid/fugu_gland/afterattack(atom/target, mob/user, proximity_flag)
 	if(proximity_flag && isanimal(target))

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

@@ -8,6 +8,7 @@
 	icon_living = "shade"
 	maxHealth = 50
 	health = 50
+	spacewalk = TRUE
 	healable = 0
 	speak_emote = list("hisses")
 	emote_hear = list("wails.","screeches.")
@@ -40,9 +41,6 @@
 		return 0
 	return ..()
 
-/mob/living/simple_animal/shade/Process_Spacemove(movement_dir = 0)
-	return TRUE //this doesn't make much sense; you'd thing TRUE would mean it'd process spacemove but it means it doesn't
-
 /mob/living/simple_animal/shade/attack_animal(mob/living/simple_animal/M)
 	if(isconstruct(M))
 		var/mob/living/simple_animal/hostile/construct/C = M

code/modules/mob/mob.dm

@@ -7,6 +7,8 @@
 	GLOB.living_mob_list -= src
 	GLOB.all_clockwork_mobs -= src
 	GLOB.mob_directory -= tag
+	for (var/alert in alerts)
+		clear_alert(alert, TRUE)
 	if(observers && observers.len)
 		for(var/M in observers)
 			var/mob/dead/observe = M

code/modules/mob/mob_defines.dm

@@ -46,6 +46,7 @@
 	var/slurring = 0		//Carbon
 	var/cultslurring = 0	//Carbon
 	var/real_name = null
+	var/spacewalk = FALSE
 	var/druggy = 0			//Carbon
 	var/confused = 0		//Carbon
 	var/resting = 0			//Carbon

code/modules/mob/mob_movement.dm

@@ -297,7 +297,7 @@
 ///For moving in space
 ///return TRUE for movement 0 for none
 /mob/Process_Spacemove(movement_dir = 0)
-	if(..())
+	if(spacewalk || ..())
 		return TRUE
 	var/atom/movable/backup = get_spacemove_backup()
 	if(backup)

code/modules/mob/transform_procs.dm

@@ -461,7 +461,11 @@
 	qdel(src)
 
 /mob/proc/become_overmind(starting_points = 60)
-	var/mob/camera/blob/B = new /mob/camera/blob(loc, starting_points)
+	var/turf/T = get_turf(loc) //just to avoid messing up in lockers
+	var/area/A = get_area(T)
+	if(((A && !A.blob_allowed) || !(T.z in GLOB.station_z_levels)) && LAZYLEN(GLOB.blobstart))
+		T = get_turf(pick(GLOB.blobstart))
+	var/mob/camera/blob/B = new /mob/camera/blob(T, starting_points)
 	B.key = key
 	. = B
 	qdel(src)

code/modules/modular_computers/file_system/programs/ntdownloader.dm

@@ -130,7 +130,7 @@
 		for(var/A in GLOB.ntnet_global.available_station_software)
 			var/datum/computer_file/program/P = A
 			// Only those programs our user can run will show in the list
-			if(!P.can_run(user,transfer = 1))
+			if(!P.can_run(user,transfer = 1) || hard_drive.find_file_by_name(P.filename))
 				continue
 			all_entries.Add(list(list(
 			"filename" = P.filename,
@@ -144,6 +144,8 @@
 			var/list/hacked_programs[0]
 			for(var/S in GLOB.ntnet_global.available_antag_software)
 				var/datum/computer_file/program/P = S
+				if(hard_drive.find_file_by_name(P.filename))
+					continue
 				data["hackedavailable"] = 1
 				hacked_programs.Add(list(list(
 				"filename" = P.filename,

code/modules/ninja/energy_katana.dm

@@ -28,6 +28,10 @@
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 
+/obj/item/energy_katana/attack_self(mob/user)
+	dash_toggled = !dash_toggled
+	to_chat(user, "<span class='notice'>You [dash_toggled ? "enable" : "disable"] the dash function on [src].</span>")
+
 /obj/item/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	if(dash_toggled)
 		jaunt.Teleport(user, target)
@@ -99,5 +103,3 @@
 	max_charges = 3
 	charge_rate = 30
 	recharge_sound = null
-
-

code/modules/power/cable.dm

@@ -48,24 +48,31 @@ By design, d1 is the smallest direction and d2 is the highest
 	var/obj/item/stack/cable_coil/stored
 
 	var/cable_color = "red"
+	color = "#ff0000"
 
 /obj/structure/cable/yellow
 	cable_color = "yellow"
+	color = "#ffff00"
 
 /obj/structure/cable/green
 	cable_color = "green"
+	color = "#00aa00"
 
 /obj/structure/cable/blue
 	cable_color = "blue"
+	color = "#1919c8"
 
 /obj/structure/cable/pink
 	cable_color = "pink"
+	color = "#ff3cc8"
 
 /obj/structure/cable/orange
 	cable_color = "orange"
+	color = "#ff8000"
 
 /obj/structure/cable/cyan
 	cable_color = "cyan"
+	color = "#00ffff"
 
 /obj/structure/cable/white
 	cable_color = "white"
@@ -123,6 +130,7 @@ By design, d1 is the smallest direction and d2 is the highest
 		icon_state = "[d1]-[d2]-f"
 	else
 		icon_state = "[d1]-[d2]"
+	color = null
 	add_atom_colour(cable_color, FIXED_COLOUR_PRIORITY)
 
 /obj/structure/cable/proc/handlecable(obj/item/W, mob/user, params)
@@ -523,6 +531,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 /obj/item/stack/cable_coil/update_icon()
 	icon_state = "[initial(item_state)][amount < 3 ? amount : ""]"
 	name = "cable [amount < 3 ? "piece" : "coil"]"
+	color = null
 	add_atom_colour(item_color, FIXED_COLOUR_PRIORITY)
 
 /obj/item/stack/cable_coil/attack_hand(mob/user)
@@ -743,30 +752,38 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 
 /obj/item/stack/cable_coil/red
 	item_color = "red"
+	color = "#ff0000"
 
 /obj/item/stack/cable_coil/yellow
 	item_color = "yellow"
+	color = "#ffff00"
 
 /obj/item/stack/cable_coil/blue
 	item_color = "blue"
+	color = "#1919c8"
 
 /obj/item/stack/cable_coil/green
 	item_color = "green"
+	color = "#00aa00"
 
 /obj/item/stack/cable_coil/pink
 	item_color = "pink"
+	color = "#ff3ccd"
 
 /obj/item/stack/cable_coil/orange
 	item_color = "orange"
+	color = "#ff8000"
 
 /obj/item/stack/cable_coil/cyan
 	item_color = "cyan"
+	color = "#00ffff"
 
 /obj/item/stack/cable_coil/white
 	item_color = "white"
 
 /obj/item/stack/cable_coil/random
 	item_color = null
+	color = "#ffffff"
 
 /obj/item/stack/cable_coil/random/five
 	amount = 5

code/modules/projectiles/projectile.dm

@@ -101,21 +101,32 @@
 
 /obj/item/projectile/proc/on_hit(atom/target, blocked = FALSE)
 	var/turf/target_loca = get_turf(target)
+
+	var/hitx
+	var/hity
+	if(target == original)
+		hitx = target.pixel_x + p_x - 16
+		hity = target.pixel_y + p_y - 16
+	else
+		hitx = target.pixel_x + rand(-8, 8)
+		hity = target.pixel_y + rand(-8, 8)
+
 	if(!nodamage && (damage_type == BRUTE || damage_type == BURN) && iswallturf(target_loca) && prob(75))
 		var/turf/closed/wall/W = target_loca
-		var/mutable_appearance/decal = mutable_appearance('icons/effects/effects.dmi', "bullet_hole", TURF_DECAL_LAYER)
-		if(target == original)
-			decal.pixel_x = target.pixel_x + p_x - 16
-			decal.pixel_y = target.pixel_y + p_y - 16
-		else
-			decal.pixel_x = target.pixel_x + rand(2, -2)
-			decal.pixel_y = target.pixel_y + rand(2, -2)
-		W.add_damage_decal(decal)
+		if(impact_effect_type)
+			new impact_effect_type(target_loca, hitx, hity)
+
+		W.add_dent(WALL_DENT_SHOT, hitx, hity)
+
+		return 0
+
 	if(!isliving(target))
 		if(impact_effect_type)
-			new impact_effect_type(target_loca, target, src)
+			new impact_effect_type(target_loca, hitx, hity)
 		return 0
+
 	var/mob/living/L = target
+
 	if(blocked != 100) // not completely blocked
 		if(damage && L.blood_volume && damage_type == BRUTE)
 			var/splatter_dir = dir
@@ -128,7 +139,7 @@
 			if(prob(33))
 				L.add_splatter_floor(target_loca)
 		else if(impact_effect_type)
-			new impact_effect_type(target_loca, target, src)
+			new impact_effect_type(target_loca, hitx, hity)
 
 		var/organ_hit_text = ""
 		var/limb_hit = L.check_limb_hit(def_zone)//to get the correct message info.

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -62,11 +62,13 @@
 /obj/machinery/chem_master/attackby(obj/item/I, mob/user, params)
 	if(default_deconstruction_screwdriver(user, "mixer0_nopower", "mixer0", I))
 		if(beaker)
-			beaker.loc = src.loc
+			beaker.forceMove(drop_location())
+			adjust_item_drop_location(beaker)
 			beaker = null
 			reagents.clear_reagents()
 		if(bottle)
-			bottle.loc = src.loc
+			bottle.forceMove(drop_location())
+			adjust_item_drop_location(bottle)
 			bottle = null
 		return
 
@@ -153,7 +155,8 @@
 	switch(action)
 		if("eject")
 			if(beaker)
-				beaker.loc = src.loc
+				beaker.forceMove(drop_location())
+				adjust_item_drop_location(beaker)
 				beaker = null
 				reagents.clear_reagents()
 				icon_state = "mixer0"
@@ -161,7 +164,8 @@
 
 		if("ejectp")
 			if(bottle)
-				bottle.loc = src.loc
+				bottle.forceMove(drop_location())
+				adjust_item_drop_location(bottle)
 				bottle = null
 				. = TRUE
 
@@ -214,16 +218,15 @@
 					if(bottle && bottle.contents.len < bottle.storage_slots)
 						P = new/obj/item/reagent_containers/pill(bottle)
 					else
-						P = new/obj/item/reagent_containers/pill(src.loc)
+						P = new/obj/item/reagent_containers/pill(drop_location())
 					P.name = trim("[name] pill")
-					P.pixel_x = rand(-7, 7) //random position
-					P.pixel_y = rand(-7, 7)
+					adjust_item_drop_location(P)
 					reagents.trans_to(P,vol_each)
 			else
 				var/name = stripped_input(usr, "Name:", "Name your pack!", reagents.get_master_reagent_name(), MAX_NAME_LEN)
 				if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, be_close=TRUE))
 					return
-				var/obj/item/reagent_containers/food/condiment/pack/P = new/obj/item/reagent_containers/food/condiment/pack(src.loc)
+				var/obj/item/reagent_containers/food/condiment/pack/P = new/obj/item/reagent_containers/food/condiment/pack(drop_location())
 
 				P.originalname = name
 				P.name = trim("[name] pack")
@@ -248,10 +251,9 @@
 			var/obj/item/reagent_containers/pill/P
 
 			for(var/i = 0; i < amount; i++)
-				P = new/obj/item/reagent_containers/pill/patch(src.loc)
+				P = new/obj/item/reagent_containers/pill/patch(drop_location())
 				P.name = trim("[name] patch")
-				P.pixel_x = rand(-7, 7) //random position
-				P.pixel_y = rand(-7, 7)
+				adjust_item_drop_location(P)
 				reagents.trans_to(P,vol_each)
 			. = TRUE
 
@@ -264,7 +266,7 @@
 				var/name = stripped_input(usr, "Name:","Name your bottle!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN)
 				if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, be_close=TRUE))
 					return
-				var/obj/item/reagent_containers/food/condiment/P = new(src.loc)
+				var/obj/item/reagent_containers/food/condiment/P = new(drop_location())
 				P.originalname = name
 				P.name = trim("[name] bottle")
 				reagents.trans_to(P, P.volume)
@@ -280,15 +282,15 @@
 
 				var/obj/item/reagent_containers/glass/bottle/P
 				for(var/i = 0; i < amount_full; i++)
-					P = new/obj/item/reagent_containers/glass/bottle(src.loc)
-					P.pixel_x = rand(-7, 7) //random position
-					P.pixel_y = rand(-7, 7)
+					P = new/obj/item/reagent_containers/glass/bottle(drop_location())
 					P.name = trim("[name] bottle")
+					adjust_item_drop_location(P)
 					reagents.trans_to(P, 30)
 
 				if(vol_part)
-					P = new/obj/item/reagent_containers/glass/bottle(src.loc)
+					P = new/obj/item/reagent_containers/glass/bottle(drop_location())
 					P.name = trim("[name] bottle")
+					adjust_item_drop_location(P)
 					reagents.trans_to(P, vol_part)
 			. = TRUE
 
@@ -328,6 +330,29 @@
 		return 0
 
 
+/obj/machinery/chem_master/adjust_item_drop_location(atom/movable/AM) // Special version for chemmasters and condimasters
+	if (AM == beaker)
+		AM.pixel_x = -8
+		AM.pixel_y = 8
+		return null
+	else if (AM == bottle)
+		if (length(bottle.contents))
+			AM.pixel_x = -13
+		else
+			AM.pixel_x = -7
+		AM.pixel_y = -8
+		return null
+	else
+		var/md5 = md5(AM.name)
+#if DM_VERSION > 511
+#warn Refactor the loop in /obj/machinery/chem_master/adjust_item_drop_location() to make use of 512's list-like access to characters in a string
+#endif
+		for (var/i in 1 to 32)
+			. += hex2num(copytext(md5,i,i+1))
+		. = . % 9
+		AM.pixel_x = ((.%3)*6)
+		AM.pixel_y = -8 + (round( . / 3)*8)
+
 /obj/machinery/chem_master/condimaster
 	name = "CondiMaster 3000"
 	desc = "Used to create condiments and other cooking supplies."

code/modules/reagents/chemistry/machinery/smoke_machine.dm

@@ -1,6 +1,6 @@
 /obj/machinery/smoke_machine
-	name = "Smoke Machine"
-	desc = "Seriously man?"
+	name = "smoke machine"
+	desc = "A machine with a centrifuge installed into it. It produces smoke with any reagents you put into the machine."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "smoke0"
 	density = TRUE
@@ -11,9 +11,9 @@
 	var/cooldown = 0
 	var/screen = "home"
 	var/useramount = 30 // Last used amount
-	var/volume = 1000
+	var/volume = 300
 	var/setting = 3
-	var/list/possible_settings = list(3,6,9,12,15)
+	var/list/possible_settings = list(3,6,9)
 
 /datum/effect_system/smoke_spread/chem/smoke_machine/set_up(datum/reagents/carry, setting = 3, efficiency = 10, loc)
 	amount = setting
@@ -66,7 +66,7 @@
 
 /obj/machinery/smoke_machine/attackby(obj/item/I, mob/user, params)
 	add_fingerprint(user)
-	if(istype(I, /obj/item/reagent_containers))
+	if(istype(I, /obj/item/reagent_containers) && I.is_open_container())
 		var/obj/item/reagent_containers/RC = I
 		var/units = RC.reagents.trans_to(src, RC.amount_per_transfer_from_this)
 		if(units)

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -1175,10 +1175,10 @@
 	M.AdjustUnconscious(-20, 0)
 	M.adjustStaminaLoss(-0.5*REM, 0)
 
-/datum/reagent/browngas
-	name = "Brown gas"
-	id = "brown_gas"
-	description = "A strange brown gas that makes you feel faster"
+/datum/reagent/nitryl
+	name = "Nitryl"
+	id = "no2"
+	description = "A highly reactive gas that makes you feel faster"
 	reagent_state = GAS
 	metabolization_rate = REAGENTS_METABOLISM
 	color = "90560B"

code/modules/reagents/reagent_containers/borghydro.dm

@@ -199,7 +199,6 @@ Borg Shaker
 		to_chat(usr, "<span class='warning'>It is currently empty! Please allow some time for the synthesizer to produce more.</span>")
 
 /obj/item/reagent_containers/borghypo/borgshaker/hacked
-	..()
 	name = "cyborg shaker"
 	desc = "Will mix drinks that knock them dead."
 	icon = 'icons/obj/drinks.dmi'

code/modules/reagents/reagent_containers/bottle.dm

@@ -73,8 +73,8 @@
 	list_reagents = list("chloralhydrate" = 15)
 
 /obj/item/reagent_containers/glass/bottle/charcoal
-	name = "antitoxin bottle"
-	desc = "A small bottle of charcoal."
+	name = "charcoal bottle"
+	desc = "A small bottle of charcoal, which removes toxins and other chemicals from the bloodstream."
 	list_reagents = list("charcoal" = 30)
 
 /obj/item/reagent_containers/glass/bottle/mutagen

code/modules/reagents/reagent_containers/glass.dm

@@ -217,7 +217,7 @@
 	list_reagents = list("silver_sulfadiazine" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/charcoal
-	name = "antitoxin reserve tank"
+	name = "charcoal reserve tank"
 	list_reagents = list("charcoal" = 50)
 
 /obj/item/reagent_containers/glass/beaker/large/epinephrine

code/modules/research/designs/machine_designs.dm

@@ -315,13 +315,21 @@
 	category = list ("Misc. Machinery")
 
 /datum/design/board/processor
-	name = "Machine Design (Processor Board)"
-	desc = "The circuit board for a processor."
+	name = "Machine Design (Food Processor Board)"
+	desc = "The circuit board for a food processor."
 	id = "processor"
 	req_tech = list("programming" = 1)
 	build_path = /obj/item/circuitboard/machine/processor
 	category = list ("Misc. Machinery")
 
+/datum/design/board/slimeprocessor
+	name = "Machine Design (Slime Processor Board)"
+	desc = "The circuit board for a slime processor."
+	id = "slimeprocessor"
+	req_tech = list("programming" = 1, "plasmatech" = 1)
+	build_path = /obj/item/circuitboard/machine/processor/slime
+	category = list ("Misc. Machinery")
+
 /datum/design/board/recycler
 	name = "Machine Design (Recycler Board)"
 	desc = "The circuit board for a recycler."

code/modules/research/xenobiology/xenobiology.dm

@@ -196,6 +196,7 @@
 		to_chat(SM, "<span class='warning'>All at once it makes sense: you know what you are and who you are! Self awareness is yours!</span>")
 		to_chat(SM, "<span class='userdanger'>You are grateful to be self aware and owe [user.real_name] a great debt. Serve [user.real_name], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.</span>")
 		to_chat(user, "<span class='notice'>[SM] accepts [src] and suddenly becomes attentive and aware. It worked!</span>")
+		SM.copy_known_languages_from(user, TRUE)
 		qdel(src)
 	else
 		to_chat(user, "<span class='notice'>[SM] looks interested for a moment, but then looks back down. Maybe you should try again later.</span>")