Merge remote-tracking branch 'remotes/upstream/master' into rodform

# Conflicts:
#	icons/mob/actions.dmi

code/__HELPERS/lists.dm

@@ -625,3 +625,15 @@ proc/dd_sortedObjectList(list/incoming)
 
 /datum/alarm/dd_SortValue()
 	return "[sanitize(last_name)]"
+	
+//Picks from the list, with some safeties, and returns the "default" arg if it fails
+#define DEFAULTPICK(L, default) ((istype(L, /list) && L:len) ? pick(L) : default)
+
+#define LAZYINITLIST(L) if (!L) L = list()
+
+#define UNSETEMPTY(L) if (L && !L.len) L = null
+#define LAZYREMOVE(L, I) if(L) { L -= I; if(!L.len) { L = null; } }
+#define LAZYADD(L, I) if(!L) { L = list(); } L += I;
+#define LAZYACCESS(L, I) (L ? (isnum(I) ? (I > 0 && I <= L.len ? L[I] : null) : L[I]) : null)
+#define LAZYLEN(L) length(L)
+#define LAZYCLEARLIST(L) if(L) L.Cut()

code/_onclick/item_attack.dm

@@ -161,13 +161,13 @@
 
 		for(var/mob/O in viewers(messagesource, null))
 			if(attack_verb.len)
-				O.show_message("<span class='danger'>[M] has been [pick(attack_verb)] with [src][showname] </span>", 1)
+				O.show_message("<span class='combat danger'>[M] has been [pick(attack_verb)] with [src][showname] </span>", 1)
 			else
-				O.show_message("<span class='danger'>[M] has been attacked with [src][showname] </span>", 1)
+				O.show_message("<span class='combat danger'>[M] has been attacked with [src][showname] </span>", 1)
 
 		if(!showname && user)
 			if(user.client)
-				to_chat(user, "<span class='danger'>You attack [M] with [src]. </span>")
+				to_chat(user, "<span class='combat danger'>You attack [M] with [src]. </span>")
 
 
 

code/datums/datacore.dm

@@ -135,7 +135,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 	if(H.gender == FEMALE)
 		g = "f"
 
-	var/icon/icobase = H.species.icobase
+	var/icon/icobase = head_organ.icobase //At this point all the organs would have the same icobase, so this is just recycling.
 
 	preview_icon = new /icon(icobase, "torso_[g]")
 	var/icon/temp
@@ -153,8 +153,8 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 	if(H.body_accessory && istype(H.body_accessory, /datum/body_accessory/tail))
 		temp = new/icon("icon" = H.body_accessory.icon, "icon_state" = H.body_accessory.icon_state)
 		preview_icon.Blend(temp, ICON_OVERLAY)
-	else if(H.species.tail && H.species.bodyflags & HAS_TAIL)
-		temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[H.species.tail]_s")
+	else if(H.tail && H.species.bodyflags & HAS_TAIL)
+		temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[H.tail]_s")
 		preview_icon.Blend(temp, ICON_OVERLAY)
 
 	for(var/obj/item/organ/external/E in H.organs)

code/datums/progressbar.dm

@@ -1,9 +1,12 @@
+#define PROGRESSBAR_HEIGHT 6
+
 /datum/progressbar
 	var/goal = 1
 	var/image/bar
 	var/shown = 0
 	var/mob/user
 	var/client/client
+	var/listindex
 
 /datum/progressbar/New(mob/User, goal_number, atom/target)
 	. = ..()
@@ -11,15 +14,21 @@
 		EXCEPTION("Invalid target given")
 	if(goal_number)
 		goal = goal_number
-	bar = image('icons/effects/progessbar.dmi', target, "prog_bar_0")
+	bar = image('icons/effects/progessbar.dmi', target, "prog_bar_0", HUD_LAYER)
+	bar.plane = HUD_PLANE
 	bar.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
-	bar.pixel_y = 32
 	user = User
 	if(user)
 		client = user.client
 
+	LAZYINITLIST(user.progressbars)
+	LAZYINITLIST(user.progressbars[bar.loc])
+	var/list/bars = user.progressbars[bar.loc]
+	bars.Add(src)
+	listindex = bars.len
+	bar.pixel_y = 32 + (PROGRESSBAR_HEIGHT * (listindex - 1))
+
 /datum/progressbar/proc/update(progress)
-//	to_chat(world, "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]")
 	if(!user || !user.client)
 		shown = 0
 		return
@@ -35,8 +44,24 @@
 		user.client.images += bar
 		shown = 1
 
+/datum/progressbar/proc/shiftDown()
+	--listindex
+	bar.pixel_y -= PROGRESSBAR_HEIGHT
+
 /datum/progressbar/Destroy()
+	for(var/I in user.progressbars[bar.loc])
+		var/datum/progressbar/P = I
+		if(P != src && P.listindex > listindex)
+			P.shiftDown()
+
+	var/list/bars = user.progressbars[bar.loc]
+	bars.Remove(src)
+	if(!bars.len)
+		LAZYREMOVE(user.progressbars, bar.loc)
+
 	if(client)
 		client.images -= bar
 	qdel(bar)
-	. = ..()
+	. = ..()
+
+#undef PROGRESSBAR_HEIGHT

code/game/data_huds.dm

@@ -139,6 +139,7 @@
 /mob/living/carbon/proc/med_hud_set_status()
 	var/image/holder = hud_list[STATUS_HUD]
 	//var/image/holder2 = hud_list[STATUS_HUD_OOC]
+	var/mob/living/simple_animal/borer/B = has_brain_worms()
 	if(stat == 2)
 		holder.icon_state = "huddead"
 		//holder2.icon_state = "huddead"
@@ -146,13 +147,8 @@
 		holder.icon_state = "hudxeno"
 	else if(check_virus())
 		holder.icon_state = "hudill"
-	else if(has_brain_worms())
-		var/mob/living/simple_animal/borer/B = has_brain_worms()
-		if(B.controlling)
-			holder.icon_state = "hudbrainworm"
-		else
-			holder.icon_state = "hudhealthy"
-			//holder2.icon_state = "hudhealthy"
+	else if(has_brain_worms() && B != null && B.controlling)
+		holder.icon_state = "hudbrainworm"
 	else
 		holder.icon_state = "hudhealthy"
 		//holder2.icon_state = "hudhealthy"

code/game/gamemodes/blob/powers.dm

@@ -333,7 +333,7 @@
 
 	if(ticker && ticker.mode.name == "blob")
 		var/datum/game_mode/blob/BL = ticker.mode
-		BL.blobwincount = initial(BL.blobwincount) * 2
+		BL.blobwincount += initial(BL.blobwincount)
 
 
 /mob/camera/blob/verb/blob_broadcast()

code/game/gamemodes/changeling/powers/panacea.dm

@@ -11,6 +11,16 @@
 
 	to_chat(user, "<span class='notice'>We cleanse impurities from our form.</span>")
 
+	var/mob/living/simple_animal/borer/B = user.has_brain_worms()
+	if(B)
+		if(B.controlling)
+			B.detatch()
+		B.leave_host()
+		if(iscarbon(user))
+			var/mob/living/carbon/C = user
+			C.vomit(0)
+			to_chat(user, "<span class='notice'>We expel a parasite from our form.</span>")
+
 	var/obj/item/organ/internal/body_egg/egg = user.get_int_organ(/obj/item/organ/internal/body_egg)
 	if(egg)
 		egg.remove(user)

code/game/gamemodes/miniantags/borer/borer_chemicals.dm

@@ -0,0 +1,51 @@
+/datum/borer_chem
+	var/chemname
+	var/chemdesc = "This is a chemical"
+	var/chemuse = 30
+	var/quantity = 10
+
+/datum/borer_chem/capulettium_plus
+	chemname = "capulettium_plus"
+	chemdesc = "Silences and masks pulse."
+
+/datum/borer_chem/charcoal
+	chemname = "charcoal"
+	chemdesc = "Slowly heals toxin damage, also slowly removes other chemicals."
+
+/datum/borer_chem/epinephrine
+	chemname = "epinephrine"
+	chemdesc = "Stabilizes critical condition and slowly heals suffocation damage."
+
+/datum/borer_chem/fliptonium
+	chemname = "fliptonium"
+	chemdesc = "Causes uncontrollable flipping."
+	chemuse = 50
+
+/datum/borer_chem/hydrocodone
+	chemname = "hydrocodone"
+	chemdesc = "An extremely strong painkiller."
+
+/datum/borer_chem/mannitol
+	chemname = "mannitol"
+	chemdesc = "Heals brain damage."
+
+/datum/borer_chem/methamphetamine
+	chemname = "methamphetamine"
+	chemdesc = "Reduces stun times and increases stamina. Deals small amounts of brain damage."
+	chemuse = 50
+
+/datum/borer_chem/mitocholide
+	chemname = "mitocholide"
+	chemdesc = "Heals internal organ damage."
+
+/datum/borer_chem/salbutamol
+	chemname = "salbutamol"
+	chemdesc = "Heals suffocation damage."
+
+/datum/borer_chem/salglu_solution
+	chemname = "salglu_solution"
+	chemdesc = "Slowly heals brute and burn damage, also slowly restores blood."
+
+/datum/borer_chem/spaceacillin
+	chemname = "spaceacillin"
+	chemdesc = "Slows progression of diseases and fights infections."

