Merge remote-tracking branch 'upstream/master'

Conflicts:
	baystation12.dme

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

@@ -286,3 +286,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(host)
 		host.ckey = src.ckey
 		host << "<span class='info'>You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.</span>"
+
+/mob/dead/observer/verb/view_manfiest()
+	set name = "View Crew Manifest"
+	set category = "Ghost"
+
+	var/dat
+	dat += "<h4>Crew Manifest</h4>"
+	dat += data_core.get_manifest()
+
+	src << browse(dat, "window=manifest;size=370x420;can_close=1")

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

@@ -18,6 +18,29 @@
 			return
 
 	. = src.say_dead(message)
+
+
+/mob/dead/observer/emote(var/act, var/type, var/message)
+	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+
+	if(!message)
+		return
+
+	if(act != "me")
+		return
+
+	log_emote("Ghost/[src.key] : [message]")
+
+	if(src.client)
+		if(src.client.prefs.muted & MUTE_DEADCHAT)
+			src << "\red You cannot emote in deadchat (muted)."
+			return
+
+		if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT))
+			return
+
+	. = src.emote_dead(message)
+
 /*
 	for (var/mob/M in hearers(null, null))
 		if (!M.stat)

code/modules/mob/emote.dm

@@ -1,5 +1,5 @@
 // All mobs should have custom emote, really..
-mob/proc/custom_emote(var/m_type=1,var/message = null)
+/mob/proc/custom_emote(var/m_type=1,var/message = null)
 
 	if(!use_me && usr == src)
 		usr << "You are unable to emote."
@@ -25,7 +25,7 @@ mob/proc/custom_emote(var/m_type=1,var/message = null)
  //Hearing gasp and such every five seconds is not good emotes were not global for a reason.
  // Maybe some people are okay with that.
 
-		for(var/mob/M in world)
+		for(var/mob/M in player_list)
 			if (!M.client)
 				continue //skip monkeys and leavers
 			if (istype(M, /mob/new_player))
@@ -42,3 +42,38 @@ mob/proc/custom_emote(var/m_type=1,var/message = null)
 		else if (m_type & 2)
 			for (var/mob/O in hearers(src.loc, null))
 				O.show_message(message, m_type)
+
+/mob/proc/emote_dead(var/message)
+
+	if(client.prefs.muted & MUTE_DEADCHAT)
+		src << "\red You cannot send deadchat emotes (muted)."
+		return
+
+	if(!(client.prefs.toggles & CHAT_DEAD))
+		src << "\red You have deadchat muted."
+		return
+
+	var/input
+	if(!message)
+		input = copytext(sanitize(input(src, "Choose an emote to display.") as text|null), 1, MAX_MESSAGE_LEN)
+	else
+		input = message
+
+	if(input)
+		message = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <b>[src]</b> [message]</span>"
+	else
+		return
+
+
+	if(message)
+		log_emote("Ghost/[src.key] : [message]")
+
+		for(var/mob/M in player_list)
+			if(istype(M, /mob/new_player))
+				continue
+
+			if(M.client && M.client.holder && (M.client.holder.rights & R_ADMIN|R_MOD) && (M.client.prefs.toggles & CHAT_DEAD)) // Show the emote to admins/mods
+				M << message
+
+			else if(M.stat == DEAD && (M.client.prefs.toggles & CHAT_DEAD)) // Show the emote to regular ghosts with deadchat toggled on
+				M.show_message(message, 2)

code/modules/mob/language.dm

@@ -0,0 +1,89 @@
+/*
+	Datum based languages. Easily editable and modular.
+*/
+
+/datum/language
+	var/name = "an unknown language" // Fluff name of language if any.
+	var/desc = "A language."         // Short description for 'Check Languages'.
+	var/speech_verb = "says"         // 'says', 'hisses', 'farts'.
+	var/colour = "say_quote"         // CSS style to use for strings in this language.
+	var/key = "x"                    // Character used to speak in language eg. :o for Unathi.
+	var/flags = 0                    // Various language flags.
+	var/native                       // If set, non-native speakers will have trouble speaking.
+
+/datum/language/unathi
+	name = "Sinta'unathi"
+	desc = "The common language of Moghes, composed of sibilant hisses and rattles. Spoken natively by Unathi."
+	speech_verb = "hisses"
+	colour = "soghun"
+	key = "o"
+	flags = WHITELISTED
+
+/datum/language/tajaran
+	name = "Siik'tajr"
+	desc = "An expressive language that combines yowls and chirps with posture, tail and ears. Native to the Tajaran."
+	speech_verb = "mrowls"
+	colour = "tajaran"
+	key = "j"
+	flags = WHITELISTED
+
+/datum/language/skrell
+	name = "Skrellian"
+	desc = "A melodic and complex language spoken by the Skrell of Qerrbalak. Some of the notes are inaudible to humans."
+	speech_verb = "warbles"
+	colour = "skrell"
+	key = "k"
+	flags = WHITELISTED
+
+/datum/language/vox
+	name = "Vox-pidgin"
+	desc = "The common tongue of the various Vox ships making up the Shoal. It sounds like chaotic shrieking to everyone else."
+	speech_verb = "shrieks"
+	colour = "vox"
+	key = "v"
+	flags = RESTRICTED
+
+/*
+/datum/language/human
+	name = "Sol Common"
+	desc = "A bastardized hybrid of informal English and elements of Mandarin Chinese; the common language of the Sol system."
+	key = "hum"
+	flags = RESTRICTED
+
+// Galactic common languages (systemwide accepted standards).
+/datum/language/trader
+	name = "Tradeband"
+	desc = "Maintained by the various trading cartels in major systems, this elegant, structured language is used for bartering and bargaining."
+	speech_verb = "enunciates"
+	key = "tra"
+
+/datum/language/gutter
+	name = "Gutter"
+	desc = "Much like Standard, this crude pidgin tongue descended from numerous languages and serves as Tradeband for criminal elements."
+	speech_verb = "growls"
+	key = "gut"
+*/
+
+// Language handling.
+/mob/proc/add_language(var/language)
+
+	for(var/datum/language/L in languages)
+		if(L && L.name == language)
+			return 0
+
+	var/datum/language/new_language = all_languages[language]
+
+	if(!istype(new_language,/datum/language))
+		return 0
+
+	languages += new_language
+	return 1
+
+/mob/proc/remove_language(var/rem_language)
+
+	for(var/datum/language/L in languages)
+		if(L && L.name == rem_language)
+			languages -= L
+			return 1
+
+	return 0

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

@@ -455,4 +455,26 @@
 	<BR>"}
 	user << browse(dat, text("window=mob[];size=325x500", name))
 	onclose(user, "mob[name]")
-	return
+	return
+
+//generates realistic-ish pulse output based on preset levels
+/mob/living/carbon/proc/get_pulse(var/method)	//method 0 is for hands, 1 is for machines, more accurate
+	var/temp = 0								//see setup.dm:694
+	switch(src.pulse)
+		if(PULSE_NONE)
+			return "0"
+		if(PULSE_SLOW)
+			temp = rand(40, 60)
+			return num2text(method ? temp : temp + rand(-10, 10))
+		if(PULSE_NORM)
+			temp = rand(60, 90)
+			return num2text(method ? temp : temp + rand(-10, 10))
+		if(PULSE_FAST)
+			temp = rand(90, 120)
+			return num2text(method ? temp : temp + rand(-10, 10))
+		if(PULSE_2FAST)
+			temp = rand(120, 160)
+			return num2text(method ? temp : temp + rand(-10, 10))
+		if(PULSE_THREADY)
+			return method ? ">250" : "extremely weak and fast, patient's artery feels like a thread"
+//			output for machines^	^^^^^^^output for people^^^^^^^^^

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

@@ -2,8 +2,7 @@
 	gender = MALE
 	var/list/stomach_contents = list()
 	var/brain_op_stage = 0.0
-	var/datum/disease2/disease/virus2 = null
-	var/list/datum/disease2/disease/resistances2 = list()
+	var/list/datum/disease2/disease/virus2 = list()
 	var/antibodies = 0
 
 	var/silent = null 		//Can't talk. Value goes down every life proc.
@@ -19,4 +18,6 @@
 	//Surgery info
 	var/datum/surgery_status/op_stage = new/datum/surgery_status
 	//Active emote/pose
-	var/pose = null
+	var/pose = null
+
+	var/pulse = PULSE_NORM	//current pulse level

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

@@ -54,6 +54,34 @@
 	dizziness = 0
 	jitteriness = 0
 
+	//Handle brain slugs.
+	var/datum/organ/external/head = get_organ("head")
+	var/mob/living/simple_animal/borer/B
+
+	for(var/I in head.implants)
+		if(istype(I,/mob/living/simple_animal/borer))
+			B = I
+	if(B)
+		if(!B.ckey && ckey && B.controlling)
+			B.ckey = ckey
+			B.controlling = 0
+		if(B.host_brain.ckey)
+			ckey = B.host_brain.ckey
+			B.host_brain.ckey = null
+			B.host_brain.name = "host brain"
+			B.host_brain.real_name = "host brain"
+
+		verbs -= /mob/living/carbon/human/proc/release_control
+
+	//Check for heist mode kill count.
+	if(ticker.mode && ( istype( ticker.mode,/datum/game_mode/heist) ) )
+		//Check for last assailant's mutantrace.
+		/*if( LAssailant && ( istype( LAssailant,/mob/living/carbon/human ) ) )
+			var/mob/living/carbon/human/V = LAssailant
+			if (V.dna && (V.dna.mutantrace == "vox"))*/ //Not currently feasible due to terrible LAssailant tracking.
+		//world << "Vox kills: [vox_kills]"
+		vox_kills++ //Bad vox. Shouldn't be killing humans.
+
 	if(!gibbed)
 		emote("deathgasp") //let the world KNOW WE ARE DEAD
 

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

@@ -190,6 +190,12 @@
 		else if(jitteriness >= 100)
 			msg += "<span class='warning'>[t_He] [t_is] twitching ever so slightly.</span>\n"
 
+	//splints
+	for(var/organ in list("l_leg","r_leg","l_arm","r_arm"))
+		var/datum/organ/external/o = get_organ(organ)
+		if(o && o.status & ORGAN_SPLINTED)
+			msg += "<span class='warning'>[t_He] [t_has] a splint on his [o.display_name]!</span>\n"
+
 	if(suiciding)
 		msg += "<span class='warning'>[t_He] appears to have commited suicide... there is no hope of recovery.</span>\n"
 
@@ -199,29 +205,19 @@
 	var/distance = get_dist(usr,src)
 	if(istype(usr, /mob/dead/observer) || usr.stat == 2) // ghosts can see anything
 		distance = 1
-	if (src.stat == 1 || stat == 2)
+	if (src.stat)
 		msg += "<span class='warning'>[t_He] [t_is]n't responding to anything around [t_him] and seems to be asleep.</span>\n"
 		if((stat == 2 || src.health < config.health_threshold_crit) && distance <= 3)
 			msg += "<span class='warning'>[t_He] does not appear to be breathing.</span>\n"
-		if(istype(usr, /mob/living/carbon/human) && usr.stat == 0 && src.stat == 1 && distance <= 1)
+		if(istype(usr, /mob/living/carbon/human) && !usr.stat && distance <= 1)
 			for(var/mob/O in viewers(usr.loc, null))
 				O.show_message("[usr] checks [src]'s pulse.", 1)
-			spawn(15)
-				usr << "\blue [t_He] has a pulse!"
-
-	if (src.stat == 2 || (status_flags & FAKEDEATH))
-		if(distance <= 1)
-			if(istype(usr, /mob/living/carbon/human) && usr.stat == 0)
-				for(var/mob/O in viewers(usr.loc, null))
-					O.show_message("[usr] checks [src]'s pulse.", 1)
-			spawn(15)
-				var/foundghost = 0
-				if(src.client)
-					foundghost = 1
-				if(!foundghost)
-					usr << "<span class='deadsay'>[t_He] has no pulse and [t_his] soul has departed...</span>"
+		spawn(15)
+			if(distance <= 1 && usr.stat != 1)
+				if(pulse == PULSE_NONE)
+					usr << "<span class='deadsay'>[t_He] has no pulse[src.client ? "" : " and [t_his] soul has departed"]...</span>"
 				else
-					usr << "<span class='deadsay'>[t_He] has no pulse...</span>"
+					usr << "<span class='deadsay'>[t_He] has a pulse!</span>"
 
 	msg += "<span class='warning'>"
 

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

@@ -5,15 +5,46 @@
 	icon = 'icons/mob/human.dmi'
 	icon_state = "body_m_s"
 	var/list/hud_list = list()
-
+	var/datum/species/species //Contains icon generation and language information, set during New().
 
 /mob/living/carbon/human/dummy
 	real_name = "Test Dummy"
 	status_flags = GODMODE|CANPUSH
 
+/mob/living/carbon/human/skrell/New()
+	h_style = "Skrell Male Tentacles"
+	set_species("Skrell")
+	..()
 
+/mob/living/carbon/human/tajaran/New()
+	h_style = "Tajaran Ears"
+	set_species("Tajaran")
+	..()
+
+/mob/living/carbon/human/unathi/New()
+	h_style = "Unathi Horns"
+	set_species("Unathi")
+	..()
+
+/mob/living/carbon/human/vox/New()
+	h_style = "Short Vox Quills"
+	set_species("Vox")
+	..()
+
+/mob/living/carbon/human/diona/New()
+	species = new /datum/species/diona(src)
+	..()
 
 /mob/living/carbon/human/New()
+
+	if(!species)
+		set_species()
+
+	if(species.language)
+		var/datum/language/L = all_languages[species.language]
+		if(L)
+			languages += L
+
 	var/datum/reagents/R = new/datum/reagents(1000)
 	reagents = R
 	R.my_atom = src
@@ -379,6 +410,7 @@
 	<BR>[(handcuffed ? text("<A href='?src=\ref[src];item=handcuff'>Handcuffed</A>") : text("<A href='?src=\ref[src];item=handcuff'>Not Handcuffed</A>"))]
 	<BR>[(legcuffed ? text("<A href='?src=\ref[src];item=legcuff'>Legcuffed</A>") : text(""))]
 	<BR>[(internal ? text("<A href='?src=\ref[src];item=internal'>Remove Internal</A>") : "")]
+	<BR><A href='?src=\ref[src];item=splints'>Remove Splints</A>
 	<BR><A href='?src=\ref[src];item=pockets'>Empty Pockets</A>
 	<BR><A href='?src=\ref[user];refresh=1'>Refresh</A>
 	<BR><A href='?src=\ref[user];mach_close=mob[name]'>Close</A>
@@ -794,44 +826,14 @@
 	return
 
 /mob/living/carbon/human/get_species()
