Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/setup.dm

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

@@ -487,6 +487,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 	src << browse(dat, "window=manifest;size=370x420;can_close=1")
 
+//this is called when a ghost is drag clicked to something.
+/mob/dead/observer/MouseDrop(atom/over)
+	if(!usr || !over) return
+	if (isobserver(usr) && usr.client && usr.client.holder && isliving(over))
+		if (usr.client.holder.cmd_ghost_drag(src,over))
+			return
+
+	return ..()
+
 //BEGIN TELEPORT HREF CODE
 /mob/dead/observer/Topic(href, href_list)
 	if(usr != src)

code/modules/mob/language.dm

@@ -260,7 +260,7 @@
 	desc = "The common galactic tongue."
 	speech_verb = "says"
 	whisper_verb = "whispers"
-	key = "0"
+	key = "9"
 	flags = RESTRICTED
 	syllables = list("blah","blah","blah","bleh","meh","neh","nah","wah")
 
@@ -468,6 +468,12 @@
 	. = (L in languages)
 	languages.Remove(L)
 
+/mob/living/remove_language(rem_language)
+	var/datum/language/L = all_languages[rem_language]
+	if(default_language == L)
+		default_language = null
+	return ..()
+
 // Can we speak this language, as opposed to just understanding it?
 /mob/proc/can_speak(datum/language/speaking)
 
@@ -488,4 +494,32 @@
 	src << browse(dat, "window=checklanguage")
 	return
 
+/mob/living/check_languages()
+	var/dat = "<b><font size = 5>Known Languages</font></b><br/><br/>"
+
+	if(default_language)
+		dat += "Current default language: [default_language] - <a href='byond://?src=\ref[src];default_lang=reset'>reset</a><br/><br/>"
+
+	for(var/datum/language/L in languages)
+		if(!(L.flags & NONGLOBAL))
+			if(L == default_language)
+				dat += "<b>[L.name] (:[L.key])</b> - default - <a href='byond://?src=\ref[src];default_lang=reset'>reset</a><br/>[L.desc]<br/><br/>"
+			else
+				dat += "<b>[L.name] (:[L.key])</b> - <a href='byond://?src=\ref[src];default_lang=[L]'>set default</a><br/>[L.desc]<br/><br/>"
+
+	src << browse(dat, "window=checklanguage")
+
+/mob/living/Topic(href, href_list)
+	if(href_list["default_lang"])
+		if(href_list["default_lang"] == "reset")
+			set_default_language(null)
+		else
+			var/datum/language/L = all_languages[href_list["default_lang"]]
+			if(L)
+				set_default_language(L)
+		check_languages()
+		return 1
+	else
+		return ..()
+
 #undef SCRAMBLE_CACHE_LEN

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

@@ -1,6 +1,6 @@
 /mob/living/carbon/alien/hitby(atom/movable/AM)
 	..(AM, 1)
-	
+
 /*Code for aliens attacking aliens. Because aliens act on a hivemind, I don't see them as very aggressive with each other.
 As such, they can either help or harm other aliens. Help works like the human help command while harm is a simple nibble.
 In all, this is a lot like the monkey code. /N
@@ -25,23 +25,8 @@ In all, this is a lot like the monkey code. /N
 			visible_message("<span class='notice'>[M.name] nuzzles [src] trying to wake it up!</span>")
 
 		if ("grab")
-			if (M == src || anchored)
-				return
-			if (!(status_flags & CANPUSH))
-				return
-
-			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src )
-
-			M.put_in_active_hand(G)
-
-			grabbed_by += G
-			G.synch()
-
-			LAssailant = M
-
-			for(var/mob/O in viewers(src, null))
-				if ((O.client && !( O.blinded )))
-					O.show_message(text("\red [] has grabbed [] passively!", M, src), 1)
+			src.grabbedby(M)
+			return 1
 
 		else
 			if (health > 0)
@@ -69,23 +54,7 @@ In all, this is a lot like the monkey code. /N
 		if("help")
 			help_shake_act(M)
 		if("grab")
-			if (M == src || anchored)
-				return
-			if (!(status_flags & CANPUSH))
-				return
-
-			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src )
-
-			M.put_in_active_hand(G)
-
-			grabbed_by += G
-			G.synch()
-
-			LAssailant = M
-
-			for(var/mob/O in viewers(src, null))
-				if ((O.client && !( O.blinded )))
-					O.show_message(text("\red [] has grabbed [] passively!", M, src), 1)
+			src.grabbedby(M)
 		if ("harm", "disarm")
 			return 1
 	return 0

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

@@ -47,7 +47,7 @@
 
 	real_name = src.name
 	verbs.Add(/mob/living/carbon/alien/humanoid/proc/corrosive_acid,/mob/living/carbon/alien/humanoid/proc/resin)
-	verbs -= /mob/living/carbon/alien/verb/alien_ventcrawl
+	verbs -= /mob/living/carbon/alien/verb/ventcrawl
 	..()
 
 /mob/living/carbon/alien/humanoid/empress

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

@@ -65,9 +65,9 @@
 	return (tally + move_delay_add + config.alien_delay)
 
 /mob/living/carbon/alien/humanoid/Process_Spacemove(var/check_drift = 0)
-	if(..())	
+	if(..())
 		return 1
-		
+
 	return 0
 
 ///mob/living/carbon/alien/humanoid/bullet_act(var/obj/item/projectile/Proj) taken care of in living

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

@@ -24,7 +24,7 @@
 
 	real_name = src.name
 	verbs.Add(/mob/living/carbon/alien/humanoid/proc/corrosive_acid,/mob/living/carbon/alien/humanoid/proc/neurotoxin,/mob/living/carbon/alien/humanoid/proc/resin)
-	verbs -= /mob/living/carbon/alien/verb/alien_ventcrawl
+	verbs -= /mob/living/carbon/alien/verb/ventcrawl
 	..()
 
 

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

@@ -1,5 +1,5 @@
-/mob/living/carbon/alien/verb/alien_ventcrawl() // -- TLE
-	set name = "Crawl through vent (alien)"
+/mob/living/carbon/alien/verb/ventcrawl(var/atom/pipe) // -- TLE
+	set name = "Crawl Through Vent(Alien)"
 	set desc = "Enter an air vent and crawl through the pipe system."
 	set category = "Alien"
-	handle_ventcrawl()
+	handle_ventcrawl(pipe)

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

@@ -16,10 +16,15 @@
 		return emote(copytext(message,2))
 
 	var/datum/language/speaking = parse_language(message)
+
 	if(speaking)
 		message = copytext(message,2+length(speaking.key))
 	else
-		speaking = all_languages["Xenomorph"]
+		var/quickcheck = get_default_language()
+		if(quickcheck)
+			speaking = get_default_language()
+		else //because no clue how to actually set xeno's default language since they aren't a species, just do it here
+			speaking = all_languages["Xenomorph"]
 
 	var/ending = copytext(message, length(message))
 	if (speaking)

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

@@ -67,7 +67,9 @@
 
 	if(target.key)
 		target.ghostize()
-
+	var/mob/living/carbon/C = target
+	if(istype(C))
+		C.brain_op_stage = 1.0
 	if(brainmob)
 		if(brainmob.mind)
 			brainmob.mind.transfer_to(target)
@@ -78,13 +80,11 @@
 /obj/item/organ/brain/slime
 	name = "slime core"
 	desc = "A complex, organic knot of jelly and crystalline particles."
-	robotic = 2
 	icon = 'icons/mob/slimes.dmi'
 	icon_state = "green slime extract"
 
 /obj/item/organ/brain/golem
 	name = "chem"
 	desc = "A tightly furled roll of paper, covered with indecipherable runes."
-	robotic = 2
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "scroll"

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

@@ -1,3 +1,6 @@
+mob/living
+	var/canEnterVentWith = "/obj/item/weapon/implant=0&/obj/item/clothing/mask/facehugger=0&/obj/item/device/radio/borg=0&/obj/machinery/camera=0"
+
 /mob/living/carbon/Login()
 	..()
 	update_hud()
@@ -244,6 +247,9 @@
 /mob/living/carbon/proc/eyecheck()
 	return 0
 
+/mob/living/carbon/proc/tintcheck()
+	return 0
+
 /mob/living/carbon/proc/getDNA()
 	return dna
 
@@ -253,104 +259,83 @@
 /mob/living/carbon/can_use_vents()
 	return
 
-/mob/living/proc/handle_ventcrawl(var/obj/machinery/atmospherics/unary/vent_pump/vent_found = null, var/ignore_items = 0) // -- TLE -- Merged by Carn
-	if(stat)
-		src << "You must be conscious to do this!"
-		return
-	if(lying)
-		src << "You can't vent crawl while you're stunned!"
-		return
+/mob/living/proc/handle_ventcrawl(var/atom/clicked_on) // -- TLE -- Merged by Carn
+	diary << "[src] is ventcrawling."
+	if(!stat)
+		if(!lying)
 
-	var/special_fail_msg = can_use_vents()
-	if(special_fail_msg)
-		src << "\red [special_fail_msg]"
-		return
+/*
+			if(clicked_on)
+				world << "We start with [clicked_on], and [clicked_on.type]"
+*/
+			var/obj/machinery/atmospherics/unary/vent_found
+
+			if(clicked_on && Adjacent(clicked_on))
+				vent_found = clicked_on
+				if(!istype(vent_found) || !vent_found.can_crawl_through())
+					vent_found = null
+
+
+			if(!vent_found)
+				for(var/obj/machinery/atmospherics/machine in range(1,src))
+					if(is_type_in_list(machine, ventcrawl_machinery))
+						vent_found = machine
+
+					if(!vent_found.can_crawl_through())
+						vent_found = null
+
+					if(vent_found)
+						break
+
+			if(vent_found)
+				if(vent_found.network && (vent_found.network.normal_members.len || vent_found.network.line_members.len))
+
+					src << "You begin climbing into the ventilation system..."
+					if(!do_after(src, 45))
+						return
+
+					if(!client)
+						return
+
+					if(contents.len && !isrobot(src))
+						for(var/obj/item/carried_item in contents)//If the ventcrawler got on objects.
+							if(!(isInTypes(carried_item, canEnterVentWith)))
+								src << "<SPAN CLASS='warning'>You can't be carrying items or have items equipped when vent crawling!</SPAN>"
+								return
+
+					visible_message("<B>[src] scrambles into the ventilation ducts!</B>", "You climb into the ventilation system.")
+
+					loc = vent_found
+					add_ventcrawl(vent_found)
+
+				else
+					src << "This vent is not connected to anything."
+
+			else
+				src << "You must be standing on or beside an air vent to enter it."
+
+		else
+			src << "You can't vent crawl while you're stunned!"
 
-	if(vent_found) // one was passed in, probably from vent/AltClick()
-		if(vent_found.welded)
-			src << "That vent is welded shut."
-			return
-		if(!vent_found.Adjacent(src))
-			return // don't even acknowledge that
 	else
-		for(var/obj/machinery/atmospherics/unary/vent_pump/v in range(1,src))
-			if(!v.welded)
-				if(v.Adjacent(src))
-					vent_found = v
-	if(!vent_found)
-		src << "You'll need a non-welded vent to crawl into!"
-		return
+		src << "You must be conscious to do this!"
+	return
 
-	if(!vent_found.network || !vent_found.network.normal_members.len)
-		src << "This vent is not connected to anything."
-		return
+/mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/unary/starting_machine)
+	for(var/datum/pipeline/pipeline in starting_machine.network.line_members)
+		for(var/atom/A in (pipeline.members || pipeline.edges))
+			var/image/new_image = image(A, A.loc, dir = A.dir)
+			pipes_shown += new_image
+			client.images += new_image
 
-	var/list/vents = list()
-	for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in vent_found.network.normal_members)
-		if(temp_vent.welded)
-			continue
-		if(temp_vent in loc)
-			continue
-		var/turf/T = get_turf(temp_vent)
+/mob/living/proc/remove_ventcrawl()
+	for(var/image/current_image in pipes_shown)
+		client.images -= current_image
 