code/game/gamemodes/miniantags/borer/borer_event.dm

@@ -4,11 +4,11 @@
 	announceWhen = 400
 
 	var/spawncount = 5
-	var/successSpawn = 0        //So we don't make a command report if nothing gets spawned.
+	var/successSpawn = FALSE        //So we don't make a command report if nothing gets spawned.
 
 /datum/event/borer_infestation/setup()
 	announceWhen = rand(announceWhen, announceWhen + 50)
-	spawncount = rand(1, 3)
+	spawncount = rand(2, 3)
 
 /datum/event/borer_infestation/announce()
 	if(successSpawn)
@@ -22,14 +22,8 @@
 			if(temp_vent.parent.other_atmosmch.len > 50)
 				vents += temp_vent
 
-	spawn(0)
-		var/list/candidates = pollCandidates("Do you want to play as a cortical borer?", ROLE_BORER, 1)
-		while(spawncount > 0 && vents.len && candidates.len)
-			var/obj/vent = pick_n_take(vents)
-			var/mob/C = pick_n_take(candidates)
-
-			var/mob/living/simple_animal/borer/new_borer = new(vent.loc)
-			new_borer.key = C.key
-
-			spawncount--
-			successSpawn = 1
+	while(spawncount >= 1 && vents.len)
+		var/obj/vent = pick_n_take(vents)
+		new /mob/living/simple_animal/borer(vent.loc)
+		successSpawn = TRUE
+		spawncount--

code/game/gamemodes/miniantags/borer/borer_html.dm

@@ -0,0 +1,69 @@
+/mob/living/simple_animal/borer/proc/get_html_template(content)
+	var/html = {"<!DOCTYPE html">
+		<html>
+		<head>
+			<title>Borer Chemicals</title>
+			<link rel='stylesheet' type='text/css' href='icons.css'>
+			<link rel='stylesheet' type='text/css' href='shared.css'>
+			<style type='text/css'>
+			body {
+				font-size: 12px;
+				color: #ffffff;
+				font-family: Verdana, Geneva, sans-serif;
+				background: #272727;
+				overflow-x: hidden;
+			}
+			a, a:link, a:visited, a:active, .link, .linkOn, .linkOff, .selected, .disabled {
+				color: #ffffff;
+				text-decoration: none;
+				background: #40628a;
+				border: 1px solid #161616;
+				cursor: pointer;
+				display: inline-block;
+			}
+			a:hover, .linkActive:hover {
+				background: #507aac;
+				cursor: pointer;
+			}
+			p {
+				text-align: center;
+				font-size: 11px;
+				margin: 0px;
+			}
+			table {
+				width: 560px;
+				text-align: center;
+			}
+			td {
+				width: 560px;
+			}
+			.chem-select {
+				width: 560px;
+				text-align: center;
+			}
+			.enabled {
+				background-color: #0a0;
+			}
+			.disabled {
+				background-color: #a00;
+			}
+			.shown {
+				display: block;
+			}
+			.hidden {
+				display: none;
+			}
+			</style>
+			<script src="jquery.min.js"></script>
+			<script type='text/javascript'>
+				function update_chemicals(chemicals) {
+					$('#chemicals').text(chemicals);
+				}
+				$(function() {
+				});
+			</script>
+		</head>
+		<body scroll='yes'><div id='content'>
+		[content]
+		</div></body></html>"}
+	return html

code/game/gamemodes/wizard/soulstone.dm

@@ -8,7 +8,7 @@
 	slot_flags = SLOT_BELT
 	origin_tech = "bluespace=4;materials=4"
 	var/imprinted = "empty"
-	
+
 	var/usability = TRUE // Can this soul stone be used by anyone, or only cultists/wizards?
 	var/reusable = TRUE // Can this soul stone be used more than once?
 	var/spent = FALSE // If the soul stone can only be used once, has it been used?
@@ -18,7 +18,7 @@
 		return TRUE
 
 	return FALSE
-	
+
 /obj/item/device/soulstone/proc/was_used()
 	if(!reusable)
 		spent = TRUE
@@ -26,21 +26,21 @@
 		desc = "A fragment of the legendary treasure known simply as \
 			the 'Soul Stone'. The shard lies still, dull and lifeless; \
 			whatever spark it once held long extinguished."
-			
+
 /obj/item/device/soulstone/anybody
 	usability = TRUE
 
 /obj/item/device/soulstone/anybody/chaplain
 	name = "mysterious old shard"
 	reusable = FALSE
-	
+
 /obj/item/device/soulstone/pickup(mob/living/user)
 	..()
 	if(!can_use(user))
 		to_chat(user, "<span class='danger'>An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.</span>")
 		user.Dizzy(120)
-		
-//////////////////////////////Capturing////////////////////////////////////////////////////////		
+
+//////////////////////////////Capturing////////////////////////////////////////////////////////
 /obj/item/device/soulstone/attack(mob/living/carbon/human/M as mob, mob/user as mob)
 	if(!can_use(user))
 		user.Paralyse(5)
@@ -53,7 +53,7 @@
 
 	if(!ishuman(M) || istype(M, /mob/living/carbon/human/dummy)) //If target is not a human or a dummy
 		return ..()
-		
+
 	if(M.has_brain_worms()) //Borer stuff - RR
 		to_chat(user, "<span class='warning'>This being is corrupted by an alien intelligence and cannot be soul trapped.</span>")
 		return ..()
@@ -62,6 +62,13 @@
 		to_chat(user, "<span class='warning'>A mysterious force prevents you from trapping this being's soul.</span>")
 		return ..()
 
+	if(iscultist(M))
+		to_chat(user, "<span class='cultlarge'>This soul is already MINE.</span>")
+		return ..()
+
+		M.create_attack_log("<font color='orange'>Has had their soul captured with [src.name] by [key_name(user)]</font>")
+		user.create_attack_log("<font color='red'>Used the [src.name] to capture the soul of [key_name(M)]</font>")
+
 	M.create_attack_log("<font color='orange'>Has had their soul captured with [src.name] by [key_name(user)]</font>")
 	user.create_attack_log("<font color='red'>Used the [src.name] to capture the soul of [key_name(M)]</font>")
 	log_attack("<font color='red'>[key_name(user)] used the [src.name] to capture the soul of [key_name(M)]</font>")
@@ -69,7 +76,7 @@
 	transfer_soul("VICTIM", M, user)
 	return
 
-///////////////////Options for using captured souls///////////////////////////////////////	
+///////////////////Options for using captured souls///////////////////////////////////////
 /obj/item/device/soulstone/attack_self(mob/user)
 	if(!in_range(src, user))
 		return
@@ -77,8 +84,8 @@
 	if(!can_use(user))
 		user.Paralyse(5)
 		to_chat(user, "<span class='userdanger'>Your body is wracked with debilitating pain!</span>")
-		return		
-		
+		return
+
 	user.set_machine(src)
 	var/dat = "<TT><B>Soul Stone</B><BR>"
 	for(var/mob/living/simple_animal/shade/A in src)
@@ -127,7 +134,7 @@
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "construct"
 	desc = "A wicked machine used by those skilled in magical arts. It is inactive"
-	
+
 /obj/structure/constructshell/examine(mob/user)
 	if(..(user, 0))
 		if(iscultist(user) || iswizard(user) || user.stat == DEAD)

code/game/machinery/cloning.dm

@@ -124,6 +124,9 @@
 	buf.dna.unique_enzymes = md5(buf.dna.real_name)
 	buf.dna.UI=list(0x066,0x000,0x033,0x000,0x000,0x000,0xAF0,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x000,0x033,0x066,0x0FF,0x4DB,0x002,0x690,0x000,0x000)
 	//buf.dna.UI=list(0x0C8,0x0C8,0x0C8,0x0C8,0x0C8,0x0C8,0x000,0x000,0x000,0x000,0x161,0xFBD,0xDEF) // Farmer Jeff
+	for(var/i in buf.dna.UI.len to DNA_UI_LENGTH)
+		buf.dna.UI += 0x000
+	buf.dna.ResetSE()
 	buf.dna.UpdateUI()
 
 /obj/item/weapon/disk/data/monkey

code/game/machinery/computer/camera_advanced.dm

@@ -37,18 +37,19 @@
 		off_action.Activate()
 
 /obj/machinery/computer/camera_advanced/attack_hand(mob/user)
-	if(..())
-		return
-	if(!iscarbon(user))
-		return
 	if(current_user)
 		to_chat(user, "The console is already in use!")
 		return
-
+	if(!iscarbon(user))
+		return
+	if(..())
+		return
 	user.set_machine(src)
+
 	if(!eyeobj)
 		CreateEye()
-	if(!eyeobj.initialized)
+
+	if(!eyeobj.eye_initialized)
 		var/camera_location
 		for(var/obj/machinery/camera/C in cameranet.cameras)
 			if(!C.can_use())
@@ -57,7 +58,7 @@
 				camera_location = get_turf(C)
 				break
 		if(camera_location)
-			eyeobj.initialized = 1
+			eyeobj.eye_initialized = 1
 			give_eye_control(user)
 			eyeobj.setLoc(camera_location)
 		else
@@ -66,6 +67,7 @@
 			user.unset_machine()
 	else
 		give_eye_control(user)
+		eyeobj.setLoc(eyeobj.loc)
 
 
 /obj/machinery/computer/camera_advanced/proc/give_eye_control(mob/user)
@@ -77,7 +79,6 @@
 	user.remote_view = 1
 	user.remote_control = eyeobj
 	user.reset_perspective(eyeobj)
-	eyeobj.setLoc(eyeobj.loc)
 
 /mob/camera/aiEye/remote
 	name = "Inactive Camera Eye"
@@ -86,10 +87,15 @@
 	var/acceleration = 1
 	var/mob/living/carbon/human/eye_user = null
 	var/obj/machinery/computer/camera_advanced/origin
-	var/initialized = 0
+	var/eye_initialized = 0
 	var/visible_icon = 0
 	var/image/user_image = null
 
+/mob/camera/aiEye/remote/Destroy()
+	eye_user = null
+	origin = null
+	return ..()
+
 /mob/camera/aiEye/remote/GetViewerClient()
 	if(eye_user)
 		return eye_user.client
@@ -102,12 +108,11 @@
 		T = get_turf(T)
 		loc = T
 		cameranet.visibility(src)
-		if(eye_user.client)
-			if(visible_icon)
+		if(visible_icon)
+			if(eye_user.client)
 				eye_user.client.images -= user_image
 				user_image = image(icon,loc,icon_state,FLY_LAYER)
 				eye_user.client.images += user_image
-			eye_user.client.eye = src
 
 /mob/camera/aiEye/remote/relaymove(mob/user,direct)
 	var/initial = initial(sprint)
@@ -140,14 +145,16 @@
 	remote_eye.origin.current_user = null
 	remote_eye.origin.jump_action.Remove(C)
 	remote_eye.eye_user = null
-	C.reset_perspective(null)
 	if(C.client)
-		C.client.images -= remote_eye.user_image
+		C.reset_perspective(null)
+		if(remote_eye.visible_icon)
+			C.client.images -= remote_eye.user_image
 		for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
 			C.client.images -= chunk.obscured
 	C.remote_control = null
 	C.unset_machine()
 	src.Remove(C)
+	playsound(remote_eye.origin, 'sound/machines/terminal_off.ogg', 25, 0)
 
 /datum/action/innate/camera_jump
 	name = "Jump To Camera"
@@ -175,7 +182,14 @@
 			T[text("[][]", netcam.c_tag, (netcam.can_use() ? null : " (Deactivated)"))] = netcam
 
 
+	playsound(origin, 'sound/machines/terminal_prompt.ogg', 25, 0)
 	var/camera = input("Choose which camera you want to view", "Cameras") as null|anything in T
 	var/obj/machinery/camera/final = T[camera]
+	playsound(origin, "terminal_type", 25, 0)
 	if(final)
+		playsound(origin, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0)
 		remote_eye.setLoc(get_turf(final))
+		C.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/noise)
+		C.clear_fullscreen("flash", 3) //Shorter flash than normal since it's an ~~advanced~~ console!
+	else
+		playsound(origin, 'sound/machines/terminal_prompt_deny.ogg', 25, 0)

