Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

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

@@ -263,6 +263,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set name = "Become mouse"
 	set category = "Ghost"
 
+	var/timedifference = world.time - client.time_died_as_mouse
+	if(client.time_died_as_mouse && timedifference <= mouse_respawn_time * 600)
+		var/timedifference_text
+		timedifference_text = time2text(mouse_respawn_time * 600 - timedifference,"mm:ss")
+		src << "<span class='warning'>You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left.</span>"
+		return
+
 	//find a viable mouse candidate
 	var/mob/living/simple_animal/mouse/host
 	var/obj/machinery/atmospherics/unary/vent_pump/vent_found

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

@@ -10,14 +10,13 @@
 	var/construction_time = 75
 	var/searching = 0
 	var/askDelay = 10 * 60 * 1
-
+	var/mob/living/carbon/brain/brainmob = null
 	req_access = list(access_robotics)
 	var/locked = 0
-	var/mob/living/carbon/brain/brainmob = null//The current occupant.
 	var/obj/mecha = null//This does not appear to be used outside of reference in mecha.dm.
 
 	attack_self(mob/user as mob)
-		if(!brainmob && searching == 0)
+		if(!brainmob.key && searching == 0)
 			//Start the process of searching for a new user.
 			user << "\blue You carefully locate the manual activation switch and start the positronic brain's boot process."
 			icon_state = "posibrain-searching"
@@ -37,7 +36,7 @@
 		spawn(0)
 			if(!C)	return
 			var/response = alert(C, "Someone is requesting a personality for a positronic brain. Would you like to play as one?", "Positronic brain request", "Yes", "No", "Never for this round")
-			if(!C || brainmob)	return		//handle logouts that happen whilst the alert is waiting for a response, and responses issued after a brain has been located.
+			if(!C || brainmob.key)	return		//handle logouts that happen whilst the alert is waiting for a response, and responses issued after a brain has been located.
 			if(response == "Yes")
 				transfer_personality(C.mob)
 			else if (response == "Never for this round")
@@ -47,29 +46,15 @@
 
 	proc/transfer_personality(var/mob/candidate)
 
-		var/mob/living/carbon/brain/B = new(src)
-
 		src.searching = 0
-
-		src.brainmob = B
 		src.brainmob.mind = candidate.mind
-
-		src.brainmob.name = "PBU-[rand(100, 999)]"
-		src.brainmob.real_name = "PBU-[rand(100, 999)]"
-		src.brainmob.loc = src
-		src.brainmob.container = src
-		src.brainmob.robot_talk_understand = 1
-		src.brainmob.stat = 0
-		src.brainmob.silent = 0
-		src.brainmob.brain_op_stage = 4.0
 		src.brainmob.key = candidate.key
-		dead_mob_list -= src.brainmob
-		living_mob_list += src.brainmob
+		src.name = "positronic brain ([src.brainmob.name])"
 
 		src.brainmob << "<b>You are a positronic brain, brought into existence on [station_name()].</b>"
 		src.brainmob << "<b>As a synthetic intelligence, you answer to all crewmembers, as well as the AI.</b>"
 		src.brainmob << "<b>Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.</b>"
-		src.brainmob << "Use say :b to speak to other artificial intelligences."
+		src.brainmob << "<b>Use say :b to speak to other artificial intelligences.</b>"
 		src.brainmob.mind.assigned_role = "Positronic Brain"
 
 		var/turf/T = get_turf_or_move(src.loc)
@@ -100,12 +85,14 @@
 	var/msg = "<span class='info'>*---------*\nThis is \icon[src] \a <EM>[src]</EM>!\n[desc]\n"
 	msg += "<span class='warning'>"
 
-	if(src.brainmob)
+	if(src.brainmob.key)
 		switch(src.brainmob.stat)
 			if(CONSCIOUS)
 				if(!src.brainmob.client)	msg += "It appears to be in stand-by mode.\n" //afk
 			if(UNCONSCIOUS)		msg += "<span class='warning'>It doesn't seem to be responsive.</span>\n"
 			if(DEAD)			msg += "<span class='deadsay'>It appears to be completely inactive.</span>\n"
+	else
+		msg += "<span class='deadsay'>It appears to be completely inactive.</span>\n"
 	msg += "<span class='info'>*---------*</span>"
 	usr << msg
 	return
@@ -121,4 +108,19 @@
 				brainmob.emp_damage += rand(10,20)
 			if(3)
 				brainmob.emp_damage += rand(0,10)
+	..()
+
+/obj/item/device/posibrain/New()
+
+	src.brainmob = new(src)
+	src.brainmob.name = "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]"
+	src.brainmob.real_name = src.brainmob.name
+	src.brainmob.loc = src
+	src.brainmob.container = src
+	src.brainmob.robot_talk_understand = 1
+	src.brainmob.stat = 0
+	src.brainmob.silent = 0
+	src.brainmob.brain_op_stage = 4.0
+	dead_mob_list -= src.brainmob
+
 	..()

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

@@ -188,7 +188,7 @@
 					status = "MISSING!"
 				if(status == "")
 					status = "OK"
-				src.show_message(text("\t []My [] is [].",status=="OK"?"\blue ":"\red ",org.getDisplayName(),status),1)
+				src.show_message(text("\t []My [] is [].",status=="OK"?"\blue ":"\red ",org.display_name,status),1)
 			if((SKELETON in H.mutations) && (!H.w_uniform) && (!H.wear_suit))
 				H.play_xylophone()
 		else

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

@@ -596,3 +596,10 @@
 	set category = "IC"
 
 	pose =  copytext(sanitize(input(usr, "This is [src]. \He is...", "Pose", null)  as text), 1, MAX_MESSAGE_LEN)
+
+/mob/living/carbon/human/verb/set_flavor()
+	set name = "Set Flavour Text"
+	set desc = "Sets an extended description of your character's features."
+	set category = "IC"
+
+	flavor_text =  copytext(sanitize(input(usr, "Please enter your new flavour text.", "Flavour text", null)  as text), 1)

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

@@ -38,6 +38,11 @@
 	organs_by_name["l_foot"] = new/datum/organ/external/l_foot(organs_by_name["l_leg"])
 	organs_by_name["r_foot"] = new/datum/organ/external/r_foot(organs_by_name["r_leg"])
 
