Finished moving the clothes in defines over to modules.

Several head objects path changed so they are not helmets, head means can fit on your head, helmet was securities helmets, space helmets currently still helmet.
Cult restricted job list now has the sec force + cap because you can’t convert them as is.
AI removed from protected traitor jobs as malf is currently effectively out of commission.
A Protected list was added to changling.
Removed the furry mob files that were not checked.
Moved two unchecked files to unused


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3896 316c924e-a436-60f5-8080-3fe189b3f50e

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

@@ -1,213 +0,0 @@
-/mob/living/carbon/human/tajaran/examine()
-	set src in view()
-
-
-
-
-
-
-
-
-
-
-
-
-/*  BS12 Examine.  Not sure why this is here, it seems to be mostly a copy and paste of the parent.
-/mob/living/carbon/human/tajaran/examine()
-	set src in view()
-
-	usr << "\blue *---------*"
-
-	usr << "\blue This is \icon[src.icon] <B>[src.name]</B>! One of the cat-like Tajarans."
-
-	// crappy hack because you can't do \his[src] etc
-	var/t_his = "its"
-	var/t_him = "it"
-	if (src.gender == MALE)
-		t_his = "his"
-		t_him = "him"
-	else if (src.gender == FEMALE)
-		t_his = "her"
-		t_him = "her"
-
-	if (src.w_uniform)
-		if (src.w_uniform.blood_DNA)
-			usr << "\red [src.name] is wearing a[src.w_uniform.blood_DNA ? " bloody " : " "] \icon[src.w_uniform] [src.w_uniform.name]!"
-		else
-			usr << "\blue [src.name] is wearing a \icon[src.w_uniform] [src.w_uniform.name]."
-
-	if (src.handcuffed)
-		usr << "\blue [src.name] is \icon[src.handcuffed] handcuffed!"
-
-	if (src.wear_suit)
-		if (src.wear_suit.blood_DNA)
-			usr << "\red [src.name] has a[src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name] on!"
-		else
-			usr << "\blue [src.name] has a \icon[src.wear_suit] [src.wear_suit.name] on."
-
-	if (src.l_ear)
-		usr << "\blue [src.name] has a \icon[src.l_ear] [src.l_ear.name] on [t_his] left ear."
-
-	if (src.r_ear)
-		usr << "\blue [src.name] has a \icon[src.r_ear] [src.r_ear.name] on [t_his] right ear."
-
-	if (src.wear_mask)
-		if (src.wear_mask.blood_DNA)
-			usr << "\red [src.name] has a[src.wear_mask.blood_DNA ? " bloody " : " "] \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face!"
-		else
-			usr << "\blue [src.name] has a \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face."
-
-	if (src.l_hand)
-		if (src.l_hand.blood_DNA)
-			usr << "\red [src.name] has a[src.l_hand.blood_DNA ? " bloody " : " "] \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand!"
-		else
-			usr << "\blue [src.name] has a \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand."
-
-	if (src.r_hand)
-		if (src.r_hand.blood_DNA)
-			usr << "\red [src.name] has a[src.r_hand.blood_DNA ? " bloody " : " "] \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand!"
-		else
-			usr << "\blue [src.name] has a \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand."
-
-	if (src.belt)
-		if (src.belt.blood_DNA)
-			usr << "\red [src.name] has a[src.belt.blood_DNA ? " bloody " : " "] \icon[src.belt] [src.belt.name] on [t_his] belt!"
-		else
-			usr << "\blue [src.name] has a \icon[src.belt] [src.belt.name] on [t_his] belt."
-	if(src.s_store)
-		if(src.s_store.blood_DNA)
-			usr << "\red [src.name] has a[src.s_store.blood_DNA ? " bloody " : " "] \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]!"
-		else
-			usr << "\blue [src.name] has a \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]."
-	if (src.shoes)
-		usr << "[src.shoes.blood_DNA ? "\red" : "\blue"][src.name] has a[src.shoes.blood_DNA ? " bloody " : " "] \icon[src.shoes] [src.shoes.name] on [t_his] feet."
-
-
-	if (src.gloves)
-		if (src.gloves.blood_DNA)
-			usr << "\red [src.name] has bloody \icon[src.gloves] [src.gloves.name] on [t_his] hands!"
-		else
-			usr << "\blue [src.name] has \icon[src.gloves] [src.gloves.name] on [t_his] hands."
-	else if (src.blood_DNA)
-		usr << "\red [src.name] has bloody hands!"
-
-	if (src.back)
-		usr << "\blue [src.name] has a \icon[src.back] [src.back.name] on [t_his] back."
-
-	if (src.wear_id)
-		var/id
-		var/photo = 0
-		if(istype(src:wear_id, /obj/item/device/pda))
-			var/obj/item/device/pda/pda = src:wear_id
-			id = pda.owner
-		else
-			id = src.wear_id.registered_name_name
-			if (src.wear_id.PHOTO)
-				photo = 1
-		if (id != src.real_name && in_range(src, usr) && prob(10))
-			if (photo)
-				usr << "\red [src.name] is wearing \icon[src.wear_id] [src.wear_id.name] with a photo yet doesn't seem to be that person!!!"
-			else
-				usr << "\red [src.name] is wearing \icon[src.wear_id] [src.wear_id.name] yet doesn't seem to be that person!!!"
-		else
-			if (photo)
-				usr << "\blue [src.name] is wearing \icon[src.wear_id] [src.wear_id.name] with a photo."
-			else
-				usr << "\blue [src.name] is wearing \icon[src.wear_id] [src.wear_id.name]."
-
-
-	if (src.is_jittery)
-		switch(src.jitteriness)
-			if(300 to INFINITY)
-				usr << "\red [src] is violently convulsing."
-			if(200 to 300)
-				usr << "\red [src] looks extremely jittery."
-			if(100 to 200)
-				usr << "\red [src] is twitching ever so slightly."
-
-	if (src.suiciding)
-		switch(src.suiciding)
-			if(1)
-				usr << "\red [src.name] appears to have bitten [t_his] tongue off!"
-
-	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)
-		usr << "\red [name] doesn't seem to be responding to anything around [t_him], [t_his] eyes closed as though asleep."
-		if(health < 0 && distance <= 3)
-			usr << "\red [name] does not appear to be breathing."
-		if(ishuman(src) && usr.stat == 0 && src.stat == 1 && distance <= 1)
-			for(var/mob/O in viewers(usr.loc, null))
-				O.show_message("[usr] checks [src]'s pulse.", 1)
-			sleep(15)
-			usr << "\blue [name] has a pulse!"
-
-	if (src.stat == 2 || (changeling && changeling.changeling_fakedeath == 1))
-		if(distance <= 1)
-			if(ishuman(usr) && usr.stat == 0)
-				for(var/mob/O in viewers(usr.loc, null) )
-					O.show_message("[usr] checks [src]'s pulse.", 1)
-			sleep(15)
-			usr << "\red [name] has no pulse!"
-	else
-		if (src.getBruteLoss())
-			if (src.getBruteLoss() < 30)
-				usr << "\red [src.name] looks slightly injured!"
-			else
-				usr << "\red <B>[src.name] looks severely injured!</B>"
-
-		if (src.cloneloss)
-			if (src.cloneloss < 30)
-				usr << "\red [src.name] looks slightly... unfinished?"
-			else
-				usr << "\red <B>[src.name] looks very... unfinished?</B>"
-
-		if (src.getFireLoss())
-			if (src.getFireLoss() < 30)
-				usr << "\red [src.name] looks slightly burned!"
-			else
-				usr << "\red <B>[src.name] looks severely burned!</B>"
-
-		if (src.nutrition < 100)
-			usr << "\red [src.name] looks like flesh and bones."
-		else if (src.nutrition >= 500)
-			if (usr.nutrition < 100)
-				usr << "\red [src.name] looks very round and delicious. Like a little piggy. A tasty piggy."
-			else
-				usr << "\blue [src.name] looks quite chubby."
-
-		else if (src.brainloss >= 60)
-			usr << "\red [src.name] has a stupid expression on [t_his] face."
-		if (!src.client)
-			usr << "\red [src.name] doesn't seem as though they want to talk."
-
-	for(var/named in organs)
-		var/datum/organ/external/temp = organs[named]
-		if(temp.destroyed)
-			usr << "\red [src.name] is missing [t_his] [temp.display_name]."
-		if(temp.wounds)
-			for(var/datum/organ/external/wound/w in temp.wounds)
-				var/size = w.wound_size
-				var/sizetext
-				switch(size)
-					if(1)
-						sizetext = "cut"
-					if(2)
-						sizetext = "deep cut"
-					if(3)
-						sizetext = "flesh wound"
-					if(4)
-						sizetext = "gaping wound"
-					if(5)
-						sizetext = "big gaping wound"
-					if(6)
-						sizetext = "massive wound"
-				if(w.bleeding)
-					usr << "\red [src.name] is bleeding from a [sizetext] on [t_his] [temp.display_name]."
-					continue
-
-
-	usr << "\blue *---------*"
-*/

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