code/game/objects/items/weapons/RCD.dm

@@ -28,6 +28,7 @@ RCD
 	var/canRwall = 0
 	var/menu = 1
 	var/door_type = /obj/machinery/door/airlock
+	var/door_name = "Airlock"
 	req_access = list(access_engine)
 	var/list/door_accesses = list()
 	var/list/door_accesses_list = list()
@@ -85,7 +86,7 @@ RCD
 /obj/item/weapon/rcd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state)
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "rcd.tmpl", "[name]", 400, 400, state = state)
+		ui = new(user, src, ui_key, "rcd.tmpl", "[name]", 450, 400, state = state)
 		ui.open()
 		ui.set_auto_update(1)
 
@@ -93,6 +94,7 @@ RCD
 	var/data[0]
 	data["mode"] = mode
 	data["door_type"] = door_type
+	data["door_name"] = door_name
 	data["menu"] = menu
 	data["matter"] = matter
 	data["max_matter"] = max_matter
@@ -164,6 +166,11 @@ RCD
 			door_accesses_list[++door_accesses_list.len] = list("name" = get_access_desc(access), "id" = access, "enabled" = (access in door_accesses))
 		. = 1
 
+	if(href_list["choice"] && !locked)
+		var/temp_t = sanitize(copytext(input("Enter a custom Airlock Name.","Airlock Name"),1,MAX_MESSAGE_LEN))
+		if(temp_t)
+			door_name = temp_t
+
 /obj/item/weapon/rcd/proc/activate()
 	playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
 
@@ -207,6 +214,7 @@ RCD
 						if(!useResource(10, user)) return 0
 						activate()
 						var/obj/machinery/door/airlock/T = new door_type(A)
+						T.name = door_name
 						T.autoclose = 1
 						if(one_access)
 							T.req_one_access = door_accesses.Copy()

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -184,7 +184,6 @@
 	name = "vox specialized nitrogen tank"
 	desc = "A high-tech nitrogen tank designed specifically for Vox."
 	icon_state = "emergency_vox"
-	item_state = "emergency_vox"
 	volume = 25
 
 /obj/item/weapon/tank/emergency_oxygen/vox/New()

code/game/objects/items/weapons/tools.dm

@@ -130,6 +130,7 @@
 	name = "welding tool"
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "welder"
+	item_state = "welder"
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	force = 3
@@ -151,7 +152,6 @@
 	create_reagents(max_fuel)
 	reagents.add_reagent("fuel", max_fuel)
 	update_icon()
-	return
 
 /obj/item/weapon/weldingtool/examine(mob/user)
 	if(..(user, 0))
@@ -178,7 +178,6 @@
 		else
 			icon_state = "[initial(icon_state)][ratio]"
 	update_torch()
-	return
 
 /obj/item/weapon/weldingtool/attackby(obj/item/I, mob/user, params)
 	if(isscrewdriver(I))
@@ -361,7 +360,6 @@
 	name = "Industrial Welding Tool"
 	desc = "A slightly larger welder with a larger tank."
 	icon_state = "indwelder"
-	icon_state = "welder"
 	max_fuel = 40
 	materials = list(MAT_METAL=70, MAT_GLASS=60)
 	origin_tech = "engineering=2"
@@ -387,6 +385,7 @@
 	name = "Upgraded Welding Tool"
 	desc = "An upgraded welder based off the industrial welder."
 	icon_state = "upindwelder"
+	item_state = "upindwelder"
 	max_fuel = 80
 	w_class = 3
 	materials = list(MAT_METAL=70, MAT_GLASS=120)
@@ -396,6 +395,7 @@
 	name = "Experimental Welding Tool"
 	desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes."
 	icon_state = "exwelder"
+	item_state = "exwelder"
 	max_fuel = 40
 	w_class = 3
 	materials = list(MAT_METAL=70, MAT_GLASS=120)

code/game/objects/structures/crates_lockers/closets/cardboardbox.dm

@@ -1,6 +1,7 @@
 /obj/structure/closet/cardboard
 	name = "large cardboard box"
 	desc = "Just a box..."
+	icon = 'icons/obj/cardboard_boxes.dmi'
 	icon_state = "cardboard"
 	icon_opened = "cardboard_open"
 	icon_closed = "cardboard"
@@ -43,7 +44,7 @@
 
 /mob/living/proc/do_alert_animation(atom/A)
 	var/image/I
-	I = image('icons/obj/closet.dmi', A, "cardboard_special", A.layer+1)
+	I = image('icons/obj/cardboard_boxes.dmi', A, "cardboard_special", A.layer+1)
 	var/list/viewing = list()
 	for(var/mob/M in viewers(A))
 		if(M.client)
