Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/modules/admin/holder2.dm

@@ -48,7 +48,7 @@ proc/admin_proc()
 	world << "you have enough rights!"
 
 NOTE: it checks usr! not src! So if you're checking somebody's rank in a proc which they did not call
-you will have to do something like if(client.rights & R_ADMIN) yourself.
+you will have to do something like if(client.holder.rights & R_ADMIN) yourself.
 */
 /proc/check_rights(rights_required, show_msg=1)
 	if(usr && usr.client)

code/modules/client/preferences.dm

@@ -764,13 +764,13 @@ datum/preferences
 						g_hair = rand(0,255)
 						b_hair = rand(0,255)
 					if("h_style")
-						h_style = random_hair_style(gender)
+						h_style = random_hair_style(gender, species)
 					if("facial")
 						r_facial = rand(0,255)
 						g_facial = rand(0,255)
 						b_facial = rand(0,255)
 					if("f_style")
-						f_style = random_facial_hair_style(gender)
+						f_style = random_facial_hair_style(gender, species)
 					if("underwear")
 						underwear = rand(1,underwear_m.len)
 						ShowChoices(user)
@@ -822,9 +822,7 @@ datum/preferences
 							var/list/valid_hairstyles = list()
 							for(var/hairstyle in hair_styles_list)
 								var/datum/sprite_accessory/S = hair_styles_list[hairstyle]
-								if(gender == MALE && S.gender == FEMALE)
-									continue
-								if(gender == FEMALE && S.gender == MALE)
+								if(gender != S.gender)
 									continue
 								if( !(species in S.species_allowed))
 									continue
@@ -840,9 +838,7 @@ datum/preferences
 							var/list/valid_facialhairstyles = list()
 							for(var/facialhairstyle in facial_hair_styles_list)
 								var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
-								if(gender == MALE && S.gender == FEMALE)
-									continue
-								if(gender == FEMALE && S.gender == MALE)
+								if(gender != S.gender)
 									continue
 								if( !(species in S.species_allowed))
 									continue
@@ -925,9 +921,7 @@ datum/preferences
 						var/list/valid_facialhairstyles = list()
 						for(var/facialhairstyle in facial_hair_styles_list)
 							var/datum/sprite_accessory/S = facial_hair_styles_list[facialhairstyle]
-							if(gender == MALE && S.gender == FEMALE)
-								continue
-							if(gender == FEMALE && S.gender == MALE)
+							if(gender != S.gender)
 								continue
 							if( !(species in S.species_allowed))
 								continue

code/modules/mob/living/carbon/alien/humanoid/emote.dm

@@ -1,4 +1,4 @@
-/mob/living/carbon/alien/humanoid/emote(var/act)
+/mob/living/carbon/alien/humanoid/emote(var/act,var/m_type=1,var/message = null)
 
 	var/param = null
 	if (findtext(act, "-", 1, null))
@@ -9,10 +9,25 @@
 	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
 		act = copytext(act,1,length(act))
 	var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle)
-	var/m_type = 1
-	var/message
 
 	switch(act)
+		if ("me")
+			if(silent)
+				return
+			if (src.client)
+				if (client.prefs.muted & MUTE_IC)
+					src << "\red You cannot send IC messages (muted)."
+					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
+			if (stat)
+				return
+			if(!(message))
+				return
+			return custom_emote(m_type, message)
+
+		if ("custom")
+			return custom_emote(m_type, message)
 		if("sign")
 			if (!src.restrained())
 				message = text("<B>The alien</B> signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))

code/modules/mob/living/carbon/alien/larva/emote.dm

@@ -1,4 +1,4 @@
-/mob/living/carbon/alien/larva/emote(var/act)
+/mob/living/carbon/alien/larva/emote(var/act,var/m_type=1,var/message = null)
 
 	var/param = null
 	if (findtext(act, "-", 1, null))
@@ -9,10 +9,25 @@
 	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
 		act = copytext(act,1,length(act))
 	var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle)
-	var/m_type = 1
-	var/message
 
 	switch(act)