+	new/datum/organ/internal/heart(src)
+	new/datum/organ/internal/lungs(src)
+	new/datum/organ/internal/liver(src)
+	new/datum/organ/internal/kidney(src)
+
 
 	// connect feet to legs and hands to arms
 /*	var/datum/organ/external/organ = organs_by_name["l_hand"]
@@ -899,24 +904,51 @@
 					H.brainmob.mind.transfer_to(src)
 					del(H)
 
-	var/datum/organ/external/chest/E = get_organ("chest")
-	if(E.ruptured_lungs == 1)
-		E.ruptured_lungs = 0
+	for(var/datum/organ/internal/I in internal_organs)
+		I.damage = 0
 
 	for (var/datum/disease/virus in viruses)
 		virus.cure()
 	..()
 
 /mob/living/carbon/human/proc/is_lung_ruptured()
-	var/datum/organ/external/chest/E = get_organ("chest")
-	return E.ruptured_lungs
-
+	var/datum/organ/internal/lungs/L = internal_organs["lungs"]
+	return L.is_bruised()
 
 /mob/living/carbon/human/proc/rupture_lung()
-	var/datum/organ/external/chest/E = get_organ("chest")
+	var/datum/organ/internal/lungs/L = internal_organs["lungs"]
 
-	if(E.ruptured_lungs == 0)
+	if(!L.is_bruised())
 		src.custom_pain("You feel a stabbing pain in your chest!", 1)
+		L.damage = L.min_bruised_damage
 
-	E.ruptured_lungs = 1
+/*
+/mob/living/carbon/human/verb/simulate()
+	set name = "sim"
+	set background = 1
 
+	var/damage = input("Wound damage","Wound damage") as num
+
+	var/germs = 0
+	var/tdamage = 0
+	var/ticks = 0
+	while (germs < 2501 && ticks < 100000 && round(damage/10)*20)
+		diary << "VIRUS TESTING: [ticks] : germs [germs] tdamage [tdamage] prob [round(damage/10)*20]"
+		ticks++
+		if (prob(round(damage/10)*20))
+			germs++
+		if (germs == 100)
+			world << "Reached stage 1 in [ticks] ticks"
+		if (germs > 100)
+			if (prob(10))
+				damage++
+				germs++
+		if (germs == 1000)
+			world << "Reached stage 2 in [ticks] ticks"
+		if (germs > 1000)
+			damage++
+			germs++
+		if (germs == 2500)
+			world << "Reached stage 3 in [ticks] ticks"
+	world << "Mob took [tdamage] tox damage"
+*/

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

@@ -461,6 +461,7 @@ It can still be worn/put on as normal.
 */
 /obj/effect/equip_e/human/done()	//TODO: And rewrite this :< ~Carn
 	target.cpr_time = 1
+	if(isanimal(source)) return //animals cannot strip people
 	if(!source || !target) return		//Target or source no longer exist
 	if(source.loc != s_loc) return		//source has moved
 	if(target.loc != t_loc) return		//target has moved

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

@@ -155,6 +155,16 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 						//At this point, we dun care which blood we are adding to, as long as they get more blood.
 						B.volume = B.volume + 0.1 // regenerate blood VERY slowly
 
+			// Damaged heart virtually reduces the blood volume, as the blood isn't
+			// being pumped properly anymore.
+			var/datum/organ/internal/heart/heart = internal_organs["heart"]
+			switch(heart.damage)
+				if(5 to 10)
+					blood_volume *= 0.8
+				if(11 to 20)
+					blood_volume *= 0.5
+				if(21 to INFINITY)
+					blood_volume *= 0.3
 
 			switch(blood_volume)
 				if(BLOOD_VOLUME_SAFE to 10000)
@@ -617,7 +627,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 					Paralyse(3) // 3 gives them one second to wake up and run away a bit!
 					if(SA_pp > SA_sleep_min) // Enough to make us sleep as well
 						sleeping = max(sleeping+2, 10)
-				else if(SA_pp > 0.01)	// There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
+				else if(SA_pp > 0.15)	// There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
 					if(prob(20))
 						spawn(0) emote(pick("giggle", "laugh"))
 				SA.moles = 0
@@ -1044,6 +1054,22 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 			var/datum/organ/O = pick(organs)
 			O.trace_chemicals[A.name] = 100
 
+		var/damaged_liver_process_accuracy = 10
+		if(life_tick % damaged_liver_process_accuracy == 0)
+			// Damaged liver means some chemicals are very dangerous
+			var/datum/organ/internal/liver/liver = internal_organs["liver"]
+			if(liver.damage >= liver.min_bruised_damage)
+				for(var/datum/reagent/R in src.reagents.reagent_list)
+					// Ethanol and all drinks are bad
+					if(istype(R, /datum/reagent/ethanol))
+						adjustToxLoss(0.1 * damaged_liver_process_accuracy)
+
+				// Can't cope with toxins at all
+				for(var/toxin in list("toxin", "plasma", "sacid", "pacid", "cyanide", "lexorin", "amatoxin", "chloralhydrate", "carpotoxin", "zombiepowder", "mindbreaker"))
+					if(src.reagents.has_reagent(toxin))
+						adjustToxLoss(0.3 * damaged_liver_process_accuracy)
+
+
 		updatehealth()
 
 		return //TODO: DEFERRED
@@ -1260,10 +1286,9 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 					if("lizard","slime")
 						see_in_dark = 3
 						see_invisible = SEE_INVISIBLE_LEVEL_ONE
-					if("tajaran")
-						see_in_dark = 4
-					if("shadow")
+					if("shadow","tajaran")
 						see_in_dark = 8
+						see_invisible = SEE_INVISIBLE_LEVEL_ONE
 					else
 						see_in_dark = 2
 
@@ -1403,7 +1428,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
 
 			var/masked = 0
 
-			if( istype(head, /obj/item/clothing/head/welding) )
+			if( istype(head, /obj/item/clothing/head/welding) || istype(head, /obj/item/clothing/head/helmet/space/unathi))
 				var/obj/item/clothing/head/welding/O = head
 				if(!O.up && tinted_weldhelh)
 					client.screen += global_hud.darkMask

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

@@ -222,6 +222,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 	var/husk_color_mod = rgb(96,88,80)
 	var/hulk_color_mod = rgb(48,224,40)
 	var/plant_color_mod = rgb(144,224,144)