-	if(dna)
-		switch(dna.mutantrace)
-			if("lizard")
-				return "Unathi"
-			if("tajaran")
-				return "Tajaran"
-			if("skrell")
-				return "Skrell"
-			if("vox")
-				return "Vox"
-			if("plant")
-				return "Mobile vegetation"
-			if("golem")
-				return "Animated Construct"
-			else
-				return "Human"
 
-/mob/living/carbon/get_species()
-	if(src.dna)
-		if(src.dna.mutantrace == "lizard")
-			return "Unathi"
-		else if(src.dna.mutantrace == "skrell")
-			return "Skrell"
-		else if(src.dna.mutantrace == "tajaran")
-			return "Tajaran"
-		else if(src.dna.mutantrace == "vox")
-			return "vox"
+	if(!species)
+		set_species()
 
-/mob/living/carbon/proc/update_mutantrace_languages()
-	if(src.dna)
-		if(src.dna.mutantrace == "lizard")
-			src.soghun_talk_understand = 1
-		else if(src.dna.mutantrace == "skrell")
-			src.skrell_talk_understand = 1
-		else if(src.dna.mutantrace == "tajaran")
-			src.tajaran_talk_understand = 1
-		else if(src.dna.mutantrace == "vox")
-			src.vox_talk_understand = 1
+	if(dna && dna.mutantrace == "golem")
+		return "Animated Construct"
+
+	return species.name
 
 /mob/living/carbon/human/proc/play_xylophone()
 	if(!src.xylophone)
@@ -1028,6 +1030,7 @@
 		if (!O.amputated)
 			O.status &= ~ORGAN_DESTROYED
 		O.wounds.Cut()
+		O.heal_damage(1000,1000,1,1)
 
 	var/datum/organ/external/head/h = organs_by_name["head"]
 	h.disfigured = 0
@@ -1047,6 +1050,10 @@
 
 	for (var/datum/disease/virus in viruses)
 		virus.cure()
+	for (var/ID in virus2)
+		var/datum/disease2/disease/V = virus2[ID]
+		V.cure(src)
+
 	..()
 
 /mob/living/carbon/human/proc/is_lung_ruptured()
@@ -1197,6 +1204,8 @@ mob/living/carbon/human/yank_out_object()
 /mob/living/carbon/human/proc/handle_embedded_objects()
 
 	for(var/datum/organ/external/organ in src.organs)
+		if(organ.status & ORGAN_SPLINTED) //Splints prevent movement.
+			continue
 		for(var/obj/item/weapon/O in organ.implants)
 			if(!istype(O,/obj/item/weapon/implant) && prob(5)) //Moving with things stuck in you could be bad.
 				// All kinds of embedded objects cause bleeding.
@@ -1210,6 +1219,143 @@ mob/living/carbon/human/yank_out_object()
 						msg ="<span class='warning'>[O] in your [organ.display_name] twists painfully as you move.</span>"
 				src << msg
 
-				organ.status |= ORGAN_BLEEDING
 				organ.take_damage(rand(1,3), 0, 0)
-				src.adjustToxLoss(rand(1,3))
+				if(!(organ.status & ORGAN_ROBOT)) //There is no blood in protheses.
+					organ.status |= ORGAN_BLEEDING
+					src.adjustToxLoss(rand(1,3))
+
+/mob/living/carbon/human/verb/check_pulse()
+	set category = "Object"
+	set name = "Check pulse"
+	set desc = "Approximately count somebody's pulse. Requires you to stand still at least 6 seconds."
+	set src in view(1)
+	var/self = 0
+
+	if(usr.stat == 1 || usr.restrained() || !isliving(usr)) return
+
+	if(usr == src)
+		self = 1
+	if(!self)
+		usr.visible_message("\blue [usr] kneels down, puts \his hand on [src]'s wrist and begins counting their pulse.",\
+		"You begin counting [src]'s pulse")
+	else
+		usr.visible_message("\blue [usr] begins counting their pulse.",\
+		"You begin counting your pulse.")
+
+	if(src.pulse)
+		usr << "\blue [self ? "You have a" : "[src] has a"] pulse! Counting..."
+	else
+		usr << "\red [src] has no pulse!"	//it is REALLY UNLIKELY that a dead person would check his own pulse
+		return
+
+	usr << "Don't move until counting is finished."
+	var/time = world.timeofday
+	sleep(60)
+	if(usr.l_move_time >= time)	//checks if our mob has moved during the sleep()
+		usr << "You moved while counting. Try again."
+	else
+		usr << "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]."
+
+/mob/living/carbon/human/proc/set_species(var/new_species)
+
+	if(!new_species)
+		new_species = "Human"
+
+	if(species && (species.name && species.name == new_species))
+		return
+
+	species = all_species[new_species]
+
+	see_in_dark = species.darksight
+	if(see_in_dark > 2)
+		see_invisible = SEE_INVISIBLE_LEVEL_ONE
+	else
+		see_invisible = SEE_INVISIBLE_LIVING
+
+	spawn(0)
+		update_icons()
+
+	if(species)
+		return 1
+	else
+		return 0
+
+//Brain slug proc for voluntary removal of control.
+/mob/living/carbon/human/proc/release_control()
+
+	set category = "Alien"
+	set name = "Release Control"
+	set desc = "Release control of your host's body."
+
+	var/datum/organ/external/head = get_organ("head")
+	var/mob/living/simple_animal/borer/B
+
+	for(var/I in head.implants)
+		if(istype(I,/mob/living/simple_animal/borer))
+			B = I
+	if(!B)
+		return
+
+	if(B.controlling)
+		src << "\red <B>You withdraw your probosci, releasing control of [B.host_brain]</B>"
+		B.host_brain << "\red <B>Your vision swims as the alien parasite releases control of your body.</B>"
+		B.ckey = ckey
+		B.controlling = 0
+	if(B.host_brain.ckey)
+		ckey = B.host_brain.ckey
+		B.host_brain.ckey = null
+		B.host_brain.name = "host brain"
+		B.host_brain.real_name = "host brain"
+
+	verbs -= /mob/living/carbon/human/proc/release_control
+	verbs -= /mob/living/carbon/human/proc/punish_host
+	verbs -= /mob/living/carbon/human/proc/spawn_larvae
+
+//Brain slug proc for tormenting the host.
+/mob/living/carbon/human/proc/punish_host()
+	set category = "Alien"
+	set name = "Torment host"
+	set desc = "Punish your host with agony."
+
+	var/mob/living/simple_animal/borer/B = has_brain_worms()
+
+	if(!B)
+		return
+
+	if(B.host_brain.ckey)
+		src << "\red <B>You send a punishing spike of psychic agony lancing into your host's brain.</B>"
+		B.host_brain << "\red <B><FONT size=3>Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!</FONT></B>"
+
+//Check for brain worms in head.
+/mob/living/carbon/human/proc/has_brain_worms()
+
+	var/datum/organ/external/head = get_organ("head")
+
+	for(var/I in head.implants)
+		if(istype(I,/mob/living/simple_animal/borer))
+			return I
+
+	return 0
+
+/mob/living/carbon/human/proc/spawn_larvae()
+	set category = "Alien"
+	set name = "Reproduce"
+	set desc = "Spawn several young."
+
+	var/mob/living/simple_animal/borer/B = has_brain_worms()
+
+	if(!B)
+		return
+
+	if(B.chemicals >= 100)
+		src << "\red <B>Your host twitches and quivers as you rapdly excrete several larvae from your sluglike body.</B>"
+		visible_message("\red <B>[src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!</B>")
+		B.chemicals -= 100
+
+		new /obj/effect/decal/cleanable/vomit(get_turf(src))
+		playsound(loc, 'sound/effects/splat.ogg', 50, 1)
+		new /mob/living/simple_animal/borer(get_turf(src))
+
+	else
+		src << "You do not have enough chemicals stored to reproduce."
+		return

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

@@ -103,34 +103,19 @@
 
 		if("hurt")
 
-			var/attack_verb
-			if(M.dna)
-				switch(M.dna.mutantrace)
-					if("lizard")
-						attack_verb = "scratch"
-					if("tajaran")
-						attack_verb = "scratch"
-					if("plant")
-						attack_verb = "slash"
-					else
-						attack_verb = "punch"
+			M.attack_log += text("\[[time_stamp()]\] <font color='red'>[M.species.attack_verb]ed [src.name] ([src.ckey])</font>")
+			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [M.species.attack_verb]ed by [M.name] ([M.ckey])</font>")
 
-			M.attack_log += text("\[[time_stamp()]\] <font color='red'>[attack_verb]ed [src.name] ([src.ckey])</font>")
-			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been [attack_verb]ed by [M.name] ([M.ckey])</font>")
-
-			log_attack("<font color='red'>[M.name] ([M.ckey]) [attack_verb]ed [src.name] ([src.ckey])</font>")
+			log_attack("<font color='red'>[M.name] ([M.ckey]) [M.species.attack_verb]ed [src.name] ([src.ckey])</font>")
 
 			var/damage = rand(0, 5)//BS12 EDIT
 			if(!damage)
-				switch(attack_verb)
-					if("slash")
-						playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
-					if("scratch")
-						playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
-					else
-						playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+				if(M.species.attack_verb == "punch")
+					playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+				else
+					playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
 
-				visible_message("\red <B>[M] has attempted to [attack_verb] [src]!</B>")
+				visible_message("\red <B>[M] has attempted to [M.species.attack_verb] [src]!</B>")
 				return 0
 
 
@@ -140,21 +125,18 @@
 			if(HULK in M.mutations)			damage += 5
 
 
-			switch(attack_verb)
-				if("slash")
-					playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
-				if("scratch")
-					playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
-				else
-					playsound(loc, "punch", 25, 1, -1)
+			if(M.species.attack_verb == "punch")
+				playsound(loc, "punch", 25, 1, -1)
+			else
+				playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
 
-			visible_message("\red <B>[M] has [attack_verb]ed [src]!</B>")
+			visible_message("\red <B>[M] has [M.species.attack_verb]ed [src]!</B>")
 			//Rearranged, so claws don't increase weaken chance.
 			if(damage >= 5 && prob(50))
 				visible_message("\red <B>[M] has weakened [src]!</B>")
 				apply_effect(2, WEAKEN, armor_block)
 
-			if(attack_verb == "scratch")	damage += 5
+			if(M.species.attack_verb != "punch")	damage += 5
 			apply_damage(damage, BRUTE, affecting, armor_block)
 
 

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

@@ -11,21 +11,6 @@ emp_act
 /mob/living/carbon/human/bullet_act(var/obj/item/projectile/P, var/def_zone)
 
 // BEGIN TASER NERF
-	if(istype(P, /obj/item/projectile/energy/electrode))
-		var/datum/organ/external/select_area = get_organ(def_zone) // We're checking the outside, buddy!
-		var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform, gloves, shoes) // What all are we checking?
-		// var/deflectchance=90 //Is it a CRITICAL HIT with that taser?
-		for(var/bp in body_parts) //Make an unregulated var to pass around.
-			if(!bp)
-				continue //Does this thing we're shooting even exist?
-			if(bp && istype(bp ,/obj/item/clothing)) // If it exists, and it's clothed
-				var/obj/item/clothing/C = bp // Then call an argument C to be that clothing!
-				if(C.body_parts_covered & select_area.body_part) // Is that body part being targeted covered?
-					P.agony=P.agony*C.siemens_coefficient
-		apply_effect(P.agony,AGONY,0)
-		flash_pain()
-		src <<"\red You have been shot!"
-		del P
 					/* Commenting out new-old taser nerf.
 					if(C.siemens_coefficient == 0) //If so, is that clothing shock proof?
 						if(prob(deflectchance))
@@ -43,7 +28,7 @@ emp_act
 // END TASER NERF
 
 	if(wear_suit && istype(wear_suit, /obj/item/clothing/suit/armor/laserproof))
-		if(istype(P, /obj/item/projectile/energy) || !(istype(P, /obj/item/projectile/energy/electrode)) || istype(P, /obj/item/projectile/beam))
+		if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))
 			var/reflectchance = 40 - round(P.damage/3)
 			if(!(def_zone in list("chest", "groin")))
 				reflectchance /= 2
@@ -69,6 +54,41 @@ emp_act
 	if(check_shields(P.damage, "the [P.name]"))
 		P.on_hit(src, 2)
 		return 2
+
+//BEGIN BOOK'S TASER NERF.
+	if(istype(P, /obj/item/projectile/energy/electrode))
+		var/datum/organ/external/select_area = get_organ(def_zone) // We're checking the outside, buddy!
+		var/list/body_parts = list(head, wear_mask, wear_suit, w_uniform, gloves, shoes) // What all are we checking?
+		// var/deflectchance=90 //Is it a CRITICAL HIT with that taser?
+		for(var/bp in body_parts) //Make an unregulated var to pass around.
+			if(!bp)
+				continue //Does this thing we're shooting even exist?
+			if(bp && istype(bp ,/obj/item/clothing)) // If it exists, and it's clothed
+				var/obj/item/clothing/C = bp // Then call an argument C to be that clothing!
+				if(C.body_parts_covered & select_area.body_part) // Is that body part being targeted covered?
+					P.agony=P.agony*C.siemens_coefficient
+		apply_effect(P.agony,AGONY,0)
+		flash_pain()
+		src <<"\red You have been shot!"
+		del P
+
+		var/obj/item/weapon/cloaking_device/C = locate((/obj/item/weapon/cloaking_device) in src)
+		if(C && C.active)
+			C.attack_self(src)//Should shut it off
+			update_icons()
+			src << "\blue Your [C.name] was disrupted!"
+			Stun(2)
+
+		if(istype(equipped(),/obj/item/device/assembly/signaler))
+			var/obj/item/device/assembly/signaler/signaler = equipped()
+			if(signaler.deadman && prob(80))
+				src.visible_message("\red [src] triggers their deadman's switch!")
+				signaler.signal()
+
+		return
+//END TASER NERF
+
+
 	return (..(P , def_zone))
 
 

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

@@ -1,14 +1,14 @@
 /mob/living/carbon/human/movement_delay()
 	var/tally = 0
 
-	if(reagents.has_reagent("hyperzine")) return -1
-
-	if(reagents.has_reagent("nuka_cola")) return -1
-
 	if (istype(loc, /turf/space)) return -1 // It's hard to be slowed down in space by... anything
 
 	handle_embedded_objects() //Moving with objects stuck in you can cause bad times.
 
+	if(reagents.has_reagent("hyperzine")) return -1
+
+	if(reagents.has_reagent("nuka_cola")) return -1
+
 	var/health_deficiency = (100 - health - halloss)
 	if(health_deficiency >= 40) tally += (health_deficiency / 25)
 
@@ -25,6 +25,8 @@
 		var/datum/organ/external/E = get_organ(organ_name)
 		if(!E || (E.status & ORGAN_DESTROYED))
 			tally += 4
+		if(E.status & ORGAN_SPLINTED)
+			tally += 0.5
 		else if(E.status & ORGAN_BROKEN)
 			tally += 1.5
 

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

@@ -340,6 +340,16 @@
 			if("id")
 				if ((!( target.wear_id ) || !( target.w_uniform )))
 					del(src)
+			if("splints")
+				var/count = 0
+				for(var/organ in list("l_leg","r_leg","l_arm","r_arm"))
+					var/datum/organ/external/o = target.organs_by_name[organ]
+					if(o.status & ORGAN_SPLINTED)
+						count = 1
+						break
+				if(count == 0)
+					del(src)
+					return
 			if("internal")
 				if ((!( (istype(target.wear_mask, /obj/item/clothing/mask) && istype(target.back, /obj/item/weapon/tank) && !( target.internal )) ) && !( target.internal )))
 					del(src)
@@ -366,7 +376,7 @@
 					message = "\red <B>[source] fails to take off \a [target.wear_mask] from [target]'s head!</B>"
 					return
 				else
-					message = "\red <B>[source] is trying to take off \a [source.wear_mask] from [target]'s head!</B>"
+					message = "\red <B>[source] is trying to take off \a [target.wear_mask] from [target]'s head!</B>"
 			if("l_hand")
 				message = "\red <B>[source] is trying to take off \a [target.l_hand] from [target]'s left hand!</B>"
 			if("r_hand")
@@ -443,6 +453,9 @@
 					message = "\red <B>[source] is trying to remove [target]'s internals</B>"
 				else
 					message = "\red <B>[source] is trying to set on [target]'s internals.</B>"
+			if("splints")
+				message = text("\red <B>[] is trying to remove []'s splints!</B>", source, target)
+
 		for(var/mob/M in viewers(target, null))
 			M.show_message(message, 1)
 	spawn( HUMAN_STRIP_DELAY )
@@ -541,6 +554,16 @@ It can still be worn/put on as normal.
 			slot_to_process = slot_legcuffed
 			if (target.legcuffed)
 				strip_item = target.legcuffed
+		if("splints")
+			for(var/organ in list("l_leg","r_leg","l_arm","r_arm"))
+				var/datum/organ/external/o = target.get_organ(organ)
+				if (o && o.status & ORGAN_SPLINTED)
+					var/obj/item/W = new /obj/item/stack/medical/splint/single()
+					o.status &= ~ORGAN_SPLINTED
+					if (W)
+						W.loc = target.loc
+						W.layer = initial(W.layer)
+						W.add_fingerprint(source)
 		if("CPR")
 			if ((target.health > config.health_threshold_dead && target.health < config.health_threshold_crit))
 				var/suff = min(target.getOxyLoss(), 7)

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

@@ -113,6 +113,8 @@
 
 	handle_regular_hud_updates()
 
+	pulse = handle_pulse()
+
 	// Grabbing
 	for(var/obj/item/weapon/grab/G in src)
 		G.process()
@@ -406,7 +408,7 @@
 		// Nitrogen, for Vox.
 		var/Nitrogen_pp = (breath.nitrogen/breath.total_moles())*breath_pressure
 
-		if(O2_pp < safe_oxygen_min && src.dna.mutantrace!="vox") 	// Too little oxygen
+		if(O2_pp < safe_oxygen_min && species.name != "Vox") 	// Too little oxygen
 			if(prob(20))
 				spawn(0) emote("gasp")
 			if(O2_pp > 0)
@@ -424,7 +426,7 @@
 			oxyloss += 5*ratio
 			oxygen_used = breath.oxygen*ratio/6
 			oxygen_alert = max(oxygen_alert, 1)*/