+		if ("me")
+			if(silent)
+				return
+			if (src.client)
+				if (client.prefs.muted & MUTE_IC)
+					src << "\red You cannot send IC messages (muted)."
+					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
+			if (stat)
+				return
+			if(!(message))
+				return
+			return custom_emote(m_type, message)
+
+		if ("custom")
+			return custom_emote(m_type, message)
 		if("sign")
 			if (!src.restrained())
 				message = text("<B>The alien</B> signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))

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

@@ -12,6 +12,23 @@
 	if(src.stat == DEAD)
 		return
 	switch(act)
+		if ("me")
+			if(silent)
+				return
+			if (src.client)
+				if (client.prefs.muted & MUTE_IC)
+					src << "\red You cannot send IC messages (muted)."
+					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
+			if (stat)
+				return
+			if(!(message))
+				return
+			return custom_emote(m_type, message)
+
+		if ("custom")
+			return custom_emote(m_type, message)
 		if ("alarm")
 			src << "You sound an alarm."
 			message = "<B>[src]</B> sounds an alarm."

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

@@ -63,7 +63,7 @@
 			else
 				alert("Unable to use this emote, must be either hearable or visible.")
 				return
-			message = "<B>[src]</B> [input]"
+			return custom_emote(m_type, message)
 
 		if ("me")
 			if(silent)
@@ -78,7 +78,7 @@
 				return
 			if(!(message))
 				return
-			message = "<B>[src]</B> [message]"
+			return custom_emote(m_type, message)
 
 		if ("salute")
 			if (!src.buckled)

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

@@ -282,40 +282,43 @@
 						wound_descriptors[this_wound_desc] += W.amount
 						continue
 					wound_descriptors[this_wound_desc] = W.amount
-				var/list/flavor_text = list()
-				var/list/no_exclude = list("gaping wound", "big gaping wound", "massive wound", "large bruise",\
-				"huge bruise", "massive bruise", "severe burn", "large burn", "deep burn", "carbonised area")
-				for(var/wound in wound_descriptors)
-					switch(wound_descriptors[wound])
-						if(1)
-							if(!flavor_text.len)
-								flavor_text += "<span class='warning'>[t_He] has[prob(10) && !(wound in no_exclude)  ? " what might be" : ""] a [wound]"
-							else
-								flavor_text += "[prob(10) && !(wound in no_exclude) ? " what might be" : ""] a [wound]"
-						if(2)
-							if(!flavor_text.len)
-								flavor_text += "<span class='warning'>[t_He] has[prob(10) && !(wound in no_exclude) ? " what might be" : ""] a pair of [wound]s"
-							else
-								flavor_text += "[prob(10) && !(wound in no_exclude) ? " what might be" : ""] a pair of [wound]s"
-						if(3 to 5)
-							if(!flavor_text.len)
-								flavor_text += "<span class='warning'>[t_He] has several [wound]s"
-							else
-								flavor_text += " several [wound]s"
-						if(6 to INFINITY)
-							if(!flavor_text.len)
-								flavor_text += "<span class='warning'>[t_He] has a bunch of [wound]s"
-							else
-								flavor_text += " a ton of [wound]\s"
-				var/flavor_text_string = ""
-				for(var/text = 1, text <= flavor_text.len, text++)
-					if(text == flavor_text.len && flavor_text.len > 1)
-						flavor_text_string += ", and"
-					else if(flavor_text.len > 1 && text > 1)
-						flavor_text_string += ","
-					flavor_text_string += flavor_text[text]
-				flavor_text_string += " on [t_his] [temp.display_name].</span><br>"
-				wound_flavor_text["[temp.display_name]"] = flavor_text_string
+				if(wound_descriptors.len)
+					var/list/flavor_text = list()
+					var/list/no_exclude = list("gaping wound", "big gaping wound", "massive wound", "large bruise",\
+					"huge bruise", "massive bruise", "severe burn", "large burn", "deep burn", "carbonised area")
+					for(var/wound in wound_descriptors)
+						switch(wound_descriptors[wound])
+							if(1)
+								if(!flavor_text.len)
+									flavor_text += "<span class='warning'>[t_He] has[prob(10) && !(wound in no_exclude)  ? " what might be" : ""] a [wound]"
+								else
+									flavor_text += "[prob(10) && !(wound in no_exclude) ? " what might be" : ""] a [wound]"
+							if(2)
+								if(!flavor_text.len)
+									flavor_text += "<span class='warning'>[t_He] has[prob(10) && !(wound in no_exclude) ? " what might be" : ""] a pair of [wound]s"
+								else
+									flavor_text += "[prob(10) && !(wound in no_exclude) ? " what might be" : ""] a pair of [wound]s"
+							if(3 to 5)
+								if(!flavor_text.len)
+									flavor_text += "<span class='warning'>[t_He] has several [wound]s"
+								else
+									flavor_text += " several [wound]s"
+							if(6 to INFINITY)
+								if(!flavor_text.len)
+									flavor_text += "<span class='warning'>[t_He] has a bunch of [wound]s"
+								else
+									flavor_text += " a ton of [wound]\s"
+					var/flavor_text_string = ""
+					for(var/text = 1, text <= flavor_text.len, text++)
+						if(text == flavor_text.len && flavor_text.len > 1)
+							flavor_text_string += ", and"
+						else if(flavor_text.len > 1 && text > 1)
+							flavor_text_string += ","
+						flavor_text_string += flavor_text[text]
+					flavor_text_string += " on [t_his] [temp.display_name].</span><br>"
+					wound_flavor_text["[temp.display_name]"] = flavor_text_string
+				else
+					wound_flavor_text["[temp.display_name]"] = ""
 				if(temp.status & ORGAN_BLEEDING)
 					is_bleeding["[temp.display_name]"] = 1
 			else

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

@@ -347,21 +347,25 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 	if(f_style)
 		var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[f_style]
-		if(facial_hair_style)
+		if(facial_hair_style && src.species.name in facial_hair_style.species_allowed)
 			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)