+	var/necrosis_color_mod = rgb(10,50,0)
 
 	var/husk = (HUSK in src.mutations)  //100% unnecessary -Agouri	//nope, do you really want to iterate through src.mutations repeatedly? -Pete
 	var/fat = (FAT in src.mutations)
@@ -283,6 +284,9 @@ proc/get_damage_icon_part(damage_state, body_part)
 				temp = new /icon(icobase, "[part.icon_name]")
 			if(part.status & ORGAN_ROBOT)
 				temp.GrayScale()
+			if(part.status & ORGAN_DEAD)
+				temp.ColorTone(necrosis_color_mod)
+				temp.SetIntensity(0.7)
 			else if(!skeleton)
 				if(husk)
 					temp.ColorTone(husk_color_mod)
@@ -789,7 +793,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 		if(!wear_suit || !(wear_suit.flags_inv & HIDEJUMPSUIT) && !istype(wear_suit, /obj/item/clothing/suit/space))
 			overlays_lying[TAIL_LAYER] = image("icon" = 'icons/effects/species.dmi', "icon_state" = "tajtail_l")
 			overlays_standing[TAIL_LAYER] = image("icon" = 'icons/effects/species.dmi', "icon_state" = "tajtail_s")
-	else if( cur_species == "Soghun")
+	else if( cur_species == "Unathi")
 		if(!wear_suit || !(wear_suit.flags_inv & HIDEJUMPSUIT) && !istype(wear_suit, /obj/item/clothing/suit/space))
 			overlays_lying[TAIL_LAYER] = image("icon" = 'icons/effects/species.dmi', "icon_state" = "sogtail_l")
 			overlays_standing[TAIL_LAYER] = image("icon" = 'icons/effects/species.dmi', "icon_state" = "sogtail_s")

code/modules/mob/living/say.dm