@@ -52,6 +53,7 @@
 	I.alpha = 0
 	animate(I, pixel_z = 32, alpha = 255, time = 5, easing = ELASTIC_EASING)
 
+
 /obj/structure/closet/cardboard/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(src.opened)
 		if(istype(W, /obj/item/weapon/weldingtool))
@@ -62,3 +64,25 @@
 			for(var/mob/M in viewers(src))
 				M.show_message("<span class='notice'>\The [src] has been cut apart by [user] with \the [WC].</span>", 3, "You hear cutting.", 2)
 			qdel(src)
+			return
+		if(istype(W, /obj/item/weapon/pen))
+			var/decalselection = input("Please select a decal") as null|anything in list("Atmospherics", "Bartender", "Barber", "Blueshield",	"Brig Physician", "Captain",
+			"Cargo", "Chief Engineer",	"Chaplain",	"Chef", "Chemist", "Civilian", "Clown", "CMO", "Coroner", "Detective", "Engineering", "Genetics", "HOP",
+			"HOS", "Hydroponics", "Internal Affairs Agent", "Janitor",	"Magistrate", "Mechanic", "Medical", "Mime", "Mining", "NT Representative", "Paramedic", "Pod Pilot",
+			"Prisoner",	"Research Director", "Security", "Syndicate", "Therapist", "Virology", "Warden", "Xenobiology")
+			if(!decalselection)
+				return
+			if(user.incapacitated())
+				to_chat(user, "You're in no condition to perform this action.")
+				return
+			if(W != user.get_active_hand())
+				to_chat(user, "You must be holding the pen to perform this action.")
+				return
+			if(! Adjacent(user))
+				to_chat(user, "You have moved too far away from the cardboard box.")
+				return
+			decalselection = replacetext(decalselection, " ", "_")
+			decalselection = lowertext(decalselection)
+			icon_opened = ("cardboard_open_"+decalselection)
+			icon_closed = ("cardboard_"+decalselection)
+			update_icon() // a proc declared in the closets parent file used to update opened/closed sprites on normal closets

code/game/response_team.dm

@@ -5,6 +5,9 @@
 #define ERT_TYPE_RED		2
 #define ERT_TYPE_GAMMA		3
 
+/datum/game_mode
+	var/list/datum/mind/ert = list()
+
 var/list/response_team_members = list()
 var/responseteam_age = 21 // Minimum account age to play as an ERT member
 var/datum/response_team/active_team = null
@@ -187,6 +190,7 @@ var/ert_request_answered = 0
 	M.mind.special_role = SPECIAL_ROLE_ERT
 	if(!(M.mind in ticker.minds))
 		ticker.minds += M.mind //Adds them to regular mind list.
+	ticker.mode.ert += M.mind
 	M.forceMove(spawn_location)
 
 	active_team.equip_officer(class, M)

code/game/sound.dm