+			if(facial_hair_style.do_colouration)
+				facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
+				facial_l.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
+
 			face_standing.Blend(facial_s, ICON_OVERLAY)
 			face_lying.Blend(facial_l, ICON_OVERLAY)
 
 	if(h_style && !(head && (head.flags & BLOCKHEADHAIR)))
 		var/datum/sprite_accessory/hair_style = hair_styles_list[h_style]
-		if(hair_style)
+		if(hair_style && src.species.name in hair_style.species_allowed)
 			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)
+			if(hair_style.do_colouration)
+				hair_s.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
+				hair_l.Blend(rgb(r_hair, g_hair, b_hair), ICON_ADD)
+
 			face_standing.Blend(hair_s, ICON_OVERLAY)
 			face_lying.Blend(hair_l, ICON_OVERLAY)
 

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

@@ -1,4 +1,4 @@
-/mob/living/carbon/slime/emote(var/act, var/type, var/desc)
+/mob/living/carbon/slime/emote(var/act,var/m_type=1,var/message = null)
 
 
 	if (findtext(act, "-", 1, null))
@@ -9,14 +9,24 @@
 	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
 		act = copytext(act,1,length(act))
 
-	var/m_type = 1
-	var/message
-
 	switch(act)
 		if ("me")
-			return custom_emote(m_type, desc)
+			if(silent)
+				return
+			if (src.client)
+				if (client.prefs.muted & MUTE_IC)
+					src << "\red You cannot send IC messages (muted)."
+					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
+			if (stat)
+				return
+			if(!(message))
+				return
+			return custom_emote(m_type, message)
+
 		if ("custom")
-			return custom_emote(m_type, desc)
+			return custom_emote(m_type, message)
 		if("moan")
 			message = "<B>The [src.name]</B> moans."
 			m_type = 2

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

@@ -1,4 +1,4 @@
-/mob/living/carbon/monkey/emote(var/act, var/type, var/desc)
+/mob/living/carbon/monkey/emote(var/act,var/m_type=1,var/message = null)
 
 	var/param = null
 	if (findtext(act, "-", 1, null))
@@ -10,15 +10,26 @@
 		act = copytext(act,1,length(act))
 
 	var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle)
-	var/m_type = 1
-	var/message
 
 	switch(act)
 		if ("me")
-			return custom_emote(m_type, desc)
+			if(silent)
+				return
+			if (src.client)
+				if (client.prefs.muted & MUTE_IC)
+					src << "\red You cannot send IC messages (muted)."
+					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
+			if (stat)
+				return
+			if(!(message))
+				return
+			return custom_emote(m_type, message)
+
 
 		if ("custom")