-		if(!T || T.z != loc.z)
-			continue
+	pipes_shown.len = 0
 
-		var/i = 1
-		var/index = "[T.loc.name]\[[i]\]"
-		while(index in vents)
-			i++
-			index = "[T.loc.name]\[[i]\]"
-		vents[index] = temp_vent
-	if(!vents.len)
-		src << "\red There are no available vents to travel to, they could be welded."
-		return
-
-	var/obj/selection = input("Select a destination.", "Duct System") as null|anything in sortAssoc(vents)
-	if(!selection)	return
-
-	if(!vent_found.Adjacent(src))
-		src << "Never mind, you left."
-		return
-
-	if(!ignore_items)
-		for(var/obj/item/carried_item in contents)//If the monkey got on objects.
-			if( !istype(carried_item, /obj/item/weapon/implant) && !istype(carried_item, /obj/item/clothing/mask/facehugger) )//If it's not an implant or a facehugger
-				src << "\red You can't be carrying items or have items equipped when vent crawling!"
-				return
-
-	if(isslime(src))
-		var/mob/living/carbon/slime/S = src
-		if(S.Victim)
-			src << "\red You'll have to let [S.Victim] go or finish eating \him first."
-			return
-
-	var/obj/machinery/atmospherics/unary/vent_pump/target_vent = vents[selection]
-	if(!target_vent)
-		return
-
-	for(var/mob/O in viewers(src, null))
-		O.show_message(text("<B>[src] scrambles into the ventillation ducts!</B>"), 1)
-	loc = target_vent
-
-	var/travel_time = round(get_dist(loc, target_vent.loc) / 2)
-
-	spawn(travel_time)
-
-		if(!target_vent)	return
-		for(var/mob/O in hearers(target_vent,null))
-			O.show_message("You hear something squeezing through the ventilation ducts.",2)
-
-		sleep(travel_time)
-
-		if(!target_vent)	return
-		if(target_vent.welded)			//the vent can be welded while alien scrolled through the list or travelled.
-			target_vent = vent_found 	//travel back. No additional time required.
-			src << "\red The vent you were heading to appears to be welded."
-		loc = target_vent.loc
-		var/area/new_area = get_area(loc)
-		if(new_area)
-			new_area.Entered(src)
+	if(client)
+		client.eye = src
 
 /mob/living/carbon/clean_blood()
 	. = ..()
@@ -414,7 +399,7 @@
 
 				M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been thrown by [usr.name] ([usr.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]</font>")
 				usr.attack_log += text("\[[time_stamp()]\] <font color='red'>Has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor]</font>")
-				msg_admin_attack("[usr.name] ([usr.ckey]) has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[usr.x];Y=[usr.y];Z=[usr.z]'>JMP</a>)")
+				msg_admin_attack("[usr.name] ([usr.ckey])[isAntag(usr) ? "(ANTAG)" : ""] has thrown [M.name] ([M.ckey]) from [start_T_descriptor] with the target [end_T_descriptor] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[usr.x];Y=[usr.y];Z=[usr.z]'>JMP</a>)")
 
 				if(!iscarbon(usr))
 					M.LAssailant = null
@@ -631,4 +616,4 @@
 	return 0
 
 /mob/living/carbon/is_muzzled()
-	return(istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
+	return(istype(src.wear_mask, /obj/item/clothing/mask/muzzle))

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

@@ -42,6 +42,9 @@
 	prev_gender = gender // Debug for plural genders
 	make_blood()
 
+	var/mob/M = src
+	faction |= "\ref[M]"
+
 	// Set up DNA.
 	if(!delay_ready_dna)
 		dna.ready_dna(src)
@@ -98,6 +101,14 @@
 	h_style = "blue IPC screen"
 	..(new_loc, "Machine")
 
+/mob/living/carbon/human/shadow/New(var/new_loc)
+	h_style = "Bald"
+	..(new_loc, "Shadow")
+
+/mob/living/carbon/human/golem/New(var/new_loc)
+	h_style = "Bald"
+	..(new_loc, "Golem")
+
 /mob/living/carbon/human/Bump(atom/movable/AM as mob|obj, yes)
 	if ((!( yes ) || now_pushing))
 		return
@@ -1027,29 +1038,32 @@
 ///Returns a number between -1 to 2
 /mob/living/carbon/human/eyecheck()
 	var/number = 0
-	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))
-		number += 2
-	if(istype(src.head, /obj/item/clothing/head/helmet/space/eva))
-		number -= 2
-	if(istype(src.head, /obj/item/clothing/head/helmet/space/rig/medical))
-		number -= 2
-	if(istype(src.glasses, /obj/item/clothing/glasses/thermal))
-		number -= 1
-	if(istype(src.glasses, /obj/item/clothing/glasses/sunglasses))
-		number += 1
-	if(istype(src.glasses, /obj/item/clothing/glasses/hud/health_advanced)) // New blueshield / brig phys no flash medi hud
-		number += 1
-	if(istype(src.glasses, /obj/item/clothing/glasses/night/shadowling))
-		number += 2
-	if(istype(src.glasses, /obj/item/clothing/glasses/welding))
-		var/obj/item/clothing/glasses/welding/W = src.glasses
-		if(!W.up)
-			number += 2
+	if(istype(src.head, /obj/item/clothing/head))			//are they wearing something on their head
+		var/obj/item/clothing/head/HFP = src.head			//if yes gets the flash protection value from that item
+		number += HFP.flash_protect
+	if(istype(src.glasses, /obj/item/clothing/glasses))		//glasses
+		var/obj/item/clothing/glasses/GFP = src.glasses
+		number += GFP.flash_protect
+	if(istype(src.wear_mask, /obj/item/clothing/mask))		//mask
+		var/obj/item/clothing/mask/MFP = src.wear_mask
+		number += MFP.flash_protect
 	return number
 
+///tintcheck()
+///Checks eye covering items for visually impairing tinting, such as welding masks
+///Checked in life.dm. 0 & 1 = no impairment, 2 = welding mask overlay, 3 = You can see jack, but you can't see shit.
+/mob/living/carbon/human/tintcheck()
+	var/tinted = 0
+	if(istype(src.head, /obj/item/clothing/head))
+		var/obj/item/clothing/head/HT = src.head
+		tinted += HT.tint
+	if(istype(src.glasses, /obj/item/clothing/glasses))
+		var/obj/item/clothing/glasses/GT = src.glasses
+		tinted += GT.tint
+	if(istype(src.wear_mask, /obj/item/clothing/mask))
+		var/obj/item/clothing/mask/MT = src.wear_mask
+		tinted += MT.tint
+	return tinted
 
 /mob/living/carbon/human/IsAdvancedToolUser()
 	return 1//Humans can use guns and such
@@ -1074,9 +1088,6 @@
 	if(!species)
 		set_species()
 
-	if(dna && dna.mutantrace == "golem")
-		return "Animated Construct"
-
 	return species.name
 
 /mob/living/carbon/human/proc/play_xylophone()
@@ -1379,7 +1390,6 @@
 		dna = new /datum/dna(null)
 		dna.species = species.name
 		dna.real_name = real_name
-	dna.mutantrace = null
 
 	species.handle_post_spawn(src)
 
@@ -1394,6 +1404,15 @@
 	else
 		return 0
 
+/mob/living/carbon/human/get_default_language()
+	if(default_language)
+		return default_language
+
+	if(!species)
+		return null
+	return species.default_language ? all_languages[species.default_language] : null
+
+
 /mob/living/carbon/human/proc/bloody_doodle()
 	set category = "IC"
 	set name = "Write in blood"
@@ -1628,9 +1647,6 @@
 	if(istype(head, /obj/item/clothing/head/wizard) || istype(head, /obj/item/clothing/head/helmet/space/rig/wizard))
 		threatcount += 2
 
-	//Check for nonhuman scum
-	if(dna && dna.mutantrace && dna.mutantrace != "none")
-		threatcount += 1
 
 	//Loyalty implants imply trustworthyness
 	if(isloyal(src))

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

@@ -53,6 +53,8 @@
 //      log_debug("No gloves, [M] is truing to infect [src]")
 			M.spread_disease_to(src, "Contact")
 
+	var/datum/martial_art/attacker_style = M.martial_art
+
 	switch(M.a_intent)
 		if("help")
 			if(health >= config.health_threshold_crit)
@@ -81,149 +83,142 @@
 			return 1
 
 		if("grab")
-			if(M == src || anchored)
-				return 0
-			if(w_uniform)
-				w_uniform.add_fingerprint(M)
-
-			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src)
-			if(buckled)
-				M << "<span class='notice'>You cannot grab [src], \he is buckled in!</span>"
-			if(!G)  //the grab will delete itself in New if affecting is anchored
-				return
-			M.put_in_active_hand(G)
-			grabbed_by += G
-			G.synch()
-			LAssailant = M
-
-			playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-			visible_message("<span class='warning'>[M] has grabbed [src] passively!</span>")
-			add_logs(src, M, "grabbed", addition="passively")
-			return 1
+			if(attacker_style && attacker_style.grab_act(H, src))
+				return 1
+			else
+				src.grabbedby(M)
+				return 1
 
 		if("harm")
-			var/datum/unarmed_attack/attack = M.species.unarmed
-			//Vampire code
-			if(M.zone_sel && M.zone_sel.selecting == "head" && src != M)
-				if(M.mind && M.mind.vampire && (M.mind in ticker.mode.vampires) && !M.mind.vampire.draining)
-					if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH)))
-						M << "\red Remove their mask!"
-						return 0
-					if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH)))
-						M << "\red Remove your mask!"
-						return 0
-					if(mind && mind.vampire && (mind in ticker.mode.vampires))
-						M << "\red Your fangs fail to pierce [src.name]'s cold flesh"
-						return 0
-					if(SKELETON in mutations)
-						M << "\red There is no blood in a skeleton!"
-						return 0
-					//we're good to suck the blood, blaah
-					M.handle_bloodsucking(src)
-					add_logs(src, M, "vampirebit")
-					message_admins("[M.name] ([M.ckey]) vampirebit [src.name] ([src.ckey])")
-					return
-			//end vampire codes
-
-			M.do_attack_animation(src)
-			add_logs(src, M, "[pick(attack.attack_verb)]ed")
-
-			if(!iscarbon(M))
-				LAssailant = null
+			if(attacker_style && attacker_style.harm_act(H, src))
+				return 1
 			else
-				LAssailant = M
+				var/datum/unarmed_attack/attack = M.species.unarmed
 
-			var/damage = rand(0, M.species.max_hurt_damage)//BS12 EDIT
-			if(!damage)
-				playsound(loc, attack.miss_sound, 25, 1, -1)
-				visible_message("\red <B>[M] tried to [pick(attack.attack_verb)] [src]!</B>")
-				return 0
+				//Vampire code
+				if(M.zone_sel && M.zone_sel.selecting == "head" && src != M)
+					if(M.mind && M.mind.vampire && (M.mind in ticker.mode.vampires) && !M.mind.vampire.draining)
+						if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH)))
+							M << "\red Remove their mask!"
+							return 0
+						if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH)))
+							M << "\red Remove your mask!"
+							return 0
+						if(mind && mind.vampire && (mind in ticker.mode.vampires))
+							M << "\red Your fangs fail to pierce [src.name]'s cold flesh"
+							return 0
+						if(SKELETON in mutations)
+							M << "\red There is no blood in a skeleton!"
+							return 0
+						//we're good to suck the blood, blaah
+						M.handle_bloodsucking(src)
+						add_logs(src, M, "vampirebit")
+						message_admins("[M.name] ([M.ckey]) vampirebit [src.name] ([src.ckey])")
+						return
+				//end vampire codes
 
+				M.do_attack_animation(src)
+				add_logs(src, M, "[pick(attack.attack_verb)]ed")
 