@@ -12,6 +12,9 @@ var/list/page_sound = list('sound/effects/pageturn1.ogg', 'sound/effects/pagetur
 var/list/gun_sound = list('sound/weapons/Gunshot.ogg', 'sound/weapons/Gunshot2.ogg','sound/weapons/Gunshot3.ogg','sound/weapons/Gunshot4.ogg')
 var/list/computer_ambience = list('sound/goonstation/machines/ambicomp1.ogg', 'sound/goonstation/machines/ambicomp2.ogg', 'sound/goonstation/machines/ambicomp3.ogg')
 var/list/ricochet = list('sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg','sound/weapons/effects/ric3.ogg','sound/weapons/effects/ric4.ogg','sound/weapons/effects/ric5.ogg')
+var/list/terminal_type = list('sound/machines/terminal_button01.ogg', 'sound/machines/terminal_button02.ogg', 'sound/machines/terminal_button03.ogg',
+							  'sound/machines/terminal_button04.ogg', 'sound/machines/terminal_button05.ogg', 'sound/machines/terminal_button06.ogg',
+							  'sound/machines/terminal_button07.ogg', 'sound/machines/terminal_button08.ogg')
 
 /proc/playsound(var/atom/source, soundin, vol as num, vary, extrarange as num, falloff, var/is_global, var/pitch)
 
@@ -137,4 +140,6 @@ var/list/ricochet = list('sound/weapons/effects/ric1.ogg', 'sound/weapons/effect
 				soundin = pick(computer_ambience)
 			if("ricochet")
 				soundin = pick(ricochet)
+			if("terminal_type")
+				soundin = pick(terminal_type)
 	return soundin

code/modules/admin/admin_verbs.dm

@@ -166,7 +166,7 @@ var/list/admin_verbs_debug = list(
 	/client/proc/admin_serialize,
 	/client/proc/admin_deserialize,
 	/client/proc/jump_to_ruin,
-	/client/proc/toggle_medal_disable	
+	/client/proc/toggle_medal_disable
 	)
 var/list/admin_verbs_possess = list(
 	/proc/possess,
@@ -213,6 +213,10 @@ var/list/admin_verbs_snpc = list(
 	/client/proc/hide_snpc_verbs
 )
 
+/client/proc/on_holder_add()
+	if(chatOutput && chatOutput.loaded)
+		chatOutput.loadAdmin()
+
 /client/proc/add_admin_verbs()
 	if(holder)
 		verbs += admin_verbs_default

code/modules/admin/holder2.dm

@@ -32,6 +32,7 @@ var/list/admin_datums = list()
 	if(istype(C))
 		owner = C
 		owner.holder = src
+		owner.on_holder_add()
 		owner.add_admin_verbs()	//TODO
 		owner.verbs -= /client/proc/readmin
 		admins |= C

code/modules/admin/player_panel.dm

@@ -538,6 +538,9 @@
 					spider_minds += S.mind
 			dat += check_role_table("Terror Spiders", spider_minds)
 
+		if(ticker.mode.ert.len)
+			dat += check_role_table("ERT", ticker.mode.ert)
+
 		dat += "</body></html>"
 		usr << browse(dat, "window=roundstatus;size=400x500")
 	else

code/modules/admin/topic.dm

@@ -1710,6 +1710,103 @@
 		to_chat(src.owner, "You sent a [eviltype] fax to [H]")
 		log_admin("[key_name(src.owner)] sent [key_name(H)] a [eviltype] fax")
 		message_admins("[key_name_admin(src.owner)] replied to [key_name_admin(H)] with a [eviltype] fax")
+	else if(href_list["Bless"])
+		if(!check_rights(R_ADMIN))
+			return
+		var/mob/living/M = locateUID(href_list["Bless"])
+		if(!istype(M))
+			to_chat(usr, "This can only be used on instances of type /mob/living")
+			return
+		var/btypes = list("To Arrivals", "Moderate Heal")
+		var/mob/living/carbon/human/H
+		if(ishuman(M))
+			H = M
+			btypes += "Heal Over Time"
+			btypes += "Permanent Regeneration"
+			btypes += "Super Powers"
+		var/blessing = input(src.owner, "How would you like to bless [M]?", "Its good to be good...", "") as null|anything in btypes
+		if(!(blessing in btypes))
+			return
+		switch(blessing)
+			if("To Arrivals")
+				M.forceMove(pick(latejoin))
+				to_chat(M, "<span class='userdanger'>You are abruptly pulled through space!</span>")
+			if("Moderate Heal")
+				M.adjustBruteLoss(-25)
+				M.adjustFireLoss(-25)
+				M.adjustToxLoss(-25)
+				M.adjustOxyLoss(-25)
+				to_chat(M,"<span class='userdanger'>You feel invigorated!</span>")
+			if("Heal Over Time")
+				H.reagents.add_reagent("salglu_solution", 30)
+				H.reagents.add_reagent("salbutamol", 20)
+				H.reagents.add_reagent("spaceacillin", 20)
+			if("Permanent Regeneration")
+				H.dna.SetSEState(REGENERATEBLOCK, 1)
+				genemutcheck(H, REGENERATEBLOCK,  null, MUTCHK_FORCED)
+				H.update_mutations()
+			if("Super Powers")
+				var/list/default_genes = list(REGENERATEBLOCK, NOBREATHBLOCK, COLDBLOCK)
+				for(var/gene in default_genes)
+					H.dna.SetSEState(gene, 1)
+					genemutcheck(H, gene,  null, MUTCHK_FORCED)
+					H.update_mutations()
+	else if(href_list["Smite"])
+		if(!check_rights(R_ADMIN))
+			return
+		var/mob/living/M = locateUID(href_list["Smite"])
+		var/mob/living/carbon/human/H
+		if(!istype(M))
+			to_chat(usr, "This can only be used on instances of type /mob/living")
+			return
+		var/ptypes = list("Lightning bolt", "Fire Death", "Gib")
+		if(ishuman(M))
+			H = M
+			ptypes += "Brain Damage"
+			ptypes += "Honk Tumor"
+			ptypes += "Cluwne"
+			ptypes += "Mutagen Cookie"
+			ptypes += "Hellwater Cookie"
+		var/punishment = input(src.owner, "How would you like to smite [M]?", "Its good to be baaaad...", "") as null|anything in ptypes
+		if(!(punishment in ptypes))
+			return
+		switch(punishment)
+			if("Lightning bolt")
+				M.electrocute_act(5, "Lightning Bolt", safety=1)
+				playsound(get_turf(M), 'sound/magic/LightningShock.ogg', 50, 1, -1)
+				M.adjustFireLoss(75)
+				M.Weaken(5)
+				to_chat(M, "<span class='userdanger'>The gods have punished you for your sins!</span>")
+			if("Brain Damage")
+				H.adjustBrainLoss(75)
+			if("Fire Death")
+				to_chat(M,"<span class='userdanger'>You feel hotter than usual. Maybe you should lowe-wait, is that your hand melting?</span>")
+				var/turf/simulated/T = get_turf(M)
+				new /obj/effect/hotspot(T)
+				M.adjustFireLoss(150)
+			if("Honk Tumor")
+				if(!H.get_int_organ(/obj/item/organ/internal/honktumor))
+					var/obj/item/organ/internal/organ = new /obj/item/organ/internal/honktumor
+					to_chat(H, "<span class='userdanger'>Life seems funnier, somehow.</span>")
+					organ.insert(H)
+			if("Cluwne")
+				H.makeCluwne()
+			if("Mutagen Cookie")
+				var/obj/item/weapon/reagent_containers/food/snacks/cookie/evilcookie = new /obj/item/weapon/reagent_containers/food/snacks/cookie
+				evilcookie.reagents.add_reagent("mutagen", 10)
+				evilcookie.desc = "It has a faint green glow."
+				evilcookie.bitesize = 100
+				H.drop_l_hand()
+				H.equip_to_slot_or_del(evilcookie, slot_l_hand)
+			if("Hellwater Cookie")
+				var/obj/item/weapon/reagent_containers/food/snacks/cookie/evilcookie = new /obj/item/weapon/reagent_containers/food/snacks/cookie
+				evilcookie.reagents.add_reagent("hell_water", 25)
+				evilcookie.desc = "Sulphur-flavored."
+				evilcookie.bitesize = 100
+				H.drop_l_hand()
+				H.equip_to_slot_or_del(evilcookie, slot_l_hand)
+			if("Gib")
+				M.gib(FALSE)
 	else if(href_list["FaxReplyTemplate"])
 		if(!check_rights(R_ADMIN))
 			return

code/modules/admin/verbs/pray.dm

@@ -13,7 +13,7 @@
 			return
 
 	var/image/cross = image('icons/obj/storage.dmi',"bible")
-	msg = "\blue [bicon(cross)] <b><font color=purple>PRAY: </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=[UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) ([admin_jump_link(src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>):</b> [msg]"
+	msg = "\blue [bicon(cross)] <b><font color=purple>PRAY: </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=[UID()]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) ([admin_jump_link(src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>) (<A HREF='?_src_=holder;Bless=[UID()]'>BLESS</A>) (<A HREF='?_src_=holder;Smite=[UID()]'>SMITE</A>):</b> [msg]"
 
 	for(var/client/X in admins)
 		if(check_rights(R_EVENT,0,X.mob))

code/modules/client/client procs.dm

@@ -335,6 +335,7 @@
 		world.update_status()
 
 	if(holder)
+		on_holder_add()
 		add_admin_verbs()
 		admin_memo_output("Show", 0, 1)
 

code/modules/client/preference/preferences.dm

@@ -95,6 +95,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	var/UI_style_alpha = 255
 	var/windowflashing = TRUE
 
+	//ghostly preferences
+	var/ghost_anonsay = 0
 
 	//character preferences
 	var/real_name						//our character's name
@@ -446,6 +448,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			dat += "<b>Ghost ears:</b> <a href='?_src_=prefs;preference=ghost_ears'><b>[(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]</b></a><br>"
 			dat += "<b>Ghost sight:</b> <a href='?_src_=prefs;preference=ghost_sight'><b>[(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"]</b></a><br>"
 			dat += "<b>Ghost radio:</b> <a href='?_src_=prefs;preference=ghost_radio'><b>[(toggles & CHAT_GHOSTRADIO) ? "Nearest Speakers" : "All Chatter"]</b></a><br>"
+			dat += "<b>Deadchat anonymity:</b> <a href='?_src_=prefs;preference=ghost_anonsay'><b>[ghost_anonsay ? "Anonymous" : "Not Anonymous"]</b></a><br>"
 
 			dat += "</td><td width='300px' height='300px' valign='top'>"
 			dat += "<h2>Special Role Settings</h2>"
@@ -1997,6 +2000,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 				if("ghost_radio")
 					toggles ^= CHAT_GHOSTRADIO
 
+				if("ghost_anonsay")
+					ghost_anonsay = !ghost_anonsay
+
 				if("save")
 					save_preferences(user)
 					save_character(user)

code/modules/client/preference/preferences_mysql.dm

@@ -14,8 +14,9 @@
 					nanoui_fancy,
 					show_ghostitem_attack,
 					lastchangelog,
-					exp,
-					windowflashing
+					windowflashing,
+					ghost_anonsay,
+					exp
 					FROM [format_table_name("player")]
 					WHERE ckey='[C.ckey]'"}
 					)
@@ -42,8 +43,9 @@
 		nanoui_fancy = text2num(query.item[11])
 		show_ghostitem_attack = text2num(query.item[12])
 		lastchangelog = query.item[13]
-		exp = query.item[14]
-		windowflashing = text2num(query.item[15])
+		windowflashing = text2num(query.item[14])
+		ghost_anonsay = text2num(query.item[15])
+		exp = query.item[16]
 
 	//Sanitize
 	ooccolor		= sanitize_hexcolor(ooccolor, initial(ooccolor))
@@ -58,8 +60,9 @@
 	nanoui_fancy	= sanitize_integer(nanoui_fancy, 0, 1, initial(nanoui_fancy))
 	show_ghostitem_attack = sanitize_integer(show_ghostitem_attack, 0, 1, initial(show_ghostitem_attack))
 	lastchangelog	= sanitize_text(lastchangelog, initial(lastchangelog))
-	exp	= sanitize_text(exp, initial(exp))
 	windowflashing = sanitize_integer(windowflashing, 0, 1, initial(windowflashing))
+	ghost_anonsay = sanitize_integer(ghost_anonsay, 0, 1, initial(ghost_anonsay))
+	exp	= sanitize_text(exp, initial(exp))
 	return 1
 
 /datum/preferences/proc/save_preferences(client/C)
@@ -85,7 +88,8 @@
 					nanoui_fancy='[nanoui_fancy]',
 					show_ghostitem_attack='[show_ghostitem_attack]',
 					lastchangelog='[lastchangelog]',
-					windowflashing='[windowflashing]'
+					windowflashing='[windowflashing]',
+					ghost_anonsay='[ghost_anonsay]'
 					WHERE ckey='[C.ckey]'"}
 					)
 

code/modules/events/meaty_ops.dm

@@ -15,5 +15,5 @@
 
 
 
-/datum/event/meteor_wave/goreops/end()
+/datum/event/meteor_wave/goreop/end()
 	event_announcement.Announce("All MeteorOps are dead. Major Station Victory.", "MeteorOps")

code/modules/food_and_drinks/food/snacks.dm

@@ -1218,13 +1218,6 @@
 		user.drop_item()
 		forceMove(get_turf(O))
 		return Expand()
-	if(istype(O, /obj/machinery/computer/camera_advanced/xenobio))
-		var/obj/machinery/computer/camera_advanced/xenobio/X = O
-		X.monkeys++
-		to_chat(user, "<span class='notice'>You feed [src] to the [X]. It now has [X.monkeys] monkey cubes stored.</span>")
-		user.drop_item()
-		qdel(src)
-		return
 	..()
 
 /obj/item/weapon/reagent_containers/food/snacks/monkeycube/water_act(volume, temperature)

code/modules/lighting/lighting_overlay.dm

@@ -59,21 +59,14 @@ var/list/all_lighting_overlays = list() // Global list of lighting overlays.
 
 	var/max = max(cr.cache_mx, cg.cache_mx, cb.cache_mx, ca.cache_mx)
 