-			return custom_emote(m_type, desc)
+			return custom_emote(m_type, message)
 
 		if("sign")
 			if (!src.restrained())

code/modules/mob/new_player/new_player.dm

@@ -350,7 +350,7 @@
 		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))
+			if(is_alien_whitelisted(src, client.prefs.species) || !config.usealienwhitelist || !(chosen_species.flags & WHITELISTED) || (client.holder.rights & R_ADMIN) )// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.
 				new_character.set_species(client.prefs.species)
 				if(chosen_species.language)
 					new_character.add_language(chosen_species.language)

code/modules/mob/new_player/preferences_setup.dm

@@ -7,8 +7,8 @@ datum/preferences
 			else
 				gender = FEMALE
 		s_tone = random_skin_tone()
-		h_style = random_hair_style(gender)
-		f_style = random_facial_hair_style(gender)
+		h_style = random_hair_style(gender, species)
+		f_style = random_facial_hair_style(gender, species)
 		randomize_hair_color("hair")
 		randomize_hair_color("facial")
 		randomize_eyes_color()

code/modules/mob/new_player/sprite_accessories.dm

@@ -28,9 +28,12 @@
 	// Determines if the accessory will be skipped or included in random hair generations
 	var/gender = NEUTER
 
-	// Restrict some styles to specific races
+	// Restrict some styles to specific species
 	var/list/species_allowed = list("Human")
 