-			var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
-			var/armor_block = run_armor_check(affecting, "melee")
-
-			if(HULK in M.mutations)
-				damage += 5
-				Weaken(4)
-
-			playsound(loc, attack.attack_sound, 25, 1, -1)
-
-			visible_message("\red <B>[M] [pick(attack.attack_verb)]ed [src]!</B>")
-
-			damage += attack.damage
-			apply_damage(damage, BRUTE, affecting, armor_block, sharp=attack.sharp, edge=attack.edge) //moving this back here means Armalis are going to knock you down  70% of the time, but they're pure adminbus anyway.
-			if((stat != DEAD) && damage >= 9)
-				visible_message("<span class='danger'>[M] has weakened [src]!</span>", \
-								"<span class='userdanger'>[M] has weakened [src]!</span>")
-				apply_effect(4, WEAKEN, armor_block)
-				forcesay(hit_appends)
-			else if(lying)
-				forcesay(hit_appends)
-
-
-		if("disarm")
-			add_logs(src, M, "disarmed")
-
-			if(w_uniform)
-				w_uniform.add_fingerprint(M)
-			var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
-			var/randn = rand(1, 100)
-			if (randn <= 25)
-				apply_effect(2, WEAKEN, run_armor_check(affecting, "melee"))
-				playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-				visible_message("\red <B>[M] has pushed [src]!</B>")
-				M.attack_log += text("\[[time_stamp()]\] <font color='red'>Pushed [src.name] ([src.ckey])</font>")
-				src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been pushed by [M.name] ([M.ckey])</font>")
 				if(!iscarbon(M))
 					LAssailant = null
 				else
 					LAssailant = M
 
-				log_attack("[M.name] ([M.ckey]) pushed [src.name] ([src.ckey])")
-				return
+				var/damage = rand(0, M.species.max_hurt_damage)//BS12 EDIT
+				if(!damage)
+					playsound(loc, attack.miss_sound, 25, 1, -1)
+					visible_message("\red <B>[M] tried to [pick(attack.attack_verb)] [src]!</B>")
+					return 0
 
-/*			if(randn <= 45 && !lying)
-				if(head)
-					var/obj/item/clothing/head/H = head
-					if(!istype(H) || prob(H.loose))
-						if(unEquip(H))
-							if(prob(60))
-								step_away(H,M)
-							visible_message("<span class='warning'>[M] has knocked [src]'s [H] off!</span>",
-											"<span class='warning'>[M] knocked \the [H] clean off your head!</span>") */
 
-			var/talked = 0	// BubbleWrap
+				var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
+				var/armor_block = run_armor_check(affecting, "melee")
 
-			if(randn <= 60)
-				//BubbleWrap: Disarming breaks a pull
-				if(pulling)
-					visible_message("\red <b>[M] has broken [src]'s grip on [pulling]!</B>")
-					talked = 1
-					stop_pulling()
+				if(HULK in M.mutations)
+					damage += 5
+					Weaken(4)
 
-				//BubbleWrap: Disarming also breaks a grab - this will also stop someone being choked, won't it?
-				if(istype(l_hand, /obj/item/weapon/grab))
-					var/obj/item/weapon/grab/lgrab = l_hand
-					if(lgrab.affecting)
-						visible_message("\red <b>[M] has broken [src]'s grip on [lgrab.affecting]!</B>")
+				playsound(loc, attack.attack_sound, 25, 1, -1)
+
+				visible_message("\red <B>[M] [pick(attack.attack_verb)]ed [src]!</B>")
+
+				damage += attack.damage
+				apply_damage(damage, BRUTE, affecting, armor_block, sharp=attack.sharp, edge=attack.edge) //moving this back here means Armalis are going to knock you down  70% of the time, but they're pure adminbus anyway.
+				if((stat != DEAD) && damage >= 9)
+					visible_message("<span class='danger'>[M] has weakened [src]!</span>", \
+									"<span class='userdanger'>[M] has weakened [src]!</span>")
+					apply_effect(4, WEAKEN, armor_block)
+					forcesay(hit_appends)
+				else if(lying)
+					forcesay(hit_appends)
+
+
+		if("disarm")
+			if(attacker_style && attacker_style.disarm_act(H, src))
+				return 1
+			else
+				add_logs(src, M, "disarmed")
+
+				if(w_uniform)
+					w_uniform.add_fingerprint(M)
+				var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
+				var/randn = rand(1, 100)
+				if (randn <= 25)
+					apply_effect(2, WEAKEN, run_armor_check(affecting, "melee"))
+					playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+					visible_message("\red <B>[M] has pushed [src]!</B>")
+					M.attack_log += text("\[[time_stamp()]\] <font color='red'>Pushed [src.name] ([src.ckey])</font>")
+					src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been pushed by [M.name] ([M.ckey])</font>")
+					if(!iscarbon(M))
+						LAssailant = null
+					else
+						LAssailant = M
+
+					log_attack("[M.name] ([M.ckey]) pushed [src.name] ([src.ckey])")
+					return
+
+	/*			if(randn <= 45 && !lying)
+					if(head)
+						var/obj/item/clothing/head/H = head
+						if(!istype(H) || prob(H.loose))
+							if(unEquip(H))
+								if(prob(60))
+									step_away(H,M)
+								visible_message("<span class='warning'>[M] has knocked [src]'s [H] off!</span>",
+												"<span class='warning'>[M] knocked \the [H] clean off your head!</span>") */
+
+				var/talked = 0	// BubbleWrap
+
+				if(randn <= 60)
+					//BubbleWrap: Disarming breaks a pull
+					if(pulling)
+						visible_message("\red <b>[M] has broken [src]'s grip on [pulling]!</B>")
 						talked = 1
-					spawn(1)
-						del(lgrab)
-				if(istype(r_hand, /obj/item/weapon/grab))
-					var/obj/item/weapon/grab/rgrab = r_hand
-					if(rgrab.affecting)
-						visible_message("\red <b>[M] has broken [src]'s grip on [rgrab.affecting]!</B>")
-						talked = 1
-					spawn(1)
-						del(rgrab)
-				//End BubbleWrap
+						stop_pulling()
 
-				if(!talked)	//BubbleWrap
-					if(drop_item())
-						visible_message("\red <B>[M] has disarmed [src]!</B>")
-				playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-				return
+					//BubbleWrap: Disarming also breaks a grab - this will also stop someone being choked, won't it?
+					if(istype(l_hand, /obj/item/weapon/grab))
+						var/obj/item/weapon/grab/lgrab = l_hand
+						if(lgrab.affecting)
+							visible_message("\red <b>[M] has broken [src]'s grip on [lgrab.affecting]!</B>")
+							talked = 1
+						spawn(1)
+							del(lgrab)
+					if(istype(r_hand, /obj/item/weapon/grab))
+						var/obj/item/weapon/grab/rgrab = r_hand
+						if(rgrab.affecting)
+							visible_message("\red <b>[M] has broken [src]'s grip on [rgrab.affecting]!</B>")
+							talked = 1
+						spawn(1)
+							del(rgrab)
+					//End BubbleWrap
+
+					if(!talked)	//BubbleWrap
+						if(drop_item())
+							visible_message("\red <B>[M] has disarmed [src]!</B>")
+					playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+					return
 
 
 			playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)

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

@@ -310,17 +310,7 @@ This function restores all organs.
 				damage = damage*species.brute_mod
 			if(organ.take_damage(damage, 0, sharp, edge, used_weapon))
 				UpdateDamageIcon()
-			var/list/attack_bubble_recipients = list()
-			var/mob/living/user
-			for(var/mob/O in viewers(user, src))
-				if (O.client && !( O.blinded ))
-					attack_bubble_recipients.Add(O.client)
-			spawn(0)
-				var/image/dmgIcon = image('icons/mob/hit_blips.dmi', src, "dmg[rand(1,2)]",MOB_LAYER+1)
-				dmgIcon.pixel_x = (!lying) ? rand(-3,3) : rand(-11,12)
-				dmgIcon.pixel_y = (!lying) ? rand(-11,9) : rand(-10,1)
-				//world << "x: [dmgIcon.pixel_x] AND y: [dmgIcon.pixel_y]"
-				flick_overlay(dmgIcon, attack_bubble_recipients, 9)
+			receive_damage()
 		if(BURN)
 			damageoverlaytemp = 20
 			if(species && species.burn_mod)

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

@@ -218,7 +218,7 @@ emp_act
 /mob/living/carbon/human/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone)
 	if(!I || !user)	return 0
 
-	if(istype(I, /obj/item/weapon/butch/meatcleaver) && src.stat == DEAD && user.a_intent == "harm")
+	if((istype(I, /obj/item/weapon/butch/meatcleaver) || istype(I, /obj/item/weapon/twohanded/chainsaw)) && src.stat == DEAD && user.a_intent == "harm")
 		var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new /obj/item/weapon/reagent_containers/food/snacks/meat/human(get_turf(src.loc))
 		newmeat.name = src.real_name + newmeat.name
 		newmeat.subjectname = src.real_name
@@ -231,7 +231,7 @@ emp_act
 		if(!src.meatleft)
 			src.attack_log += "\[[time_stamp()]\] Was chopped up into meat by <b>[user]/[user.ckey]</b>"
 			user.attack_log += "\[[time_stamp()]\] Chopped up <b>[src]/[src.ckey]</b> into meat</b>"
-			msg_admin_attack("[user.name] ([user.ckey]) chopped up [src] ([src.ckey]) into meat (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+			msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] chopped up [src] ([src.ckey]) into meat (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 			if(!iscarbon(user))
 				LAssailant = null
 			else
@@ -384,7 +384,7 @@ emp_act
 				src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with a [O], thrown by [M.name] ([assailant.ckey])</font>")
 				M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [src.name] ([src.ckey]) with a thrown [O]</font>")
 				if(!istype(src,/mob/living/simple_animal/mouse))
-					msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
+					msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey])[isAntag(M) ? "(ANTAG)" : ""] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
 
 		//thrown weapon embedded object code.
 		if(dtype == BRUTE && istype(O,/obj/item))

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

@@ -24,6 +24,7 @@
 	var/b_skin = 0
 
 	var/lip_style = null	//no lipstick by default- arguably misleading, as it could be used for general makeup
+	var/lip_color = "white"
 
 	var/age = 30		//Player's age (pure fluff)
 	var/b_type = "A+"	//Player's bloodtype
@@ -55,6 +56,8 @@
 
 	var/speech_problem_flag = 0
 
+	var/datum/martial_art/martial_art = null
+
 	var/miming = null //Toggle for the mime's abilities.
 	var/special_voice = "" // For changing our voice. Used by a symptom.
 	var/said_last_words=0

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

@@ -111,6 +111,9 @@
 	if(!. || !I)
 		return
 
+	var/obj/item/organ/O = I //Organs shouldn't be removed unless you call droplimb.
+	if(istype(O) && O.owner == src)
+		return
 
 	if(I == wear_suit)
 		if(s_store)

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

@@ -24,6 +24,10 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 	"4" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay4"),\
 	"5" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay5"),\
 	"6" = image("icon" = 'icons/mob/screen1_full.dmi', "icon_state" = "brutedamageoverlay6"))
+
+#define TINT_IMPAIR 2			//Threshold of tint level to apply weld mask overlay
+#define TINT_BLIND 3			//Threshold of tint level to obscure vision fully
+
 /mob/living/carbon/human
 	var/oxygen_alert = 0
 	var/toxins_alert = 0
@@ -36,6 +40,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 	var/exposedtimenow = 0
 	var/firstexposed = 0
 	var/heartbeat = 0
+	var/tinttotal = 0				// Total level of visually impairing items
 
 /mob/living/carbon/human/Life()
 	set invisibility = 0
@@ -52,6 +57,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 	//to find it.
 	blinded = null
 	fire_alert = 0 //Reset this here, because both breathe() and handle_environment() have a chance to set it.