@@ -1,491 +0,0 @@
-//their language needs to hook into radios as well
-
-/mob/living/carbon/human/tajaran/say_quote(var/text,var/is_speaking_taj)
-	//work out if the listener can understand or not
-
-	var/ending = copytext(text, length(text))
-	if (src.stuttering)
-		return "stammers, \"[text]\"";
-	if (src.slurring)
-		return "slurrs, \"[text]\"";
-	if (src.brainloss >= 60)
-		return "gibbers, \"[text]\"";
-
-	if(is_speaking_taj)
-		return "mrowls, \"[text]\""//pick("yowls, \"[text]\"", "growls, \"[text]\"","mewls, \"[text]\"", "mrowls, \"[text]\"", "meows, \"[text]\"", "purrs, \"[text]\"");
-
-	if (ending == "?")
-		return "asks, \"[text]\"";
-	else if (ending == "!")
-		return "exclaims, \"[text]\"";
-
-	return "says, \"[text]\"";
-
-//convert message to an indecipherable series of sounds for anyone who isnt tajaran
-/mob/living/carbon/human/tajaran/proc/tajspeak(var/message)
-	//return stars(message)
-	var/te = html_decode(message)
-	var/t = ""
-	var/n = length(message)
-	var/p = 1
-	while(p <= n)
-		if (copytext(te, p, p + 1) != " ")
-			t = text("[][]", t, pick(tajspeak_letters))
-		p++
-	return html_encode(t)
-	/*if (pr == null)
-		pr = 25
-	if (pr <= 0)
-		return null
-	else
-		if (pr >= 100)
-			return n
-	var/te = html_decode(n)
-	var/t = ""
-	n = length(n)
-	var/p = null
-	p = 1
-	while(p <= n)
-		if ((copytext(te, p, p + 1) == " " || prob(pr)))
-			t = text("[][]", t, copytext(te, p, p + 1))
-		else
-			t = text("[]*", t)
-		p++
-	return html_encode(t)*/
-
-/mob/living/carbon/human/tajaran/say(var/message)
-	var/message_old = message
-	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
-
-	if (!message)
-		return
-
-	log_say("[name]/[key] : [message]")
-
-	if (length(message) >= 1)
-		if (miming && copytext(message, 1, 2) != "*")
-			return
-
-	if (stat == 2)
-		return say_dead(message)
-
-	if (silent)
-		return
-
-	if (src.client && (client.muted || src.client.muted_complete))
-		src << "You are muted."
-		return
-
-	// wtf?
-	if (stat)
-		return
-
-	// Mute disability
-	if (disabilities & 64)
-		return
-
-	if (istype(wear_mask, /obj/item/clothing/mask/muzzle))
-		return
-
-	// emotes
-	if (copytext(message, 1, 2) == "*" && !stat)
-		return emote(copytext(message, 2))
-
-	var/alt_name = ""
-	if (istype(src, /mob/living/carbon/human) && name != real_name)
-		var/mob/living/carbon/human/H = src
-		alt_name = " (as [H.get_visible_name()])"
-	var/italics = 0
-	var/message_range = null
-	var/message_mode = null
-
-	if (brainloss >= 60 && prob(50))
-		if (ishuman(src))
-			message_mode = "headset"
-	// Special message handling
-	else if (copytext(message, 1, 2) == ";")
-		if (ishuman(src))
-			message_mode = "headset"
-		else if(istype(src, /mob/living/silicon/pai) || istype(src, /mob/living/silicon/robot))
-			message_mode = "pAI"
-		message = copytext(message, 2)
-
-	else if (length(message) >= 2)
-		var/channel_prefix = copytext(message, 1, 3)
-
-		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) && (message_mode=="department" || (message_mode in radiochannels)))
-				message_mode = null //only humans can use headsets
-
-	if (!message)
-		return
-
-	//work out if we're speaking tajaran or not
-	var/is_speaking_taj = 0
-	if(copytext(message, 1, 3) == ":j" || copytext(message, 1, 3) == ":J")
-		message = copytext(message, 3)
-		if(taj_talk_understand)
-			is_speaking_taj = 1
-
-	if( !message_mode && (disease_symptoms & DISEASE_WHISPER))
-		message_mode = "whisper"
-
-	if(src.stunned > 0 || (traumatic_shock > 61 && prob(50)))
-		message_mode = "" //Stunned people shouldn't be able to physically turn on their radio/hold down the button to speak into it
-
-
-	message = capitalize(message) //capitalize the first letter of what they actually say
-
-	// :downs:
-	if (brainloss >= 60)
-		message = dd_replacetext(message, " am ", " ")
-		message = dd_replacetext(message, " is ", " ")
-		message = dd_replacetext(message, " are ", " ")
-		message = dd_replacetext(message, "you", "u")
-		message = dd_replacetext(message, "help", "halp")
-		message = dd_replacetext(message, "grief", "grife")
-		message = dd_replacetext(message, "space", "spess")
-		message = dd_replacetext(message, "carp", "crap")
-		message = dd_replacetext(message, "reason", "raisin")
-		if(prob(50))
-			message = uppertext(message)
-			message += "[stutter(pick("!", "!!", "!!!"))]"
-		if(!stuttering && prob(15))
-			message = stutter(message)
-
-	if (stuttering)
-		message = stutter(message)
-	if (slurring)
-		message = slur(message)
-
-/* //qw do not have beesease atm.
-	if(virus)
-		if(virus.name=="beesease" && virus.stage>=2)
-			if(prob(virus.stage*10))
-				var/bzz = length(message)
-				message = "B"
-				for(var/i=0,i<bzz,i++)
-					message += "Z"
-*/
-	var/list/obj/item/used_radios = new
-
-	switch (message_mode)
-		if ("headset")
-			if (src:l_ear && istype(src:l_ear,/obj/item/device/radio))
-				src:l_ear.talk_into(src, message, 0, "[is_speaking_taj ? "tajaran" : "english"]")
-				used_radios += src:l_ear
-			else if (src:r_ear)
-				src:r_ear.talk_into(src, message, 0, "[is_speaking_taj ? "tajaran" : "english"]")
-				used_radios += src:r_ear
-
-			message_range = 1
-			italics = 1
-
-
-		if ("secure headset")
-			if (src:l_ear && istype(src:l_ear,/obj/item/device/radio))
-				src:l_ear.talk_into(src, message, 1, "[is_speaking_taj ? "tajaran" : "english"]")
-				used_radios += src:l_ear
-			else if (src:r_ear)
-				src:r_ear.talk_into(src, message, 1, "[is_speaking_taj ? "tajaran" : "english"]")
-				used_radios += src:r_ear
-
-			message_range = 1
-			italics = 1
-
-		if ("right ear")
-			if (src:r_ear)
-				src:r_ear.talk_into(src, message, 0, "[is_speaking_taj ? "tajaran" : "english"]")
-				used_radios += src:r_ear
-
-			message_range = 1
-			italics = 1
-
-		if ("left ear")
-			if (src:l_ear)
-				src:l_ear.talk_into(src, message, 0, "[is_speaking_taj ? "tajaran" : "english"]")
-				used_radios += src:l_ear
-
-			message_range = 1
-			italics = 1
-
-		if ("intercom")
-			for (var/obj/item/device/radio/intercom/I in view(1, null))
-				I.talk_into(src, message, 0, "[is_speaking_taj ? "tajaran" : "english"]")
-				used_radios += I
-
-			message_range = 1
-			italics = 1
-
-		//I see no reason to restrict such way of whispering
-		if ("whisper")
-			whisper(trim(copytext(message_old, 3)))
-			return
-
-		if ("binary")
-			if(robot_talk_understand || binarycheck())
-			//message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) //seems redundant
-				robot_talk(message)
-			return
-
-		if ("alientalk")
-			if(alien_talk_understand || hivecheck())
-			//message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) //seems redundant
-				alien_talk(message)
-			return
-
-		if ("department")
-			if (src:l_ear && istype(src:l_ear,/obj/item/device/radio))
-				src:l_ear.talk_into(src, message, message_mode)
-				used_radios += src:l_ear
-			else if (src:r_ear)
-				src:r_ear.talk_into(src, message, message_mode)
-				used_radios += src:r_ear
-			message_range = 1
-			italics = 1
-		if("changeling")
-			if(src.changeling)
-				for(var/mob/living/carbon/aChangeling in world)
-					if(aChangeling.changeling)
-						aChangeling << "<i><font color=#800080><b>[gender=="male"?"Mr.":"Mrs."] [changeling.changelingID]:</b> [message]</font></i>"
-				return
-////SPECIAL HEADSETS START
-		else
-			//world << "SPECIAL HEADSETS"
-			if (message_mode in radiochannels)
-				if (src:l_ear && istype(src:l_ear,/obj/item/device/radio))
-					src:l_ear.talk_into(src, message, message_mode)
-					used_radios += src:l_ear
-				else if (src:r_ear)
-					src:r_ear.talk_into(src, message, message_mode)
-					used_radios += src:r_ear
-				message_range = 1
-				italics = 1
-/////SPECIAL HEADSETS END
-
-	var/list/listening
-/*
-	if(istype(loc, /obj/item/device/aicard)) // -- TLE
-		var/obj/O = loc
-		if(istype(O.loc, /mob))
-			var/mob/M = O.loc
-			listening = hearers(message_range, M)
-		else
-			listening = hearers(message_range, O)
-	else
-		listening = hearers(message_range, src)
-
-	for (var/obj/O in view(message_range, src))
-		for (var/mob/M in O)
-			listening += M // maybe need to check if M can hear src
-		spawn (0)
-			if (O)
-				O.hear_talk(src, message)
-
-	if (!(src in listening))
-		listening += src
-
-*/
-	var/turf/T = get_turf(src)
-	listening = hearers(message_range, T)
-	var/list/V = view(message_range, T)
-	var/list/W = V
-	//find mobs in lockers, cryo, intellicards, brains, MMIs, and so on.
-	for (var/mob/M in world)
-		if (!M.client)
-			continue //skip monkeys and leavers
-		if (istype(M, /mob/new_player))
-			continue
-		if (M.stat <2) //is alive
-			if (isturf(M.loc))
-				continue //if M can hear us it was already found by hearers()
-			if (get_turf(M) in V) //this is slow, but I don't think we'd have a lot of wardrobewhores every round --rastaf0
-				listening+=M
-		else
-			if (M.client && M.client.ghost_ears)
-				listening|=M
-
-	var/list/eavesdroppers = get_mobs_in_view(7, src)
-	for(var/mob/M in listening)
-		eavesdroppers.Remove(M)
-	for(var/mob/M in eavesdroppers)
-		if(M.stat)
-			eavesdroppers.Remove(M)
-
-	for (var/obj/O in ((W | contents)-used_radios))
-		W |= O
-
-	for (var/mob/M in W)
-		W |= M.contents
-		if(ishuman(M))
-			var/mob/living/carbon/human/G = M
-			for(var/name in G.organs)
-				var/datum/organ/external/F = G.organs[name]
-				W |= F.implant
-
-	for (var/obj/item/device/pda/M in W)
-		W |= M.contents
-
-	for (var/obj/O in W) //radio in pocket could work, radio in backpack wouldn't --rastaf0
-		spawn (0)
-			if(O && !istype(O.loc, /obj/item/weapon/storage))
-				O.hear_talk(src, message)
-
-	if(isbrain(src))//For brains to properly talk if they are in an MMI..or in a brain. Could be extended to other mobs I guess.
-		for(var/obj/O in loc)//Kinda ugly but whatever.
-			if(O)
-				spawn(0)
-					O.hear_talk(src, message)
-
-	var/list/heard_a = list() // understood us
-	var/list/heard_b = list() // didn't understand us
-
-	for (var/mob/M in listening)
-		//if speaking in tajaran, only let other tajs understand
-		if ( M.say_understands(src) && (M.taj_talk_understand || !is_speaking_taj)  )
-			heard_a += M
-		else
-			heard_b += M
-
-	var/speech_bubble_test = say_test(message)
-	var/image/speech_bubble = image('talk.dmi',src,"h[speech_bubble_test]")
-
-	var/rendered = null
-	if (length(heard_a))
-		var/message_a = say_quote(message,is_speaking_taj)
-		if (italics)
-			message_a = "<i>[message_a]</i>"
-		if (!istype(src, /mob/living/carbon/human))
-			rendered = "<span class='game say'><span class='name'>[name]</span> <span class='message'>[message_a]</span></span>"
-		else if(istype(wear_mask, /obj/item/clothing/mask/gas/voice))
-			if(wear_mask:vchange)
-				rendered = "<span class='game say'><span class='name'>[wear_mask:voice]</span> <span class='message'>[message_a]</span></span>"
-			else
-				rendered = "<span class='game say'><span class='name'>[name]</span> <span class='message'>[message_a]</span></span>"
-		else
-			rendered = "<span class='game say'><span class='name'>[real_name]</span>[alt_name] <span class='message'>[message_a]</span></span>"
-
-
-/*
-		// Create speech bubble
-		var/obj/effect/speech_bubble/B = new/obj/effect/speech_bubble
-		B.icon = 'speechbubble.dmi'
-		B.parent = src
-		B.mouse_opacity = 0
-		B.invisibility = invisibility
-		B.layer = 10
-
-		// Determine if the speech bubble's going to have a special look
-		var/presay = ""
-		if(istype(src, /mob/living/silicon))
-			presay = "bot"
-		if(istype(src, /mob/living/carbon/alien))
-			presay = "xeno"
-		if(istype(src, /mob/living/carbon/metroid))
-			presay = "metroid"
-*/
-		for (var/mob/M in heard_a)
-
-			M.show_message(rendered, 2)
-			M << speech_bubble
-		spawn(30) del(speech_bubble)
-		//spawn(30) del(speech_bubble)
-			/*
-			if(M.client)
-
-				// If this client has bubbles disabled, obscure the bubble
-				if(!M.client.bubbles || M == src)
-					var/image/I = image('speechbubble.dmi', B, "override")
-					I.override = 1
-					M << I
-			*/
-
-		/*
-		// find the suffix, if bot, human or monkey
-		var/punctuation = ""
-		if(presay == "bot" || presay == "")
-			var/ending = copytext(text, length(text))
-			if (ending == "?")
-				punctuation = "question"
-			else if (ending == "!")
-				punctuation = "exclamation"
-			else
-				punctuation = ""
-
-		// flick the bubble
-		flick("[presay]say[punctuation]", B)
-
-		if(istype(loc, /turf))
-			B.loc = loc
-		else
-			B.loc = loc.loc
-
-		spawn()
-			sleep(11)
-			del(B)
-		*/
-
-	if (length(heard_b))
-		var/message_b = tajspeak(message)
-		message_b = say_quote(message_b,1)
-
-		if (italics)
-			message_b = "<i>[message_b]</i>"
-
-		rendered = "<span class='game say'><span class='name'>[voice_name]</span> <span class='message'>[message_b]</span></span>"
-
-
-		/*
-		// Create speech bubble
-		var/obj/effect/speech_bubble/B = new/obj/effect/speech_bubble
-		B.icon = 'speechbubble.dmi'
-		B.parent = src
-		B.mouse_opacity = 0
-		B.invisibility = invisibility
-		B.layer = 10
-
-		// Determine if the speech bubble's going to have a special look
-		var/presay = ""
-		if(istype(src, /mob/living/silicon))
-			presay = "bot"
-		if(istype(src, /mob/living/carbon/alien))
-			presay = "xeno"
-		if(istype(src, /mob/living/carbon/metroid))
-			presay = "metroid"
-		*/
-
-		for (var/mob/M in heard_b)
-			M.show_message(rendered, 2)
-			M << speech_bubble
-		spawn(30) del(speech_bubble)
-
-			/*
-			if(M.client)
-
-				if(!M.client.bubbles || M == src)
-					var/image/I = image('speechbubble.dmi', B, "override")
-					I.override = 1
-					M << I
-
-
-		flick("[presay]say", B)
-
-		if(istype(loc, /turf))
-			B.loc = loc
-		else
-			B.loc = loc.loc
-
-		spawn()
-			sleep(11)
-			del(B)
-		*/
-
-	if (length(eavesdroppers))
-
-		for (var/mob/M in eavesdroppers)
-			M << "\blue [src] speaks into their radio..."
-			M << speech_bubble
-		spawn(30) del(speech_bubble)

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