+	// Whether or not the accessory can be affected by colouration
+	var/do_colouration = 1
+
 
 /*
 ////////////////////////////
@@ -386,117 +389,139 @@
 		name = "Long Unathi Spines"
 		icon_state = "soghun_longspines"
 		species_allowed = list("Unathi")
+		do_colouration = 0
 
 	una_spines_short
 		name = "Short Unathi Spines"
 		icon_state = "soghun_shortspines"
 		species_allowed = list("Unathi")
+		do_colouration = 0
 
 	una_frills_long
 		name = "Long Unathi Frills"
 		icon_state = "soghun_longfrills"
 		species_allowed = list("Unathi")
+		do_colouration = 0
 
 	una_frills_short
 		name = "Short Unathi Frills"
 		icon_state = "soghun_shortfrill"
 		species_allowed = list("Unathi")
+		do_colouration = 0
 
 	una_horns
 		name = "Unathi Horns"
 		icon_state = "soghun_horns"
 		species_allowed = list("Unathi")
+		do_colouration = 0
 
 	skr_tentacle_m
 		name = "Skrell Male Tentacles"
 		icon_state = "skrell_hair_m"
 		species_allowed = list("Skrell")
 		gender = MALE
+		do_colouration = 0
 
 	skr_tentacle_f
 		name = "Skrell Female Tentacles"
 		icon_state = "skrell_hair_f"
 		species_allowed = list("Skrell")
 		gender = FEMALE
+		do_colouration = 0
 
 	skr_gold_m
 		name = "Gold plated Skrell Male Tentacles"
 		icon_state = "skrell_goldhair_m"
 		species_allowed = list("Skrell")
 		gender = MALE
+		do_colouration = 0
 
 	skr_gold_f
 		name = "Gold chained Skrell Female Tentacles"
 		icon_state = "skrell_goldhair_f"
 		species_allowed = list("Skrell")
 		gender = FEMALE
+		do_colouration = 0
 
 	skr_clothtentacle_m
 		name = "Cloth draped Skrell Male Tentacles"
 		icon_state = "skrell_clothhair_m"
 		species_allowed = list("Skrell")
 		gender = MALE
+		do_colouration = 0
 
 	skr_clothtentacle_f
 		name = "Cloth draped Skrell Female Tentacles"
 		icon_state = "skrell_clothhair_f"
 		species_allowed = list("Skrell")
 		gender = FEMALE
+		do_colouration = 0
 
 	taj_ears
 		name = "Tajaran Ears"
 		icon_state = "ears_plain"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_ears_clean
 		name = "Tajara Clean"
 		icon_state = "hair_clean"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_ears_shaggy
 		name = "Tajara Shaggy"
 		icon_state = "hair_shaggy"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_ears_mohawk
 		name = "Tajaran Mohawk"
 		icon_state = "hair_mohawk"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_ears_plait
 		name = "Tajara Plait"
 		icon_state = "hair_plait"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_ears_straight
 		name = "Tajara Straight"
 		icon_state = "hair_straight"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_ears_long
 		name = "Tajara Long"
 		icon_state = "hair_long"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_ears_rattail
 		name = "Tajara Rat Tail"
 		icon_state = "hair_rattail"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_ears_spiky
 		name = "Tajara Spiky"
 		icon_state = "hair_tajspiky"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_ears_messy
 		name = "Tajara Messy"
 		icon_state = "hair_messy"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	vox_quills_short
 		name = "Short Vox Quills"
 		icon_state = "vox_shortquills"
 		species_allowed = list("Vox")
+		do_colouration = 0
 
 /datum/sprite_accessory/facial_hair
 
@@ -504,31 +529,37 @@
 		name = "Tajara Sideburns"
 		icon_state = "facial_mutton"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_mutton
 		name = "Tajara Mutton"
 		icon_state = "facial_mutton"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_pencilstache
 		name = "Tajara Pencilstache"
 		icon_state = "facial_pencilstache"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_moustache
 		name = "Tajara Moustache"
 		icon_state = "facial_moustache"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_goatee
 		name = "Tajara Goatee"
 		icon_state = "facial_goatee"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 	taj_smallstache
 		name = "Tajara Smallsatche"
 		icon_state = "facial_smallstache"
 		species_allowed = list("Tajaran")
+		do_colouration = 0
 
 //skin styles - WIP
 //going to have to re-integrate this with surgery

code/modules/organs/organ_external.dm

@@ -81,10 +81,11 @@
 		burn *= 0.66 //~2/3 damage for ROBOLIMBS
 
 	//If limb took enough damage, try to cut or tear it off
-	if(config.limbs_can_break && brute_dam >= max_damage * config.organ_health_multiplier)
-		if( (sharp && prob(5 * brute)) || (brute > 20 && prob(2 * brute)) )
-			droplimb(1)
-			return
+	if(body_part != UPPER_TORSO && body_part != LOWER_TORSO) //as hilarious as it is, getting hit on the chest too much shouldn't effectively gib you.
+		if(config.limbs_can_break && brute_dam >= max_damage * config.organ_health_multiplier)
+			if( (sharp && prob(5 * brute)) || (brute > 20 && prob(2 * brute)) )
+				droplimb(1)
+				return
 
 	// High brute damage or sharp objects may damage internal organs
 	if(internal_organs != null) if( (sharp && brute >= 5) || brute >= 10) if(prob(5))
@@ -742,21 +743,44 @@ obj/item/weapon/organ/New(loc, mob/living/carbon/human/H)
 	//Forming icon for the limb
 
 	//Setting base icon for this mob's race
-	if(ishuman(H) && H.dna)
-		var/icon/base = new H.species.icobase
-		if(base)
-			icon = base.MakeLying()
+	var/icon/base
+	if(H.species && H.species.icobase)
+		base = icon(H.species.icobase)
 	else
-		icon_state = initial(icon_state)+"_l"
+		base = icon('icons/mob/human_races/r_human.dmi')
 
-	var/icon/I = new /icon(icon, icon_state)
+	if(base)
+		base = base.MakeLying()
 
-	//Changing limb's skin tone to match owner
-	if (H.s_tone >= 0)
-		I.Blend(rgb(H.s_tone, H.s_tone, H.s_tone), ICON_ADD)
-	else
-		I.Blend(rgb(-H.s_tone,  -H.s_tone,  -H.s_tone), ICON_SUBTRACT)
-	icon = I
+		//Changing limb's skin tone to match owner
+		if(!H.species || H.species.flags & HAS_SKIN_TONE)
+			if (H.s_tone >= 0)
+				base.Blend(rgb(H.s_tone, H.s_tone, H.s_tone), ICON_ADD)
+			else
+				base.Blend(rgb(-H.s_tone,  -H.s_tone,  -H.s_tone), ICON_SUBTRACT)
+
+		//this is put here since I can't easially edit the same icon from head's constructor
+		if(istype(src, /obj/item/weapon/organ/head))
+			//Add (facial) hair.
+			if(H.f_style)
+				var/datum/sprite_accessory/facial_hair_style = facial_hair_styles_list[H.f_style]
+				if(facial_hair_style)
+					var/icon/facial = new/icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_l")
+					if(facial_hair_style.do_colouration)
+						facial.Blend(rgb(H.r_facial, H.g_facial, H.b_facial), ICON_ADD)
+
+					base.Blend(facial, ICON_OVERLAY)
+
+			if(H.h_style && !(H.head && (H.head.flags & BLOCKHEADHAIR)))
+				var/datum/sprite_accessory/hair_style = hair_styles_list[H.h_style]
+				if(hair_style)
+					var/icon/hair = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_l")
+					if(hair_style.do_colouration)
+						hair.Blend(rgb(H.r_hair, H.g_hair, H.b_hair), ICON_ADD)
+
+					base.Blend(hair, ICON_OVERLAY)
+
+	icon = base
 
 
 /****************************************************
@@ -794,21 +818,24 @@ obj/item/weapon/organ/head
 	var/brain_op_stage = 0
 
 obj/item/weapon/organ/head/New(loc, mob/living/carbon/human/H)
+	if(istype(H))
+		src.icon_state = H.gender == MALE? "head_m" : "head_f"
 	..()
 	spawn(5)
 	if(brainmob && brainmob.client)
 		brainmob.client.screen.len = null //clear the hud
-	if(ishuman(H))
-		if(H.gender == FEMALE)
-			H.icon_state = "head_f"
-		H.overlays += H.generate_head_icon()
+
+	//if(ishuman(H))
+	//	if(H.gender == FEMALE)
+	//		H.icon_state = "head_f"
+	//	H.overlays += H.generate_head_icon()
 	transfer_identity(H)
-	pixel_x = -10
-	pixel_y = 6
+
 	name = "[H.real_name]'s head"
 
 	H.regenerate_icons()
 
+	H.stat = 2
 	H.death()
 
 obj/item/weapon/organ/head/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->head

code/modules/organs/organ_internal.dm

@@ -63,6 +63,9 @@
 
 	process()
 		if(owner.life_tick % process_accuracy == 0)
+			if(src.damage < 0)
+				src.damage = 0
+
 			//High toxins levels are dangerous
 			if(owner.getToxLoss() >= 60 && !owner.reagents.has_reagent("anti_toxin"))
 				//Healthy liver suffers on its own
@@ -75,7 +78,7 @@
 					O.damage += 0.2  * process_accuracy
 
 			//Detox can heal small amounts of damage
-			if (owner.reagents.has_reagent("anti_toxin") && src.damage < src.min_bruised_damage)
+			if (src.damage && src.damage < src.min_bruised_damage && owner.reagents.has_reagent("anti_toxin"))
 				src.damage -= 0.2 * process_accuracy
 
 			// Damaged liver means some chemicals are very dangerous

code/modules/virus2/effect.dm

@@ -48,7 +48,7 @@
 	proc/deactivate(var/mob/living/carbon/mob)
 
 ////////////////////////SPECIAL/////////////////////////////////
-/datum/disease2/effect/alien
+/*/datum/disease2/effect/alien
 	name = "Unidentified Foreign Body"
 	stage = 4
 	activate(var/mob/living/carbon/mob,var/multiplier)
@@ -62,7 +62,7 @@
 				new/mob/living/carbon/alien/larva(mob.loc)
 			var/datum/disease2/disease/D = mob:virus2
 			mob:gib()
-			del D
+			del D*/
 
 /datum/disease2/effect/invisible
 	name = "Waiting Syndrome"
@@ -309,7 +309,7 @@
 	activate(var/mob/living/carbon/mob,var/multiplier)
 		if(istype(mob, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = mob
-			if(!(H.h_style == "Bald") && !(H.h_style == "Balding Hair"))
+			if(H.species.name == "Human" && !(H.h_style == "Bald") && !(H.h_style == "Balding Hair"))
 				H << "<span class='danger'>Your hair starts to fall out in clumps...</span>"
 				spawn(50)
 					H.h_style = "Balding Hair"