+	tinttotal = tintcheck() //here as both hud updates and status updates call it
 
 	//TODO: seperate this out
 	// update the current life tick, can be used to e.g. only do something every 4 ticks
@@ -697,63 +703,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 
 		return min(1,thermal_protection)
 
-	/*
-	proc/add_fire_protection(var/temp)
-		var/fire_prot = 0
-		if(head)
-			if(head.protective_temperature > temp)
-				fire_prot += (head.protective_temperature/10)
-		if(wear_mask)
-			if(wear_mask.protective_temperature > temp)
-				fire_prot += (wear_mask.protective_temperature/10)
-		if(glasses)
-			if(glasses.protective_temperature > temp)
-				fire_prot += (glasses.protective_temperature/10)
-		if(ears)
-			if(ears.protective_temperature > temp)
-				fire_prot += (ears.protective_temperature/10)
-		if(wear_suit)
-			if(wear_suit.protective_temperature > temp)
-				fire_prot += (wear_suit.protective_temperature/10)
-		if(w_uniform)
-			if(w_uniform.protective_temperature > temp)
-				fire_prot += (w_uniform.protective_temperature/10)
-		if(gloves)
-			if(gloves.protective_temperature > temp)
-				fire_prot += (gloves.protective_temperature/10)
-		if(shoes)
-			if(shoes.protective_temperature > temp)
-				fire_prot += (shoes.protective_temperature/10)
-
-		return fire_prot
-
-	proc/handle_temperature_damage(body_part, exposed_temperature, exposed_intensity)
-		if(nodamage)
-			return
-		//world <<"body_part = [body_part], exposed_temperature = [exposed_temperature], exposed_intensity = [exposed_intensity]"
-		var/discomfort = min(abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
-
-		if(exposed_temperature > bodytemperature)
-			discomfort *= 4
-
-		if(mutantrace == "plant")
-			discomfort *= TEMPERATURE_DAMAGE_COEFFICIENT * 2 //I don't like magic numbers. I'll make mutantraces a datum with vars sometime later. -- Urist
-		else
-			discomfort *= TEMPERATURE_DAMAGE_COEFFICIENT //Dangercon 2011 - now with less magic numbers!
-		//world <<"[discomfort]"
-
-		switch(body_part)
-			if(HEAD)
-				apply_damage(2.5*discomfort, BURN, "head")
-			if(UPPER_TORSO)
-				apply_damage(2.5*discomfort, BURN, "chest")
-			if(LEGS)
-				apply_damage(0.6*discomfort, BURN, "l_leg")
-				apply_damage(0.6*discomfort, BURN, "r_leg")
-			if(ARMS)
-				apply_damage(0.4*discomfort, BURN, "l_arm")
-				apply_damage(0.4*discomfort, BURN, "r_arm")
-	*/
 
 	proc/get_covered_bodyparts()
 		var/covered = 0
@@ -828,7 +777,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 					SetWeakened(0)
 					SetStunned(0)
 
-		if(dna && dna.mutantrace == "shadow")
+		if(species.light_dam)
 			var/light_amount = 0
 			if(isturf(loc))
 				var/turf/T = loc
@@ -836,11 +785,12 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 				if(A)
 					if(A.lighting_use_dynamic)	light_amount = T.lighting_lumcount
 					else						light_amount =  10
-			if(light_amount > 2) //if there's enough light, start dying
+			if(light_amount > species.light_dam) //if there's enough light, start dying
 				take_overall_damage(1,1)
-			else if (light_amount < 2) //heal in the dark
+			else //heal in the dark
 				heal_overall_damage(1,1)
 
+
 		//The fucking FAT mutation is the greatest shit ever. It makes everyone so hot and bothered.
 		if(species.flags & CAN_BE_FAT)
 			if(FAT in mutations)
@@ -1028,9 +978,9 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			else if(eye_blind)			//blindness, heals slowly over time
 				eye_blind = max(eye_blind-1,0)
 				blinded = 1
-			else if(istype(glasses, /obj/item/clothing/glasses/sunglasses/blindfold))	//resting your eyes with a blindfold heals blurry eyes faster
+			else if(tinttotal >= TINT_BLIND)	//covering your eyes heals blurry eyes faster
 				eye_blurry = max(eye_blurry-3, 0)
-				blinded = 1
+			//	blinded = 1						//now handled under /handle_regular_hud_updates()
 			else if(eye_blurry)	//blurry eyes heal slowly
 				eye_blurry = max(eye_blurry-1, 0)
 
@@ -1188,14 +1138,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			if(healths)		healths.icon_state = "health7"	//DEAD healthmeter
 		else
 			sight &= ~(SEE_TURFS|SEE_MOBS|SEE_OBJS)
-			if(dna)
-				switch(dna.mutantrace)
-					if("slime")
-						see_in_dark = 3
-						see_invisible = SEE_INVISIBLE_LEVEL_ONE
-					if("shadow")
-						see_in_dark = 8
-						see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
 
 			if(mind && mind.vampire)
 				if((VAMP_VISION in mind.vampire.powers) && !(VAMP_FULL in mind.vampire.powers))
@@ -1358,6 +1300,16 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 							bodytemp.icon_state = "temp-1"
 						else
 							bodytemp.icon_state = "temp0"
+
+//	This checks how much the mob's eyewear impairs their vision
+			if(tinttotal >= TINT_IMPAIR)
+				if(tinted_weldhelh)
+					if(tinttotal >= TINT_BLIND)
+						blinded = 1								// You get the sudden urge to learn to play keyboard
+						client.screen += global_hud.darkMask
+					else
+						client.screen += global_hud.darkMask
+
 			if(blind)
 				if(blinded)		blind.layer = 18
 				else			blind.layer = 0
@@ -1373,19 +1325,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			if(eye_blurry)			client.screen += global_hud.blurry
 			if(druggy)				client.screen += global_hud.druggy
 
-			var/masked = 0
-
-			if( istype(head, /obj/item/clothing/head/welding) || istype(head, /obj/item/clothing/head/helmet/space/unathi))
-				var/obj/item/clothing/head/welding/O = head
-				if(!O.up && tinted_weldhelh)
-					client.screen += global_hud.darkMask
-					masked = 1
-
-			if(!masked && istype(glasses, /obj/item/clothing/glasses/welding) )
-				var/obj/item/clothing/glasses/welding/O = glasses
-				if(!O.up && tinted_weldhelh)
-					client.screen += global_hud.darkMask
-
 			if(machine)
 				if(!machine.check_eye(src))		reset_view(null)
 			else
@@ -1636,6 +1575,8 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 					var/obj/item/clothing/mask/M = H.wear_mask
 					if(M && (M.flags & MASKCOVERSMOUTH))
 						return
+					if(H.species && H.species.flags & NO_BREATHE)
+						return //no puking if you can't smell!
 					H << "<spawn class='warning'>You smell something foul..."
 					H.fakevomit()
 

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

@@ -16,7 +16,7 @@
 		if(stat == 2)
 			return say_dead(message)
 		return
-		
+
 	if (is_muzzled())
 		src << "<span class='danger'>You're muzzled and cannot speak!</span>"
 		return
@@ -40,8 +40,8 @@
 	var/datum/language/speaking = parse_language(message)
 	if(speaking)
 		message = copytext(message,2+length(speaking.key))
-	else if(species.default_language)
-		speaking = all_languages[species.default_language]
+	else
+		speaking = get_default_language()
 
 	var/ending = copytext(message, length(message))
 	if (speaking)

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