-	var/list/new_matrix = list(
+	color  = list(
 		cr.cache_r, cr.cache_g, cr.cache_b, 0,
 		cg.cache_r, cg.cache_g, cg.cache_b, 0,
 		cb.cache_r, cb.cache_g, cb.cache_b, 0,
 		ca.cache_r, ca.cache_g, ca.cache_b, 0,
 		0, 0, 0, 1
-	)
-	var/lum = max > LIGHTING_SOFT_THRESHOLD
-
-	if(lum)
-		luminosity = 1
-		animate(src, color = new_matrix, time = 5)
-	else
-		animate(src, color = new_matrix, time = 5)
-		animate(luminosity = 0, time = 0)
+		)
+	luminosity = max > LIGHTING_SOFT_THRESHOLD
 
 
 

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

@@ -22,7 +22,6 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
 							//Note that this is not a reliable way to determine if admins started as observers, since they change mobs a lot.
 	universal_speak = 1
 	var/atom/movable/following = null
-	var/anonsay = 0
 	var/image/ghostimage = null //this mobs ghost image, for deleting and stuff
 	var/ghostvision = 1 //is the ghost able to see things humans can't?
 	var/seedarkness = 1
@@ -596,15 +595,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 //END TELEPORT HREF CODE
 
 /mob/dead/observer/verb/toggle_anonsay()
+	set name = "Toggle Anonymous Dead-chat"
 	set category = "Ghost"
-	set name = "Toggle Anonymous Chat"
 	set desc = "Toggles showing your key in dead chat."
-
-	src.anonsay = !src.anonsay
-	if(anonsay)
-		to_chat(src, "<span class='info'>Your key won't be shown when you speak in dead chat.</span>")
-	else
-		to_chat(src, "<span class='info'>Your key will be publicly visible again.</span>")
+	client.prefs.ghost_anonsay = !client.prefs.ghost_anonsay
+	to_chat(src, "As a ghost, your key will [(client.prefs.ghost_anonsay) ? "no longer" : "now"] be shown when you speak in dead chat.</span>")
+	client.prefs.save_preferences(src)
 
 /mob/dead/observer/verb/toggle_ghostsee()
 	set name = "Toggle Ghost Vision"

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

@@ -57,6 +57,10 @@
 			on_CD = handle_emote_CD(50) //longer cooldown
 		if("fart", "farts", "flip", "flips", "snap", "snaps")
 			on_CD = handle_emote_CD()				//proc located in code\modules\mob\emote.dm
+		if("cough", "coughs")
+			on_CD = handle_emote_CD()
+		if("sneeze", "sneezes")
+			on_CD = handle_emote_CD()
 		//Everything else, including typos of the above emotes
 		else
 			on_CD = 0	//If it doesn't induce the cooldown, we won't check for the cooldown
@@ -399,6 +403,12 @@
 				if(!muzzled)
 					message = "<B>[src]</B> coughs!"
 					m_type = 2
+					if(gender == FEMALE)
+						if(species.female_cough_sounds)
+							playsound(src, pick(species.female_cough_sounds), 120)
+					else
+						if(species.male_cough_sounds)
+							playsound(src, pick(species.male_cough_sounds), 120)
 				else
 					message = "<B>[src]</B> makes a strong noise."
 					m_type = 2
@@ -654,6 +664,10 @@
 			else
 				if(!muzzled)
 					message = "<B>[src]</B> sneezes."
+					if(gender == FEMALE)
+						playsound(src, species.female_sneeze_sound, 70)
+					else
+						playsound(src, species.male_sneeze_sound, 70)
 					m_type = 2
 				else
 					message = "<B>[src]</B> makes a strange noise."

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

@@ -1514,6 +1514,8 @@
 		if(oldspecies.default_genes.len)
 			oldspecies.handle_dna(src,1) // Remove any genes that belong to the old species
 
+	tail = species.tail
+
 	if(vessel)
 		vessel = null
 	make_blood()
@@ -2050,6 +2052,10 @@
 
 	return .
 
+/mob/living/carbon/human/proc/change_icobase(var/new_icobase, var/new_deform, var/owner_sensitive)
+	for(var/obj/item/organ/external/O in organs)
+		O.change_organ_icobase(new_icobase, new_deform, owner_sensitive) //Change the icobase/deform of all our organs. If owner_sensitive is set, that means the proc won't mess with frankenstein limbs.
+
 /mob/living/carbon/human/serialize()
 	// Currently: Limbs/organs only
 	var/list/data = ..()

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

@@ -57,7 +57,7 @@ emp_act
 	organ.add_autopsy_data(P.name, P.damage) // Add the bullet's name to the autopsy data
 
 	return (..(P , def_zone))
-	
+
 /mob/living/carbon/human/check_projectile_dismemberment(obj/item/projectile/P, def_zone)
 	var/obj/item/organ/external/affecting = get_organ(check_zone(def_zone))
 	if(affecting && !affecting.cannot_amputate && affecting.get_damage() >= (affecting.max_damage - P.dismemberment))
@@ -67,7 +67,7 @@ emp_act
 				damtype = DROPLIMB_BLUNT
 			if(BURN)
 				damtype = DROPLIMB_BURN
-			
+
 		affecting.droplimb(FALSE, damtype)
 
 /mob/living/carbon/human/getarmor(var/def_zone, var/type)
@@ -226,9 +226,9 @@ emp_act
 
 	if(! I.discrete)
 		if(I.attack_verb.len)
-			visible_message("<span class='danger'>[src] has been [pick(I.attack_verb)] in the [hit_area] with [I.name] by [user]!</span>")
+			visible_message("<span class='combat danger'>[src] has been [pick(I.attack_verb)] in the [hit_area] with [I.name] by [user]!</span>")
 		else
-			visible_message("<span class='danger'>[src] has been attacked in the [hit_area] with [I.name] by [user]!</span>")
+			visible_message("<span class='combat danger'>[src] has been attacked in the [hit_area] with [I.name] by [user]!</span>")
 
 	var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened hit to your [hit_area].", armour_penetration = I.armour_penetration)
 	var/weapon_sharp = is_sharp(I)
@@ -264,8 +264,8 @@ emp_act
 				if("head")//Harder to score a stun but if you do it lasts a bit longer
 					if(stat == CONSCIOUS && armor < 50)
 						if(prob(I.force))
-							visible_message("<span class='danger'>[src] has been knocked down!</span>", \
-											"<span class='userdanger'>[src] has been knocked down!</span>")
+							visible_message("<span class='combat danger'>[src] has been knocked down!</span>", \
+											"<span class='combat userdanger'>[src] has been knocked down!</span>")
 							apply_effect(5, WEAKEN, armor)
 							AdjustConfused(15)
 						if(prob(I.force + ((100 - health)/2)) && src != user && I.damtype == BRUTE)
@@ -284,8 +284,8 @@ emp_act
 
 				if("upper body")//Easier to score a stun but lasts less time
 					if(stat == CONSCIOUS && I.force && prob(I.force + 10))
-						visible_message("<span class='danger'>[src] has been knocked down!</span>", \
-										"<span class='userdanger'>[src] has been knocked down!</span>")
+						visible_message("<span class='combat danger'>[src] has been knocked down!</span>", \
+										"<span class='combat userdanger'>[src] has been knocked down!</span>")
 						apply_effect(5, WEAKEN, armor)
 
 					if(bloody)

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

@@ -72,3 +72,4 @@ var/global/default_martial_art = new/datum/martial_art
 	var/fire_sprite = "Standing"
 
 	var/datum/body_accessory/body_accessory = null
+	var/tail // Name of tail image in species effects icon file.

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

@@ -128,6 +128,10 @@
 	var/scream_verb = "screams"
 	var/male_scream_sound = 'sound/goonstation/voice/male_scream.ogg'
 	var/female_scream_sound = 'sound/goonstation/voice/female_scream.ogg'
+	var/male_cough_sounds = list('sound/effects/mob_effects/m_cougha.ogg','sound/effects/mob_effects/m_coughb.ogg', 'sound/effects/mob_effects/m_coughc.ogg')
+	var/female_cough_sounds = list('sound/effects/mob_effects/f_cougha.ogg','sound/effects/mob_effects/f_coughb.ogg')
+	var/male_sneeze_sound = 'sound/effects/mob_effects/sneeze.ogg'
+	var/female_sneeze_sound = 'sound/effects/mob_effects/f_sneeze.ogg'
 
 	//Default hair/headacc style vars.
 	var/default_hair				//Default hair style for newly created humans unless otherwise set.
@@ -676,4 +680,4 @@ It'll return null if the organ doesn't correspond, so include null checks when u
 		H.see_invisible = SEE_INVISIBLE_MINIMUM
 
 	if(H.see_override)	//Override all
-		H.see_invisible = H.see_override
+		H.see_invisible = H.see_override

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