@@ -1,60 +0,0 @@
-/mob/living/carbon/human/proc/Tajaraize()
-	if (monkeyizing)
-		return
-	for(var/obj/item/W in src)
-		drop_from_slot(W)
-	update_clothing()
-	monkeyizing = 1
-	canmove = 0
-	icon = null
-	invisibility = 101
-	for(var/datum/organ/external/organ in organs)
-		del(organ)
-
-
-	var/atom/movable/overlay/animation = new /atom/movable/overlay( loc )
-	animation.icon_state = "blank"
-	animation.icon = 'mob.dmi'
-	animation.master = src
-	flick("h2monkey", animation)
-	sleep(48)
-	//animation = null
-	var/mob/living/carbon/human/tajaran/O = new /mob/living/carbon/human/tajaran( loc )
-	del(animation)
-
-	O.real_name = real_name
-	O.name = name
-	O.dna = dna
-	updateappearance(O,O.dna.uni_identity)
-	O.loc = loc
-	O.viruses = viruses
-	viruses = list()
-	for(var/datum/disease/D in O.viruses)
-		D.affected_mob = O
-	O.universal_speak = 1 //hacky fix until someone can figure out how to make them only understand humans
-
-	if (client)
-		client.mob = O
-	if(mind)
-		mind.transfer_to(O)
-
-	O << "<B>You are now a Tajara.</B>"
-	spawn(0)//To prevent the proc from returning null.
-		del(src)
-	return
-
-/client/proc/make_tajaran(mob/living/carbon/human/H as mob)
-	set category = "Fun"
-	set name = "Make Tajaran"
-	set desc = "Make (mob) into a tajaran."
-
-	if (!holder)
-		src << "Only administrators may use this command."
-		return
-
-	if(config.no_taj)
-		src << "Sorry, Tajarans are not allowed on this server." // For some reason allowing them is a big enough fucking issue that I have to add this flag
-		return
-
-	if(istype(H))
-		H:Tajaraize()

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