@@ -0,0 +1,100 @@
+/datum/species/golem
+	name = "Golem"
+
+	icobase = 'icons/mob/human_races/r_golem.dmi'
+	deform = 'icons/mob/human_races/r_golem.dmi'
+
+	default_language = "Galactic Common"
+	flags = NO_BREATHE | NO_PAIN | NO_BLOOD | NO_SCAN
+
+	blood_color = "#515573"
+	flesh_color = "#137E8F"
+
+
+	has_organ = list(
+		"brain" = /obj/item/organ/brain/golem
+		)
+
+/datum/species/golem/handle_post_spawn(var/mob/living/carbon/human/H)
+	if(H.mind)
+		H.mind.assigned_role = "Golem"
+		H.mind.special_role = "Golem"
+	H.real_name = "adamantine golem ([rand(1, 1000)])"
+	H.name = H.real_name
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/golem(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/golem(H), slot_wear_suit)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/golem(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/golem(H), slot_wear_mask)
+	H.equip_to_slot_or_del(new /obj/item/clothing/gloves/golem(H), slot_gloves)
+	..()
+
+
+////////Adamantine Golem stuff I dunno where else to put it
+
+/obj/item/clothing/under/golem
+	name = "adamantine skin"
+	desc = "a golem's skin"
+	icon_state = "golem"
+	item_state = "golem"
+	_color = "golem"
+	has_sensor = 0
+	flags = ABSTRACT | NODROP
+	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/suit/golem
+	name = "adamantine shell"
+	desc = "a golem's thick outter shell"
+	icon_state = "golem"
+	item_state = "golem"
+	w_class = 4//bulky item
+	gas_transfer_coefficient = 0.90
+	permeability_coefficient = 0.50
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS|HEAD
+	slowdown = 1.0
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	flags = ONESIZEFITSALL | STOPSPRESSUREDMAGE | ABSTRACT | NODROP
+	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS | HEAD
+	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
+	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS | HEAD
+	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
+	armor = list(melee = 80, bullet = 20, laser = 20, energy = 10, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/shoes/golem
+	name = "golem's feet"
+	desc = "sturdy adamantine feet"
+	icon_state = "golem"
+	item_state = "golem"
+	flags = NOSLIP | ABSTRACT | MASKINTERNALS | MASKCOVERSMOUTH | NODROP
+	slowdown = SHOES_SLOWDOWN+1
+
+
+/obj/item/clothing/mask/gas/golem
+	name = "golem's face"
+	desc = "the imposing face of an adamantine golem"
+	icon_state = "golem"
+	item_state = "golem"
+	siemens_coefficient = 0
+	unacidable = 1
+	flags = ABSTRACT | NODROP
+
+
+/obj/item/clothing/gloves/golem
+	name = "golem's hands"
+	desc = "strong adamantine hands"
+	icon_state = "golem"
+	item_state = null
+	siemens_coefficient = 0
+	flags = ABSTRACT | NODROP
+
+
+/obj/item/clothing/head/space/golem
+	icon_state = "golem"
+	item_state = "dermal"
+	_color = "dermal"
+	name = "golem's head"
+	desc = "a golem's head"
+	unacidable = 1
+	flags = STOPSPRESSUREDMAGE | ABSTRACT | NODROP
+	heat_protection = HEAD
+	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
+	armor = list(melee = 80, bullet = 20, laser = 20, energy = 10, bomb = 0, bio = 0, rad = 0)

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

@@ -187,37 +187,30 @@
 				src << "\red You feel your face freezing and an icicle forming in your lungs!"
 		else if(breath.temperature > heat_level_1)
 			if(prob(20))
-				if(H.dna.mutantrace == "slime")
-					src << "\red You feel supercharged by the extreme heat!"
-				else
-					src << "\red You feel your face burning and a searing heat in your lungs!"
-		if(H.dna.mutantrace == "slime")
-			if(breath.temperature < cold_level_1)
-				H.adjustToxLoss(round(cold_level_1 - breath.temperature))
+				src << "\red You feel your face burning and a searing heat in your lungs!"
+
+		switch(breath.temperature)
+			if(-INFINITY to cold_level_3)
+				H.apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
 				H.fire_alert = max(H.fire_alert, 1)
-		else
-			switch(breath.temperature)
-				if(-INFINITY to cold_level_3)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
-					H.fire_alert = max(H.fire_alert, 1)
 
-				if(cold_level_3 to cold_level_2)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
-					H.fire_alert = max(H.fire_alert, 1)
+			if(cold_level_3 to cold_level_2)
+				H.apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
+				H.fire_alert = max(H.fire_alert, 1)
 
-				if(cold_level_2 to cold_level_1)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
-					H.fire_alert = max(H.fire_alert, 1)
+			if(cold_level_2 to cold_level_1)
+				H.apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
+				H.fire_alert = max(H.fire_alert, 1)
 
-				if(heat_level_1 to heat_level_2)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
-					H.fire_alert = max(H.fire_alert, 2)
+			if(heat_level_1 to heat_level_2)
+				H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
+				H.fire_alert = max(H.fire_alert, 2)
 
-				if(heat_level_2 to heat_level_3)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
-					H.fire_alert = max(H.fire_alert, 2)
+			if(heat_level_2 to heat_level_3)
+				H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
+				H.fire_alert = max(H.fire_alert, 2)
 
-				if(heat_level_3 to INFINITY)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
-					H.fire_alert = max(H.fire_alert, 2)
+			if(heat_level_3 to INFINITY)
+				H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
+				H.fire_alert = max(H.fire_alert, 2)
 	return 1

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

@@ -0,0 +1,23 @@
+/datum/species/shadow
+	name = "Shadow"
+
+	icobase = 'icons/mob/human_races/r_shadow.dmi'
+	deform = 'icons/mob/human_races/r_shadow.dmi'
+
+	default_language = "Galactic Common"
+	unarmed_type = /datum/unarmed_attack/claws
+	light_dam = 2
+	darksight = 8
+
+	blood_color = "#CCCCCC"
+	flesh_color = "#AAAAAA"
+
+	has_organ = list(
+		"brain" = /obj/item/organ/brain
+		)
+
+	flags = NO_BLOOD | NO_BREATHE | NO_SCAN
+	bodyflags = FEET_NOSLIP
+
+/datum/species/shadow/handle_death(var/mob/living/carbon/human/H)
+	H.dust()

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

@@ -332,6 +332,12 @@ proc/get_damage_icon_part(damage_state, body_part)
 	if(update_icons)
 		update_icons()
 
+	if(lip_style  && species && species.flags & HAS_LIPS)
+		var/icon/lips = icon("icon"='icons/mob/human_face.dmi', "icon_state"="lips_[lip_style]_s")
+		lips.Blend(lip_color, ICON_ADD)
+
+		stand_icon.Blend(lips, ICON_OVERLAY)
+
 	//tail
 	update_tail_showing(0)
 
@@ -433,11 +439,6 @@ proc/get_damage_icon_part(damage_state, body_part)
 
 
 /mob/living/carbon/human/proc/update_mutantrace(var/update_icons=1)
-	var/fat
-	if( FAT in mutations )
-		fat = "fat"
-//	var/g = "m"
-//	if (gender == FEMALE)	g = "f"
 //BS12 EDIT
 	var/skel = (SKELETON in src.mutations)
 	if(skel)
@@ -445,18 +446,6 @@ proc/get_damage_icon_part(damage_state, body_part)
 	else
 		skeleton = null
 
-	if(dna)
-		switch(dna.mutantrace)
-			if("golem","shadow","adamantine")
-				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/genetics.dmi', "icon_state" = "[dna.mutantrace][fat]_[gender]_s")
-			if("slime")
-				overlays_standing[MUTANTRACE_LAYER]	= image("icon" = 'icons/effects/slimemutant.dmi', "icon_state" = "[slime_color]_[dna.mutantrace][fat]_[gender]_s")
-			else
-				overlays_standing[MUTANTRACE_LAYER]	= null
-
-	if(!dna || !(dna.mutantrace in list("golem","metroid")))
-		update_body(0)
-
 	update_hair(0)
 	if(update_icons)   update_icons()
 

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

@@ -345,11 +345,10 @@
 					if(issilicon(L) && (rabid || attacked)) // They can't eat silicons, but they can glomp them in defence
 						targets += L // Possible target found!
 
-					if(istype(L, /mob/living/carbon/human) && dna) //Ignore slime(wo)men
+					if(istype(L, /mob/living/carbon/human)) //Ignore slime(wo)men
 						var/mob/living/carbon/human/H = L
-						if(H.dna)
-							if(H.dna.mutantrace == "slime")
-								continue
+						if(H.species.name == "Slime People")
+							continue
 
 					if(!L.canmove) // Only one slime can latch on at a time.
 						var/notarget = 0

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

@@ -686,15 +686,6 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 		..()
 		create_reagents(100)
 
-/obj/item/slime_extract/attack(mob/living/carbon/human/M as mob, mob/user as mob) //changing slime people colors
-		if(M.dna.mutantrace != "slime" || M != user) return
-
-		M.slime_color = _color
-		user <<"You absorb the core and your color shifts!"
-		M.update_mutantrace()
-		del(src) //Finally a tidy way to remove all the used cores lying about
-
-
 
 /obj/item/slime_extract/grey
 	name = "grey slime extract"
@@ -899,90 +890,6 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle17"
 
-	/*afterattack(obj/target, mob/user , flag)
-		if(istype(target, /obj/item/slime_extract))
-			if(target.enhanced == 1)
-				user << "<span class='warning'> This extract has already been enhanced!</span>"
-				return ..()
-			if(target.Uses == 0)
-				user << "<span class='warning'> You can't enhance a used extract!</span>"
-				return ..()
-			user <<"You apply the enhancer. It now has triple the amount of uses."
-			target.Uses = 3
-			target.enahnced = 1
-			del(src)*/
-
-////////Adamantine Golem stuff I dunno where else to put it
-
-// This will eventually be removed.
-
-/obj/item/clothing/under/golem
-	name = "adamantine skin"
-	desc = "a golem's skin"
-	icon_state = "golem"
-	item_state = "golem"
-	_color = "golem"
-	has_sensor = 0
-	flags = ABSTRACT | NODROP
-	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
-
-/obj/item/clothing/suit/golem
-	name = "adamantine shell"
-	desc = "a golem's thick outter shell"
-	icon_state = "golem"
-	item_state = "golem"
-	w_class = 4//bulky item
-	gas_transfer_coefficient = 0.90
-	permeability_coefficient = 0.50
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS|HEAD
-	slowdown = 1.0
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-	flags = ONESIZEFITSALL | STOPSPRESSUREDMAGE | ABSTRACT | NODROP
-	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS | HEAD
-	max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-	cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS | HEAD
-	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
-	armor = list(melee = 80, bullet = 20, laser = 20, energy = 10, bomb = 0, bio = 0, rad = 0)
-
-/obj/item/clothing/shoes/golem
-	name = "golem's feet"
-	desc = "sturdy adamantine feet"
-	icon_state = "golem"
-	item_state = "golem"
-	flags = NOSLIP | ABSTRACT | MASKINTERNALS | MASKCOVERSMOUTH | NODROP
-	slowdown = SHOES_SLOWDOWN+1
-
-
-/obj/item/clothing/mask/gas/golem
-	name = "golem's face"
-	desc = "the imposing face of an adamantine golem"
-	icon_state = "golem"
-	item_state = "golem"
-	siemens_coefficient = 0
-	unacidable = 1
-	flags = ABSTRACT | NODROP
-
-
-/obj/item/clothing/gloves/golem
-	name = "golem's hands"
-	desc = "strong adamantine hands"
-	icon_state = "golem"
-	item_state = null
-	siemens_coefficient = 0
-	flags = ABSTRACT | NODROP
-
-
-/obj/item/clothing/head/space/golem
-	icon_state = "golem"
-	item_state = "dermal"
-	_color = "dermal"
-	name = "golem's head"
-	desc = "a golem's head"
-	unacidable = 1
-	flags = STOPSPRESSUREDMAGE | ABSTRACT | NODROP
-	heat_protection = HEAD
-	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
-	armor = list(melee = 80, bullet = 20, laser = 20, energy = 10, bomb = 0, bio = 0, rad = 0)
 
 /obj/effect/goleRUNe
 	anchored = 1
@@ -1014,16 +921,8 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 		if(!ghost)
 			user << "The rune fizzles uselessly. There is no spirit nearby."
 			return
-		var/mob/living/carbon/human/G = new /mob/living/carbon/human
-		G.dna.mutantrace = "adamantine"
+		var/mob/living/carbon/human/golem/G = new /mob/living/carbon/human/golem
 		if(prob(50))	G.gender = "female"
-		G.real_name = text("Adamantine Golem ([rand(1, 1000)])")
-		G.equip_to_slot_or_del(new /obj/item/clothing/under/golem(G), slot_w_uniform)
-		G.equip_to_slot_or_del(new /obj/item/clothing/suit/golem(G), slot_wear_suit)
-		G.equip_to_slot_or_del(new /obj/item/clothing/shoes/golem(G), slot_shoes)
-		G.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/golem(G), slot_wear_mask)
-		G.equip_to_slot_or_del(new /obj/item/clothing/gloves/golem(G), slot_gloves)
-		//G.equip_to_slot_or_del(new /obj/item/clothing/head/space/golem(G), slot_head)
 		G.loc = src.loc
 		G.key = ghost.key
 		G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost."
@@ -1064,115 +963,4 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
 				O << "\red You are not eligable."
 				return
 			ghosts.Add(O)
-			O << "\blue You are signed up to be a golem."
-
-//////////////////////////////Old shit from metroids/RoRos, and the old cores, would not take much work to re-add them////////////////////////
-
-/*
-// Basically this slime Core catalyzes reactions that normally wouldn't happen anywhere
-/obj/item/slime_core
-	name = "slime extract"
-	desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"."
-	icon = 'icons/mob/slimes.dmi'
-	icon_state = "slime extract"
-	force = 1.0
-	w_class = 1.0
-	throwforce = 1.0
-	throw_speed = 2
-	throw_range = 6
-	origin_tech = "biotech=4"
-	var/POWERFLAG = 0 // sshhhhhhh
-	var/Flush = 30
-	var/Uses = 5 // uses before it goes inert
-
-/obj/item/slime_core/New()
-		..()
-		create_reagents(100)
-		POWERFLAG = rand(1,10)
-		Uses = rand(7, 25)
-		//flags |= NOREACT
-/*
-		spawn()
-			Life()
-
-	proc/Life()
-		while(src)
-			sleep(25)
-			Flush--
-			if(Flush <= 0)
-				reagents.clear_reagents()
-				Flush = 30
-*/
-
-
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/slime
-	name = "slime egg"
-	desc = "A small, gelatinous egg."
-	icon = 'icons/mob/mob.dmi'
-	icon_state = "slime egg-growing"
-	bitesize = 12
-	origin_tech = "biotech=4"
-	var/grown = 0
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/slime/New()
-	..()
-	reagents.add_reagent("nutriment", 4)
-	reagents.add_reagent("slimejelly", 1)
-	spawn(rand(1200,1500))//the egg takes a while to "ripen"
-		Grow()
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/slime/proc/Grow()
-	grown = 1
-	icon_state = "slime egg-grown"
-	processing_objects.Add(src)
-	return
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/slime/proc/Hatch()
-	processing_objects.Remove(src)
-	var/turf/T = get_turf(src)
-	src.visible_message("<span class='warning'> The [name] pulsates and quivers!</span>")
-	spawn(rand(50,100))
-		src.visible_message("<span class='warning'> The [name] bursts open!</span>")
-		new/mob/living/carbon/slime(T)
-		del(src)
-
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/slime/process()
-	var/turf/location = get_turf(src)
-	var/datum/gas_mixture/environment = location.return_air()
-	if (environment.toxins > MOLES_PLASMA_VISIBLE)//plasma exposure causes the egg to hatch
-		src.Hatch()
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/slime/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
-	if(istype( W, /obj/item/toy/crayon ))
-		return
-	else
-		..()
-*/
-
-/obj/item/slime_color
-	name = "slimeperson color selector"
-	desc = "Allows you to change your slimeperson color, once."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "t-ray0"
-	force = 1.0
-	w_class = 1.0
-	throwforce = 1.0
-	throw_speed = 3
-	throw_range = 6
-	origin_tech = "biotech=4"
-	_color = "grey"
-	var/Uses = 1 // uses before it goes inert
-	var/list/slimecolor = list("grey","gold","silver","metal","purple","darkpurple","orange","yellow","red","blue","darkblue","pink","green","lightpink","black","oil","adamantine")
-
-
-/obj/item/slime_color/attack(mob/living/carbon/human/M as mob, mob/user as mob) //changing slime people colors
-	if(M.dna.mutantrace != "slime" || M != user) return
-
-
-	var/pickedcolor = input("Please select a slime color", "Slimeperson color chooser")  as null|anything in slimecolor
-	M.slime_color = pickedcolor
-	user << "You absorb the pigment and your color shifts!"
-	M.update_mutantrace()
-	del(src) //Finally a tidy way to remove all the used cores lying about
+			O << "\blue You are signed up to be a golem."

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