@@ -360,34 +360,35 @@
 	//H.verbs += /mob/living/carbon/human/proc/leap
 	..()
 
-/datum/species/vox/updatespeciescolor(var/mob/living/carbon/human/H) //Handling species-specific skin-tones for the Vox race.
+/datum/species/vox/updatespeciescolor(var/mob/living/carbon/human/H, var/owner_sensitive = 1) //Handling species-specific skin-tones for the Vox race.
 	if(H.species.name == "Vox") //Making sure we don't break Armalis.
+		var/new_icobase = 'icons/mob/human_races/vox/r_vox.dmi' //Default Green Vox.
+		var/new_deform = 'icons/mob/human_races/vox/r_def_vox.dmi' //Default Green Vox.
 		switch(H.s_tone)
 			if(6) //Azure Vox.
-				icobase = 'icons/mob/human_races/vox/r_voxazu.dmi'
-				deform = 'icons/mob/human_races/vox/r_def_voxazu.dmi'
-				tail = "voxtail_azu"
+				new_icobase = 'icons/mob/human_races/vox/r_voxazu.dmi'
+				new_deform = 'icons/mob/human_races/vox/r_def_voxazu.dmi'
+				H.tail = "voxtail_azu"
 			if(5) //Emerald Vox.
-				icobase = 'icons/mob/human_races/vox/r_voxemrl.dmi'
-				deform = 'icons/mob/human_races/vox/r_def_voxemrl.dmi'
-				tail = "voxtail_emrl"
+				new_icobase = 'icons/mob/human_races/vox/r_voxemrl.dmi'
+				new_deform = 'icons/mob/human_races/vox/r_def_voxemrl.dmi'
+				H.tail = "voxtail_emrl"
 			if(4) //Grey Vox.
-				icobase = 'icons/mob/human_races/vox/r_voxgry.dmi'
-				deform = 'icons/mob/human_races/vox/r_def_voxgry.dmi'
-				tail = "voxtail_gry"
+				new_icobase = 'icons/mob/human_races/vox/r_voxgry.dmi'
+				new_deform = 'icons/mob/human_races/vox/r_def_voxgry.dmi'
+				H.tail = "voxtail_gry"
 			if(3) //Brown Vox.
-				icobase = 'icons/mob/human_races/vox/r_voxbrn.dmi'
-				deform = 'icons/mob/human_races/vox/r_def_voxbrn.dmi'
-				tail = "voxtail_brn"
+				new_icobase = 'icons/mob/human_races/vox/r_voxbrn.dmi'
+				new_deform = 'icons/mob/human_races/vox/r_def_voxbrn.dmi'
+				H.tail = "voxtail_brn"
 			if(2) //Dark Green Vox.
-				icobase = 'icons/mob/human_races/vox/r_voxdgrn.dmi'
-				deform = 'icons/mob/human_races/vox/r_def_voxdgrn.dmi'
-				tail = "voxtail_dgrn"
+				new_icobase = 'icons/mob/human_races/vox/r_voxdgrn.dmi'
+				new_deform = 'icons/mob/human_races/vox/r_def_voxdgrn.dmi'
+				H.tail = "voxtail_dgrn"
 			else  //Default Green Vox.
-				icobase = 'icons/mob/human_races/vox/r_vox.dmi'
-				deform = 'icons/mob/human_races/vox/r_def_vox.dmi'
-				tail = "voxtail" //Ensures they get an appropriately coloured tail depending on the skin-tone.
+				H.tail = "voxtail" //Ensures they get an appropriately coloured tail depending on the skin-tone.
 
+		H.change_icobase(new_icobase, new_deform, owner_sensitive) //Update the icobase/deform of all our organs, but make sure we don't mess with frankenstein limbs in doing so.
 		H.update_dna()
 
 /datum/species/vox/armalis/handle_post_spawn(var/mob/living/carbon/human/H)
@@ -519,6 +520,11 @@
 	butt_sprite = "slime"
 	//Has default darksight of 2.
 
+	male_cough_sounds = null    //slime people don't have lungs
+	female_cough_sounds = null
+	male_sneeze_sound = null
+	female_sneeze_sound = null
+
 	has_organ = list(
 		"brain" = /obj/item/organ/internal/brain/slime
 		)
@@ -738,6 +744,12 @@
 	slowdown = 5
 	remains_type = /obj/effect/decal/cleanable/ash
 
+	male_cough_sounds = null  //diona don't have lungs
+	female_cough_sounds = null
+	male_sneeze_sound = null
+	female_sneeze_sound = null
+
+
 	warning_low_pressure = 50
 	hazard_low_pressure = -1
 
@@ -827,7 +839,7 @@
 
 	if(H.nutrition > NUTRITION_LEVEL_WELL_FED)
 		H.nutrition = NUTRITION_LEVEL_WELL_FED
-		
+
 	if(light_amount > 0)
 		H.clear_alert("nolight")
 	else
@@ -881,6 +893,10 @@
 	reagent_tag = PROCESS_SYN
 	male_scream_sound = 'sound/goonstation/voice/robot_scream.ogg'
 	female_scream_sound = 'sound/goonstation/voice/robot_scream.ogg'
+	male_cough_sounds = list('sound/effects/mob_effects/m_machine_cougha.ogg','sound/effects/mob_effects/m_machine_coughb.ogg', 'sound/effects/mob_effects/m_machine_coughc.ogg')
+	female_cough_sounds = list('sound/effects/mob_effects/f_machine_cougha.ogg','sound/effects/mob_effects/f_machine_coughb.ogg')
+	male_sneeze_sound = 'sound/effects/mob_effects/machine_sneeze.ogg'
+	female_sneeze_sound = 'sound/effects/mob_effects/f_machine_sneeze.ogg'
 	butt_sprite = "machine"
 
 	has_organ = list(
@@ -940,6 +956,10 @@
 	speech_chance = 20
 	male_scream_sound = 'sound/voice/DraskTalk2.ogg'
 	female_scream_sound = 'sound/voice/DraskTalk2.ogg'
+	male_cough_sounds = null      //whale cough when
+	female_cough_sounds = null
+	male_sneeze_sound = null
+	female_sneeze_sound = null
 
 	burn_mod = 2
 	//exotic_blood = "cryoxadone"
@@ -1022,4 +1042,4 @@
 				H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
 
 			if(heat_level_3_breathe to INFINITY)
-				H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
+				H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")

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

@@ -298,9 +298,9 @@ var/global/list/damage_icon_parts = list()
 				base_icon.MapColors(rgb(tone[1],0,0),rgb(0,tone[2],0),rgb(0,0,tone[3]))
 
 		//Handle husk overlay.
-		if(husk && ("overlay_husk" in icon_states(species.icobase)))
+		if(husk && ("overlay_husk" in icon_states(chest.icobase)))
 			var/icon/mask = new(base_icon)
-			var/icon/husk_over = new(species.icobase,"overlay_husk")
+			var/icon/husk_over = new(chest.icobase,"overlay_husk")
 			mask.MapColors(0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,1, 0,0,0,0)
 			husk_over.Blend(mask, ICON_ADD)
 			base_icon.Blend(husk_over, ICON_OVERLAY)
@@ -1197,9 +1197,9 @@ var/global/list/damage_icon_parts = list()
 			else // Otherwise, since the user's tail isn't overlapped by limbs, go ahead and use default icon generation.
 				overlays_standing[TAIL_LAYER] = image(accessory_s, "pixel_x" = body_accessory.pixel_x_offset, "pixel_y" = body_accessory.pixel_y_offset)
 
-	else if(species.tail && species.bodyflags & HAS_TAIL) //no tailless tajaran
+	else if(tail && species.bodyflags & HAS_TAIL) //no tailless tajaran
 		if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL) && !istype(wear_suit, /obj/item/clothing/suit/space))
-			var/icon/tail_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[species.tail]_s")
+			var/icon/tail_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[tail]_s")
 			if(species.bodyflags & HAS_SKIN_COLOR)
 				tail_s.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
 			if(tail_marking_icon)
@@ -1266,8 +1266,8 @@ var/global/list/damage_icon_parts = list()
 		else // Otherwise, since the user's tail isn't overlapped by limbs, go ahead and use default icon generation.
 			overlays_standing[TAIL_LAYER] = image(accessory_s, "pixel_x" = body_accessory.pixel_x_offset, "pixel_y" = body_accessory.pixel_y_offset)
 
-	else if(species.tail && species.bodyflags & HAS_TAIL)
-		var/icon/tailw_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[species.tail]w_s")
+	else if(tail && species.bodyflags & HAS_TAIL)
+		var/icon/tailw_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[tail]w_s")
 		if(species.bodyflags & HAS_SKIN_COLOR)
 			tailw_s.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
 		if(tail_marking_icon)