@@ -1,670 +0,0 @@
-/mob/living/carbon/human/tajaran
-	name = "tajaran"
-	real_name = "tajaran"
-	voice_name = "tajaran"
-	icon = 'tajaran.dmi'
-	icon_state = "m-none"
-	var/list/tajspeak_letters
-	//
-	universal_speak = 1 //hacky fix until someone can figure out how to make them only understand humans
-	taj_talk_understand = 1
-	voice_message = "mrowls"
-
-/mob/living/carbon/human/tajaran/New()
-
-	..()
-
-	tajspeak_letters = new/list("~","*","-")
-
-	var/g = "m"
-	if (gender == FEMALE)
-		g = "f"
-
-	spawn(1)
-		stand_icon = new /icon('tajaran.dmi', "body_[g]_s")
-		lying_icon = new /icon('tajaran.dmi', "body_[g]_l")
-		icon = stand_icon
-		update_clothing()
-
-		src << "\blue Your Tajaran icons have been generated!"
-
-
-
-
-/mob/living/carbon/human/tajaran/update_clothing()
-//	..()
-
-	if (monkeyizing)
-		return
-
-	overlays = null
-
-	// lol
-	var/fat = ""
-	/*if (mutations & FAT)
-		fat = "fat"*/
-/*
-	if (mutations & HULK)
-		overlays += image("icon" = 'genetics.dmi', "icon_state" = "hulk[fat][!lying ? "_s" : "_l"]")
-*/
-	if (mutations & COLD_RESISTANCE)
-		overlays += image("icon" = 'genetics.dmi', "icon_state" = "fire[fat][!lying ? "_s" : "_l"]")
-
-	if (mutations & TK)
-		overlays += image("icon" = 'genetics.dmi', "icon_state" = "telekinesishead[fat][!lying ? "_s" : "_l"]")
-
-	if (mutations & LASER)
-		overlays += image("icon" = 'genetics.dmi', "icon_state" = "lasereyes[!lying ? "_s" : "_l"]")
-
-	if (mutantrace)
-		switch(mutantrace)
-			if("golem","metroid")
-				overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat][!lying ? "_s" : "_l"]")
-				if(face_standing)
-					del(face_standing)
-				if(face_lying)
-					del(face_lying)
-				if(stand_icon)
-					del(stand_icon)
-				if(lying_icon)
-					del(lying_icon)
-			if("lizard")
-				overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]")
-				if(face_standing)
-					del(face_standing)
-				if(face_lying)
-					del(face_lying)
-				if(stand_icon)
-					del(stand_icon)
-				if(lying_icon)
-					del(lying_icon)
-			if("plant")
-				if(stat != 2) //if not dead, that is
-					overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace][fat]_[gender][!lying ? "_s" : "_l"]")
-				else
-					overlays += image("icon" = 'genetics.dmi', "icon_state" = "[mutantrace]_d")
-				if(face_standing)
-					del(face_standing)
-				if(face_lying)
-					del(face_lying)
-				if(stand_icon)
-					del(stand_icon)
-				if(lying_icon)
-					del(lying_icon)
-	else
-		if(!face_standing || !face_lying)
-			update_face()
-		if(!stand_icon || !lying_icon)
-			update_body()
-
-	if(buckled)
-		if(istype(buckled, /obj/structure/stool/bed))
-			lying = 1
-		else
-			lying = 0
-
-	// Automatically drop anything in store / id / belt if you're not wearing a uniform.
-	if (!w_uniform)
-		for (var/obj/item/thing in list(r_store, l_store, wear_id, belt))
-			if (thing)
-				u_equip(thing)
-				if (client)
-					client.screen -= thing
-
-				if (thing)
-					thing.loc = loc
-					thing.dropped(src)
-					thing.layer = initial(thing.layer)
-
-
-	//if (zone_sel)
-	//	zone_sel.overlays = null
-	//	zone_sel.overlays += body_standing
-	//	zone_sel.overlays += image("icon" = 'zone_sel.dmi', "icon_state" = text("[]", zone_sel.selecting))
-
-	if (lying)
-		icon = lying_icon
-
-		overlays += body_lying
-
-		if (face_lying)
-			overlays += face_lying
-	else
-		icon = stand_icon
-
-		overlays += body_standing
-
-		if (face_standing)
-			overlays += face_standing
-
-	// Uniform
-	if(w_uniform)
-		/*if (mutations & FAT && !(w_uniform.flags & ONESIZEFITSALL))
-			src << "\red You burst out of the [w_uniform.name]!"
-			var/obj/item/clothing/c = w_uniform
-			u_equip(c)
-			if(client)
-				client.screen -= c
-			if(c)
-				c:loc = loc
-				c:dropped(src)
-				c:layer = initial(c:layer)*/
-		if(w_uniform)//I should really not need these
-			w_uniform.screen_loc = ui_iclothing
-		if(istype(w_uniform, /obj/item/clothing/under))
-			var/t1 = w_uniform.color
-			if (!t1)
-				t1 = icon_state
-			/*if (mutations & FAT)
-				overlays += image("icon" = 'uniform_fat.dmi', "icon_state" = "[t1][!lying ? "_s" : "_l"]", "layer" = MOB_LAYER)
-			else*/
-			overlays += image("icon" = 'uniform.dmi', "icon_state" = text("[][]",t1, (!(lying) ? "_s" : "_l")), "layer" = MOB_LAYER)
-			if (w_uniform.blood_DNA)
-				var/icon/stain_icon = icon('blood.dmi', "uniformblood[!lying ? "" : "2"]")
-				overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
-
-	if (wear_id)
-		overlays += image("icon" = 'mob.dmi', "icon_state" = "id[!lying ? null : "2"]", "layer" = MOB_LAYER)
-
-	if (client)
-		client.screen -= hud_used.intents
-		client.screen -= hud_used.mov_int
-
-
-	//Screenlocs for these slots are handled by the huds other_update()
-	//because theyre located on the 'other' inventory bar.
-
-	// Gloves
-	var/datum/organ/external/lo = get_organ("l_hand")
-	var/datum/organ/external/ro = get_organ("r_hand")
-	if (!lo.destroyed || !ro.destroyed)
-		if (gloves)
-			var/t1 = gloves.item_state
-			if (!t1)
-				t1 = gloves.icon_state
-			var/icon/gloves_icon = new /icon("icon" = 'hands.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")))
-			if(lo.destroyed)
-				gloves_icon.Blend(new /icon('limb_mask.dmi', "right_[lying?"l":"s"]"), ICON_MULTIPLY)
-			else if(ro.destroyed)
-				gloves_icon.Blend(new /icon('limb_mask.dmi', "left_[lying?"l":"s"]"), ICON_MULTIPLY)
-			overlays += image(gloves_icon, "layer" = MOB_LAYER)
-			if (gloves.blood_DNA)
-				var/icon/stain_icon = icon('blood.dmi', "bloodyhands[!lying ? "" : "2"]")
-				if(lo.destroyed)
-					stain_icon.Blend(new /icon('limb_mask.dmi', "right_[lying?"l":"s"]"), ICON_MULTIPLY)
-				else if(ro.destroyed)
-					stain_icon.Blend(new /icon('limb_mask.dmi', "left_[lying?"l":"s"]"), ICON_MULTIPLY)
-				overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
-		else if (blood_DNA)
-			var/icon/stain_icon = icon('blood.dmi', "bloodyhands[!lying ? "" : "2"]")
-			if(lo.destroyed)
-				stain_icon.Blend(new /icon('limb_mask.dmi', "right_[lying?"l":"s"]"), ICON_MULTIPLY)
-			else if(ro.destroyed)
-				stain_icon.Blend(new /icon('limb_mask.dmi', "left_[lying?"l":"s"]"), ICON_MULTIPLY)
-			overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
-	// Glasses
-	if (glasses)
-		var/t1 = glasses.icon_state
-		overlays += image("icon" = 'eyes.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
-	// Ears
-	/*
-	if (l_ear)
-		var/t1 = l_ear.icon_state
-		overlays += image("icon" = 'ears.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
-	if (r_ear)
-		var/t1 = r_ear.icon_state
-		overlays += image("icon" = 'ears.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
-
-	*/
-	// Shoes
-	lo = get_organ("l_foot")
-	ro = get_organ("r_foot")
-	if ((!lo.destroyed || !ro.destroyed) && shoes)
-		var/t1 = shoes.icon_state
-		var/icon/shoes_icon = new /icon("icon" = 'feet.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")))
-		if(lo.destroyed && !lying)
-			shoes_icon.Blend(new /icon('limb_mask.dmi', "right[lying?"_l":""]"), ICON_MULTIPLY)
-		else if(ro.destroyed && !lying)
-			shoes_icon.Blend(new /icon('limb_mask.dmi', "left[lying?"_l":""]"), ICON_MULTIPLY)
-		overlays += image(shoes_icon, "layer" = MOB_LAYER)
-		if (shoes.blood_DNA)
-			var/icon/stain_icon = icon('blood.dmi', "shoesblood[!lying ? "" : "2"]")
-			if(lo.destroyed)
-				stain_icon.Blend(new /icon('limb_mask.dmi', "right_[lying?"l":"s"]"), ICON_MULTIPLY)
-			else if(ro.destroyed)
-				stain_icon.Blend(new /icon('limb_mask.dmi', "left_[lying?"l":"s"]"), ICON_MULTIPLY)
-			overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)	// Radio
-/*	if (w_radio)
-		overlays += image("icon" = 'ears.dmi', "icon_state" = "headset[!lying ? "" : "2"]", "layer" = MOB_LAYER) */
-
-	if (s_store)
-		var/t1 = s_store.item_state
-		if (!t1)
-			t1 = s_store.icon_state
-		s_store.screen_loc = ui_sstore1
-
-	if(client) hud_used.other_update() //Update the screenloc of the items on the 'other' inventory bar
-											   //to hide / show them.
-	if (client)
-		if (i_select)
-			if (intent)
-				client.screen += hud_used.intents
-
-				var/list/L = dd_text2list(intent, ",")
-				L[1] += ":-11"
-				i_select.screen_loc = dd_list2text(L,",") //ICONS4, FUCKING SHIT
-			else
-				i_select.screen_loc = null
-		if (m_select)
-			if (m_int)
-				client.screen += hud_used.mov_int
-
-				var/list/L = dd_text2list(m_int, ",")
-				L[1] += ":-11"
-				m_select.screen_loc = dd_list2text(L,",") //ICONS4, FUCKING SHIT
-			else
-				m_select.screen_loc = null
-
-	var/tail_shown = 1
-	if (wear_suit)
-		/*if (mutations & FAT && !(wear_suit.flags & ONESIZEFITSALL))
-			src << "\red You burst out of the [wear_suit.name]!"
-			var/obj/item/clothing/c = wear_suit
-			u_equip(c)
-			if(client)
-				client.screen -= c
-			if(c)
-				c:loc = loc
-				c:dropped(src)
-				c:layer = initial(c:layer)*/
-		if (istype(wear_suit, /obj/item/clothing/suit))
-			var/t1 = wear_suit.icon_state
-			overlays += image("icon" = 'suit.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
-		if (wear_suit)
-			if (wear_suit.blood_DNA)
-				var/icon/stain_icon = null
-				if (istype(wear_suit, /obj/item/clothing/suit/armor/vest))
-					stain_icon = icon('blood.dmi', "armorblood[!lying ? "" : "2"]")
-
-				else
-					stain_icon = icon('blood.dmi', "suitblood[!lying ? "" : "2"]")
-				overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
-			wear_suit.screen_loc = ui_oclothing
-		if (istype(wear_suit, /obj/item/clothing/suit/straight_jacket))
-			if (handcuffed)
-				handcuffed.loc = loc
-				handcuffed.layer = initial(handcuffed.layer)
-				handcuffed = null
-			if ((l_hand || r_hand))
-				var/h = hand
-				hand = 1
-				drop_item()
-				hand = 0
-				drop_item()
-				hand = h
-		//if wearing some suits, hide the tail
-		if ( istype(wear_suit, /obj/item/clothing/suit/bio_suit) || istype(wear_suit, /obj/item/clothing/suit/bomb_suit) || istype(wear_suit, /obj/item/clothing/suit/space) )
-			tail_shown = 0
-	if(tail_shown)
-		overlays += image("icon" = icon('tajaran.dmi', "tail_[gender==FEMALE ? "f" : "m"]_[lying ? "l" : "s"]"), "layer" = MOB_LAYER)
-
-	if (lying)
-		if (face_lying)
-			overlays += face_lying
-	else
-		if (face_standing)
-			overlays += face_standing
-
-	if (wear_mask)
-		if (istype(wear_mask, /obj/item/clothing/mask))
-			var/t1 = wear_mask.icon_state
-			overlays += image("icon" = 'mask.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
-			if (!istype(wear_mask, /obj/item/clothing/mask/cigarette))
-				if (wear_mask.blood_DNA)
-					var/icon/stain_icon = icon('blood.dmi', "maskblood[!lying ? "" : "2"]")
-					overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
-			wear_mask.screen_loc = ui_mask
-
-	// Head
-	if (head)
-		var/t1 = head.icon_state
-		var/icon/head_icon = icon('head.dmi', text("[][]", t1, (!( lying ) ? null : "2")))
-		if(istype(head,/obj/item/clothing/head/kitty))
-			head_icon = (( lying ) ? head:mob2 : head:mob)
-		overlays += image("icon" = head_icon, "layer" = MOB_LAYER)
-		if (head.blood_DNA)
-			var/icon/stain_icon = icon('blood.dmi', "helmetblood[!lying ? "" : "2"]")
-			overlays += image("icon" = stain_icon, "layer" = MOB_LAYER)
-		head.screen_loc = ui_head
-	else
-		var/datum/organ/external/head = get_organ("head")
-		if(!head.destroyed)
-		//if not wearing anything on the head, show the ears
-			overlays += image("icon" = icon('tajaran.dmi', "ears_[gender==FEMALE ? "f" : "m"]_[lying ? "l" : "s"]"), "layer" = MOB_LAYER)
-
-	// Belt
-	if (belt)
-		var/t1 = belt.item_state
-		if (!t1)
-			t1 = belt.icon_state
-		overlays += image("icon" = 'belt.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
-		belt.screen_loc = ui_belt
-
-
-	name = get_visible_name()
-
-	if (wear_id)
-		wear_id.screen_loc = ui_id
-
-	if (l_store)
-		l_store.screen_loc = ui_storage1
-
-	if (r_store)
-		r_store.screen_loc = ui_storage2
-
-	if (back)
-		var/t1 = back.icon_state
-		overlays += image("icon" = 'back.dmi', "icon_state" = text("[][]", t1, (!( lying ) ? null : "2")), "layer" = MOB_LAYER)
-		back.screen_loc = ui_back
-
-	if (handcuffed)
-		pulling = null
-		if (!lying)
-			overlays += image("icon" = 'mob.dmi', "icon_state" = "handcuff1", "layer" = MOB_LAYER)
-		else
-			overlays += image("icon" = 'mob.dmi', "icon_state" = "handcuff2", "layer" = MOB_LAYER)
-
-	if (client)
-		client.screen -= contents
-		client.screen += contents
-
-	if (r_hand)
-		overlays += image("icon" = 'items_righthand.dmi', "icon_state" = r_hand.item_state ? r_hand.item_state : r_hand.icon_state, "layer" = MOB_LAYER+1)
-
-		r_hand.screen_loc = ui_rhand
-
-	if (l_hand)
-		overlays += image("icon" = 'items_lefthand.dmi', "icon_state" = l_hand.item_state ? l_hand.item_state : l_hand.icon_state, "layer" = MOB_LAYER+1)
-
-		l_hand.screen_loc = ui_lhand
-
-	var/shielded = 0
-	for (var/obj/item/weapon/cloaking_device/S in src)
-		if (S.active)
-			shielded = 2
-			break
-
-	if(istype(wear_suit, /obj/item/clothing/suit/space/space_ninja)&&wear_suit:s_active)
-		shielded = 3
-
-	switch(shielded)
-		if(1)
-			overlays += image("icon" = 'effects.dmi', "icon_state" = "shield", "layer" = MOB_LAYER+1)
-		if(2)
-			invisibility = 2
-			//New stealth. Hopefully doesn't lag too much. /N
-			if(istype(loc, /turf))//If they are standing on a turf.
-				AddCamoOverlay(loc)//Overlay camo.
-		if(3)
-			if(istype(loc, /turf))
-			//Ninjas may flick into view once in a while if they are stealthed.
-				if(prob(90))
-					NinjaStealthActive(loc)
-				else
-					NinjaStealthMalf()
-		else
-			invisibility = 0
-
-	if (shielded == 2)
-		invisibility = 2
-	else
-		invisibility = 0
-/*
-	for (var/mob/M in viewers(1, src))//For the love of god DO NOT REFRESH EVERY SECOND - Mport
-		if ((M.client && M.machine == src))
-			spawn (0)
-				show_inv(M)
-				return
-*/
-	last_b_state = stat
-
-/mob/living/carbon/human/tajaran/update_body()
-	if(stand_icon)
-		del(stand_icon)
-	if(lying_icon)
-		del(lying_icon)
-
-	if (mutantrace)
-		return
-
-	var/g = "m"
-	if (gender == MALE)
-		g = "m"
-	else if (gender == FEMALE)
-		g = "f"
-
-	stand_icon = new /icon('tajaran.dmi', "torso_[g]_s")
-	lying_icon = new /icon('tajaran.dmi', "torso_[g]_l")
-
-
-
-	var/husk = (mutations & HUSK)
-	//var/obese = (mutations & FAT)
-
-	stand_icon.Blend(new /icon('tajaran.dmi', "chest_[g]_s"), ICON_OVERLAY)
-	lying_icon.Blend(new /icon('tajaran.dmi', "chest_[g]_l"), ICON_OVERLAY)
-
-	var/datum/organ/external/head = get_organ("head")
-	if(!head.destroyed)
-		stand_icon.Blend(new /icon('tajaran.dmi', "head_[g]_s"), ICON_OVERLAY)
-		lying_icon.Blend(new /icon('tajaran.dmi', "head_[g]_l"), ICON_OVERLAY)
-
-	for(var/datum/organ/external/part in organs)
-		if(!istype(part, /datum/organ/external/groin) \
-			&& !istype(part, /datum/organ/external/chest) \
-			&& !istype(part, /datum/organ/external/head) \
-			&& !part.destroyed)
-			var/icon/temp = new /icon('tajaran.dmi', "[part.icon_name]_s")
-			if(part.robot) temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
-			stand_icon.Blend(temp, ICON_OVERLAY)
-			temp = new /icon('tajaran.dmi', "[part.icon_name]_l")
-			if(part.robot) temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
-			lying_icon.Blend(temp , ICON_OVERLAY)
-
-	stand_icon.Blend(new /icon('tajaran.dmi', "groin_[g]_s"), ICON_OVERLAY)
-	lying_icon.Blend(new /icon('tajaran.dmi', "groin_[g]_l"), ICON_OVERLAY)
-
-	if (husk)
-		var/icon/husk_s = new /icon('tajaran.dmi', "husk_s")
-		var/icon/husk_l = new /icon('tajaran.dmi', "husk_l")
-
-		for(var/datum/organ/external/part in organs)
-			if(!istype(part, /datum/organ/external/groin) \
-				&& !istype(part, /datum/organ/external/chest) \
-				&& !istype(part, /datum/organ/external/head) \
-				&& part.destroyed)
-				husk_s.Blend(new /icon('dam_mask.dmi', "[part.icon_name]"), ICON_SUBTRACT)
-				husk_l.Blend(new /icon('dam_mask.dmi', "[part.icon_name]2"), ICON_SUBTRACT)
-
-		stand_icon.Blend(husk_s, ICON_OVERLAY)
-		lying_icon.Blend(husk_l, ICON_OVERLAY)
-	/*else if(obese)
-		stand_icon.Blend(new /icon('human.dmi', "fatbody_s"), ICON_OVERLAY)
-		lying_icon.Blend(new /icon('human.dmi', "fatbody_l"), ICON_OVERLAY)*/
-
-	// Skin tone
-	if (s_tone >= 0)
-		stand_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
-		lying_icon.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)
-	else
-		stand_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
-		lying_icon.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
-
-	if (underwear > 0)
-		//if(!obese)
-		stand_icon.Blend(new /icon('tajaran.dmi', "underwear[underwear]_[g]_s"), ICON_OVERLAY)
-		lying_icon.Blend(new /icon('tajaran.dmi', "underwear[underwear]_[g]_l"), ICON_OVERLAY)
-
-
-/mob/living/carbon/human/tajaran/update_face()
-	if(organs)
-		var/datum/organ/external/head = get_organ("head")
-		if(head)
-			if(head.destroyed)
-				del(face_standing)
-				del(face_lying)
-				return
-
-	//if(!facial_hair_style || !hair_style)	return//Seems people like to lose their icons, this should stop the runtimes for now
-	del(face_standing)
-	del(face_lying)
-
-	if (mutantrace)
-		return
-
-	var/g = "m"
-	if (gender == MALE)
-		g = "m"
-	else if (gender == FEMALE)
-		g = "f"
-
-	var/icon/eyes_s = new/icon("icon" = 'tajaran_face.dmi', "icon_state" = "eyes_s")
-	var/icon/eyes_l = new/icon("icon" = 'tajaran_face.dmi', "icon_state" = "eyes_l")
-	eyes_s.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-	eyes_l.Blend(rgb(r_eyes, g_eyes, b_eyes), ICON_ADD)
-
-	//var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s")
-	//var/icon/hair_l = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_l")
-	//hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
-	//hair_l.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
-
-	//var/icon/facial_s = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
-	//var/icon/facial_l = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_l")
-	//facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
-	//facial_l.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
-
-	var/icon/mouth_s = new/icon("icon" = 'tajaran_face.dmi', "icon_state" = "mouth_[g]_s")
-	var/icon/mouth_l = new/icon("icon" = 'tajaran_face.dmi', "icon_state" = "mouth_[g]_l")
-
-	// if the head or mask has the flag BLOCKHAIR (equal to 5), then do not apply hair
-	//if((!(head && (head.flags & BLOCKHAIR))) && !(wear_mask && (wear_mask.flags & BLOCKHAIR)))
-		//eyes_s.Blend(hair_s, ICON_OVERLAY)
-		//eyes_l.Blend(hair_l, ICON_OVERLAY)
-
-	eyes_s.Blend(mouth_s, ICON_OVERLAY)
-	eyes_l.Blend(mouth_l, ICON_OVERLAY)
-
-	// if BLOCKHAIR, do not apply facial hair
-	//if((!(head && (head.flags & BLOCKHAIR))) && !(wear_mask && (wear_mask.flags & BLOCKHAIR)))
-		//eyes_s.Blend(facial_s, ICON_OVERLAY)
-		//eyes_l.Blend(facial_l, ICON_OVERLAY)
-
-
-	face_standing = new /image()
-	face_lying = new /image()
-	face_standing.icon = eyes_s
-	face_standing.layer = MOB_LAYER
-	face_lying.icon = eyes_l
-	face_lying.layer = MOB_LAYER
-
-	del(mouth_l)
-	del(mouth_s)
-	//del(facial_l)
-	//del(facial_s)
-	//del(hair_l)
-	//del(hair_s)
-	del(eyes_l)
-	del(eyes_s)
-
-/mob/living/carbon/human/tajaran/co2overloadtime = null
-/mob/living/carbon/human/tajaran/temperature_resistance = T0C+70
-
-
-
-/mob/living/carbon/human/tajaran/Emissary/
-	unacidable = 1
-	var/aegis = 1
-
-/mob/living/carbon/human/tajaran/Emissary/New()
-
-	..()
-
-	reagents.add_reagent("hyperzine", 5000)		//From the dark, to the light, it's a supersonic flight!
-													// Gotta keep it going!
-	if (!(mutations & HULK))
-		mutations |= HULK
-
-	if (!(mutations & LASER))
-		mutations |= LASER
-
-	if (!(mutations & XRAY))
-		mutations |= XRAY
-		sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
-		see_in_dark = 8
-		see_invisible = 2
-
-	if (!(mutations & COLD_RESISTANCE))
-		mutations |= COLD_RESISTANCE
-
-	if (!(mutations & TK))
-		mutations |= TK
-
-	if(!(mutations & HEAL))
-		mutations |= HEAL
-
-	spawn(0)
-		while(src)
-			adjustBruteLoss(-10)
-			adjustToxLoss(-10)
-			adjustOxyLoss(-10)
-			adjustFireLoss(-10)
-			sleep(10)
-
-
-/mob/living/carbon/human/tajaran/Emissary/ex_act()
-	return
-
-/mob/living/carbon/human/tajaran/Emissary/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, inrange, params)
-	if(istype(target , /obj/machinery/door/airlock))
-		if(target:locked)
-			target:locked = 0
-		if(!target:density)
-			return 1
-		if(target:operating > 0)
-			return
-		if(!ticker)
-			return 0
-		if(!target:operating)
-			target:operating = 1
-
-		target:animate("opening")
-		target:sd_SetOpacity(0)
-		sleep(10)
-		target:layer = 2.7
-		target:density = 0
-		target:update_icon()
-		target:sd_SetOpacity(0)
-		target:update_nearby_tiles()
-
-		target:operating = -1
-
-		user << "You force the door open, shearing the bolts and burning out the motor."
-
-		if(target:operating)
-			target:operating = -1
-	else if(istype(target , /obj/machinery/door/firedoor))
-		target:open()
-
-/mob/living/carbon/human/tajaran/Emissary/Life()
-
-	..()
-
-	if (!(mutations & HULK))
-		mutations |= HULK
-
-
-	if((stat == 2) && aegis)
-		src.show_message("\red [src]'s eyes open suddenlly.", 3, "\red \"I gave a solemn vow to never die for long.\"", 2)
-		src.heal_overall_damage(9001,9001)
-		src.stat = 0
-		aegis = 0

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

@@ -1,170 +0,0 @@
-/mob/living/carbon/human/tajaran/whisper(message as text)
-	//Figured it out.  If you use say :w (message) it HTML encodes it, THEN passes it to the whisper code, which does so again.  Jeez.  --SkyMarshal
-	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
-
-	if (!message)
-		return
-
-	if (silent)
-		return
-
-	log_whisper("[src.name]/[src.key] : [message]")
-
-	if (src.client && (src.client.muted || src.client.muted_complete))
-		src << "You are muted."
-		return
-
-	if (src.stat == 2)
-		return src.say_dead(message)
-
-	if (src.stat)
-		return
-
-	var/alt_name = ""
-	if (istype(src, /mob/living/carbon/human) && src.name != src.real_name)
-		var/mob/living/carbon/human/H = src
-		alt_name = " (as [H.get_visible_name()])"
-	// Mute disability
-	if (src.disabilities & 64)
-		return
-
-	if (istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
-		return
-
-	var/italics = 1
-	var/message_range = 1
-
-	//work out if we're speaking tajaran or not
-	var/is_speaking_taj = 0
-	if(copytext(message, 1, 4) == ":j ")
-		message = copytext(message, 4)
-		if(taj_talk_understand)
-			is_speaking_taj = 1
-
-	if(istype(src.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja)&&src.wear_mask:voice=="Unknown")
-		if(copytext(message, 1, 2) != "*")
-			var/list/temp_message = dd_text2list(message, " ")
-			var/list/pick_list = list()
-			for(var/i = 1, i <= temp_message.len, i++)
-				pick_list += i
-			for(var/i=1, i <= abs(temp_message.len/3), i++)
-				var/H = pick(pick_list)
-				if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
-				temp_message[H] = ninjaspeak(temp_message[H])
-				pick_list -= H
-			message = dd_list2text(temp_message, " ")
-			message = dd_replaceText(message, "o", "¤")
-			message = dd_replaceText(message, "p", "þ")
-			message = dd_replaceText(message, "l", "£")
-			message = dd_replaceText(message, "s", "§")
-			message = dd_replaceText(message, "u", "µ")
-			message = dd_replaceText(message, "b", "ß")
-
-	message = capitalize(message)
-
-	if (src.stuttering)
-		message = stutter(message)
-	if (src.slurring)
-		message = slur(message)
-
-	for (var/obj/O in view(message_range, src))
-		spawn (0)
-			if (O)
-				O.hear_talk(src, message)
-
-	var/list/listening = hearers(message_range, src)
-	listening -= src
-	listening += src
-	var/list/eavesdropping = hearers(2, src)
-	eavesdropping -= src
-	eavesdropping -= listening
-	var/list/watching  = hearers(5, src)
-	watching  -= src
-	watching  -= listening
-	watching  -= eavesdropping
-
-	var/list/heard_a = list() // understood us
-	var/list/heard_b = list() // didn't understand us
-
-	for (var/mob/M in listening)
-		if ( M.say_understands(src) && (M.taj_talk_understand || !is_speaking_taj)  )
-			heard_a += M
-		else
-			heard_b += M
-
-	var/rendered = null
-
-	for (var/mob/M in watching)
-		if ( (M.say_understands(src) && !is_speaking_taj) || istype(M,/mob/living/carbon/human/tajaran) )
-			rendered = "<span class='game say'><span class='name'>[src.name]</span> [is_speaking_taj ? "quietly mrowls" : "whispers"] something.</span>"
-		else
-			rendered = "<span class='game say'><span class='name'>[src.voice_name]</span> [is_speaking_taj ? "quietly mrowls" : "whispers"] something.</span>"
-		M.show_message(rendered, 2)
-
-	if (length(heard_a))
-		var/message_a = message
-
-		if (italics)
-			message_a = "<i>[message_a]</i>"
-		//This appears copied from carbon/living say.dm so the istype check for mob is probably not needed. Appending for src is also not needed as the game will check that automatically.
-		if (!istype(src, /mob/living/carbon/human))
-			rendered = "<span class='game say'><span class='name'>[name]</span> [is_speaking_taj ? "mrowls quietly" : "whispers"], <span class='message'>\"[message_a]\"</span></span>"
-		else if (istype(wear_mask, /obj/item/clothing/mask/gas/voice))
-			if (wear_mask:vchange)
-				rendered = "<span class='game say'><span class='name'>[wear_mask:voice]</span> [is_speaking_taj ? "mrowls quietly" : "whispers"], <span class='message'>\"[message_a]\"</span></span>"
-			else
-				rendered = "<span class='game say'><span class='name'>[name]</span> [is_speaking_taj ? "mrowls quietly" : "whispers"], <span class='message'>\"[message_a]\"</span></span>"
-		else
-			rendered = "<span class='game say'><span class='name'>[real_name]</span>[alt_name] [is_speaking_taj ? "mrowls quietly" : "whispers"], <span class='message'>\"[message_a]\"</span></span>"
-
-		for (var/mob/M in heard_a)
-			M.show_message(rendered, 2)
-
-	if (length(heard_b))
-		var/message_b
-
-		message_b = tajspeak(message)
-
-		if (italics)
-			message_b = "<i>[message_b]</i>"
-
-		rendered = "<span class='game say'><span class='name'>[src.voice_name]</span> mrows quietly, <span class='message'>\"[message_b]\"</span></span>"
-
-		for (var/mob/M in heard_b)
-			M.show_message(rendered, 2)
-
-	for (var/mob/M in eavesdropping)
-		if (M.say_understands(src))
-			var/message_c = tajspeak(message)
-			if (!istype(src, /mob/living/carbon/human))
-				rendered = "<span class='game say'><span class='name'>[name]</span> mrowls quietly, <span class='message'>\"[message_c]\"</span></span>"
-			else if(istype(wear_mask, /obj/item/clothing/mask/gas/voice))
-				if(wear_mask:vchange)
-					rendered = "<span class='game say'><span class='name'>[wear_mask:voice]</span> mrowls quietly, <span class='message'>\"[message_c]\"</span></span>"
-				else
-					rendered = "<span class='game say'><span class='name'>[name]</span> mrowls quietly, <span class='message'>\"[message_c]\"</span></span>"
-			else
-				rendered = "<span class='game say'><span class='name'>[real_name]</span>[alt_name] mrowls quietly, <span class='message'>\"[message_c]\"</span></span>"
-			M.show_message(rendered, 2)
-		else
-			rendered = "<span class='game say'><span class='name'>[src.voice_name]</span> quietly mrowls something.</span>"
-			M.show_message(rendered, 2)
-
-	if (italics)
-		message = "<i>[message]</i>"
-
-	if (!istype(src, /mob/living/carbon/human))
-		rendered = "<span class='game say'><span class='name'>[name]</span> [is_speaking_taj ? "mrowls quietly" : "whispers"], <span class='message'>\"[message]\"</span></span>"
-	else if (istype(src.wear_mask, /obj/item/clothing/mask/gas/voice))
-		if(wear_mask:vchange)
-			rendered = "<span class='game say'><span class='name'>[wear_mask:voice]</span> [is_speaking_taj ? "mrowls quietly" : "whispers"], <span class='message'>\"[message]\"</span></span>"
-		else
-			rendered = "<span class='game say'><span class='name'>[name]</span> [is_speaking_taj ? "mrowls quietly" : "whispers"], <span class='message'>\"[message]\"</span></span>"
-	else
-		rendered = "<span class='game say'><span class='name'>[real_name]</span>[alt_name] [is_speaking_taj ? "mrowls quietly" : "whispers"], <span class='message'>\"[message]\"</span></span>"
-
-	for (var/mob/M in world)
-		if (istype(M, /mob/new_player))
-			continue
-		if (M.stat > 1 && !(M in heard_a))
-			M.show_message(rendered, 2)

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

@@ -672,7 +672,7 @@
 ///Returns a number between -1 to 2
 /mob/living/carbon/human/eyecheck()
 	var/number = 0
-	if(istype(src.head, /obj/item/clothing/head/helmet/welding))
+	if(istype(src.head, /obj/item/clothing/head/welding))
 		if(!src.head:up)
 			number += 2
 	if(istype(src.head, /obj/item/clothing/head/helmet/space))

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

@@ -939,7 +939,7 @@
 
 
 
-		else if(istype(head, /obj/item/clothing/head/helmet/welding))		// wat.  This is never fucking called.
+		else if(istype(head, /obj/item/clothing/head/welding))		// wat.  This is never fucking called.
 			if(!head:up && tinted_weldhelh)
 				see_in_dark = 1
 
@@ -1101,7 +1101,7 @@
 				if (druggy)
 					client.screen += hud_used.druggy
 
-				if ((istype(head, /obj/item/clothing/head/helmet/welding)) )
+				if ((istype(head, /obj/item/clothing/head/welding)) )
 					if(!head:up && tinted_weldhelh)
 						client.screen += hud_used.darkMask
 

code/modules/mob/simple_animal/corgi.dm

@@ -123,7 +123,7 @@
 						/obj/item/clothing/head/caphat,
 						/obj/item/clothing/head/collectable/captain,
 						/obj/item/clothing/head/that,
-						/obj/item/clothing/head/helmet/that,
+						/obj/item/clothing/head/that,
 						/obj/item/clothing/head/kitty,
 						/obj/item/clothing/head/collectable/kitty,
 						/obj/item/clothing/head/rabbitears,
@@ -141,9 +141,9 @@
 						/obj/item/clothing/head/wizard/fake,
 						/obj/item/clothing/head/wizard,
 						/obj/item/clothing/head/collectable/wizard,
-						/obj/item/clothing/head/helmet/hardhat,
+						/obj/item/clothing/head/hardhat,
 						/obj/item/clothing/head/collectable/hardhat,
-						/obj/item/clothing/head/helmet/hardhat/white,
+						/obj/item/clothing/head/hardhat/white,
 						/obj/item/weapon/bedsheet,
 						/obj/item/clothing/head/helmet/space/santahat,
 						/obj/item/clothing/head/collectable/paper,