@@ -104,7 +104,7 @@
 				adjustBruteLoss(-10)
 				adjustFireLoss(-10)
 				adjustCloneLoss(-10)
-				
+
 				updatehealth()
 				if(Victim)
 					Victim.updatehealth()
@@ -227,9 +227,9 @@
 	else
 		src << "<i>I am not old enough to reproduce yet...</i>"
 
-/mob/living/carbon/slime/verb/ventcrawl()
+/mob/living/carbon/slime/verb/ventcrawl(var/atom/pipe)
 	set name = "Crawl through Vent"
 	set desc = "Enter an air vent and crawl through the pipe system."
 	set category = "Slime"
 	if(Victim)	return
-	handle_ventcrawl()
+	handle_ventcrawl(pipe)

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

@@ -15,7 +15,6 @@
 
 	..()
 	gender = NEUTER
-	dna.mutantrace = "plant"
 	greaterform = "Diona"
 	add_language("Rootspeak")
 	verbs -= /mob/living/carbon/monkey/verb/ventcrawl
@@ -46,7 +45,6 @@
 
 	..()
 	gender = NEUTER
-	dna.mutantrace = "plant"
 	greaterform = "Diona"
 	add_language("Rootspeak")
 	src.verbs += /mob/living/carbon/monkey/diona/proc/merge

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

@@ -80,7 +80,6 @@
 /mob/living/carbon/monkey/unathi/New()
 
 	..()
-	dna.mutantrace = "lizard"
 	greaterform = "Unathi"
 	dna.species = "Unathi"
 	add_language("Sinta'unathi")
@@ -88,7 +87,6 @@
 /mob/living/carbon/monkey/skrell/New()
 
 	..()
-	dna.mutantrace = "skrell"
 	greaterform = "Skrell"
 	dna.species = "Skrell"
 	add_language("Skrellian")
@@ -96,7 +94,6 @@
 /mob/living/carbon/monkey/tajara/New()
 
 	..()
-	dna.mutantrace = "tajaran"
 	greaterform = "Tajaran"
 	dna.species = "Tajaran"
 	add_language("Siik'tajr")
@@ -106,7 +103,6 @@
 	..()
 	alien = 1
 	gender = NEUTER
-	dna.mutantrace = "plant"
 	greaterform = "Diona"
 	dna.species = "Diona"
 	add_language("Rootspeak")

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

@@ -1,5 +1,5 @@
-/mob/living/carbon/monkey/verb/ventcrawl()
+/mob/living/carbon/monkey/verb/ventcrawl(var/atom/pipe)
 	set name = "Crawl through Vent"
 	set desc = "Enter an air vent and crawl through the pipe system."
 	set category = "Monkey"
-	handle_ventcrawl()
+	handle_ventcrawl(pipe)

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

@@ -14,7 +14,6 @@
 	var/tail                     // Name of tail image in species effects icon file.
 	var/unarmed                  //For empty hand harm-intent attack
 	var/unarmed_type = /datum/unarmed_attack
-	var/mutantrace               // Safeguard due to old code.
 
 	var/breath_type = "oxygen"   // Non-oxygen gas breathed, if any.
 	var/poison_type = "plasma"   // Poisonous air.
@@ -42,6 +41,8 @@
 	var/brute_mod = null    // Physical damage reduction/malus.
 	var/burn_mod = null     // Burn damage reduction/malus.
 
+	var/light_dam
+
 	var/max_hurt_damage = 9 // Max melee damage dealt + 5 if hulk
 	var/list/default_genes = list()
 
@@ -250,41 +251,34 @@
 				H << "\red You feel your face freezing and an icicle forming in your lungs!"
 		else if(breath.temperature > heat_level_1)
 			if(prob(20))
-				if(H.dna.mutantrace == "slime")
-					H << "\red You feel supercharged by the extreme heat!"
-				else
-					H << "\red You feel your face burning and a searing heat in your lungs!"
+				H << "\red You feel your face burning and a searing heat in your lungs!"
 
-		if(H.dna.mutantrace == "slime")
-			if(breath.temperature < cold_level_1)
-				H.adjustToxLoss(round(cold_level_1 - breath.temperature))
+
+
+		switch(breath.temperature)
+			if(-INFINITY to cold_level_3)
+				H.apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
 				H.fire_alert = max(H.fire_alert, 1)
 
-		if(H.dna.mutantrace != "slime")
-			switch(breath.temperature)
-				if(-INFINITY to cold_level_3)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
-					H.fire_alert = max(H.fire_alert, 1)
+			if(cold_level_3 to cold_level_2)
+				H.apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
+				H.fire_alert = max(H.fire_alert, 1)
 
-				if(cold_level_3 to cold_level_2)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
-					H.fire_alert = max(H.fire_alert, 1)
+			if(cold_level_2 to cold_level_1)
+				H.apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
+				H.fire_alert = max(H.fire_alert, 1)
 
-				if(cold_level_2 to cold_level_1)
-					H.apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
-					H.fire_alert = max(H.fire_alert, 1)
+			if(heat_level_1 to heat_level_2)
+				H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
+				H.fire_alert = max(H.fire_alert, 2)
 
-				if(heat_level_1 to heat_level_2)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
-					H.fire_alert = max(H.fire_alert, 2)
+			if(heat_level_2 to heat_level_3_breathe)
+				H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
+				H.fire_alert = max(H.fire_alert, 2)
 
-				if(heat_level_2 to heat_level_3_breathe)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
-					H.fire_alert = max(H.fire_alert, 2)
-
-				if(heat_level_3_breathe to INFINITY)
-					H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
-					H.fire_alert = max(H.fire_alert, 2)
+			if(heat_level_3_breathe to INFINITY)
+				H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
+				H.fire_alert = max(H.fire_alert, 2)
 	return
 
 /datum/species/proc/handle_post_spawn(var/mob/living/carbon/C) //Handles anything not already covered by basic species assignment.
@@ -554,6 +548,7 @@
 	unarmed_type = /datum/unarmed_attack/punch
 
 	flags = IS_WHITELISTED | NO_BREATHE | HAS_LIPS | NO_INTORGANS | NO_SCAN
+	bodyflags = HAS_SKIN_COLOR
 	bloodflags = BLOOD_SLIME
 
 	has_organ = list(
@@ -561,14 +556,6 @@
 		)
 
 
-/datum/species/slime/handle_post_spawn(var/mob/living/carbon/human/H)
-	H.dna = new /datum/dna(null)
-	H.dna.real_name = H.real_name
-	H.dna.species = H.species.name
-	H.dna.mutantrace = "slime"
-
-	..()
-
 /datum/species/grey
 	name = "Grey"
 	icobase = 'icons/mob/human_races/r_grey.dmi'

code/modules/mob/living/default_language.dm

@@ -0,0 +1,25 @@
+/mob/living
+	var/datum/language/default_language
+
+/mob/living/verb/set_default_language(language as null|anything in languages)
+	set name = "Set Default Language"
+	set category = "IC"
+
+	if(language)
+		src << "<span class='notice'>You will now speak [language] if you do not specify a language when speaking.</span>"
+	else
+		src << "<span class='notice'>You will now speak whatever your standard default language is if you do not specify one when speaking.</span>"
+	default_language = language
+
+// Silicons can't neccessarily speak everything in their languages list
+/mob/living/silicon/set_default_language(language as null|anything in speech_synthesizer_langs)
+	..()
+
+/mob/living/verb/check_default_language()
+	set name = "Check Default Language"
+	set category = "IC"
+
+	if(default_language)
+		src << "<span class='notice'>You are currently speaking [default_language] by default.</span>"
+	else
+		src << "<span class='notice'>Your current default language is your species or mob type default.</span>"

code/modules/mob/living/living.dm

@@ -808,6 +808,17 @@
 	..()
 	floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure we restart the bouncing after the next movement.
 
+
+/atom/movable/proc/receive_damage(atom/A)
+	var/pixel_x_diff = rand(-3,3)
+	var/pixel_y_diff = rand(-3,3)
+	animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2)
+	animate(pixel_x = initial(pixel_x), pixel_y = initial(pixel_y), time = 2)
+
+/mob/living/receive_damage(atom/A)
+	..()
+	floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure we restart the bouncing after the next movement.
+
 /mob/living/proc/do_jitter_animation(jitteriness)
 	var/amplitude = min(4, (jitteriness/100) + 1)
 	var/pixel_x_diff = rand(-amplitude, amplitude)

code/modules/mob/living/living_defense.dm

@@ -144,7 +144,7 @@
 				src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with a [O], thrown by [M.name] ([assailant.ckey])</font>")
 				M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [src.name] ([src.ckey]) with a thrown [O]</font>")
 				if(!istype(src,/mob/living/simple_animal/mouse))