@@ -15,6 +15,9 @@ var/list/department_radio_keys = list(
 	  ":t" = "Syndicate",	"#t" = "Syndicate",		".t" = "Syndicate",
 	  ":u" = "Supply",		"#u" = "Supply",		".u" = "Supply",
 	  ":g" = "changeling",	"#g" = "changeling",	".g" = "changeling",
+	  ":k" = "skrell",		"#k" = "skrell",		".k" = "skrell",
+	  ":j" = "tajaran",		"#j" = "tajaran",		".j" = "tajaran",
+	  ":o" = "soghun",		"#o" = "soghun",		".o" = "soghun",
 
 	  ":R" = "right hand",	"#R" = "right hand",	".R" = "right hand",
 	  ":L" = "left hand",	"#L" = "left hand",		".L" = "left hand",
@@ -31,6 +34,9 @@ var/list/department_radio_keys = list(
 	  ":T" = "Syndicate",	"#T" = "Syndicate",		".T" = "Syndicate",
 	  ":U" = "Supply",		"#U" = "Supply",		".U" = "Supply",
 	  ":G" = "changeling",	"#G" = "changeling",	".G" = "changeling",
+	  ":K" = "skrell",		"#K" = "skrell",		".K" = "skrell",
+	  ":J" = "tajaran",		"#J" = "tajaran",		".J" = "tajaran",
+	  ":O" = "soghun",		"#O" = "soghun",		".O" = "soghun",
 
 	  //kinda localization -- rastaf0
 	  //same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.
@@ -139,27 +145,6 @@ var/list/department_radio_keys = list(
 	if (!message)
 		return
 
-	//work out if we're speaking skrell or not
-	var/is_speaking_skrell = 0
-	if(copytext(message, 1, 3) == ":k" || copytext(message, 1, 3) == ":K")
-		message = copytext(message, 3)
-		if(skrell_talk_understand || universal_speak)
-			is_speaking_skrell = 1
-
-	//work out if we're speaking soghun or not
-	var/is_speaking_soghun = 0
-	if(copytext(message, 1, 3) == ":o" || copytext(message, 1, 3) == ":O")
-		message = copytext(message, 3)
-		if(soghun_talk_understand || universal_speak)
-			is_speaking_soghun = 1
-
-	//work out if we're speaking soghun or not
-	var/is_speaking_taj = 0
-	if(copytext(message, 1, 3) == ":j" || copytext(message, 1, 3) == ":J")
-		message = copytext(message, 3)
-		if(tajaran_talk_understand || universal_speak)
-			is_speaking_taj = 1
-
 	// :downs:
 	if (getBrainLoss() >= 60)
 		message = replacetext(message, " am ", " ")
@@ -191,6 +176,10 @@ var/list/department_radio_keys = list(
 */
 	var/list/obj/item/used_radios = new
 
+	var/is_speaking_skrell = 0
+	var/is_speaking_soghun = 0
+	var/is_speaking_taj = 0
+
 	switch (message_mode)
 		if ("headset")
 			if (src:ears)
@@ -269,6 +258,18 @@ var/list/department_radio_keys = list(
 			message_range = 1
 			italics = 1
 
+		if ("tajaran")
+			if(tajaran_talk_understand || universal_speak)
+				is_speaking_taj = 1
+
+		if ("soghun")
+			if(soghun_talk_understand || universal_speak)
+				is_speaking_soghun = 1
+
+		if ("skrell")
+			if(skrell_talk_understand || universal_speak)
+				is_speaking_skrell = 1
+
 		if("changeling")
 			if(mind && mind.changeling)
 				for(var/mob/Changeling in mob_list)

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

@@ -32,5 +32,12 @@
 		if(DEAD)			msg += "<span class='deadsay'>It looks completely unsalvageable.</span>\n"
 	msg += "*---------*</span>"
 
+	if(print_flavor_text()) msg += "[print_flavor_text()]\n"
+
+	if (pose)
+		if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
+			pose = addtext(pose,".") //Makes sure all emotes end with a period.
+		msg += "\nIt is [pose]"
+
 	usr << msg
 	return

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

@@ -54,13 +54,13 @@
 	var/speed = 0 //Cause sec borgs gotta go fast //No they dont!
 	var/scrambledcodes = 0 // Used to determine if a borg shows up on the robotics console.  Setting to one hides them.
 	var/braintype = "Cyborg"
+	var/pose
 
 /mob/living/silicon/robot/New(loc,var/syndie = 0)
 	spark_system = new /datum/effect/effect/system/spark_spread()
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 
-
 	ident = rand(1, 999)
 	updatename("Default")
 	updateicon()
@@ -101,7 +101,6 @@
 
 	playsound(loc, 'sound/voice/liveagain.ogg', 75, 1)
 
-
 //If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
 //Improved /N
 /mob/living/silicon/robot/Del()
@@ -208,6 +207,18 @@
 	real_name = changed_name
 	name = real_name
 
+/mob/living/silicon/robot/verb/Namepick()
+	if(custom_name)
+		return 0
+
+	var/newname
+	newname = input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text
+	if (newname != "")
+		custom_name = newname
+
+	updatename("Default")
+	updateicon()
+
 /mob/living/silicon/robot/verb/cmd_robot_alerts()
 	set category = "Robot Commands"
 	set name = "Show Alerts"
@@ -424,9 +435,23 @@
 
 	else if (istype(W, /obj/item/weapon/crowbar))	// crowbar means open or close the cover
 		if(opened)
-			user << "You close the cover."
-			opened = 0
-			updateicon()
+			if(cell)
+				user << "You close the cover."
+				opened = 0
+				updateicon()
+			else if(mmi && wiresexposed && isWireCut(1) && isWireCut(2) && isWireCut(3) && isWireCut(4) && isWireCut(5))
+				//Cell is out, wires are exposed, remove MMI, produce damaged chassis, baleet original mob.
+				user << "You jam the crowbar into the robot and begin levering [mmi]."
+				sleep(30)
+				user << "You damage some parts of the chassis, but eventually manage to rip out [mmi]!"
+				var/obj/item/robot_parts/robot_suit/C = new/obj/item/robot_parts/robot_suit(loc)
+				C.l_leg = new/obj/item/robot_parts/l_leg(C)
+				C.r_leg = new/obj/item/robot_parts/r_leg(C)
+				C.l_arm = new/obj/item/robot_parts/l_arm(C)
+				C.r_arm = new/obj/item/robot_parts/r_arm(C)
+				C.updateicon()
+				new/obj/item/robot_parts/chest(loc)
+				src.Del()
 		else
 			if(locked)
 				user << "The cover is locked and cannot be opened."
@@ -767,24 +792,8 @@
 	overlays.Cut()
 	if(stat == 0)
 		overlays += "eyes"
-		if(icon_state == "robot")
-			overlays.Cut()
-			overlays += "eyes-standard"
-		if(icon_state == "toiletbot")
-			overlays.Cut()
-			overlays += "eyes-toiletbot"
-		if(icon_state == "bloodhound")
-			overlays.Cut()
-			overlays += "eyes-bloodhound"
-		if(icon_state =="landmate")
-			overlays.Cut()
-			overlays += "eyes-landmate"
-		if(icon_state =="mopgearrex")
-			overlays.Cut()
-			overlays += "eyes-mopgearrex"
-		if(icon_state =="Miner" || icon_state =="Miner+j")
-			overlays.Cut()
-			overlays += "eyes-Miner"
+		overlays.Cut()
+		overlays += "eyes-[icon_state]"
 	else
 		overlays -= "eyes"
 
@@ -986,4 +995,17 @@
 		W.attack_self(src)
 
 	return
-
+
+/mob/living/silicon/robot/verb/pose()
+	set name = "Set Pose"
+	set desc = "Sets a description which will be shown when someone examines you."
+	set category = "IC"
+
+	pose =  copytext(sanitize(input(usr, "This is [src]. It is...", "Pose", null)  as text), 1, MAX_MESSAGE_LEN)
+
+/mob/living/silicon/robot/verb/set_flavor()
+	set name = "Set Flavour Text"
+	set desc = "Sets an extended description of your character's features."
+	set category = "IC"
+
+	flavor_text =  copytext(sanitize(input(usr, "Please enter your new flavour text.", "Flavour text", null)  as text), 1)

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

@@ -130,5 +130,5 @@
 	rendered = "<i><span class='game say'>Robotic Talk, <span class='name'>[name]</span> <span class='message'>[message_a]</span></span></i>"
 
 	for (var/mob/M in dead_mob_list)
-		if(!istype(M,/mob/new_player) && !(istype(M,/mob/living/carbon/brain)))//No meta-evesdropping
+		if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain)) //No meta-evesdropping
 			M.show_message(rendered, 2)

code/modules/mob/living/simple_animal/friendly/crab.dm

@@ -5,6 +5,7 @@
 	icon_state = "crab"
 	icon_living = "crab"
 	icon_dead = "crab_dead"
+	small = 1
 	speak_emote = list("clicks")
 	emote_hear = list("clicks")
 	emote_see = list("clacks")

code/modules/mob/living/simple_animal/friendly/farm_animals.dm

@@ -167,6 +167,7 @@
 	health = 1
 	var/amount_grown = 0
 	pass_flags = PASSTABLE | PASSGRILLE
+	small = 1
 
 /mob/living/simple_animal/chick/New()
 	..()
@@ -208,6 +209,7 @@ var/global/chicken_count = 0
 	var/eggsleft = 0
 	var/color
 	pass_flags = PASSTABLE
+	small = 1
 
 /mob/living/simple_animal/chicken/New()
 	..()

code/modules/mob/living/simple_animal/friendly/lizard.dm

@@ -5,6 +5,7 @@
 	icon_state = "lizard"
 	icon_living = "lizard"
 	icon_dead = "lizard-dead"
+	small = 1
 	speak_emote = list("hisses")
 	health = 5
 	maxHealth = 5

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -10,6 +10,7 @@
 	emote_hear = list("squeeks","squeaks","squiks")
 	emote_see = list("runs in a circle", "shakes", "scritches at something")
 	pass_flags = PASSTABLE
+	small = 1
 	speak_chance = 1
 	turns_per_move = 5
 	see_in_dark = 6
@@ -33,6 +34,20 @@
 		for(var/mob/M in view())
 			M << 'sound/effects/mousesqueek.ogg'
 
+	if(!ckey && stat == CONSCIOUS && prob(0.5))
+		stat = UNCONSCIOUS
+		icon_state = "mouse_[color]_sleep"
+		wander = 0
+		speak_chance = 0
+		//snuffles
+	else if(stat == UNCONSCIOUS)
+		if(ckey || prob(1))
+			stat = CONSCIOUS
+			icon_state = "mouse_[color]"
+			wander = 1
+		else if(prob(5))
+			emote("snuffles")
+
 /mob/living/simple_animal/mouse/New()
 	..()
 	if(!color)
@@ -48,6 +63,8 @@
 	src.stat = DEAD
 	src.icon_dead = "mouse_[color]_splat"
 	src.icon_state = "mouse_[color]_splat"
+	if(client)
+		client.time_died_as_mouse = world.time
 
 //copy paste from alien/larva, if that func is updated please update this one also
 /mob/living/simple_animal/mouse/verb/ventcrawl()
@@ -84,9 +101,11 @@
 			if(loc==startloc)
 				var/obj/target_vent = vents[selection_position]
 				if(target_vent)
+					/*
 					for(var/mob/O in oviewers(src, null))
 						if ((O.client && !( O.blinded )))
 							O.show_message(text("<B>[src] scrambles into the ventillation ducts!</B>"), 1)
+					*/
 					loc = target_vent.loc
 			else
 				src << "\blue You need to remain still while entering a vent."
@@ -107,15 +126,19 @@
 	if (layer != TURF_LAYER+0.2)
 		layer = TURF_LAYER+0.2
 		src << text("\blue You are now hiding.")
+		/*
 		for(var/mob/O in oviewers(src, null))
 			if ((O.client && !( O.blinded )))
 				O << text("<B>[] scurries to the ground!</B>", src)
+		*/
 	else
 		layer = MOB_LAYER
 		src << text("\blue You have stopped hiding.")
+		/*
 		for(var/mob/O in oviewers(src, null))
 			if ((O.client && !( O.blinded )))
 				O << text("[] slowly peaks up from the ground...", src)
+		*/
 
 //make mice fit under tables etc? this was hacky, and not working
 /*
@@ -152,6 +175,11 @@
 			M << 'sound/effects/mousesqueek.ogg'
 	..()
 
+/mob/living/simple_animal/mouse/Die()
+	if(client)
+		client.time_died_as_mouse = world.time
+	..()
+
 /*
  * Mouse types
  */

code/modules/mob/living/simple_animal/friendly/mushroom.dm

@@ -4,6 +4,7 @@
 	icon_state = "mushroom"
 	icon_living = "mushroom"
 	icon_dead = "mushroom_dead"
+	small = 1
 	speak_chance = 0
 	turns_per_move = 1
 	maxHealth = 5

code/modules/mob/living/simple_animal/friendly/spiderbot.dm

@@ -0,0 +1,325 @@
+/mob/living/simple_animal/spiderbot
+
+	min_oxy = 0
+	max_tox = 0
+	max_co2 = 0
+	minbodytemp = 0
+	maxbodytemp = 500
+
+	var/obj/item/device/radio/borg/radio = null
+	var/mob/living/silicon/ai/connected_ai = null
+	var/obj/item/weapon/cell/cell = null
+	var/obj/machinery/camera/camera = null
+	var/obj/item/device/mmi/mmi = null
+	var/list/req_access = list(access_robotics) //Access needed to pop out the brain.
+
+	name = "Spider-bot"
+	desc = "A skittering robotic friend!"
+	icon = 'icons/mob/robots.dmi'
+	icon_state = "spiderbot-chassis"
+	icon_living = "spiderbot-chassis"
+	icon_dead = "spiderbot-smashed"
+	wander = 0
+
+	health = 10
+	maxHealth = 10
+
+	attacktext = "shocks"
+	attacktext = "shocks"
+	melee_damage_lower = 1
+	melee_damage_upper = 3
+
+	response_help  = "pets"
+	response_disarm = "shoos"
+	response_harm   = "stomps on"
+
+	var/obj/item/held_item = null //Storage for single item they can hold.
+	var/emagged = 0               //IS WE EXPLODEN?
+	var/syndie = 0                //IS WE SYNDICAT? (currently unused)
+	speed = -1                    //Spiderbots gotta go fast.
+	//pass_flags = PASSTABLE      //Maybe griefy?
+	small = 1
+	speak_emote = list("beeps","clicks","chirps")
+
+/mob/living/simple_animal/spiderbot/attackby(var/obj/item/O as obj, var/mob/user as mob)
+
+	if(istype(O, /obj/item/device/mmi) || istype(O, /obj/item/device/posibrain))
+		var/obj/item/device/mmi/B = O
+		if(src.mmi) //There's already a brain in it.
+			user << "\red There's already a brain in [src]!"
+			return
+		if(!B.brainmob)
+			user << "\red Sticking an empty MMI into the frame would sort of defeat the purpose."
+			return
+		if(!B.brainmob.key)
+			var/ghost_can_reenter = 0
+			if(B.brainmob.mind)
+				for(var/mob/dead/observer/G in player_list)
+					if(G.can_reenter_corpse && G.mind == B.brainmob.mind)
+						ghost_can_reenter = 1
+						break
+			if(!ghost_can_reenter)
+				user << "<span class='notice'>[O] is completely unresponsive; there's no point.</span>"
+				return
+
+		if(B.brainmob.stat == DEAD)
+			user << "\red [O] is dead. Sticking it into the frame would sort of defeat the purpose."
+			return
+
+		if(jobban_isbanned(B.brainmob, "Cyborg"))
+			user << "\red [O] does not seem to fit."
+			return
+
+		user << "\blue You install [O] in [src]!"
+
+		user.drop_item()
+		src.mmi = O
+		src.transfer_personality(O)
+
+		O.loc = src
+		src.update_icon()
+		return 1
+
+	if (istype(O, /obj/item/weapon/weldingtool))
+		var/obj/item/weapon/weldingtool/WT = O
+		if (WT.remove_fuel(0))
+			if(health < maxHealth)
+				health += pick(1,1,1,2,2,3)
+				if(health > maxHealth)
+					health = maxHealth
+				add_fingerprint(user)
+				for(var/mob/W in viewers(user, null))
+					W.show_message(text("\red [user] has spot-welded some of the damage to [src]!"), 1)
+			else
+				user << "\blue [src] is undamaged!"
+		else
+			user << "Need more welding fuel!"
+			return
+	else if(istype(O, /obj/item/weapon/card/id)||istype(O, /obj/item/device/pda))
+		if (!mmi)
+			user << "\red There's no reason to swipe your ID - the spiderbot has no brain to remove."
+			return 0
+
+		var/obj/item/weapon/card/id/id_card
+
+		if(istype(O, /obj/item/weapon/card/id))
+			id_card = O
+		else
+			var/obj/item/device/pda/pda = O
+			id_card = pda.id
+
+		if(access_robotics in id_card.access)
+			user << "\blue You swipe your access card and pop the brain out of [src]."
+			eject_brain()
+
+			if(held_item)
+				held_item.loc = src.loc
+				held_item = null
+
+			return 1
+		else
+			user << "\red You swipe your card, with no effect."
+			return 0
+	else if (istype(O, /obj/item/weapon/card/emag))
+		if (emagged)
+			user << "\red [src] is already overloaded - better run."
+			return 0
+		else
+			emagged = 1
+			user << "\blue You short out the security protocols and overload [src]'s cell, priming it to explode in a short time."
+			spawn(100)	src << "\red Your cell seems to be outputting a lot of power..."
+			spawn(200)	src << "\red Internal heat sensors are spiking! Something is badly wrong with your cell!"
+			spawn(300)	src.explode()
+
+	else
+		if(O.force)
+			var/damage = O.force
+			if (O.damtype == HALLOSS)
+				damage = 0
+			adjustBruteLoss(damage)
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
+		else
+			usr << "\red This weapon is ineffective, it does no damage."
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red [user] gently taps [src] with the [O]. ")
+
+/mob/living/simple_animal/spiderbot/proc/transfer_personality(var/obj/item/device/mmi/M as obj)
+
+		src.mind = M.brainmob.mind
+		src.mind.key = M.brainmob.key
+		src.name = "Spider-bot ([M.brainmob.name])"
+
+/mob/living/simple_animal/spiderbot/proc/explode() //When emagged.
+	for(var/mob/M in viewers(src, null))
+		if ((M.client && !( M.blinded )))
+			M.show_message("\red [src] makes an odd warbling noise, fizzles, and explodes.")
+	explosion(get_turf(loc), -1, -1, 3, 5)
+	eject_brain()
+	Die()
+
+/mob/living/simple_animal/spiderbot/proc/update_icon()
+	if(mmi)
+		if (istype(mmi,/obj/item/device/mmi))
+			icon_state = "spiderbot-chassis-mmi"
+			icon_living = "spiderbot-chassis-mmi"
+		else
+			icon_state = "spiderbot-chassis-posi"
+			icon_living = "spiderbot-chassis-posi"
+	else
+		icon_state = "spiderbot-chassis"
+		icon_living = "spiderbot-chassis"
+
+/mob/living/simple_animal/spiderbot/proc/eject_brain()
+	if(mmi)
+		var/turf/T = get_turf(loc)
+		if(T)
+			mmi.loc = T
+		if(mind)	mind.transfer_to(mmi.brainmob)
+		mmi = null
+		src.name = "Spider-bot"
+		update_icon()
+
+/mob/living/simple_animal/spiderbot/Del()
+	eject_brain()
+	..()
+
+/mob/living/simple_animal/spiderbot/New()
+
+	radio = new /obj/item/device/radio/borg(src)
+	camera = new /obj/machinery/camera(src)
+	camera.c_tag = "Spiderbot-[real_name]"
+	camera.network = list("SS13")
+
+	..()
+
+/mob/living/simple_animal/spiderbot/Die()
+
+	living_mob_list -= src
+	dead_mob_list += src
+
+	if(camera)
+		camera.status = 0
+
+	robogibs(src.loc, viruses)
+	src.Del()
+	return
+
+//copy paste from alien/larva, if that func is updated please update this one also
+/mob/living/simple_animal/spiderbot/verb/ventcrawl()
+	set name = "Crawl through Vent"
+	set desc = "Enter an air vent and crawl through the pipe system."
+	set category = "Spiderbot"
+
+//	if(!istype(V,/obj/machinery/atmoalter/siphs/fullairsiphon/air_vent))
+//		return
+	var/obj/machinery/atmospherics/unary/vent_pump/vent_found
+	var/welded = 0
+	for(var/obj/machinery/atmospherics/unary/vent_pump/v in range(1,src))
+		if(!v.welded)
+			vent_found = v
+			break
+		else
+			welded = 1
+	if(vent_found)
+		if(vent_found.network&&vent_found.network.normal_members.len)
+			var/list/vents = list()
+			for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in vent_found.network.normal_members)
+				if(temp_vent.loc == loc)
+					continue
+				vents.Add(temp_vent)
+			var/list/choices = list()
+			for(var/obj/machinery/atmospherics/unary/vent_pump/vent in vents)
+				if(vent.loc.z != loc.z)
+					continue
+				var/atom/a = get_turf(vent)
+				choices.Add(a.loc)
+			var/turf/startloc = loc
+			var/obj/selection = input("Select a destination.", "Duct System") in choices
+			var/selection_position = choices.Find(selection)
+			if(loc==startloc)
+				var/obj/target_vent = vents[selection_position]
+				if(target_vent)
+					loc = target_vent.loc
+			else
+				src << "\blue You need to remain still while entering a vent."
+		else
+			src << "\blue This vent is not connected to anything."
+	else if(welded)
+		src << "\red That vent is welded."
+	else
+		src << "\blue You must be standing on or beside an air vent to enter it."
+	return
+
+//copy paste from alien/larva, if that func is updated please update this one alsoghost
+/mob/living/simple_animal/spiderbot/verb/hide()
+	set name = "Hide"
+	set desc = "Allows to hide beneath tables or certain items. Toggled on or off."
+	set category = "Spiderbot"
+
+	if (layer != TURF_LAYER+0.2)
+		layer = TURF_LAYER+0.2
+		src << text("\blue You are now hiding.")
+	else
+		layer = MOB_LAYER
+		src << text("\blue You have stopped hiding.")
+
+//Cannibalized from the parrot mob. ~Zuhayr
+
+/mob/living/simple_animal/spiderbot/verb/drop_held_item()
+	set name = "Drop held item"
+	set category = "Spiderbot"
+	set desc = "Drop the item you're holding."
+
+	if(stat)
+		return
+
+	if(!held_item)
+		usr << "\red You have nothing to drop!"
+		return 0
+
+	if(istype(held_item, /obj/item/weapon/grenade))
+		visible_message("\red [src] launches the [held_item]!", "\red You launch the [held_item]!", "You hear a skittering noise and a thump!")
+		var/obj/item/weapon/grenade/G = held_item
+		G.loc = src.loc
+		G.prime()
+		held_item = null
+		return 1
+
+	visible_message("\blue [src] drops the [held_item]!", "\blue You drop the [held_item]!", "You hear a skittering noise and a soft thump.")
+
+	held_item.loc = src.loc
+	held_item = null
+	return 1
+
+	return
+
+/mob/living/simple_animal/spiderbot/verb/get_item()
+	set name = "Pick up item"
+	set category = "Spiderbot"
+	set desc = "Allows you to take a nearby small item."
+
+	if(stat)
+		return -1
+
+	if(held_item)
+		src << "\red You are already holding the [held_item]"
+		return 1
+
+	var/list/items = list()
+	for(var/obj/item/I in view(1,src))
+		if(I.loc != src && I.w_class <= 2)
+			items.Add(I)
+
+	var/obj/selection = input("Select an item.", "Pickup") in items
+
+	if(selection)
+		held_item = selection
+		selection.loc = src
+		visible_message("\blue [src] scoops up the [held_item]!", "\blue You grab the [held_item]!", "You hear a skittering noise and a clink.")
+		return held_item
+
+	src << "\red There is nothing of interest to take."
+	return 0

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

@@ -8,7 +8,7 @@
 	var/projectiletype
 	var/projectilesound
 	var/casingtype
-	var/move_to_delay = 2 //delay for the automated movement.
+	var/move_to_delay = 4 //delay for the automated movement.
 	var/list/friends = list()
 	var/break_stuff_probability = 10
 	stop_automated_movement_when_pulled = 0
@@ -46,6 +46,13 @@
 				stance = HOSTILE_STANCE_ATTACK
 				T = M
 				break
+
+		if(istype(A, /obj/machinery/bot))
+			var/obj/machinery/bot/B = A
+			if (B.health > 0)
+				stance = HOSTILE_STANCE_ATTACK
+				T = B
+				break
 	return T
 
 
@@ -88,6 +95,9 @@
 		var/obj/mecha/M = target_mob
 		M.attack_animal(src)
 		return M
+	if(istype(target_mob,/obj/machinery/bot))
+		var/obj/machinery/bot/B = target_mob
+		B.attack_animal(src)
 
 /mob/living/simple_animal/hostile/proc/LoseTarget()
 	stance = HOSTILE_STANCE_IDLE

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

@@ -19,7 +19,7 @@
 	stop_automated_movement_when_pulled = 0
 	health = 300
 	maxHealth = 300
-	speed = 4
+	speed = 8
 	projectiletype = /obj/item/projectile/beam/drone
 	projectilesound = 'sound/weapons/laser3.ogg'
 	destroy_surroundings = 0
@@ -35,11 +35,16 @@
 	var/disabled = 0
 	var/exploding = 0
 
+	//Drones aren't affected by atmos.
 	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 = 600
 
 	var/has_loot = 1
 	faction = "malf_drone"
@@ -152,7 +157,7 @@
 	hostile_drone = 0
 	walk(src,0)
 
-/mob/living/simple_animal/Die()
+/mob/living/simple_animal/hostile/retaliate/malf_drone/Die()
 	src.visible_message("\blue \icon[src] [src] suddenly breaks apart.")
 	..()
 	del(src)

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

@@ -33,6 +33,7 @@
 	icon_living = "parrot_fly"
 	icon_dead = "parrot_dead"
 	pass_flags = PASSTABLE
+	small = 1
 
 	speak = list("Hi","Hello!","Cracker?","BAWWWWK george mellons griffing me")
 	speak_emote = list("squawks","says","yells")

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

@@ -446,10 +446,14 @@
 /mob/living/simple_animal/proc/SA_attackable(target_mob)
 	if (isliving(target_mob))
 		var/mob/living/L = target_mob
-		if(!L.stat || L.health <= 0)
+		if(!L.stat && L.health >= 0)
 			return (0)
 	if (istype(target_mob,/obj/mecha))
 		var/obj/mecha/M = target_mob
 		if (M.occupant)
 			return (0)
+	if (istype(target_mob,/obj/machinery/bot))
+		var/obj/machinery/bot/B = target_mob
+		if(B.health > 0)
+			return (0)
 	return (1)

code/modules/mob/mob_defines.dm

@@ -79,6 +79,7 @@
 	var/eye_stat = null//Living, potentially Carbon
 	var/lastpuke = 0
 	var/unacidable = 0
+	var/small = 0
 
 	var/name_archive //For admin things like possession
 

code/modules/mob/mob_helpers.dm

@@ -134,7 +134,7 @@ proc/hasorgans(A)
 			zone = "head"
 		if("mouth")
 			zone = "head"
-		if("l_hand")
+/*		if("l_hand")
 			zone = "l_arm"
 		if("r_hand")
 			zone = "r_arm"
@@ -144,6 +144,7 @@ proc/hasorgans(A)
 			zone = "r_leg"
 		if("groin")
 			zone = "chest"
+*/
 	return zone
 
 
@@ -171,7 +172,7 @@ proc/hasorgans(A)
 
 	// you can only miss if your target is standing and not restrained
 	if(!target.buckled && !target.lying)
-		var/miss_chance = max(10 + miss_chance_mod, 0)
+		var/miss_chance = 10
 		switch(zone)
 			if("head")
 				miss_chance = 40
@@ -191,6 +192,7 @@ proc/hasorgans(A)
 				miss_chance = 50
 			if("r_foot")
 				miss_chance = 50
+		miss_chance = max(miss_chance + miss_chance_mod, 0)
 		if(prob(miss_chance))
 			if(prob(70))
 				return null

code/modules/mob/new_player/new_player.dm

@@ -196,15 +196,11 @@
 			new_player_panel()
 
 		if(href_list["showpoll"])
-			usr << "\red DB usage has been disabled and that option should not have been available."
-			return
 
 			handle_player_polling()
 			return
 
 		if(href_list["pollid"])
-			usr << "\red DB usage has been disabled and that option should not have been available."
-			return
 
 			var/pollid = href_list["pollid"]
 			if(istext(pollid))
@@ -338,7 +334,7 @@
 			if(is_alien_whitelisted(src, "Tajaran") || !config.usealienwhitelist)
 				new_character.dna.mutantrace = "tajaran"
 				new_character.tajaran_talk_understand = 1
-		if(client.prefs.species == "Soghun")
+		if(client.prefs.species == "Unathi")
 			if(is_alien_whitelisted(src, "Soghun") || !config.usealienwhitelist)
 				new_character.dna.mutantrace = "lizard"
 				new_character.soghun_talk_understand = 1

code/modules/mob/new_player/preferences_setup.dm

@@ -138,7 +138,7 @@ datum/preferences
 		if(species == "Tajaran")
 			preview_icon = new /icon('icons/effects/species.dmi', "tajaran_[g]_s")
 			preview_icon.Blend(new /icon('icons/effects/species.dmi', "tajtail_s"), ICON_OVERLAY)
-		else if(species == "Soghun")
+		else if(species == "Unathi")
 			preview_icon = new /icon('icons/effects/species.dmi', "lizard_[g]_s")
 			preview_icon.Blend(new /icon('icons/effects/species.dmi', "sogtail_s"), ICON_OVERLAY)
 		else if(species == "Skrell")

code/modules/mob/new_player/sprite_accessories.dm

@@ -48,7 +48,7 @@
 		name = "Bald"
 		icon_state = "bald"
 		gender = MALE
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	short
 		name = "Short Hair"	  // try to capatilize the names please~
@@ -119,7 +119,7 @@
 		name = "Pompadour"
 		icon_state = "hair_pompadour"
 		gender = MALE
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	quiff
 		name = "Quiff"
@@ -142,19 +142,19 @@
 		name = "Beehive"
 		icon_state = "hair_beehive"
 		gender = FEMALE
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	bobcurl
 		name = "Bobcurl"
 		icon_state = "hair_bobcurl"
 		gender = FEMALE
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	bob
 		name = "Bob"
 		icon_state = "hair_bobcut"
 		gender = FEMALE
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	bowl
 		name = "Bowl"
@@ -165,7 +165,7 @@
 		name = "Buzzcut"
 		icon_state = "hair_buzzcut"
 		gender = MALE
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	crew
 		name = "Crewcut"
@@ -227,7 +227,7 @@
 	mohawk
 		name = "Mohawk"
 		icon_state = "hair_d"
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 	jensen
 		name = "Adam Jensen Hair"
 		icon_state = "hair_jensen"
@@ -241,7 +241,7 @@
 	spiky
 		name = "Spiky"
 		icon_state = "hair_spikey"
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 	kusangi
 		name = "Kusanagi Hair"
 		icon_state = "hair_kusanagi"
@@ -306,7 +306,7 @@
 		name = "Shaved"
 		icon_state = "bald"
 		gender = NEUTER
-		species_allowed = list("Human","Soghun","Tajaran","Skrell")
+		species_allowed = list("Human","Unathi","Tajaran","Skrell")
 
 	watson
 		name = "Watson Mustache"
@@ -347,7 +347,7 @@
 	elvis
 		name = "Elvis Sideburns"
 		icon_state = "facial_elvis"
-		species_allowed = list("Human","Soghun")
+		species_allowed = list("Human","Unathi")
 
 	abe
 		name = "Abraham Lincoln Beard"
@@ -382,11 +382,30 @@
 */
 
 /datum/sprite_accessory/hair
-	tentacle_m
-		name = "Skrell Male Tentacles"
-		icon_state = "skrell_hair_m"
-		species_allowed = list("Skrell")
-		gender = MALE
+	spines_long
+		name = "Long Unathi Spines"
+		icon_state = "soghun_longspines"
+		species_allowed = list("Unathi")
+
+	spines_short
+		name = "Short Unathi Spines"
+		icon_state = "soghun_shortspines"
+		species_allowed = list("Unathi")
+
+	frills_long
+		name = "Long Unathi Frills"
+		icon_state = "soghun_longfrills"
+		species_allowed = list("Unathi")
+
+	frills_short
+		name = "Short Unathi Frills"
+		icon_state = "soghun_shortfrill"
+		species_allowed = list("Unathi")
+
+	horns
+		name = "Unathi Horns"
+		icon_state = "soghun_horns"
+		species_allowed = list("Unathi")
 
 	tentacle_f
 		name = "Skrell Female Tentacles"
@@ -499,6 +518,7 @@
 		name = "Smallsatche"
 		icon_state = "facial_smallstache"
 		species_allowed = list("Tajaran")
+
 //skin styles - WIP
 //going to have to re-integrate this with surgery
 //let the icon_state hold an icon preview for now
@@ -521,11 +541,11 @@
 		icon = 'icons/mob/human_races/r_tajaran.dmi'
 		species_allowed = list("Tajaran")
 
-	soghun
-		name = "Default soghun skin"
+	unathi
+		name = "Default Unathi skin"
 		icon_state = "default"
 		icon = 'icons/mob/human_races/r_lizard.dmi'
-		species_allowed = list("Soghun")
+		species_allowed = list("Unathi")
 
 	skrell
 		name = "Default skrell skin"

code/modules/mob/say.dm

@@ -50,7 +50,7 @@
 	for(var/mob/M in player_list)
 		if(istype(M, /mob/new_player))
 			continue
-		if(M.client && M.client.holder && (M.client.prefs.toggles & CHAT_DEAD)) //admins can toggle deadchat on and off. This is a proc in admin.dm and is only give to Administrators and above
+		if(M.client && M.client.holder && M.client.holder.rights & R_ADMIN && (M.client.prefs.toggles & CHAT_DEAD)) //admins can toggle deadchat on and off. This is a proc in admin.dm and is only give to Administrators and above
 			M << rendered	//Admins can hear deadchat, if they choose to, no matter if they're blind/deaf or not.
 		else if(M.stat == DEAD)
 			M.show_message(rendered, 2) //Takes into account blindness and such.

code/modules/mob/transform_procs.dm

@@ -170,6 +170,7 @@
 	O.mmi = new /obj/item/device/mmi(O)
 	O.mmi.transfer_identity(src)//Does not transfer key/client.
 
+	O.Namepick()
 
 	spawn(0)//To prevent the proc from returning null.
 		del(src)