-		else if(Nitrogen_pp < safe_oxygen_min && src.dna.mutantrace=="vox")  //Vox breathe nitrogen, not oxygen.
+		else if(Nitrogen_pp < safe_oxygen_min && species.name == "Vox")  //Vox breathe nitrogen, not oxygen.
 
 			if(prob(20))
 				spawn(0) emote("gasp")
@@ -469,7 +471,7 @@
 			if(reagents)
 				reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
 			toxins_alert = max(toxins_alert, 1)
-		else if(O2_pp > vox_oxygen_max && src.dna.mutantrace=="vox") //Oxygen is toxic to vox.
+		else if(O2_pp > vox_oxygen_max && species.name == "Vox") //Oxygen is toxic to vox.
 			var/ratio = (breath.oxygen/vox_oxygen_max) * 1000
 			adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
 			toxins_alert = max(toxins_alert, 1)
@@ -490,30 +492,30 @@
 
 		if( (abs(310.15 - breath.temperature) > 50) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :(
 			if(status_flags & GODMODE)	return 1	//godmode
-			if(breath.temperature < 260.15 && dna.mutantrace != "vox") //Vox are resistant to cold.
+			if(breath.temperature < species.cold_level_1)
 				if(prob(20))
 					src << "\red You feel your face freezing and an icicle forming in your lungs!"
-			else if(breath.temperature > 360.15)
+			else if(breath.temperature > species.heat_level_1)
 				if(prob(20))
 					src << "\red You feel your face burning and a searing heat in your lungs!"
 
 			switch(breath.temperature)
-				if(-INFINITY to 120)
+				if(-INFINITY to species.cold_level_3)
 					apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
 					fire_alert = max(fire_alert, 1)
-				if(120 to 200 && dna.mutantrace != "vox")  //Vox are resistant to cold.
+				if(species.cold_level_3 to species.cold_level_2)
 					apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
 					fire_alert = max(fire_alert, 1)
-				if(200 to 260 && dna.mutantrace != "vox")  //Vox are resistant to cold.
+				if(species.cold_level_2 to species.cold_level_1)
 					apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
 					fire_alert = max(fire_alert, 1)
-				if(360 to 400)
+				if(species.heat_level_1 to species.heat_level_2)
 					apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
 					fire_alert = max(fire_alert, 2)
-				if(400 to 1000)
+				if(species.heat_level_2 to species.heat_level_3)
 					apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
 					fire_alert = max(fire_alert, 2)
-				if(1000 to INFINITY)
+				if(species.heat_level_3 to INFINITY)
 					apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
 					fire_alert = max(fire_alert, 2)
 
@@ -542,17 +544,20 @@
 		if(stat != 2)
 			stabilize_temperature_from_calories()
 
+//		log_debug("Adjusting to atmosphere.")
 		//After then, it reacts to the surrounding atmosphere based on your thermal protection
-		if(loc_temp < bodytemperature)
-			//Place is colder than we are
+		if(loc_temp < BODYTEMP_COLD_DAMAGE_LIMIT)			//Place is colder than we are
 			var/thermal_protection = get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
 			if(thermal_protection < 1)
-				bodytemperature += min((1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX)
-		else
-			//Place is hotter than we are
+				var/amt = min((1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX)
+//				log_debug("[loc_temp] is Cold. Cooling by [amt]")
+				bodytemperature += amt
+		else if (loc_temp > BODYTEMP_HEAT_DAMAGE_LIMIT)			//Place is hotter than we are
 			var/thermal_protection = get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
 			if(thermal_protection < 1)
-				bodytemperature += min((1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX)
+				var/amt = min((1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX)
+//				log_debug("[loc_temp] is Heat. Heating up by [amt]")
+				bodytemperature += amt
 
 		// +/- 50 degrees from 310.15K is the 'safe' zone, where no damage is dealt.
 		if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
@@ -591,22 +596,22 @@
 		var/pressure = environment.return_pressure()
 		var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob.
 		if(status_flags & GODMODE)	return 1	//godmode
-		switch(adjusted_pressure)
-			if(HAZARD_HIGH_PRESSURE to INFINITY)
-				adjustBruteLoss( min( ( (adjusted_pressure / HAZARD_HIGH_PRESSURE) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) )
-				pressure_alert = 2
-			if(WARNING_HIGH_PRESSURE to HAZARD_HIGH_PRESSURE)
-				pressure_alert = 1
-			if(WARNING_LOW_PRESSURE to WARNING_HIGH_PRESSURE)
-				pressure_alert = 0
-			if(HAZARD_LOW_PRESSURE to WARNING_LOW_PRESSURE)
-				pressure_alert = -1
+
+		if(adjusted_pressure >= species.hazard_high_pressure)
+			adjustBruteLoss( min( ( (adjusted_pressure / species.hazard_high_pressure) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE) )
+			pressure_alert = 2
+		else if(adjusted_pressure >= species.warning_high_pressure)
+			pressure_alert = 1
+		else if(adjusted_pressure >= species.warning_low_pressure)
+			pressure_alert = 0
+		else if(adjusted_pressure >= species.hazard_low_pressure)
+			pressure_alert = -1
+		else
+			if( !(COLD_RESISTANCE in mutations))
+				adjustBruteLoss( LOW_PRESSURE_DAMAGE )
+				pressure_alert = -2
 			else
-				if( !(COLD_RESISTANCE in mutations) && src.dna.mutantrace!="vox") //Vox are resistant to pressure loss.
-					adjustBruteLoss( LOW_PRESSURE_DAMAGE )
-					pressure_alert = -2
-				else
-					pressure_alert = -1
+				pressure_alert = -1
 
 		if(environment.toxins > MOLES_PLASMA_VISIBLE)
 			pl_effects()
@@ -632,19 +637,25 @@
 	*/
 
 	proc/stabilize_temperature_from_calories()
+		var/body_temperature_difference = 310.15 - bodytemperature
+		if (abs(body_temperature_difference) < 0.01)
+			return //fuck this precision
 		switch(bodytemperature)
 			if(-INFINITY to 260.15) //260.15 is 310.15 - 50, the temperature where you start to feel effects.
 				if(nutrition >= 2) //If we are very, very cold we'll use up quite a bit of nutriment to heat us up.
 					nutrition -= 2
-				var/body_temperature_difference = 310.15 - bodytemperature
-				bodytemperature += max((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM)
+				var/recovery_amt = max((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM)
+//				log_debug("Cold. Difference = [body_temperature_difference]. Recovering [recovery_amt]")
+				bodytemperature += recovery_amt
 			if(260.15 to 360.15)
-				var/body_temperature_difference = 310.15 - bodytemperature
-				bodytemperature += body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR
+				var/recovery_amt = body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR
+//				log_debug("Norm. Difference = [body_temperature_difference]. Recovering [recovery_amt]")
+				bodytemperature += recovery_amt
 			if(360.15 to INFINITY) //360.15 is 310.15 + 50, the temperature where you start to feel effects.
 				//We totally need a sweat system cause it totally makes sense...~
-				var/body_temperature_difference = 310.15 - bodytemperature
-				bodytemperature += min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM)	//We're dealing with negative numbers
+				var/recovery_amt = min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM)	//We're dealing with negative numbers
+//				log_debug("Hot. Difference = [body_temperature_difference]. Recovering [recovery_amt]")
+				bodytemperature += recovery_amt
 
 	//This proc returns a number made up of the flags for body parts which you are protected on. (such as HEAD, UPPER_TORSO, LOWER_TORSO, etc. See setup.dm for the full list)
 	proc/get_heat_protection_flags(temperature) //Temperature is the temperature you're being exposed to.
@@ -830,8 +841,7 @@
 		if(status_flags & GODMODE)	return 0	//godmode
 		adjustToxLoss(total_plasmaloss)
 
-//		if(dna && dna.mutantrace == "plant") //couldn't think of a better place to place it, since it handles nutrition -- Urist
-		if(PLANT in mutations)
+		if(species.flags & REQUIRE_LIGHT)
 			var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
 			if(isturf(loc)) //else, there's considered to be no light
 				var/turf/T = loc
@@ -889,8 +899,7 @@
 			if(overeatduration > 1)
 				overeatduration -= 2 //doubled the unfat rate
 
-//		if(dna && dna.mutantrace == "plant")
-		if(PLANT in mutations)
+		if(species.flags & REQUIRE_LIGHT)
 			if(nutrition < 200)
 				take_overall_damage(2,0)
 
@@ -987,7 +996,7 @@
 						sleeping = max(sleeping-1, 0)
 				blinded = 1
 				stat = UNCONSCIOUS
-				if( prob(10) && health && !hal_crit )
+				if( prob(2) && health && !hal_crit )
 					spawn(0)
 						emote("snore")
 			else if(resting)
@@ -1137,14 +1146,12 @@
 			sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
 			if(dna)
 				switch(dna.mutantrace)
-					if("lizard","slime")
+					if("slime")
 						see_in_dark = 3
 						see_invisible = SEE_INVISIBLE_LEVEL_ONE
-					if("shadow","tajaran")
+					if("shadow")
 						see_in_dark = 8
 						see_invisible = SEE_INVISIBLE_LEVEL_ONE
-					else
-						see_in_dark = 2
 
 			if(XRAY in mutations)
 				sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
@@ -1219,18 +1226,22 @@
 				see_invisible = SEE_INVISIBLE_LIVING
 
 			if(healths)
-				switch(hal_screwyhud)
-					if(1)	healths.icon_state = "health6"
-					if(2)	healths.icon_state = "health7"
-					else
-						switch(health - halloss)
-							if(100 to INFINITY)		healths.icon_state = "health0"
-							if(80 to 100)			healths.icon_state = "health1"
-							if(60 to 80)			healths.icon_state = "health2"
-							if(40 to 60)			healths.icon_state = "health3"
-							if(20 to 40)			healths.icon_state = "health4"
-							if(0 to 20)				healths.icon_state = "health5"
-							else					healths.icon_state = "health6"
+				if (analgesic)
+					healths.icon_state = "health_health_numb"
+				else
+					switch(hal_screwyhud)
+						if(1)	healths.icon_state = "health6"
+						if(2)	healths.icon_state = "health7"
+						else
+							//switch(health - halloss)
+							switch(100 - traumatic_shock)
+								if(100 to INFINITY)		healths.icon_state = "health0"
+								if(80 to 100)			healths.icon_state = "health1"
+								if(60 to 80)			healths.icon_state = "health2"
+								if(40 to 60)			healths.icon_state = "health3"
+								if(20 to 40)			healths.icon_state = "health4"
+								if(0 to 20)				healths.icon_state = "health5"
+								else					healths.icon_state = "health6"
 
 			if(nutrition_icon)
 				switch(nutrition)
@@ -1332,28 +1343,35 @@
 		if(bodytemperature > 406)
 			for(var/datum/disease/D in viruses)
 				D.cure()
-			if(virus2)	virus2.cure(src)
-		if(!virus2)
-			for(var/obj/effect/decal/cleanable/blood/B in view(1,src))
-				if(B.virus2 && get_infection_chance())
-					infect_virus2(src,B.virus2)
-			for(var/obj/effect/decal/cleanable/mucus/M in view(1,src))
-				if(M.virus2 && get_infection_chance())
-					infect_virus2(src,M.virus2)
-		else
-			if(isnull(virus2)) // Trying to figure out a runtime error that keeps repeating
+			for (var/ID in virus2)
+				var/datum/disease2/disease/V = virus2[ID]
+				V.cure(src)
+
+		for(var/obj/effect/decal/cleanable/blood/B in view(1,src))
+			if(B.virus2.len && get_infection_chance(src))
+				for (var/ID in B.virus2)
+					var/datum/disease2/disease/V = virus2[ID]
+					infect_virus2(src,V)
+		for(var/obj/effect/decal/cleanable/mucus/M in view(1,src))
+			if(M.virus2.len && get_infection_chance(src))
+				for (var/ID in M.virus2)
+					var/datum/disease2/disease/V = virus2[ID]
+					infect_virus2(src,V)
+
+		for (var/ID in virus2)
+			var/datum/disease2/disease/V = virus2[ID]
+			if(isnull(V)) // Trying to figure out a runtime error that keeps repeating
 				CRASH("virus2 nulled before calling activate()")
 			else
-				virus2.activate(src)
-
+				V.activate(src)
 			// activate may have deleted the virus
-			if(!virus2) return
+			if(!V) continue
 
 			// check if we're immune
-			if(virus2.antigen & src.antibodies) virus2.dead = 1
+			if(V.antigen & src.antibodies)
+				V.dead = 1
 
-
-			return
+		return
 
 	proc/handle_stomach()
 		spawn(0)
@@ -1414,5 +1432,34 @@
 		if (shock_stage > 80)
 			Paralyse(rand(15,28))
 
+	proc/handle_pulse()
+		if(life_tick % 5) return pulse	//update pulse every 5 life ticks (~1 tick/sec, depending on server load)
+
+		if(stat == DEAD)
+			return PULSE_NONE	//that's it, you're dead, nothing can influence your pulse
+
+		var/temp = PULSE_NORM
+
+		if(round(vessel.get_reagent_amount("blood")) <= BLOOD_VOLUME_BAD)	//how much blood do we have
+			temp = PULSE_THREADY	//not enough :(
+
+		if(status_flags & FAKEDEATH)
+			temp = PULSE_NONE		//pretend that we're dead. unlike actual death, can be inflienced by meds
+
+		for(var/datum/reagent/R in reagents.reagent_list)
+			if(R.id in bradycardics)
+				if(temp <= PULSE_THREADY && temp >= PULSE_NORM)
+					temp--
+					break		//one reagent is enough
+								//comment out the breaks to make med effects stack
+		for(var/datum/reagent/R in reagents.reagent_list)				//handles different chems' influence on pulse
+			if(R.id in tachycardics)
+				if(temp <= PULSE_FAST && temp >= PULSE_NONE)
+					temp++
+					break
+
+		return temp
+
+
 #undef HUMAN_MAX_OXYLOSS
 #undef HUMAN_CRIT_MAX_OXYLOSS

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

@@ -68,7 +68,7 @@
 				message = replacetext(message, "u", "µ")
 				message = replacetext(message, "b", "ß")
 
-		else if(istype(wear_mask, /obj/item/clothing/mask/luchador))
+		/*else if(istype(wear_mask, /obj/item/clothing/mask/luchador))
 			if(copytext(message, 1, 2) != "*")
 				message = replacetext(message, "captain", "CAPITÁN")
 				message = replacetext(message, "station", "ESTACIÓN")
@@ -88,7 +88,7 @@
 				message = replacetext(message, "wizard", "mago")
 				message = uppertext(message)	//Things end up looking better this way (no mixed cases), and it fits the macho wrestler image.
 				if(prob(25))
-					message += " OLE!"
+					message += " OLE!"*/
 
 		else if(istype(wear_mask, /obj/item/clothing/mask/horsehead))
 			var/obj/item/clothing/mask/horsehead/hoers = wear_mask
@@ -105,7 +105,10 @@
 			message = slur(message)
 	..(message)
 
-/mob/living/carbon/human/say_understands(var/other)
+/mob/living/carbon/human/say_understands(var/other,var/datum/language/speaking = null)
+
+	if(has_brain_worms()) //Brain worms translate everything. Even mice and alien speak.
+		return 1
 	if (istype(other, /mob/living/silicon/ai))
 		return 1
 	if (istype(other, /mob/living/silicon/decoy))

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

@@ -220,14 +220,12 @@ 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)
 	var/hulk = (HULK in src.mutations)
 	var/skeleton = (SKELETON in src.mutations)
-	var/plant = (PLANT in src.mutations)
 
 	var/g = "m"
 	if(gender == FEMALE)	g = "f"
@@ -240,8 +238,6 @@ proc/get_damage_icon_part(damage_state, body_part)
 		else if(hulk)
 			var/list/TONE = ReadRGB(hulk_color_mod)
 			stand_icon.MapColors(rgb(TONE[1],0,0),rgb(0,TONE[2],0),rgb(0,0,TONE[3]))
-		else if(plant)
-			stand_icon.ColorTone(plant_color_mod)
 
 	var/datum/organ/external/head = get_organ("head")
 	var/has_head = 0
@@ -269,8 +265,6 @@ proc/get_damage_icon_part(damage_state, body_part)
 				else if(hulk)
 					var/list/TONE = ReadRGB(hulk_color_mod)
 					temp.MapColors(rgb(TONE[1],0,0),rgb(0,TONE[2],0),rgb(0,0,TONE[3]))
-				else if(plant)
-					temp.ColorTone(plant_color_mod)
 
 			//That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST
 			//And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part)
@@ -293,7 +287,7 @@ proc/get_damage_icon_part(damage_state, body_part)
 				stand_icon.Blend(temp, ICON_OVERLAY)
 
 	//Skin tone
-	if(!skeleton && !husk && !hulk && !plant)
+	if(!skeleton && !husk && !hulk && (species.flags & HAS_SKIN_TONE))
 		if(s_tone >= 0)
 			stand_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
 		else
@@ -309,18 +303,16 @@ proc/get_damage_icon_part(damage_state, body_part)
 	if(has_head)
 		//Eyes
 		if(!skeleton)
-			var/icon/eyes_s = new/icon('icons/mob/human_face.dmi', "eyes_s")
-			if(src.get_species()=="Vox")
-				eyes_s = new/icon('icons/mob/human_face.dmi', "vox_eyes_s")
-			eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-			stand_icon.Blend(eyes_s, ICON_OVERLAY)
+			var/icon/eyes = new/icon('icons/mob/human_face.dmi', species.eyes)
+			eyes.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
+			stand_icon.Blend(eyes, ICON_OVERLAY)
 
-	//Mouth	(lipstick!)
-	if(lip_style)	//skeletons are allowed to wear lipstick no matter what you think, agouri.
-		stand_icon.Blend(new/icon('icons/mob/human_face.dmi', "lips_[lip_style]_s"), ICON_OVERLAY)
+		//Mouth	(lipstick!)
+		if(lip_style && (species && species.flags & HAS_LIPS))	//skeletons are allowed to wear lipstick no matter what you think, agouri.
+			stand_icon.Blend(new/icon('icons/mob/human_face.dmi', "lips_[lip_style]_s"), ICON_OVERLAY)
 
 	//Underwear
-	if(underwear >0 && underwear < 12 && (src.dna.mutantrace != "vox" && src.dna.mutantrace != "kidan"))
+	if(underwear >0 && underwear < 12 && species.flags & HAS_UNDERWEAR)
 		if(!fat && !skeleton)
 			stand_icon.Blend(new /icon('icons/mob/human.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
 
@@ -429,47 +421,23 @@ proc/get_damage_icon_part(damage_state, body_part)
 	var/skeleton = (SKELETON in src.mutations)
 	if(skeleton)
 		race_icon = 'icons/mob/human_races/r_skeleton.dmi'
-	else if(dna)
-		switch(dna.mutantrace)
-			if("tajaran")
-				race_icon = 'icons/mob/human_races/r_tajaran.dmi'
-				deform_icon = 'icons/mob/human_races/r_def_tajaran.dmi'
-			if("lizard")
-				race_icon = 'icons/mob/human_races/r_lizard.dmi'
-				deform_icon = 'icons/mob/human_races/r_def_lizard.dmi'
-			if("skrell")
-				race_icon = 'icons/mob/human_races/r_skrell.dmi'
-				deform_icon = 'icons/mob/human_races/r_def_skrell.dmi'
-
-			if("vox")
-				race_icon = 'icons/mob/human_races/r_vox.dmi'
-				deform_icon = 'icons/mob/human_races/r_def_vox.dmi'
-
-			else
-				race_icon = 'icons/mob/human_races/r_human.dmi'
-				deform_icon = 'icons/mob/human_races/r_def_human.dmi'
 	else
-		icon = 'icons/mob/human_races/r_human.dmi'
+		//Icon data is kept in species datums within the mob.
+		race_icon = species.icobase
+		deform_icon = species.deform
 
 	if(dna)
 		switch(dna.mutantrace)
 			if("golem","slime","shadow","adamantine")
 				overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_l")
 				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_s")
-		//	if("lizard","tajaran","skrell")
-		//		overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.mutantrace]_[gender]_l")
-		//		overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.mutantrace]_[gender]_s")
-			if("plant")
-				if(stat == DEAD)	//TODO
-					overlays_lying[MUTANTRACE_LAYER] = image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace]_d")
-				else
-					overlays_lying[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_l")
-					overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_s")
 			else
 				overlays_lying[MUTANTRACE_LAYER]	= null
 				overlays_standing[MUTANTRACE_LAYER]	= null
+
 	if(!dna || !(dna.mutantrace in list("golem","metroid")))
 		update_body(0)
+
 	update_hair(0)
 	if(update_icons)   update_icons()
 
@@ -806,15 +774,11 @@ proc/get_damage_icon_part(damage_state, body_part)
 /mob/living/carbon/human/proc/update_tail_showing(var/update_icons=1)
 	overlays_lying[TAIL_LAYER] = null
 	overlays_standing[TAIL_LAYER] = null
-	var/cur_species = get_species()
-	if( cur_species == "Tajaran")
+
+	if(species.tail && species.flags & HAS_TAIL)
 		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 == "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")
+			overlays_lying[TAIL_LAYER] = image("icon" = 'icons/effects/species.dmi', "icon_state" = "[species.tail]_l")
+			overlays_standing[TAIL_LAYER] = image("icon" = 'icons/effects/species.dmi', "icon_state" = "[species.tail]_s")
 
 	if(update_icons)
 		update_icons()

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

@@ -150,28 +150,40 @@
 						emote("gasp")
 					updatehealth()
 
-	proc/handle_virus_updates()//copypaste from mob/carbon/human/life.dm
+	proc/handle_virus_updates()
+		if(status_flags & GODMODE)	return 0	//godmode
 		if(bodytemperature > 406)
 			for(var/datum/disease/D in viruses)
 				D.cure()
-		if(!virus2)
-			for(var/obj/effect/decal/cleanable/blood/B in view(1,src))
-				if(B.virus2 && get_infection_chance())
-					infect_virus2(src,B.virus2)
-			for(var/obj/effect/decal/cleanable/mucus/M in view(1,src))
-				if(M.virus2 && get_infection_chance())
-					infect_virus2(src,M.virus2)
-		else
-			if(isnull(virus2)) // Trying to figure out a runtime error that keeps repeating
+			for (var/ID in virus2)
+				var/datum/disease2/disease/V = virus2[ID]
+				V.cure(src)
+
+		for(var/obj/effect/decal/cleanable/blood/B in view(1,src))
+			if(B.virus2.len && get_infection_chance(src))
+				for (var/ID in B.virus2)
+					var/datum/disease2/disease/V = virus2[ID]
+					infect_virus2(src,V)
+		for(var/obj/effect/decal/cleanable/mucus/M in view(1,src))
+			if(M.virus2.len && get_infection_chance(src))
+				for (var/ID in M.virus2)
+					var/datum/disease2/disease/V = virus2[ID]
+					infect_virus2(src,V)
+
+		for (var/ID in virus2)
+			var/datum/disease2/disease/V = virus2[ID]
+			if(isnull(V)) // Trying to figure out a runtime error that keeps repeating
 				CRASH("virus2 nulled before calling activate()")
 			else
-				virus2.activate(src)
-
+				V.activate(src)
 			// activate may have deleted the virus
-			if(!virus2) return
+			if(!V) continue
 
 			// check if we're immune
-			if(virus2.antigen & src.antibodies) virus2.dead = 1
+			if(V.antigen & src.antibodies)
+				V.dead = 1
+
+		return
 
 	proc/breathe()
 		if(reagents)

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

@@ -10,116 +10,43 @@
 	update_icon = 0		///no need to call regenerate_icon
 
 	var/obj/item/weapon/card/id/wear_id = null // Fix for station bounced radios -- Skie
+	var/greaterform = "Human"                  // Used when humanizing a monkey.
+	var/ico = "monkey"                         // Used when updating icons.
+	var/uni_append = "12C4E2"                  // Small appearance modifier for different species.
 
 /mob/living/carbon/monkey/tajara
 	name = "farwa"
 	voice_name = "farwa"
 	voice_message = "mews"
 	say_message = "mews"
-	icon_state = "tajkey1"
+	ico = "tajkey"
+	uni_append = "0A0E00"
 
 /mob/living/carbon/monkey/skrell
 	name = "neaera"
 	voice_name = "neaera"
 	voice_message = "squicks"
 	say_message = "squicks"
-	icon_state = "skrellkey1"
+	ico = "skrellkey"
+	uni_append = "01CC92"
+
 /mob/living/carbon/monkey/unathi
 	name = "stok"
 	voice_name = "stok"
 	voice_message = "hisses"
 	say_message = "hisses"
-	icon_state = "stokkey1"
-
-/mob/living/carbon/monkey/unathi/New()
-	var/datum/reagents/R = new/datum/reagents(1000)
-	reagents = R
-	R.my_atom = src
-
-	if(name == "stok")
-		name = text("stok ([rand(1, 1000)])")
-	real_name = name
-	if (!(dna))
-		if(gender == NEUTER)
-			gender = pick(MALE, FEMALE)
-		dna = new /datum/dna( null )
-		dna.real_name = real_name
-		dna.uni_identity = "000000000000000000DC0000066000"
-		dna.struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6"
-		dna.unique_enzymes = md5(name)
-		dna.mutantrace = "lizard"
-				//////////blah
-		var/gendervar
-		if (gender == MALE)
-			gendervar = add_zero2(num2hex((rand(1,2049)),1), 3)
-		else
-			gendervar = add_zero2(num2hex((rand(2051,4094)),1), 3)
-		dna.uni_identity += gendervar
-		dna.uni_identity += "044"
-		dna.uni_identity += "C5D"
-	..()
-/mob/living/carbon/monkey/skrell/New()
-	var/datum/reagents/R = new/datum/reagents(1000)
-	reagents = R
-	R.my_atom = src
-	if(name == "neaera")
-		name = text("neaera ([rand(1, 1000)])")
-	real_name = name
-	if (!(dna))
-		if(gender == NEUTER)
-			gender = pick(MALE, FEMALE)
-		dna = new /datum/dna( null )
-		dna.real_name = real_name
-		dna.uni_identity = "000000000000000000DC0000066000"
-		dna.struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6"
-		dna.unique_enzymes = md5(name)
-		dna.mutantrace = "skrell"
-				//////////blah
-		var/gendervar
-		if (gender == MALE)
-			gendervar = add_zero2(num2hex((rand(1,2049)),1), 3)
-		else
-			gendervar = add_zero2(num2hex((rand(2051,4094)),1), 3)
-		dna.uni_identity += gendervar
-		dna.uni_identity += "01C"
-		dna.uni_identity += "C92"
-	..()
-/mob/living/carbon/monkey/tajara/New()
-	var/datum/reagents/R = new/datum/reagents(1000)
-	reagents = R
-	R.my_atom = src
-
-	if(name == "farwa")
-		name = text("farwa ([rand(1, 1000)])")
-	real_name = name
-	if (!(dna))
-		if(gender == NEUTER)
-			gender = pick(MALE, FEMALE)
-		dna = new /datum/dna( null )
-		dna.real_name = real_name
-		dna.uni_identity = "000000000000000000DC0000066000"
-		dna.struc_enzymes = "43359156756131E13763334D1C369012032164D4FE4CD61544B6C03F251B6C60A42821D26BA3B0FD6"
-		dna.unique_enzymes = md5(name)
-		dna.mutantrace = "tajaran"
-				//////////blah
-		var/gendervar
-		if (gender == MALE)
-			gendervar = add_zero2(num2hex((rand(1,2049)),1), 3)
-		else
-			gendervar = add_zero2(num2hex((rand(2051,4094)),1), 3)
-		dna.uni_identity += gendervar
-		dna.uni_identity += "0A0"
-		dna.uni_identity += "E00"
-	..()
+	ico = "stokkey"
+	uni_append = "044C5D"
 
 /mob/living/carbon/monkey/New()
 	var/datum/reagents/R = new/datum/reagents(1000)
 	reagents = R
 	R.my_atom = src
 
-	if(name == "monkey")
-		name = text("monkey ([rand(1, 1000)])")
-	real_name = name
+	if(name == "monkey" || name == "farwa" || name == "stok" || name == "neara") //Hideous but necessary to stop Pun-Pun becoming generic.
+		name = "[name] ([rand(1, 1000)])"
+		real_name = name
+
 	if (!(dna))
 		if(gender == NEUTER)
 			gender = pick(MALE, FEMALE)
@@ -134,12 +61,29 @@
 			gendervar = add_zero2(num2hex((rand(1,2049)),1), 3)
 		else
 			gendervar = add_zero2(num2hex((rand(2051,4094)),1), 3)
-		dna.uni_identity += gendervar
-		dna.uni_identity += "12C"
-		dna.uni_identity += "4E2"
+		dna.uni_identity += "[gendervar][uni_append]"
 	..()
+	update_icons()
 	return
 
+/mob/living/carbon/monkey/unathi/New()
+
+	..()
+	dna.mutantrace = "lizard"
+	greaterform = "Unathi"
+
+/mob/living/carbon/monkey/skrell/New()
+
+	..()
+	dna.mutantrace = "skrell"
+	greaterform = "Skrell"
+
+/mob/living/carbon/monkey/tajara/New()
+
+	..()
+	dna.mutantrace = "tajaran"
+	greaterform = "Tajaran"
+
 /mob/living/carbon/monkey/movement_delay()
 	var/tally = 0
 	if(reagents)

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

@@ -28,14 +28,7 @@
 	update_hud()
 	lying_prev = lying	//so we don't update overlays for lying/standing unless our stance changes again
 	overlays.Cut()
-	var/ico = "monkey"
-	switch(src.dna.mutantrace) //On monkey spawn, check the DNA of the mob. If alien, change to appropriate alien monkey sprite
-		if("tajaran")
-			ico = "tajkey"
-		if("lizard")
-			ico = "stokkey"
-		if("skrell")
-			ico = "skrellkey"
+
 	if(lying)
 		icon_state = ico + "0"
 		for(var/image/I in overlays_lying)

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

@@ -3,7 +3,14 @@
 
 // proc to find out in how much pain the mob is at the moment
 /mob/living/carbon/proc/updateshock()
-	src.traumatic_shock = src.getOxyLoss() + src.getToxLoss() + src.getFireLoss() + 1.2*src.getBruteLoss() + 2*src.getCloneLoss() + src.halloss
+	src.traumatic_shock = 			\
+	1	* src.getOxyLoss() + 		\
+	0.5	* src.getToxLoss() + 		\
+	2.5	* src.getFireLoss() + 		\
+	1.5	* src.getBruteLoss() + 		\
+	2	* src.getCloneLoss() + 		\
+	1	* src.halloss
+
 	if(reagents.has_reagent("alkysine"))
 		src.traumatic_shock -= 10
 	if(reagents.has_reagent("inaprovaline"))

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

@@ -0,0 +1,96 @@
+/*
+	Datum-based species. Should make for much cleaner and easier to maintain mutantrace code.
+*/
+
+/datum/species
+	var/name                     // Species name.
+
+	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/eyes = "eyes_s"                                  // Icon for eyes.
+
+	var/primitive                // Lesser form, if any (ie. monkey for humans)
+	var/tail                     // Name of tail image in species effects icon file.
+	var/language                 // Default racial language, if any.
+	var/attack_verb = "punch"    // Empty hand hurt intent verb.
+	var/mutantrace               // Safeguard due to old code.
+
+	var/breath_type     // Non-oxygen gas breathed, if any.
+
+	var/cold_level_1 = 260  // Cold damage level 1 below this point.
+	var/cold_level_2 = 200  // Cold damage level 2 below this point.
+	var/cold_level_3 = 120  // Cold damage level 3 below this point.
+
+	var/heat_level_1 = 360  // Heat damage level 1 above this point.
+	var/heat_level_2 = 400  // Heat damage level 2 above this point.
+	var/heat_level_3 = 1000 // Heat damage level 2 above this point.
+
+	var/darksight = 2
+	var/hazard_high_pressure = HAZARD_HIGH_PRESSURE   // Dangerously high pressure.
+	var/warning_high_pressure = WARNING_HIGH_PRESSURE // High pressure warning.
+	var/warning_low_pressure = WARNING_LOW_PRESSURE   // Low pressure warning.
+	var/hazard_low_pressure = HAZARD_LOW_PRESSURE     // Dangerously low pressure.
+
+	var/brute_resist    // Physical damage reduction.
+	var/burn_resist     // Burn damage reduction.
+
+	var/flags = 0       // Various specific features.
+
+/datum/species/human
+	name = "Human"
+	primitive = /mob/living/carbon/monkey
+
+	flags = HAS_SKIN_TONE | HAS_LIPS | HAS_UNDERWEAR
+
+/datum/species/unathi
+	name = "Unathi"
+	icobase = 'icons/mob/human_races/r_lizard.dmi'
+	deform = 'icons/mob/human_races/r_def_lizard.dmi'
+	language = "Sinta'unathi"
+	tail = "sogtail"
+	attack_verb = "scratch"
+	primitive = /mob/living/carbon/monkey/unathi
+	darksight = 3
+
+	flags = WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL
+
+/datum/species/tajaran
+	name = "Tajaran"
+	icobase = 'icons/mob/human_races/r_tajaran.dmi'
+	deform = 'icons/mob/human_races/r_def_tajaran.dmi'
+	language = "Siik'tajr"
+	tail = "tajtail"
+	attack_verb = "scratch"
+	darksight = 8
+
+	primitive = /mob/living/carbon/monkey/tajara
+
+	flags = WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL
+
+/datum/species/skrell
+	name = "Skrell"
+	icobase = 'icons/mob/human_races/r_skrell.dmi'
+	deform = 'icons/mob/human_races/r_def_skrell.dmi'
+	language = "Skrellian"
+	primitive = /mob/living/carbon/monkey/skrell
+
+	flags = WHITELISTED | HAS_LIPS | HAS_UNDERWEAR
+
+/datum/species/vox
+	name = "Vox"
+	icobase = 'icons/mob/human_races/r_vox.dmi'
+	deform = 'icons/mob/human_races/r_def_vox.dmi'
+	language = "Vox-pidgin"
+
+	eyes = "vox_eyes_s"
+	breath_type = "nitrogen"
+
+	flags = NO_SCAN
+
+/datum/species/diona
+	name = "Diona"
+	icobase = 'icons/mob/human_races/r_plant.dmi'
+	deform = 'icons/mob/human_races/r_def_plant.dmi'
+	attack_verb = "slash"
+
+	flags = NO_EAT | NO_BREATHE | REQUIRE_LIGHT | NON_GENDERED | NO_SCAN | IS_PLANT

code/modules/mob/living/say.dm

@@ -85,6 +85,7 @@ var/list/department_radio_keys = list(
 		if(dongle.translate_hive) return 1
 
 /mob/living/say(var/message)
+
 	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
 	message = capitalize(message)
 
@@ -123,11 +124,14 @@ var/list/department_radio_keys = list(
 	var/italics = 0
 	var/message_range = null
 	var/message_mode = null
+	var/datum/language/speaking = null //For use if a specific language is being spoken.
 
+	// If brain damaged, talk on headset at random.
 	if (getBrainLoss() >= 60 && prob(50))
 		if (ishuman(src))
 			message_mode = "headset"
-	// Special message handling
+
+	// General public key. Special message handling
 	else if (copytext(message, 1, 2) == ";")
 		if (ishuman(src))
 			message_mode = "headset"
@@ -138,8 +142,12 @@ var/list/department_radio_keys = list(
 	else if (length(message) >= 2)
 		var/channel_prefix = copytext(message, 1, 3)
 
+		//Check if the person is speaking a language that they know.
+		for(var/datum/language/L in languages)
+			if(lowertext(channel_prefix) == ":[L.key]")
+				speaking = L
+				break
 		message_mode = department_radio_keys[channel_prefix]
-		//world << "channel_prefix=[channel_prefix]; message_mode=[message_mode]"
 		if (message_mode)
 			message = trim(copytext(message, 3))
 			if (!(ishuman(src) || istype(src, /mob/living/simple_animal/parrot) || isrobot(src) && (message_mode=="department" || (message_mode in radiochannels))))
@@ -183,11 +191,6 @@ var/list/department_radio_keys = list(
 					message += "Z"
 */
 	var/list/obj/item/used_radios = new
-
-	var/is_speaking_skrell = 0
-	var/is_speaking_soghun = 0
-	var/is_speaking_taj = 0
-	var/is_speaking_vox = 0
 	var/is_speaking_radio = 0
 
 	switch (message_mode)
@@ -274,22 +277,6 @@ 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 ("vox")
-			if(vox_talk_understand || universal_speak)
-				is_speaking_vox = 1
-
 		if("changeling")
 			if(mind && mind.changeling)
 				for(var/mob/Changeling in mob_list)
@@ -377,21 +364,12 @@ var/list/department_radio_keys = list(
 
 	for (var/M in listening)
 		if(hascall(M,"say_understands"))
-			if (M:say_understands(src) && !is_speaking_skrell && !is_speaking_soghun && !is_speaking_vox && !is_speaking_taj)
+			if (M:say_understands(src,speaking))
 				heard_a += M
-			else if(ismob(M))
-				if(is_speaking_skrell && (M:skrell_talk_understand || M:universal_speak))
-					heard_a += M
-				else if(is_speaking_soghun && (M:soghun_talk_understand || M:universal_speak))
-					heard_a += M
-				else if(is_speaking_taj && (M:tajaran_talk_understand || M:universal_speak))
-					heard_a += M
-				else if(is_speaking_vox && (M:vox_talk_understand || M:universal_speak))
-					heard_a += M
-				else
-					heard_b += M
 			else
-				heard_a += M
+				heard_b += M
+		else
+			heard_a += M
 
 	var/speech_bubble_test = say_test(message)
 	var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
@@ -403,7 +381,7 @@ var/list/department_radio_keys = list(
 
 	var/rendered = null
 	if (length(heard_a))
-		var/message_a = say_quote(message,is_speaking_soghun,is_speaking_skrell,is_speaking_taj,is_speaking_vox)
+		var/message_a = say_quote(message,speaking)
 
 		if (italics)
 			message_a = "<i>[message_a]</i>"
@@ -428,7 +406,7 @@ var/list/department_radio_keys = list(
 			message_b = voice_message
 		else
 			message_b = stars(message)
-			message_b = say_quote(message_b,is_speaking_soghun,is_speaking_skrell,is_speaking_taj,is_speaking_vox)
+			message_b = say_quote(message_b,speaking)
 
 		if (italics)
 			message_b = "<i>[message_b]</i>"

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

@@ -340,7 +340,7 @@ var/list/ai_list = list()
 	if(href_list["say_word"])
 		src.announcement(href_list["say_word"])
 		return
-	
+
 	if (href_list["lawi"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite
 		var/L = text2num(href_list["lawi"])
 		switch(ioncheck[L])
@@ -561,10 +561,9 @@ var/list/ai_list = list()
 		if(!C.can_use())
 			continue
 
-		var/list/tempnetwork = C.network
-		tempnetwork.Remove("CREED", "thunder", "RD", "toxins", "Prison")
+		var/list/tempnetwork = difflist(C.network,RESTRICTED_CAMERA_NETWORKS,1)
 		if(tempnetwork.len)
-			for(var/i in C.network)
+			for(var/i in tempnetwork)
 				cameralist[i] = i
 	var/old_network = network
 	network = input(U, "Which network would you like to view?") as null|anything in cameralist

code/modules/mob/living/silicon/ai/freelook/update_triggers.dm

@@ -67,7 +67,7 @@
 	var/oldLoc = src.loc
 	. = ..()
 	if(.)
-		if(src.camera)
+		if(src.camera && src.camera.network.len)
 			if(!updating)
 				updating = 1
 				spawn(BORG_CAMERA_BUFFER)
@@ -89,12 +89,16 @@
 
 /obj/machinery/camera/New()
 	..()
-	cameranet.cameras += src
-	cameranet.addCamera(src)
+	cameranet.cameras += src //Camera must be added to global list of all cameras no matter what...
+	var/list/open_networks = difflist(network,RESTRICTED_CAMERA_NETWORKS) //...but if all of camera's networks are restricted, it only works for specific camera consoles.
+	if(open_networks.len) //If there is at least one open network, chunk is available for AI usage.
+		cameranet.addCamera(src)
 
 /obj/machinery/camera/Del()
 	cameranet.cameras -= src
-	cameranet.removeCamera(src)
+	var/list/open_networks = difflist(network,RESTRICTED_CAMERA_NETWORKS)
+	if(open_networks.len)
+		cameranet.removeCamera(src)
 	..()
 
 #undef BORG_CAMERA_BUFFER

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

@@ -38,8 +38,9 @@ var/const/VOX_VOLUME = 75
 	set desc = "Display a list of vocal words to announce to the crew."
 	set category = "AI Commands"
 
-
-	var/dat = "Here is a list of words you can type into the Announcement button to create sentences to vocally announce.<BR> \
+	src << "\red VOX is disabled until issues with the code can be sorted."
+	return
+/*	var/dat = "Here is a list of words you can type into the Announcement button to create sentences to vocally announce.<BR> \
 	Do not use punctuation as you would normally, if you want a pause you can use the full stop and comma characters by separating them with spaces, like so: 'Alpha . Test , Bravo'.<BR>"
 
 	var/index = 0
@@ -49,7 +50,7 @@ var/const/VOX_VOLUME = 75
 		if(index != vox_sounds.len)
 			dat += " / "
 
-	src << browse(dat, "window=announce_help;size=500x400")
+	src << browse(dat, "window=announce_help;size=500x400")*/
 
 
 /mob/living/silicon/ai/verb/announcement(var/message as text)
@@ -58,6 +59,9 @@ var/const/VOX_VOLUME = 75
 	set desc = "Create a vocal announcement by typing in the available words to create a setence. More help is available in 'Announcement Help'"
 	set category = "AI Commands"
 
+	src << "\red VOX is disabled until issues with the code can be sorted."
+	return
+/*
 	if(!message)
 		return
 	//if(!announcing_vox > world.time)
@@ -81,9 +85,9 @@ var/const/VOX_VOLUME = 75
 
 	if(incorrect_words.len)
 		src << "<span class='notice'>These words are not available on the announcement system: [english_list(incorrect_words)].</span>"
-
+*/
 /proc/play_vox_word(var/word, var/z_level)
-
+/*
 	word = lowertext(word)
 
 	if(vox_sounds[word])
@@ -99,12 +103,12 @@ var/const/VOX_VOLUME = 75
 				if(T.z == z_level)
 					M << voice
 		return 1
-	return 0
+	return 0*/
 
 // List is required to compile the resources into the game when it loads.
 // Dynamically loading it has bad results with sounds overtaking each other, even with the wait variable.
 
-var/list/vox_sounds = list("," = 'sound/vox/,.wav',
+var/list/vox_sounds = list(/*"," = 'sound/vox/,.wav',
 "." = 'sound/vox/..wav',
 "a" = 'sound/vox/a.wav',
 "accelerating" = 'sound/vox/accelerating.wav',
@@ -719,4 +723,4 @@ var/list/vox_sounds = list("," = 'sound/vox/,.wav',
 "yourself" = 'sound/vox/yourself.wav',
 "zero" = 'sound/vox/zero.wav',
 "zone" = 'sound/vox/zone.wav',
-"zulu" = 'sound/vox/zulu.wav')
+"zulu" = 'sound/vox/zulu.wav'*/)

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

@@ -59,8 +59,11 @@
 			for(var/datum/disease/D in patient.viruses)
 				if(!D.hidden[SCANNER])
 					foundVirus++
-			if(patient.virus2)
-				foundVirus++
+
+			for (var/ID in patient.virus2)
+				if (ID in virusDB)
+					foundVirus = 1
+					break
 
 			holder = patient.hud_list[HEALTH_HUD]
 			if(patient.stat == 2)

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

@@ -6,7 +6,7 @@
 		usr << "<span class='notice'>Something is there but you can't see it.</span>"
 		return
 
-	var/msg = "<span class='info'>*---------*\nThis is \icon[src] \a <EM>[src]</EM>!\n"
+	var/msg = "<span class='info'>*---------*\nThis is \icon[src] \a <EM>[src]</EM>[custom_name ? ", [modtype] [braintype]" : ""]!\n"
 	msg += "<span class='warning'>"
 	if (src.getBruteLoss())
 		if (src.getBruteLoss() < 75)

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

@@ -48,7 +48,7 @@
 	//var/list/laws = list()
 	var/alarms = list("Motion"=list(), "Fire"=list(), "Atmosphere"=list(), "Power"=list(), "Camera"=list())
 	var/viewalerts = 0
-	var/modtype = "robot"
+	var/modtype = "Default"
 	var/lower_mod = 0
 	var/jetpack = 0
 	var/datum/effect/effect/system/ion_trail_follow/ion_trail = null
@@ -87,7 +87,7 @@
 		module = new /obj/item/weapon/robot_module/syndicate(src)
 		hands.icon_state = "standard"
 		icon_state = "secborg"
-		modtype = "Synd"
+		modtype = "Security"
 	else
 		laws = new /datum/ai_laws/nanotrasen()
 		connected_ai = select_active_ai_with_fewest_borgs()
@@ -102,7 +102,7 @@
 	if(!scrambledcodes && !camera)
 		camera = new /obj/machinery/camera(src)
 		camera.c_tag = real_name
-		camera.network = list("SS13")
+		camera.network = list("SS13","Robots")
 		if(isWireCut(5)) // 5 = BORG CAMERA
 			camera.status = 0
 
@@ -148,10 +148,10 @@
 	if(module)
 		return
 	var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security")
-	if(crisis) //Leaving this in until it's balanced appropriately.
+	if(crisis && security_level == SEC_LEVEL_RED) //Leaving this in until it's balanced appropriately.
 		src << "\red Crisis mode active. Combat module available."
 		modules+="Combat"
-	var/mod = input("Please, select a module!", "Robot", null, null) in modules
+	modtype = input("Please, select a module!", "Robot", null, null) in modules
 
 	var/module_sprites[0] //Used to store the associations between sprite names and sprite index.
 	var/channels = list()
@@ -159,17 +159,15 @@
 	if(module)
 		return
 
-	switch(mod)
+	switch(modtype)
 		if("Standard")
 			module = new /obj/item/weapon/robot_module/standard(src)
-			modtype = "Stand"
 			module_sprites["Basic"] = "robot_old"
 			module_sprites["Android"] = "droid"
 			module_sprites["Default"] = "robot"
 
 		if("Service")
 			module = new /obj/item/weapon/robot_module/butler(src)
-			modtype = "Butler"
 			module_sprites["Waitress"] = "Service"
 			module_sprites["Kent"] = "toiletbot"
 			module_sprites["Bro"] = "Brobot"
@@ -178,16 +176,18 @@
 
 		if("Miner")
 			module = new /obj/item/weapon/robot_module/miner(src)
-			modtype = "Miner"
 			channels = list("Supply" = 1)
+			if(camera && "Robots" in camera.network)
+				camera.network.Add("MINE")
 			module_sprites["Basic"] = "Miner_old"
 			module_sprites["Advanced Droid"] = "droid-miner"
 			module_sprites["Treadhead"] = "Miner"
 
 		if("Medical")
 			module = new /obj/item/weapon/robot_module/medical(src)
-			modtype = "Med"
 			channels = list("Medical" = 1)
+			if(camera && "Robots" in camera.network)
+				camera.network.Add("Medical")
 			module_sprites["Basic"] = "Medbot"
 			module_sprites["Advanced Droid"] = "droid-medical"
 			module_sprites["Needles"] = "medicalrobot"
@@ -195,7 +195,6 @@
 
 		if("Security")
 			module = new /obj/item/weapon/robot_module/security(src)
-			modtype = "Sec"
 			channels = list("Security" = 1)
 			module_sprites["Basic"] = "secborg"
 			module_sprites["Red Knight"] = "Security"
@@ -204,7 +203,6 @@
 
 		if("Engineering")
 			module = new /obj/item/weapon/robot_module/engineering(src)
-			modtype = "Eng"
 			channels = list("Engineering" = 1)
 			module_sprites["Basic"] = "Engineering"
 			module_sprites["Antique"] = "engineerrobot"
@@ -212,26 +210,24 @@
 
 		if("Janitor")
 			module = new /obj/item/weapon/robot_module/janitor(src)
-			modtype = "Jan"
 			module_sprites["Basic"] = "JanBot2"
 			module_sprites["Mopbot"]  = "janitorrobot"
 			module_sprites["Mop Gear Rex"] = "mopgearrex"
 
 		if("Combat")
 			module = new /obj/item/weapon/robot_module/combat(src)
-			modtype = "Com"
 			module_sprites["Combat Android"] = "droid-combat"
 			channels = list("Security" = 1)
 
 	//Custom_sprite check and entry
 	if (custom_sprite == 1)
-		module_sprites["Custom"] = "[src.ckey]-[mod]"
+		module_sprites["Custom"] = "[src.ckey]-[modtype]"
 
-	hands.icon_state = lowertext(mod)
-	feedback_inc("cyborg_[lowertext(mod)]",1)
-	updatename(mod)
+	hands.icon_state = lowertext(modtype)
+	feedback_inc("cyborg_[lowertext(modtype)]",1)
+	updatename()
 
-	if(mod == "Medical" || mod == "Security" || mod == "Combat")
+	if(modtype == "Medical" || modtype == "Security" || modtype == "Combat")
 		status_flags &= ~CANPUSH
 
 	choose_icon(6,module_sprites)
@@ -239,7 +235,8 @@
 	base_icon = icon_state
 
 /mob/living/silicon/robot/proc/updatename(var/prefix as text)
-
+	if(prefix)
+		modtype = prefix
 	if(istype(mmi, /obj/item/device/mmi/posibrain))
 		braintype = "Android"
 	else
@@ -249,7 +246,7 @@
 	if(custom_name)
 		changed_name = custom_name
 	else
-		changed_name = "[(prefix ? "[prefix] " : "")][braintype]-[num2text(ident)]"
+		changed_name = "[modtype] [braintype]-[num2text(ident)]"
 	real_name = changed_name
 	name = real_name
 
@@ -287,7 +284,7 @@
 		if (newname != "")
 			custom_name = newname
 
-		updatename("Default")
+		updatename()
 		updateicon()
 
 /mob/living/silicon/robot/verb/cmd_robot_alerts()
@@ -1182,12 +1179,8 @@
 	scrambledcodes = 1
 	//Disconnect it's camera so it's not so easily tracked.
 	if(src.camera)
-		del(src.camera)
-		src.camera = null
-		// I'm trying to get the Cyborg to not be listed in the camera list
-		// Instead of being listed as "deactivated". The downside is that I'm going
-		// to have to check if every camera is null or not before doing anything, to prevent runtime errors.
-		// I could change the network to null but I don't know what would happen, and it seems too hacky for me.
+		src.camera.network = list()
+		cameranet.removeCamera(src.camera)
 
 
 /mob/living/silicon/robot/proc/ResetSecurityCodes()
@@ -1247,9 +1240,11 @@
 	else
 		src << "Something is badly wrong with the sprite selection. Harass a coder."
 		icon_state = module_sprites[1]
+		base_icon = icon_state
 		return
 
 	overlays -= "eyes"
+	base_icon = icon_state
 	updateicon()
 
 	if (triesleft >= 1)

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

@@ -223,13 +223,12 @@
 /obj/item/weapon/robot_module/combat
 	name = "combat robot module"
 
-
 	New()
 		src.modules += new /obj/item/borg/sight/thermal(src)
-		src.modules += new /obj/item/weapon/gun/energy/lasercannon/cyborg(src)
+		src.modules += new /obj/item/weapon/gun/energy/laser/cyborg(src)
 		src.modules += new /obj/item/weapon/pickaxe/plasmacutter(src)
 		src.modules += new /obj/item/borg/combat/shield(src)
 		src.modules += new /obj/item/borg/combat/mobility(src)
 		src.modules += new /obj/item/weapon/wrench(src) //Is a combat android really going to be stopped by a chair?
-		src.emag = new /obj/item/weapon/gun/energy/pulse_rifle/cyborg(src)
+		src.emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src)
 		return

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

@@ -24,14 +24,15 @@
 
 /obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R)
 	R.uneq_all()
-	R.hands.icon_state = "nomod"
-	R.icon_state = "robot"
 	del(R.module)
 	R.module = null
 	R.modtype = "robot"
 	R.real_name = "Cyborg [R.ident]"
 	R.name = R.real_name
 	R.nopush = 0
+	R.hands.icon_state = "nomod"
+	R.base_icon = "robot"
+	R.icon_state = "robot"
 	R.updateicon()
 
 	return 1

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

@@ -145,8 +145,8 @@
 	if (bot.connected_ai == ai)
 		return 1
 	return 0
-	
-	
+
+
 // this function shows the health of the pAI in the Status panel
 /mob/living/silicon/proc/show_system_integrity()
 	if(!src.stat)
@@ -154,25 +154,25 @@
 	else
 		stat(null, text("Systems nonfunctional"))
 
-	
+
 // This is a pure virtual function, it should be overwritten by all subclasses
 /mob/living/silicon/proc/show_malf_ai()
 	return 0
 
-	
+
 // this function displays the station time in the status panel
 /mob/living/silicon/proc/show_station_time()
 	stat(null, "Station Time: [worldtime2text()]")
-	
-	
+
+
 // this function displays the shuttles ETA in the status panel if the shuttle has been called
 /mob/living/silicon/proc/show_emergency_shuttle_eta()
 	if(emergency_shuttle.online && emergency_shuttle.location < 2)
 		var/timeleft = emergency_shuttle.timeleft()
 		if (timeleft)
 			stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
-				
-				
+
+
 // This adds the basic clock, shuttle recall timer, and malf_ai info to all silicon lifeforms
 /mob/living/silicon/Stat()
 	..()
@@ -182,13 +182,13 @@
 		show_emergency_shuttle_eta()
 		show_system_integrity()
 		show_malf_ai()
-		
+
 // this function displays the stations manifest in a separate window
 /mob/living/silicon/proc/show_station_manifest()
 	var/dat
 	dat += "<h4>Crew Manifest</h4>"
 	if(data_core)
-		dat += data_core.get_manifest(0) // make it monochrome
+		dat += data_core.get_manifest(1) // make it monochrome
 	dat += "<br>"
 	src << browse(dat, "window=airoster")
 	onclose(src, "airoster")

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

@@ -0,0 +1,370 @@
+/mob/living/captive_brain
+	name = "host brain"
+	real_name = "host brain"
+
+/mob/living/captive_brain/say(var/message)
+
+	if (src.client)
+		if(client.prefs.muted & MUTE_IC)
+			src << "\red You cannot speak in IC (muted)."
+			return
+		if (src.client.handle_spam_prevention(message,MUTE_IC))
+			return
+
+	if(istype(src.loc,/mob/living/simple_animal/borer))
+		var/mob/living/simple_animal/borer/B = src.loc
+		src << "You whisper silently, \"[message]\""
+		B.host << "The captive mind of [src] whispers, \"[message]\""
+
+/mob/living/captive_brain/emote(var/message)
+	return
+
+/mob/living/simple_animal/borer
+	name = "cortical borer"
+	real_name = "cortical borer"
+	desc = "A small, quivering sluglike creature."
+	speak_emote = list("chirrups")
+	emote_hear = list("chirrups")
+	response_help  = "pokes the"
+	response_disarm = "prods the"
+	response_harm   = "stomps on the"
+	icon_state = "brainslug"
+	icon_living = "brainslug"
+	icon_dead = "brainslug_dead"
+	speed = 5
+	a_intent = "harm"
+	stop_automated_movement = 1
+	status_flags = CANPUSH
+	attacktext = "nips"
+	friendly = "prods"
+	wander = 0
+	pass_flags = PASSTABLE
+
+	var/chemicals = 10                      // Chemicals used for reproduction and spitting neurotoxin.
+	var/mob/living/carbon/human/host        // Human host for the brain worm.
+	var/truename                            // Name used for brainworm-speak.
+	var/mob/living/captive_brain/host_brain // Used for swapping control of the body back and forth.
+	var/controlling                         // Used in human death check.
+
+/mob/living/simple_animal/borer/Life()
+
+	..()
+	if(host)
+		if(!stat && !host.stat)
+			if(chemicals < 250)
+				chemicals++
+			if(controlling)
+				if(prob(5))
+					host.adjustBrainLoss(rand(1,2))
+
+				if(prob(host.brainloss/20))
+					host.say("*[pick(list("blink","blink_r","choke","aflap","drool","twitch","twitch_s","gasp"))]")
+
+				//if(host.brainloss > 100)
+
+/mob/living/simple_animal/borer/New()
+	..()
+	truename = "[pick("Primary","Secondary","Tertiary","Quaternary")] [rand(1000,9999)]"
+	host_brain = new/mob/living/captive_brain(src)
+
+	for(var/mob/M in player_list)
+		if(istype(M,/mob/dead/observer))
+			var/mob/dead/observer/O = M
+			if(O.client)
+				if(O.client.prefs.be_special & BE_ALIEN)
+					src.ckey = O.ckey
+					break
+
+
+/mob/living/simple_animal/borer/say(var/message)
+
+	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
+	message = capitalize(message)
+
+	if(!message)
+		return
+
+	if (stat == 2)
+		return say_dead(message)
+
+	if (stat)
+		return
+
+	if (src.client)
+		if(client.prefs.muted & MUTE_IC)
+			src << "\red You cannot speak in IC (muted)."
+			return
+		if (src.client.handle_spam_prevention(message,MUTE_IC))
+			return
+
+	if (copytext(message, 1, 2) == "*")
+		return emote(copytext(message, 2))
+
+	if (copytext(message, 1, 2) == ";") //Brain borer hivemind.
+		return borer_speak(message)
+
+	if(!host)
+		src << "You have no host to speak to."
+		return //No host, no audible speech.
+
+	src << "You drop words into [host]'s mind: \"[message]\""
+	host << "Your own thoughts speak: \"[message]\""
+
+/mob/living/simple_animal/borer/Stat()
+	..()
+	statpanel("Status")
+
+	if(emergency_shuttle)
+		if(emergency_shuttle.online && emergency_shuttle.location < 2)
+			var/timeleft = emergency_shuttle.timeleft()
+			if (timeleft)
+				stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
+
+	if (client.statpanel == "Status")
+		stat("Chemicals", chemicals)
+
+// VERBS!
+
+/mob/living/simple_animal/borer/proc/borer_speak(var/message)
+	if(!message)
+		return
+
+	for(var/mob/M in mob_list)
+		if(M.mind && (istype(M, /mob/living/simple_animal/borer) || istype(M, /mob/dead/observer)))
+			M << "<i>Cortical link, <b>[truename]:</b> [copytext(message, 2)]</i>"
+
+/mob/living/simple_animal/borer/verb/bond_brain()
+	set category = "Alien"
+	set name = "Assume Control"
+	set desc = "Fully connect to the brain of your host."
+
+	if(!host)
+		src << "You are not inside a host body."
+		return
+
+	if(src.stat)
+		src << "You cannot do that in your current state."
+		return
+
+	src << "You begin delicately adjusting your connection to the host brain..."
+
+	spawn(300+(host.brainloss*5))
+
+		if(!host || !src || controlling) return
+
+		else
+			src << "\red <B>You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system.</B>"
+			host << "\red <B>You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours.</B>"
+
+			host_brain.ckey = host.ckey
+			host.ckey = src.ckey
+			controlling = 1
+
+			host.verbs += /mob/living/carbon/human/proc/release_control
+			host.verbs += /mob/living/carbon/human/proc/punish_host
+			host.verbs += /mob/living/carbon/human/proc/spawn_larvae
+
+/mob/living/simple_animal/borer/verb/secrete_chemicals()
+	set category = "Alien"
+	set name = "Secrete Chemicals"
+	set desc = "Push some chemicals into your host's bloodstream."
+
+	if(!host)
+		src << "You are not inside a host body."
+		return
+
+	if(stat)
+		src << "You cannot secrete chemicals in your current state."
+
+	if(chemicals < 50)
+		src << "You don't have enough chemicals!"
+
+	var/chem = input("Select a chemical to secrete.", "Chemicals") in list("bicaridine","tramadol","hyperzine")
+
+	if(chemicals < 50 || !host || controlling || !src || stat) //Sanity check.
+		return
+
+	src << "\red <B>You squirt a measure of [chem] from your reservoirs into [host]'s bloodstream.</B>"
+	host.reagents.add_reagent(chem, 15)
+	chemicals -= 50
+
+/mob/living/simple_animal/borer/verb/release_host()
+	set category = "Alien"
+	set name = "Release Host"
+	set desc = "Slither out of your host."
+
+	if(!host)
+		src << "You are not inside a host body."
+		return
+
+	if(stat)
+		src << "You cannot leave your host in your current state."
+
+
+	if(!host || !src) return
+
+	src << "You begin disconnecting from [host]'s synapses and prodding at their internal ear canal."
+
+	if(!host.stat)
+		host << "An odd, uncomfortable pressure begins to build inside your skull, behind your ear..."
+
+	spawn(200)
+
+		if(!host || !src) return
+
+		if(src.stat)
+			src << "You cannot infest a target in your current state."
+			return
+
+		src << "You wiggle out of [host]'s ear and plop to the ground."
+		if(!host.stat)
+			host << "Something slimy wiggles out of your ear and plops to the ground!"
+
+		detatch()
+
+mob/living/simple_animal/borer/proc/detatch()
+
+	if(!host) return
+
+	var/datum/organ/external/head = host.get_organ("head")
+	head.implants -= src
+	src.loc = get_turf(host)
+	controlling = 0
+
+	reset_view(null)
+	machine = null
+
+	host.reset_view(null)
+	host.machine = null
+
+	host.verbs -= /mob/living/carbon/human/proc/release_control
+	host.verbs -= /mob/living/carbon/human/proc/punish_host
+	host.verbs -= /mob/living/carbon/human/proc/spawn_larvae
+
+	if(host_brain.ckey)
+		src.ckey = host.ckey
+		host.ckey = host_brain.ckey
+		host_brain.ckey = null
+		host_brain.name = "host brain"
+		host_brain.real_name = "host brain"
+
+	host = null
+
+/mob/living/simple_animal/borer/verb/infest(var/mob/living/carbon/human/H)
+	set category = "Alien"
+	set name = "Infest"
+	set desc = "Infest a suitable humanoid host."
+
+	if(host)
+		src << "You are already within a host."
+		return
+
+	if(stat)
+		src << "You cannot infest a target in your current state."
+		return
+
+	var/list/choices = list()
+	for(var/mob/living/carbon/human/C in view(1,src))
+		if(istype(C,/mob/living/carbon/human) && C.stat != 2)
+			choices += C
+
+	var/mob/living/carbon/human/M = input(src,"Who do you wish to infest?") in null|choices
+
+	if(!M || !src) return
+
+	if(M.has_brain_worms())
+		src << "You cannot infest someone who is already infested!"
+		return
+
+	M << "Something slimy begins probing at the opening of your ear canal..."
+	src << "You slither up [M] and begin probing at their ear canal..."
+
+	if(!do_after(src,50))
+		src << "As [M] moves away, you are dislodged and fall to the ground."
+		return
+
+	if(!M || !src) return
+
+	if(src.stat)
+		src << "You cannot infest a target in your current state."
+		return
+
+	if(M.stat == 2)
+		src << "That is not an appropriate target."
+		return
+
+	if(M in view(1, src))
+		src << "You wiggle into [M]'s ear."
+		if(!M.stat)
+			M << "Something disgusting and slimy wiggles into your ear!"
+
+		src.host = M
+		var/datum/organ/external/head = M.get_organ("head")
+		head.implants += src
+		src.loc = M
+
+		host_brain.name = M.name
+		host_brain.real_name = M.real_name
+
+		return
+	else
+		src << "They are no longer in range!"
+		return
+
+/mob/living/simple_animal/borer/verb/ventcrawl()
+	set name = "Crawl through Vent"
+	set desc = "Enter an air vent and crawl through the pipe system."
+	set category = "Alien"
+
+//	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/borer/verb/hide()
+	set name = "Hide"
+	set desc = "Allows to hide beneath tables or certain items. Toggled on or off."
+	set category = "Alien"
+
+	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.")

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

@@ -18,7 +18,6 @@
 	attack_sound = 'sound/weapons/bladeslice.ogg'
 	status_flags = 0
 	universal_speak = 1
-	vox_talk_understand = 1
 
 	var/armour = null
 	var/amp = null
@@ -70,7 +69,7 @@
 
 	var/obj/item/weapon/arrow/quill/Q = new(loc)
 	Q.fingerprintslast = src.ckey
-	Q.throw_at(target,10,20)
+	Q.throw_at(target,10,30)
 	quills--
 
 	spawn(100)
@@ -102,7 +101,7 @@
 	M << "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]"
 	if(istype(M,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = M
-		if(H.dna.mutantrace == "vox")
+		if(H.species.name == "Vox")
 			return
 		H << "\red Your nose begins to bleed..."
 		H.drip(1)

code/modules/mob/mob.dm

@@ -607,6 +607,11 @@ var/list/slot_equipment_priority = list( \
 	src.pulling = AM
 	AM.pulledby = src
 
+	//Attempted fix for people flying away through space when cuffed and dragged.
+	if(ismob(AM))
+		var/mob/pulled = AM
+		pulled.inertia_dir = 0
+
 /mob/proc/can_use_hands()
 	return
 
@@ -955,4 +960,4 @@ mob/verb/yank_out_object()
 			pinned -= O
 		if(!pinned.len)
 			anchored = 0
-	return 1
+	return 1

code/modules/mob/mob_defines.dm

@@ -69,6 +69,7 @@
 	var/flavor_text = ""
 	var/med_record = ""
 	var/sec_record = ""
+	var/gen_record = ""
 	var/blinded = null
 	var/bhunger = 0			//Carbon
 	var/ajourn = 0
@@ -85,9 +86,9 @@
 	var/lastpuke = 0
 	var/unacidable = 0
 	var/small = 0
-	var/list/pinned = list() //List of things pinning this creature to walls (see living_defense.dm)
-	var/list/embedded = list() //Embedded items, since simple mobs don't have organs.
-
+	var/list/pinned = list()    //List of things pinning this creature to walls (see living_defense.dm)
+	var/list/embedded = list()  //Embedded items, since simple mobs don't have organs.
+	var/list/languages = list() // For speaking/listening.
 	var/name_archive //For admin things like possession
 
 	var/timeofdeath = 0.0//Living
@@ -210,10 +211,6 @@
 	var/universal_speak = 0 // Set to 1 to enable the mob to speak to everyone -- TLE
 	var/robot_talk_understand = 0
 	var/alien_talk_understand = 0
-	var/tajaran_talk_understand = 0
-	var/soghun_talk_understand = 0
-	var/skrell_talk_understand = 0
-	var/vox_talk_understand = 0
 
 	var/has_limbs = 1 //Whether this mob have any limbs he can move with
 	var/can_stand = 1 //Whether this mob have ability to stand

code/modules/mob/mob_movement.dm

@@ -166,10 +166,12 @@
 
 
 /client/Center()
+	/* No 3D movement in 2D spessman game. dir 16 is Z Up
 	if (isobj(mob.loc))
 		var/obj/O = mob.loc
 		if (mob.canmove)
 			return O.relaymove(mob, 16)
+	*/
 	return
 
 

code/modules/mob/new_player/new_player.dm

@@ -106,7 +106,7 @@
 
 		if(href_list["observe"])
 
-			if(alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No") == "Yes")
+			if(alert(src,"Are you sure you wish to observe? You will have to wait 30 minutes before being able to respawn!","Player Setup","Yes","No") == "Yes")
 				if(!client)	return 1
 				var/mob/dead/observer/observer = new()
 
@@ -119,7 +119,7 @@
 				src << "\blue Now teleporting."
 				observer.loc = O.loc
 				if(client.prefs.be_random_name)
-					client.prefs.real_name = random_name()
+					client.prefs.real_name = random_name(client.prefs.gender)
 				observer.real_name = client.prefs.real_name
 				observer.name = observer.real_name
 				observer.key = key
@@ -134,9 +134,7 @@
 
 			if(client.prefs.species != "Human")
 
-				var/S = client.prefs.species
-				if(S == "Unathi") S = "Soghun"
-				if(!is_alien_whitelisted(src, S) && config.usealienwhitelist)
+				if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
 					src << alert("You are currently not whitelisted to play [client.prefs.species].")
 					return 0
 
@@ -151,9 +149,7 @@
 				usr << "\blue There is an administrative lock on entering the game!"
 				return
 
-			var/S = client.prefs.species
-			if(S == "Unathi") S = "Soghun"
-			if(!is_alien_whitelisted(src, S) && config.usealienwhitelist)
+			if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist)
 				src << alert("You are currently not whitelisted to play [client.prefs.species].")
 				return 0
 
@@ -347,37 +343,25 @@
 		var/mob/living/carbon/human/new_character = new(loc)
 		new_character.lastarea = get_area(loc)
 
-		if(client.prefs.species == "Tajaran") //This is like the worst, but it works, so meh. - Erthilo
-			if(is_alien_whitelisted(src, "Tajaran") || !config.usealienwhitelist)
-				new_character.dna.mutantrace = "tajaran"
-				new_character.tajaran_talk_understand = 1
-		if(client.prefs.species == "Unathi")
-			if(is_alien_whitelisted(src, "Soghun") || !config.usealienwhitelist)
-				new_character.dna.mutantrace = "lizard"
-				new_character.soghun_talk_understand = 1
-		if(client.prefs.species == "Skrell")
-			if(is_alien_whitelisted(src, "Skrell") || !config.usealienwhitelist)
-				new_character.dna.mutantrace = "skrell"
-				new_character.skrell_talk_understand = 1
-		if(client.prefs.species == "Vox")
-			if(is_alien_whitelisted(src, "Vox"|| !config.usealienwhitelist))
-				new_character.dna.mutantrace = "vox"
-				new_character.vox_talk_understand = 1
-
-		if(client.prefs.language == "Tajaran")
-			if(is_alien_whitelisted(src, "Language_Tajaran") || !config.usealienwhitelist)
-				new_character.tajaran_talk_understand = 1
-		if(client.prefs.language == "Unathi")
-			if(is_alien_whitelisted(src, "Language_Soghun") || !config.usealienwhitelist)
-				new_character.soghun_talk_understand = 1
-		if(client.prefs.language == "Skrell")
-			if(is_alien_whitelisted(src, "Language_Skrell") || !config.usealienwhitelist)
-				new_character.skrell_talk_understand = 1
+		var/datum/species/chosen_species
+		if(client.prefs.species)
+			chosen_species = all_species[client.prefs.species]
+		if(chosen_species)
+			if(is_alien_whitelisted(src, client.prefs.species) || !config.usealienwhitelist || !(chosen_species.flags & WHITELISTED))
+				new_character.set_species(client.prefs.species)
+				if(chosen_species.language)
+					new_character.add_language(chosen_species.language)
 
+		var/datum/language/chosen_language
+		if(client.prefs.language)
+			chosen_language = all_languages[client.prefs.language]
+		if(chosen_language)
+			if(is_alien_whitelisted(src, client.prefs.language) || !config.usealienwhitelist || !(chosen_language.flags & WHITELISTED))
+				new_character.add_language(client.prefs.language)
 
 		if(ticker.random_players)
 			new_character.gender = pick(MALE, FEMALE)
-			client.prefs.real_name = random_name()
+			client.prefs.real_name = random_name(new_character.gender)
 			client.prefs.randomize_appearance_for(new_character)
 		else
 			client.prefs.copy_to(new_character)
@@ -407,7 +391,7 @@
 	proc/ViewManifest()
 		var/dat = "<html><body>"
 		dat += "<h4>Crew Manifest</h4>"
-		dat += data_core.get_manifest()
+		dat += data_core.get_manifest(OOC = 1)
 
 		src << browse(dat, "window=manifest;size=370x420;can_close=1")
 

code/modules/mob/new_player/preferences_setup.dm

@@ -137,19 +137,13 @@ datum/preferences
 		if(gender == FEMALE)	g = "f"
 
 		var/icon/icobase
-		switch(species)
-			if("Tajaran")
-				icobase = 'icons/mob/human_races/r_tajaran.dmi'
-			if("Unathi")
-				icobase = 'icons/mob/human_races/r_lizard.dmi'
-			if("Skrell")
-				icobase = 'icons/mob/human_races/r_skrell.dmi'
+		var/datum/species/current_species = all_species[species]
 
-			if("Vox")
-				icobase = 'icons/mob/human_races/r_vox.dmi'
+		if(current_species)
+			icobase = current_species.icobase
+		else
+			icobase = 'icons/mob/human_races/r_human.dmi'
 
-			else
-				icobase = 'icons/mob/human_races/r_human.dmi'
 		preview_icon = new /icon(icobase, "torso_[g]")
 		preview_icon.Blend(new /icon(icobase, "groin_[g]"), ICON_OVERLAY)
 		preview_icon.Blend(new /icon(icobase, "head_[g]"), ICON_OVERLAY)
@@ -169,16 +163,13 @@ datum/preferences
 			preview_icon.Blend(temp, ICON_OVERLAY)
 
 		// Skin tone
-		if(species == "Human")
+		if(current_species && (current_species.flags & HAS_SKIN_TONE))
 			if (s_tone >= 0)
 				preview_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
 			else
 				preview_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
 
-		var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "eyes_s")
-		if(species=="Vox")
-			eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "vox_eyes_s")
-
+		var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = current_species ? current_species.eyes : "eyes_s")
 		eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
 
 		var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]

code/modules/mob/new_player/sprite_accessories.dm

@@ -66,9 +66,9 @@
 		name = "Shoulder-length Hair Alt"
 		icon_state = "hair_longfringe"
 
-	longish
+	/*longish
 		name = "Longer Hair"
-		icon_state = "hair_b2"
+		icon_state = "hair_b2"*/
 
 	longer
 		name = "Long Hair"

code/modules/mob/say.dm

@@ -37,6 +37,10 @@
 		usr << "\red Speech is currently admin-disabled."
 		return
 
+	if(client && !(client.prefs.toggles & CHAT_DEAD))
+		usr << "\red You have deadchat muted."
+		return
+
 	if(mind && mind.name)
 		name = "[mind.name]"
 	else
@@ -50,55 +54,67 @@
 	for(var/mob/M in player_list)
 		if(istype(M, /mob/new_player))
 			continue
-		if(M.client && M.client.holder && (M.client.holder.rights & R_ADMIN|R_MOD) && (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|R_MOD) && (M.client.prefs.toggles & CHAT_DEAD)) // Show the message to admins/mods with deadchat toggled on
 			M << rendered	//Admins can hear deadchat, if they choose to, no matter if they're blind/deaf or not.
-		else if(M.stat == DEAD)
+
+		else if(M.client && M.stat == DEAD && (M.client.prefs.toggles & CHAT_DEAD)) // Show the message to regular ghosts with deadchat toggled on.
 			M.show_message(rendered, 2) //Takes into account blindness and such.
 	return
 
-/mob/proc/say_understands(var/mob/other)
+/mob/proc/say_understands(var/mob/other,var/datum/language/speaking = null)
 	if(!other)
 		return 1
-	if (src.stat == 2)
-		return 1
-	else if (istype(other, src.type))
+	else if (src.stat == 2)
 		return 1
+	else if (speaking) //Language check.
+
+		var/understood
+		for(var/datum/language/L in src.languages)
+			if(speaking.name == L.name)
+				understood = 1
+				break
+
+		if(understood || universal_speak)
+			return 1
+		else
+			return 0
+
 	else if(other.universal_speak || src.universal_speak)
 		return 1
 	else if(isAI(src) && ispAI(other))
 		return 1
+	else if (istype(other, src.type) || istype(src, other.type))
+		return 1
 	return 0
 
-/mob/proc/say_quote(var/text,var/is_speaking_soghun,var/is_speaking_skrell,var/is_speaking_tajaran,var/is_speaking_vox)
+/mob/proc/say_quote(var/text,var/datum/language/speaking)
 	if(!text)
 		return "says, \"...\"";	//not the best solution, but it will stop a large number of runtimes. The cause is somewhere in the Tcomms code
 		//tcomms code is still runtiming somewhere here
 	var/ending = copytext(text, length(text))
-	if (is_speaking_soghun)
-		return "<span class='say_quote'>hisses</span>, \"<span class='soghun'>[text]</span>\"";
-	if (is_speaking_skrell)
-		return "<span class='say_quote'>warbles</span>, \"<span class='skrell'>[text]</span>\"";
-	if (is_speaking_tajaran)
-		return "<span class='say_quote'>mrowls</span>, \"<span class='tajaran'>[text]</span>\"";
-	if (is_speaking_vox)
-		return "<span class='say_quote'>chirps</span>, \"<span class='vox'>[text]</span>\"";
-//Needs Virus2
-//	if (src.disease_symptoms & DISEASE_HOARSE)
-//		return "rasps, \"[text]\"";
-	if (src.stuttering)
-		return "<span class='say_quote'>stammers</span>, \"[text]\"";
-	if (src.slurring)
-		return "<span class='say_quote'>slurrs</span>, \"[text]\"";
-	if(isliving(src))
+
+	var/speechverb = "<span class='say_quote'>"
+
+	if (speaking)
+		speechverb = "[speaking.speech_verb]</span>, \"<span class='[speaking.colour]'>"
+	else if (src.stuttering)
+		speechverb = "stammers, \""
+	else if (src.slurring)
+		speechverb = "slurrs, \""
+	else if (ending == "?")
+		speechverb = "asks, \""
+	else if (ending == "!")
+		speechverb = "exclaims, \""
+	else if(isliving(src))
 		var/mob/living/L = src
 		if (L.getBrainLoss() >= 60)
-			return "<span class='say_quote'>gibbers</span>, \"[text]\"";
-	if (ending == "?")
-		return "<span class='say_quote'>asks</span>, \"[text]\"";
-	if (ending == "!")
-		return "<span class='say_quote'>exclaims</span>, \"[text]\"";
+			speechverb = "gibbers, \""
+		else
+			speechverb = "says, \""
+	else
+		speechverb = "says, \""
 
-	return "<span class='say_quote'>says</span>, \"[text]\"";
+	return "[speechverb][text]</span>\""
 
 /mob/proc/emote(var/act, var/type, var/message)
 	if(act == "me")

code/modules/mob/screen.dm

@@ -606,6 +606,37 @@
 
 	var/mob/living/L = usr
 
+	//Resisting control by an alien mind.
+	if(istype(src.loc,/mob/living/simple_animal/borer))
+		var/mob/living/simple_animal/borer/B = src.loc
+		var/mob/living/captive_brain/H = src
+
+		H << "\red <B>You begin doggedly resisting the parasite's control (this will take approximately sixty seconds).</B>"
+		B.host << "\red <B>You feel the captive mind of [src] begin to resist your control.</B>"
+
+		spawn(rand(350,450)+B.host.brainloss)
+
+			if(!B || !B.controlling)
+				return
+
+			B.host.adjustBrainLoss(rand(5,10))
+			H << "\red <B>With an immense exertion of will, you regain control of your body!</B>"
+			B.host << "\red <B>You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you.</b>"
+			B.controlling = 0
+
+			B.ckey = B.host.ckey
+			B.host.ckey = H.ckey
+
+			H.ckey = null
+			H.name = "host brain"
+			H.real_name = "host brain"
+
+			verbs -= /mob/living/carbon/human/proc/release_control
+			verbs -= /mob/living/carbon/human/proc/punish_host
+			verbs -= /mob/living/carbon/human/proc/spawn_larvae
+
+			return
+
 	//resisting grabs (as if it helps anyone...)
 	if ((!( L.stat ) && L.canmove && !( L.restrained() )))
 		var/resisting = 0

code/modules/mob/transform_procs.dm

@@ -21,102 +21,33 @@
 	sleep(48)
 	//animation = null
 
+	if(!species.primitive) //If the creature in question has no primitive set, this is going to be messy.
+		gib()
+		return
+
 	var/mob/living/carbon/monkey/O = null
 
-	switch(dna.mutantrace)
-		if("tajara")
-			O = new /mob/living/carbon/monkey/tajara( loc )
-			O.name = "farwa"
-			O.dna = dna
-			dna = null
-			O.dna.uni_identity = "000000000000000000DC00000660004DA0A0E00"
-			//O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8"
-			O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
-			O.loc = loc
-			O.viruses = viruses
-			viruses = list()
-			for(var/datum/disease/D in O.viruses)
-				D.affected_mob = O
+	O = new species.primitive(loc)
 
-			if (client)
-				client.mob = O
-			if(mind)
-				mind.transfer_to(O)
-			O << "<B>You are now a farwa. </B>"
-			O.a_intent = "hurt"
-			spawn(0)//To prevent the proc from returning null.
-				del(src)
-			del(animation)
-		if("lizard")
-			O = new /mob/living/carbon/monkey/unathi( loc )
-			O.name = "stok"
-			O.dna = dna
-			dna = null
-			O.dna.uni_identity = "000000000000000000DC00000660002A8044C5D"
-			//O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8"
-			O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
-			O.loc = loc
-			O.viruses = viruses
-			viruses = list()
-			for(var/datum/disease/D in O.viruses)
-				D.affected_mob = O
+	O.dna = dna
+	O.dna.uni_identity = "000000000000000000DC00000660004DA0A0E00"
+	O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
+	O.viruses = viruses
+	O.a_intent = "hurt"
 
-			if (client)
-				client.mob = O
-			if(mind)
-				mind.transfer_to(O)
-			O << "<B>You are now a stok. </B>"
-			O.a_intent = "hurt"
-			spawn(0)//To prevent the proc from returning null.
-				del(src)
-			del(animation)
-		if("skrell")
-			O = new /mob/living/carbon/monkey/unathi( loc )
-			O.name = "neaera"
-			O.dna = dna
-			dna = null
-			O.dna.uni_identity = "000000000000000000DC00000660002A8044C5D"
-			//O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8"
-			O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
-			O.loc = loc
-			O.viruses = viruses
-			viruses = list()
-			for(var/datum/disease/D in O.viruses)
-				D.affected_mob = O
+	for(var/datum/disease/D in O.viruses)
+		D.affected_mob = O
 
-			if (client)
-				client.mob = O
-			if(mind)
-				mind.transfer_to(O)
-			O << "<B>You are now a neaera. </B>"
-			O.a_intent = "hurt"
-			spawn(0)//To prevent the proc from returning null.
-				del(src)
-			del(animation)
-		else
-			O = new /mob/living/carbon/monkey( loc )
-			O.name = "monkey"
-			O.dna = dna
-			dna = null
-			O.dna.uni_identity = "00600200A00E0110148FC01300B009"
-			//O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8"
-			O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
-			O.loc = loc
-			O.viruses = viruses
-			viruses = list()
-			for(var/datum/disease/D in O.viruses)
-				D.affected_mob = O
+	if (client)
+		client.mob = O
+	if(mind)
+		mind.transfer_to(O)
 
-			if (client)
-				client.mob = O
-			if(mind)
-				mind.transfer_to(O)
-			O << "<B>You are now a monkey.</B>"
-			O.a_intent = "hurt"
-			spawn(0)//To prevent the proc from returning null.
-				del(src)
-			del(animation)
+	O << "<B>You are now [O]. </B>"
 
+	spawn(0)//To prevent the proc from returning null.
+		del(src)
+	del(animation)
 
 	return O