-					msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
+					msg_admin_attack("[src.name] ([src.ckey]) was hit by a [O], thrown by [M.name] ([assailant.ckey])[isAntag(M) ? "(ANTAG)" : ""] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
 
 		// Begin BS12 momentum-transfer code.
 		if(O.throw_source && speed >= 15)
@@ -257,3 +257,24 @@
 	IgniteMob()
 
 //Mobs on Fire end
+
+/mob/living/proc/grabbedby(mob/living/carbon/user,var/supress_message = 0)
+	if(user == src || anchored)
+		return 0
+	if(!(status_flags & CANPUSH))
+		return 0
+
+	add_logs(user, src, "grabbed", addition="passively")
+
+	var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(user, src)
+	if(buckled)
+		user << "<span class='notice'>You cannot grab [src], \he is buckled in!</span>"
+	if(!G)	//the grab will delete itself in New if src is anchored
+		return 0
+	user.put_in_active_hand(G)
+	G.synch()
+	LAssailant = user
+
+	playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+	if(!supress_message)
+		visible_message("<span class='warning'>[user] has grabbed [src] passively!</span>")

code/modules/mob/living/living_defines.dm

@@ -44,3 +44,6 @@
 	var/silent = null 		//Can't talk. Value goes down every life proc.
 	var/floating = 0
 	var/nightvision = 0
+
+	var/list/icon/pipes_shown = list()
+	var/last_played_vent

code/modules/mob/living/say.dm

@@ -64,6 +64,9 @@ proc/get_radio_key_from_channel(var/channel)
 		if(!istype(dongle)) return
 		if(dongle.translate_binary) return 1
 
+/mob/living/proc/get_default_language()
+	return default_language
+
 /mob/living/say(var/message, var/datum/language/speaking = null, var/verb="says", var/alt_name="", var/italics=0, var/message_range = world.view, var/sound/speech_sound, var/sound_vol)
 
 	var/turf/T = get_turf(src)

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

@@ -14,10 +14,10 @@
 		/obj/item/weapon/airlock_electronics,
 		/obj/item/weapon/module/power_control,
 		/obj/item/weapon/stock_parts,
-		/obj/item/light_fixture_frame,
-		/obj/item/apc_frame,
-		/obj/item/alarm_frame,
-		/obj/item/firealarm_frame,
+		/obj/item/mounted/frame/light_fixture,
+		/obj/item/mounted/frame/apc_frame,
+		/obj/item/mounted/frame/alarm_frame,
+		/obj/item/mounted/frame/firealarm,
 		/obj/item/weapon/table_parts,
 		/obj/item/weapon/rack_parts,
 		/obj/item/weapon/camera_assembly,

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

@@ -71,9 +71,15 @@
 	//parse language key and consume it
 	var/datum/language/speaking = parse_language(message)
 	if (speaking)
-		verb = speaking.speech_verb
-		message = trim(copytext(message,2+length(speaking.key)))
 
+		message = trim(copytext(message,2+length(speaking.key)))
+	else
+		speaking = get_default_language()
+
+	if (speaking)
+		verb = speaking.speech_verb
+		// This is broadcast to all mobs with the language,
+		// irrespective of distance or anything else.
 		if(speaking.flags & HIVEMIND)
 			speaking.broadcast(src,trim(message))
 			return 1

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

@@ -237,9 +237,19 @@
 
 	var/dat = "<b><font size = 5>Known Languages</font></b><br/><br/>"
 
+	if(default_language)
+		dat += "Current default language: [default_language] - <a href='byond://?src=\ref[src];default_lang=reset'>reset</a><br/><br/>"
+
 	for(var/datum/language/L in languages)
 		if(!(L.flags & NONGLOBAL))
-			dat += "<b>[L.name] (:[L.key])</b><br/>Speech Synthesizer: <i>[(L in speech_synthesizer_langs)? "YES":"NOT SUPPORTED"]</i><br/>[L.desc]<br/><br/>"
+			var/default_str
+			if(L == default_language)
+				default_str = " - default - <a href='byond://?src=\ref[src];default_lang=reset'>reset</a>"
+			else
+				default_str = " - <a href='byond://?src=\ref[src];default_lang=[L]'>set default</a>"
+
+			var/synth = (L in speech_synthesizer_langs)
+			dat += "<b>[L.name] (:[L.key])</b>[synth ? default_str : null]<br/>Speech Synthesizer: <i>[synth ? "YES" : "NOT SUPPORTED"]</i><br/>[L.desc]<br/><br/>"
 
 	src << browse(dat, "window=checklanguage")
 	return

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

@@ -456,11 +456,11 @@ mob/living/simple_animal/borer/proc/detatch()
 	host_brain.real_name = M.real_name
 	host.status_flags |= PASSEMOTES
 
-/mob/living/simple_animal/borer/verb/ventcrawl()
+/mob/living/simple_animal/borer/verb/ventcrawl(var/atom/pipe)
 	set name = "Crawl through vent (borer)"
 	set desc = "Enter an air vent and crawl through the pipe system."
 	set category = "Alien"
-	handle_ventcrawl()
+	handle_ventcrawl(pipe)
 
 /mob/living/simple_animal/borer/can_use_vents()
 	return

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

@@ -70,58 +70,11 @@
 		client.time_died_as_mouse = world.time
 
 //copy paste from alien/larva, if that func is updated please update this one also
-/mob/living/simple_animal/mouse/verb/ventcrawl()
+/mob/living/simple_animal/mouse/verb/ventcrawl(var/atom/pipe)
 	set name = "Crawl through Vent"
 	set desc = "Enter an air vent and crawl through the pipe system."
 	set category = "Mouse"
-
-//	if(!istype(V,/obj/machinery/atmoalter/siphs/fullairsiphon/air_vent))
-//		return
-
-	if(src.stat != CONSCIOUS)	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)
-					/*
-					for(var/mob/O in oviewers(src, null))
-						if ((O.client && !( O.blinded )))
-							O.show_message(text("<B>[src] scrambles into the ventillation ducts!</B>"), 1)
-					*/
-					loc = target_vent.loc
-			else
-				src << "\blue You need to remain still while entering a vent."
-		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
+	handle_ventcrawl(pipe)
 
 //make mice fit under tables etc? this was hacky, and not working
 /*

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

@@ -140,7 +140,7 @@
 			for(var/mob/M in viewers(src, null))
 				if ((M.client && !( M.blinded )))
 					M.show_message("\red [user] gently taps [src] with the [O]. ")
-					
+
 /mob/living/simple_animal/spiderbot/emag_act(user as mob)
 	if (emagged)
 		user << "\red [src] is already overloaded - better run."
@@ -219,51 +219,11 @@
 	return
 
 //copy paste from alien/larva, if that func is updated please update this one also
-/mob/living/simple_animal/spiderbot/verb/ventcrawl()
+/mob/living/simple_animal/spiderbot/verb/ventcrawl(var/atom/pipe)
 	set name = "Crawl through Vent"
 	set desc = "Enter an air vent and crawl through the pipe system."
 	set category = "Spiderbot"
-
-//	if(!istype(V,/obj/machinery/atmoalter/siphs/fullairsiphon/air_vent))
-//		return
-	var/obj/machinery/atmospherics/unary/vent_pump/vent_found
-	var/welded = 0
-	for(var/obj/machinery/atmospherics/unary/vent_pump/v in range(1,src))
-		if(!v.welded)
-			vent_found = v
-			break
-		else
-			welded = 1
-	if(vent_found)
-		if(vent_found.network&&vent_found.network.normal_members.len)
-			var/list/vents = list()
-			for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in vent_found.network.normal_members)
-				if(temp_vent.loc == loc)
-					continue
-				vents.Add(temp_vent)
-			var/list/choices = list()
-			for(var/obj/machinery/atmospherics/unary/vent_pump/vent in vents)
-				if(vent.loc.z != loc.z)
-					continue
-				var/atom/a = get_turf(vent)
-				choices.Add(a.loc)
-			var/turf/startloc = loc
-			var/obj/selection = input("Select a destination.", "Duct System") in choices
-			var/selection_position = choices.Find(selection)
-			if(loc==startloc)
-				var/obj/target_vent = vents[selection_position]
-				if(target_vent)
-					loc = target_vent.loc
-			else
-				src << "\blue You need to remain still while entering a vent."
-		else
-			src << "\blue This vent is not connected to anything."
-	else if(welded)
-		src << "\red That vent is welded."
-	else
-		src << "\blue You must be standing on or beside an air vent to enter it."
-	return
-
+	handle_ventcrawl(pipe)
 //Cannibalized from the parrot mob. ~Zuhayr
 
 /mob/living/simple_animal/spiderbot/verb/drop_held_item()

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

@@ -10,11 +10,11 @@
 	speak_chance = 0
 	turns_per_move = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
-	meat_amount = 1
+	meat_amount = 2
 	response_help = "pets the"
 	response_disarm = "gently pushes aside the"
 	response_harm = "hits the"
-	speed = 4
+	speed = 0
 	maxHealth = 25
 	health = 25
 
@@ -23,6 +23,7 @@
 	melee_damage_upper = 15
 	attacktext = "bites"
 	attack_sound = 'sound/weapons/bite.ogg'
+	speak_emote = list("gnashes")
 
 	//Space carp aren't affected by atmos.
 	min_oxy = 0
@@ -34,6 +35,7 @@
 	min_n2 = 0
 	max_n2 = 0
 	minbodytemp = 0
+	maxbodytemp = 1500
 
 
 

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

@@ -4,8 +4,24 @@
 #define MOVING_TO_TARGET 3
 #define SPINNING_COCOON 4
 
+/mob/living/simple_animal/hostile/poison
+	var/poison_per_bite = 5
+	var/poison_type = "venom"
+
+/mob/living/simple_animal/hostile/poison/AttackingTarget()
+	..()
+	if(isliving(target))
+		var/mob/living/L = target
+		if(L.reagents)
+			L.reagents.add_reagent("venom", poison_per_bite)
+			if(prob(poison_per_bite))
+				L << "<span class='danger'>You feel a tiny prick.</span>"
+				L.reagents.add_reagent(poison_type, poison_per_bite)
+
+
+
 //basic spider mob, these generally guard nests
-/mob/living/simple_animal/hostile/giant_spider
+/mob/living/simple_animal/hostile/poison/giant_spider
 	name = "giant spider"
 	desc = "Furry and black, it makes you shudder to look at it. This one has deep red eyes."
 	icon_state = "guard"
@@ -22,27 +38,27 @@
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
 	response_harm   = "hits"
-	stop_automated_movement_when_pulled = 0
-	maxHealth = 60
-	health = 60
+	maxHealth = 200
+	health = 200
 	melee_damage_lower = 15
 	melee_damage_upper = 20
-	heat_damage_per_tick = 20
-	cold_damage_per_tick = 20
-	var/poison_per_bite = 5
-	var/poison_type = "toxin"
+	heat_damage_per_tick = 20	//amount of damage applied if animal's body temperature is higher than maxbodytemp
+	cold_damage_per_tick = 20	//same as heat_damage_per_tick, only if the bodytemperature it's lower than minbodytemp
 	faction = list("spiders")
 	var/busy = 0
 	pass_flags = PASSTABLE
 	move_to_delay = 6
+	attacktext = "bites"
+	attack_sound = 'sound/weapons/bite.ogg'
 
 //nursemaids - these create webs and eggs
-/mob/living/simple_animal/hostile/giant_spider/nurse
+/mob/living/simple_animal/hostile/poison/giant_spider/nurse
 	desc = "Furry and black, it makes you shudder to look at it. This one has brilliant green eyes."
 	icon_state = "nurse"
 	icon_living = "nurse"
 	icon_dead = "nurse_dead"
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/spidereggs
+	meat_amount = 4
 	maxHealth = 40
 	health = 40
 	melee_damage_lower = 5
@@ -53,31 +69,21 @@
 	var/fed = 0
 
 //hunters have the most poison and move the fastest, so they can find prey
-/mob/living/simple_animal/hostile/giant_spider/hunter
+/mob/living/simple_animal/hostile/poison/giant_spider/hunter
 	desc = "Furry and black, it makes you shudder to look at it. This one has sparkling purple eyes."
 	icon_state = "hunter"
 	icon_living = "hunter"
 	icon_dead = "hunter_dead"
-	maxHealth = 50
-	health = 50
+	maxHealth = 120
+	health = 120
 	melee_damage_lower = 10
 	melee_damage_upper = 20
 	poison_per_bite = 5
-	move_to_delay = 4
+	move_to_delay = 5
 
-/mob/living/simple_animal/hostile/giant_spider/AttackingTarget()
+/mob/living/simple_animal/hostile/poison/giant_spider/Life()
 	..()
-	if(isliving(target))
-		var/mob/living/L = target
-		if(L.reagents)
-			L.reagents.add_reagent("toxin", poison_per_bite)
-			if(prob(poison_per_bite))
-				L << "\red You feel a tiny prick."
-				L.reagents.add_reagent(poison_type, 5)
-
-/mob/living/simple_animal/hostile/giant_spider/Life()
-	..()
-	if(!stat)
+	if(!stat && !ckey)
 		if(stance == HOSTILE_STANCE_IDLE)
 			//1% chance to skitter madly away
 			if(!busy && prob(1))
@@ -92,7 +98,7 @@
 
 // Chops off each leg with a 50/50 chance of harvesting one, until finally calling
 // default harvest action
-/mob/living/simple_animal/hostile/giant_spider/harvest()
+/mob/living/simple_animal/hostile/poison/giant_spider/harvest()
 	if(butcher_state > 0)
 		butcher_state--
 		icon_state = icon_dead + "[butcher_state]"
@@ -103,7 +109,7 @@
 	else
 		return ..()
 
-/mob/living/simple_animal/hostile/giant_spider/nurse/proc/GiveUp(var/C)
+/mob/living/simple_animal/hostile/poison/giant_spider/nurse/proc/GiveUp(var/C)
 	spawn(100)
 		if(busy == MOVING_TO_TARGET)
 			if(cocoon_target == C && get_dist(src,cocoon_target) > 1)
@@ -111,16 +117,16 @@
 			busy = 0
 			stop_automated_movement = 0
 
-/mob/living/simple_animal/hostile/giant_spider/nurse/Life()
+/mob/living/simple_animal/hostile/poison/giant_spider/nurse/Life()
 	..()
-	if(!stat)
+	if(!stat && !ckey)
 		if(stance == HOSTILE_STANCE_IDLE)
 			var/list/can_see = view(src, 10)
 			//30% chance to stop wandering and do something
 			if(!busy && prob(30))
 				//first, check for potential food nearby to cocoon
 				for(var/mob/living/C in can_see)
-					if(C.stat && !istype(C,/mob/living/simple_animal/hostile/giant_spider))
+					if(C.stat && !istype(C,/mob/living/simple_animal/hostile/poison/giant_spider))
 						cocoon_target = C
 						busy = MOVING_TO_TARGET
 						Goto(C, move_to_delay)
@@ -131,29 +137,11 @@
 				//second, spin a sticky spiderweb on this tile
 				var/obj/effect/spider/stickyweb/W = locate() in get_turf(src)
 				if(!W)
-					busy = SPINNING_WEB
-					src.visible_message("\blue \the [src] begins to secrete a sticky substance.")
-					stop_automated_movement = 1
-					spawn(40)
-						if(busy == SPINNING_WEB)
-							new /obj/effect/spider/stickyweb(src.loc)
-							busy = 0
-							stop_automated_movement = 0
+					Web()
 				else
 					//third, lay an egg cluster there
-					var/obj/effect/spider/eggcluster/E = locate() in get_turf(src)
-					if(!E && fed > 0)
-						busy = LAYING_EGGS
-						src.visible_message("\blue \the [src] begins to lay a cluster of eggs.")
-						stop_automated_movement = 1
-						spawn(50)
-							if(busy == LAYING_EGGS)
-								E = locate() in get_turf(src)
-								if(!E)
-									new /obj/effect/spider/eggcluster(src.loc)
-									fed--
-								busy = 0
-								stop_automated_movement = 0
+					if(fed)
+						LayEggs()
 					else
 						//fourthly, cocoon any nearby items so those pesky pinkskins can't use them
 						for(var/obj/O in can_see)
@@ -171,115 +159,112 @@
 
 			else if(busy == MOVING_TO_TARGET && cocoon_target)
 				if(get_dist(src, cocoon_target) <= 1)
-					busy = SPINNING_COCOON
-					src.visible_message("\blue \the [src] begins to secrete a sticky substance around \the [cocoon_target].")
-					stop_automated_movement = 1
-					walk(src,0)
-					spawn(50)
-						if(busy == SPINNING_COCOON)
-							if(cocoon_target && istype(cocoon_target.loc, /turf) && get_dist(src,cocoon_target) <= 1)
-								var/obj/effect/spider/cocoon/C = new(cocoon_target.loc)
-								var/large_cocoon = 0
-								C.pixel_x = cocoon_target.pixel_x
-								C.pixel_y = cocoon_target.pixel_y
-								for(var/mob/living/M in C.loc)
-									if(istype(M, /mob/living/simple_animal/hostile/giant_spider))
-										continue
-									large_cocoon = 1
-									fed++
-									src.visible_message("\red \the [src] sticks a proboscis into \the [cocoon_target] and sucks a viscous substance out.")
-									M.loc = C
-									C.pixel_x = M.pixel_x
-									C.pixel_y = M.pixel_y
-									break
-								for(var/obj/item/I in C.loc)
-									I.loc = C
-								for(var/obj/structure/S in C.loc)
-									if(!S.anchored)
-										S.loc = C
-										large_cocoon = 1
-								for(var/obj/machinery/M in C.loc)
-									if(!M.anchored)
-										M.loc = C
-										large_cocoon = 1
-								if(large_cocoon)
-									C.icon_state = pick("cocoon_large1","cocoon_large2","cocoon_large3")
-							busy = 0
-							stop_automated_movement = 0
+					Wrap()
 
 		else
 			busy = 0
 			stop_automated_movement = 0
 
+/mob/living/simple_animal/hostile/poison/giant_spider/verb/Web()
+	set name = "Lay Web"
+	set category = "Spider"
+	set desc = "Spread a sticky web to slow down prey."
+
+	var/T = src.loc
+
+	if(busy != SPINNING_WEB)
+		busy = SPINNING_WEB
+		src.visible_message("<span class='notice'>\the [src] begins to secrete a sticky substance.</span>")
+		stop_automated_movement = 1
+		spawn(40)
+			if(busy == SPINNING_WEB && src.loc == T)
+				new /obj/effect/spider/stickyweb(T)
+			busy = 0
+			stop_automated_movement = 0
 
 
-/mob/living/simple_animal/hostile/giant_spider/verb/web()
-	set category = "Alien"
-	set name = "Spin Web"
-	set desc = "Create a web that slows down movement."
+/mob/living/simple_animal/hostile/poison/giant_spider/nurse/verb/Wrap()
+	set name = "Wrap"
+	set category = "Spider"
+	set desc = "Wrap up prey to feast upon and objects for safe keeping."
 
-	var/obj/effect/spider/stickyweb/W = locate() in get_turf(src)
-	if(!W)
-		src.visible_message("\blue \the [src] begins to secrete a sticky substance.")
-		if(!do_after(src, 30)) return
-		new /obj/effect/spider/stickyweb(src.loc)
+	if(!cocoon_target)
+		var/list/choices = list()
+		for(var/mob/living/L in view(1,src))
+			if(L == src)
+				continue
+			if(Adjacent(L))
+				choices += L
+		for(var/obj/O in src.loc)
+			if(Adjacent(O))
+				choices += O
+		cocoon_target = input(src,"What do you wish to cocoon?") in null|choices
 
-
-/mob/living/simple_animal/hostile/giant_spider/nurse/verb/cocoon()
-	set category = "Alien"
-	set name = "Cocoon and Feed"
-	set desc = "Cocooned an incapacitated mob so you can feed upon it."
-
-	for(var/mob/living/P in range(1,src))
-		cocoon_target = P
-		if(P.stat && !istype(P,/mob/living/simple_animal/hostile/giant_spider))
-			if(get_dist(src, cocoon_target) <= 1)
-				src.visible_message("\blue \the [src] begins to secrete a sticky substance around \the [cocoon_target].")
-				if(!do_after(src, 30)) return
+	if(cocoon_target && busy != SPINNING_COCOON)
+		busy = SPINNING_COCOON
+		src.visible_message("<span class='notice'>\the [src] begins to secrete a sticky substance around \the [cocoon_target].</span>")
+		stop_automated_movement = 1
+		walk(src,0)
+		spawn(50)
+			if(busy == SPINNING_COCOON)
 				if(cocoon_target && istype(cocoon_target.loc, /turf) && get_dist(src,cocoon_target) <= 1)
 					var/obj/effect/spider/cocoon/C = new(cocoon_target.loc)
 					var/large_cocoon = 0
 					C.pixel_x = cocoon_target.pixel_x
 					C.pixel_y = cocoon_target.pixel_y
-					for(var/mob/living/M in C.loc)
-						if(istype(M, /mob/living/simple_animal/hostile/giant_spider))
-							continue
-						large_cocoon = 1
-						fed++
-						src.visible_message("\red \the [src] sticks a proboscis into \the [cocoon_target] and sucks a viscous substance out.")
-						M.loc = C
-						C.pixel_x = M.pixel_x
-						C.pixel_y = M.pixel_y
-						break
 					for(var/obj/item/I in C.loc)
 						I.loc = C
 					for(var/obj/structure/S in C.loc)
 						if(!S.anchored)
 							S.loc = C
-						large_cocoon = 1
+							large_cocoon = 1
 					for(var/obj/machinery/M in C.loc)
 						if(!M.anchored)
 							M.loc = C
+							large_cocoon = 1
+					for(var/mob/living/L in C.loc)
+						if(istype(L, /mob/living/simple_animal/hostile/poison/giant_spider))
+							continue
 						large_cocoon = 1
+						L.loc = C
+						C.pixel_x = L.pixel_x
+						C.pixel_y = L.pixel_y
+						fed++
+						visible_message("<span class='danger'>\the [src] sticks a proboscis into \the [L] and sucks a viscous substance out.</span>")
+
+						break
 					if(large_cocoon)
 						C.icon_state = pick("cocoon_large1","cocoon_large2","cocoon_large3")
+			cocoon_target = null
+			busy = 0
+			stop_automated_movement = 0
 
-
-/mob/living/simple_animal/hostile/giant_spider/nurse/verb/eggs()
-	set category = "Alien"
+/mob/living/simple_animal/hostile/poison/giant_spider/nurse/verb/LayEggs()
 	set name = "Lay Eggs"
-	set desc = "Lay a clutch of eggs to make new spiderlings. Requires you to have fed."
+	set category = "Spider"
+	set desc = "Lay a clutch of eggs, but you must wrap a creature for feeding first."
 
 	var/obj/effect/spider/eggcluster/E = locate() in get_turf(src)
-	if(!E && fed > 0)
-		src.visible_message("\blue \the [src] begins to lay a cluster of eggs.")
-		if(!do_after(src, 30)) return
-		E = locate() in get_turf(src)
-		if(!E)
-			new /obj/effect/spider/eggcluster(src.loc)
-			fed--
+	if(E)
+		src << "<span class='notice'>There is already a cluster of eggs here!</span>"
+	else if(!fed)
+		src << "<span class='warning'>You are too hungry to do this!</span>"
+	else if(busy != LAYING_EGGS)
+		busy = LAYING_EGGS
+		src.visible_message("<span class='notice'>\the [src] begins to lay a cluster of eggs.</span>")
+		stop_automated_movement = 1
+		spawn(50)
+			if(busy == LAYING_EGGS)
+				E = locate() in get_turf(src)
+				if(!E)
+					var/obj/effect/spider/eggcluster/C = new /obj/effect/spider/eggcluster(src.loc)
+					if(ckey)
+						C.player_spiders = 1
+					fed--
+			busy = 0
+			stop_automated_movement = 0
 
 #undef SPINNING_WEB
 #undef LAYING_EGGS
 #undef MOVING_TO_TARGET
-#undef SPINNING_COCOON
+#undef SPINNING_COCOON

code/modules/mob/mob_helpers.dm

@@ -156,6 +156,13 @@ proc/isorgan(A)
 			return 1
 	return 0
 
+proc/isAntag(A)
+	if(istype(A, /mob/living/carbon))
+		var/mob/living/carbon/C = A
+		if(C.mind && C.mind.special_role)
+			return 1
+	return 0
+
 proc/isnewplayer(A)
 	if(istype(A, /mob/new_player))
 		return 1

code/modules/mob/new_player/preferences_setup.dm

@@ -254,10 +254,6 @@ datum/preferences
 			facial_s.Blend(rgb(r_facial, g_facial, b_facial), ICON_ADD)
 			eyes_s.Blend(facial_s, ICON_OVERLAY)
 
-		//Slime People Overlays
-		if(current_species && (current_species.bloodflags & BLOOD_SLIME))
-			var/icon/temp = new/icon("icon" = 'icons/effects/slimemutant.dmi', "icon_state" = "[slime_color]_slime[fat]_[gender]_s")
-			preview_icon.Blend(temp, ICON_OVERLAY)
 
 		var/icon/underwear_s = null
 		if(underwear > 0 && underwear < 7 && current_species.flags & HAS_UNDERWEAR)

code/modules/mob/transform_procs.dm

@@ -465,8 +465,6 @@
 
 //Antag Creatures!
 /*	if(ispath(MP, /mob/living/simple_animal/hostile/carp) && !jobban_isbanned(src, "Syndicate"))
-		return 1
-	if(ispath(MP, /mob/living/simple_animal/hostile/giant_spider) && !jobban_isbanned(src, "Syndicate"))
 		return 1 */
 	if(ispath(MP, /mob/living/simple_animal/borer) && !jobban_isbanned(src, "alien") && !jobban_isbanned(src, "Syndicate"))
 		return 1