code/modules/mob/mob_defines.dm

@@ -196,3 +196,5 @@
 	var/list/permanent_huds = list()
 
 	var/list/actions = list()
+	
+	var/list/progressbars = null	//for stacking do_after bars

code/modules/mob/mob_helpers.dm

@@ -442,9 +442,9 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
 				if(istype(subject, /mob/dead/observer))
 					DM = subject
 				if(check_rights(R_ADMIN|R_MOD,0,M)) 							// What admins see
-					lname = "[keyname][(DM && DM.anonsay) ? "*" : (DM ? "" : "^")] ([name])"
+					lname = "[keyname][(DM && DM.client && DM.client.prefs.ghost_anonsay) ? "*" : (DM ? "" : "^")] ([name])"
 				else
-					if(DM && DM.anonsay)						// If the person is actually observer they have the option to be anonymous
+					if(DM && DM.client && DM.client.prefs.ghost_anonsay)	// If the person is actually observer they have the option to be anonymous
 						lname = "Ghost of [name]"
 					else if(DM)									// Non-anons
 						lname = "[keyname] ([name])"

code/modules/mob/new_player/preferences_setup.dm

@@ -241,11 +241,12 @@
 			var/mob/living/carbon/human/H = new
 			H.species = current_species
 			H.s_tone = s_tone
-			H.species.updatespeciescolor(H)
-
-			icobase = H.species.icobase
+			H.species.updatespeciescolor(H, 0) //The mob's species wasn't set, so it's almost certainly different than the character's species at the moment. Thus, we need to be owner-insensitive.
+			var/obj/item/organ/external/chest/C = H.get_organ("chest")
+			icobase = C.icobase ? C.icobase : C.species.icobase
 			if(H.species.bodyflags & HAS_TAIL)
-				coloured_tail = H.species.tail
+				coloured_tail = H.tail ? H.tail : H.species.tail
+
 			qdel(H)
 		else
 			icobase = current_species.icobase

code/modules/reagents/chemistry/reagents/misc.dm

@@ -417,15 +417,15 @@
 	var/newsize = current_size
 	switch(volume)
 		if(0 to 19)
-			newsize = 1.25
+			newsize = 1.1
 		if(20 to 49)
-			newsize = 1.5
+			newsize = 1.2
 		if(50 to 99)
-			newsize = 2
+			newsize = 1.25
 		if(100 to 199)
-			newsize = 2.5
+			newsize = 1.3
 		if(200 to INFINITY)
-			newsize = 3.5
+			newsize = 1.5
 
 	H.resize = newsize/current_size
 	current_size = newsize

code/modules/research/xenobiology/xenobio_camera.dm

@@ -67,6 +67,26 @@
 		return
 	return ..()
 
+/obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/O, mob/user, params)
+	if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
+		monkeys++
+		to_chat(user, "<span class='notice'>You feed [O] to [src]. It now has [monkeys] monkey cubes stored.</span>")
+		user.drop_item()
+		qdel(O)
+		return
+	else if(istype(O, /obj/item/weapon/storage/bag))
+		var/obj/item/weapon/storage/P = O
+		var/loaded = 0
+		for(var/obj/G in P.contents)
+			if(istype(G, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
+				loaded = 1
+				monkeys++
+				qdel(G)
+		if(loaded)
+			to_chat(user, "<span class='notice'>You fill [src] with the monkey cubes stored in [O]. [src] now has [monkeys] monkey cubes stored.</span>")
+		return
+	..()
+
 /datum/action/innate/camera_off/xenobio/Activate()
 	if(!target || !ishuman(target))
 		return
@@ -82,9 +102,8 @@
 	origin.monkey_recycle_action.Remove(C)
 	//All of this stuff below could probably be a proc for all advanced cameras, only the action removal needs to be camera specific
 	remote_eye.eye_user = null
+	C.reset_perspective(null)
 	if(C.client)
-		C.client.perspective = MOB_PERSPECTIVE
-		C.client.eye = src
 		C.client.images -= remote_eye.user_image
 		for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
 			C.client.images -= chunk.obscured
@@ -109,6 +128,8 @@
 			S.forceMove(remote_eye.loc)
 			S.visible_message("[S] warps in!")
 			X.stored_slimes -= S
+	else
+		to_chat(owner, "<span class='notice'>Target is not near a camera. Cannot proceed.</span>")
 
 /datum/action/innate/slime_pick_up
 	name = "Pick up Slime"
@@ -132,7 +153,8 @@
 				S.visible_message("[S] vanishes in a flash of light!")
 				S.forceMove(X)
 				X.stored_slimes += S
-
+	else
+		to_chat(owner, "<span class='notice'>Target is not near a camera. Cannot proceed.</span>")
 
 /datum/action/innate/feed_slime
 	name = "Feed Slimes"
@@ -151,7 +173,8 @@
 			food.LAssailant = C
 			X.monkeys --
 			to_chat(owner, "[X] now has [X.monkeys] monkeys left.")
-
+	else
+		to_chat(owner, "<span class='notice'>Target is not near a camera. Cannot proceed.</span>")
 
 /datum/action/innate/monkey_recycle
 	name = "Recycle Monkeys"
@@ -168,5 +191,7 @@
 		for(var/mob/living/carbon/human/M in remote_eye.loc)
 			if(issmall(M) && M.stat)
 				M.visible_message("[M] vanishes as they are reclaimed for recycling!")
-				X.monkeys += 0.2
+				X.monkeys = round(X.monkeys + 0.2,0.1)
 				qdel(M)
+	else
+		to_chat(owner, "<span class='notice'>Target is not near a camera. Cannot proceed.</span>")

code/modules/surgery/organs/organ_external.dm

@@ -18,6 +18,9 @@
 	var/model
 	var/force_icon
 
+	var/icobase = 'icons/mob/human_races/r_human.dmi'		// Normal icon set.
+	var/deform = 'icons/mob/human_races/r_def_human.dmi'	// Mutated icon set.
+
 	var/damage_state = "00"
 	var/brute_dam = 0
 	var/burn_dam = 0
@@ -127,9 +130,12 @@
 
 /obj/item/organ/external/New(var/mob/living/carbon/holder)
 	..()
-	if(istype(holder, /mob/living/carbon/human))
-		replaced(holder)
-		sync_colour_to_human(holder)
+	var/mob/living/carbon/human/H = holder
+	icobase = species.icobase
+	deform = species.deform
+	if(istype(H))
+		replaced(H)
+		sync_colour_to_human(H)
 	spawn(1)
 		get_icon()
 

code/modules/surgery/organs/organ_icon.dm

@@ -14,6 +14,16 @@ var/global/list/limb_icon_cache = list()
 		overlays += organ.mob_icon
 		child_icons += organ.mob_icon
 
+/obj/item/organ/external/proc/change_organ_icobase(var/new_icobase, var/new_deform, var/owner_sensitive) //Change the icobase/deform of this organ. If owner_sensitive is set, that means the proc won't mess with frankenstein limbs.
+	if(owner_sensitive) //This and the below statements mean that the icobase/deform will only get updated if the limb is the same species as and is owned by the mob it's attached to.
+		if(species && owner.species && species.name != owner.species.name)
+			return
+		if(dna.unique_enzymes != owner.dna.unique_enzymes) // This isn't MY arm
+			return
+
+	icobase = new_icobase ? new_icobase : icobase
+	deform	= new_deform ? new_deform : deform
+
 /obj/item/organ/external/proc/sync_colour_to_human(var/mob/living/carbon/human/H)
 	if(status & ORGAN_ROBOT && !(species && species.name == "Machine")) //machine people get skin color
 		return
@@ -29,6 +39,9 @@ var/global/list/limb_icon_cache = list()
 	if(H.species.bodyflags & HAS_SKIN_COLOR)
 		s_tone = null
 		s_col = list(H.r_skin, H.g_skin, H.b_skin)
+	if(H.species.bodyflags & HAS_ICON_SKIN_TONE)
+		var/obj/item/organ/external/chest/C = H.get_organ("chest")
+		change_organ_icobase(C.icobase, C.deform)
 
 /obj/item/organ/external/proc/sync_colour_to_dna()
 	if(status & ORGAN_ROBOT)
@@ -171,10 +184,10 @@ var/global/list/limb_icon_cache = list()
 			icon_file = 'icons/mob/human_races/robotic.dmi'
 		else
 			if(status & ORGAN_MUTATED)
-				icon_file = species.deform
+				icon_file = deform
 			else
 				// Congratulations, you are normal
-				icon_file = species.icobase
+				icon_file = icobase
 	return list(icon_file, new_icon_state)
 
 /obj/item/organ/external/chest/get_icon_state(skeletal)