Mob define cleanup: Part 2

Moved the simple_animal folder into /mob/living. - Thanks to tortoiseSVN issues, I will have to remove the old simple_animal folder in a second commit. Moved to living: - maxHealth - health - control_object - incorporeal_move Moved to carbon: - silent - alien_egg_flag Moved to human: (human_defines.dm) - All vars that used to be defined in human.dm - underwear - backbag - miming Deleted from mob: - r_epil //Old var, not used anymore - r_ch_cou //Old var, not used anymore - r_Tourette //Old var, not used anymore - spellvoice() //Old proc, not used anymore - get_damage() //Unused, we have getHealth() that does the same thing Removed some unticked files that have already been replaced. This also fixes cyborgs being 'knocked unconscious' by rolling pins and secure breifcases - Additionally; to knock someone out with a rolling pin you must now be targeting the victims head. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3976 316c924e-a436-60f5-8080-3fe189b3f50e
2025-12-10 10:21:11 +00:00 · 2012-07-03 17:14:49 +00:00
parent 4d72ac303f
commit bb901f7583
50 changed files with 1947 additions and 751 deletions
--- a/code/defines/mob/dead/observer.dm
+++ b/code/defines/mob/dead/observer.dm
@@ -5,7 +5,6 @@
 	icon_state = "ghost"
 	layer = 4
 	density = 0
-	stat = 2
 	canmove = 0
 	blinded = 0
 	anchored = 1	//  don't get pushed around
--- a/code/defines/mob/living/carbon/alien_humanoid.dm
+++ b/code/defines/mob/living/carbon/alien_humanoid.dm
@@ -14,6 +14,7 @@
 /mob/living/carbon/alien/humanoid/hunter
 	name = "alien hunter"
 	caste = "h"
+	maxHealth = 150
 	health = 150
 	storedPlasma = 100
 	max_plasma = 150
@@ -22,6 +23,7 @@
 /mob/living/carbon/alien/humanoid/sentinel
 	name = "alien sentinel"
 	caste = "s"
+	maxHealth = 125
 	health = 125
 	storedPlasma = 100
 	max_plasma = 250
@@ -30,12 +32,14 @@
 /mob/living/carbon/alien/humanoid/drone
 	name = "alien drone"
 	caste = "d"
+	maxHealth = 100
 	health = 100
 	icon_state = "aliend_s"

 /mob/living/carbon/alien/humanoid/queen
 	name = "alien queen"
 	caste = "q"
+	maxHealth = 250
 	health = 250
 	icon_state = "alienq_s"
 	nopush = 1
--- a/code/defines/mob/living/carbon/alien_larva.dm
+++ b/code/defines/mob/living/carbon/alien_larva.dm
@@ -3,6 +3,7 @@
 	icon_state = "larva"
 	pass_flags = PASSTABLE

+	maxHealth = 25
 	health = 25

 	var/amount_grown = 0
--- a/code/defines/mob/living/carbon/metroid.dm
+++ b/code/defines/mob/living/carbon/metroid.dm
@@ -11,6 +11,7 @@

 	layer = 5

+	maxHealth = 150
 	health = 150
 	gender = NEUTER

--- a/code/defines/mob/living/silicon/robot.dm
+++ b/code/defines/mob/living/silicon/robot.dm
@@ -2,6 +2,7 @@
 	name = "Cyborg"
 	icon = 'robots.dmi'//
 	icon_state = "robot"
+	maxHealth = 300
 	health = 300

 #define BORGMESON 1
--- a/code/game/dna.dm
+++ b/code/game/dna.dm
@@ -840,7 +840,7 @@
 		dat = text("[]<BR><BR><A href='?src=\ref[];clear=1'>Main Menu</A>", src.temphtml, src)
 	else
 		if (src.connected) //Is something connected?
-			var/mob/occupant = src.connected.occupant
+			var/mob/living/occupant = src.connected.occupant
 			dat = "<font color='blue'><B>Occupant Statistics:</B></FONT><BR>" //Blah obvious
 			if(occupant && occupant.dna) //is there REALLY someone in there?
 				if(NOCLONE in occupant.mutations)
--- a/code/game/gamemodes/changeling/changeling_powers.dm
+++ b/code/game/gamemodes/changeling/changeling_powers.dm
@@ -632,7 +632,7 @@ Tarjan shit, not recoding this -Sieve{R}*/
 	var/list/victims = list()
 	for(var/mob/living/carbon/C in oview(usr.changeling.sting_range))
 		victims += C
-	var/mob/T = input(usr, "Who do you wish to sting?") as null | anything in victims
+	var/mob/living/carbon/T = input(usr, "Who do you wish to sting?") as null | anything in victims
 	if(T && T in view(usr.changeling.sting_range))

 		if(usr.stat)
@@ -650,10 +650,7 @@ Tarjan shit, not recoding this -Sieve{R}*/
 		feedback_add_details("changeling_powers","SS")

 		if(!T.changeling)
-		//	T << "You feel a small prick and a burning sensation in your throat."
 			T.silent += 30
-		//else
-		//	T << "You feel a small prick."

 		usr.verbs -= /client/proc/changeling_silence_sting

@@ -984,7 +981,7 @@ Tarjan shit, not recoding this -Sieve{R}*/
 	var/list/victims = list()
 	for(var/mob/living/carbon/C in oview(usr.changeling.sting_range))
 		victims += C
-	var/mob/T = input(usr, "Who do you wish to sting?") as null | anything in victims
+	var/mob/living/carbon/T = input(usr, "Who do you wish to sting?") as null | anything in victims

 	if(T && T in view(usr.changeling.sting_range))

--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -162,15 +162,17 @@ var/global/datum/controller/gameticker/ticker
 				M.buckled = temp_buckle
 				if(M.client)
 					M.client.screen += cinematic
+
+				var/mob/living/L = M
 				switch(M.z)
 					if(0)	//inside a crate or something
-						var/turf/T = get_turf(M)
+						var/turf/T = get_turf(L)
 						if(T && T.z==1)				//we don't use M.death(0) because it calls a for(/mob) loop and
-							M.health = 0
-							M.stat = DEAD
+							L.health = 0
+							L.stat = DEAD
 					if(1)	//on a z-level 1 turf.
-						M.health = 0
-						M.stat = DEAD
+						L.health = 0
+						L.stat = DEAD

 		//Now animate the cinematic
 		switch(station_missed)
--- a/code/game/gamemodes/wizard/spells.dm
+++ b/code/game/gamemodes/wizard/spells.dm
@@ -17,7 +17,6 @@
 			usr.verbs += /client/proc/blind

 		usr.whisper("STI KALY")
-	//	usr.spellvoice()

 		var/obj/effect/overlay/B = new /obj/effect/overlay( M.loc )
 		B.icon_state = "blspell"
@@ -50,7 +49,6 @@
 	if(!usr.casting()) return

 	usr.say("FORTI GY AMA")
-	usr.spellvoice()

 	for (var/mob/living/M as mob in oview())
 		spawn(0)
@@ -162,7 +160,6 @@
 	var/forcefield

 	usr.whisper("TARCOL MINTI ZHERI")
-//	usr.spellvoice()

 	forcefield =  new /obj/effect/forcefield(locate(usr.x,usr.y,usr.z))
 	spawn (300)
@@ -185,7 +182,6 @@
 		usr.verbs += /client/proc/fireball

 	usr.say("ONI SOMA")
-	//	usr.spellvoice()

 	var/obj/effect/overlay/A = new /obj/effect/overlay( usr.loc )
 	A.icon_state = "fireball"
@@ -220,7 +216,6 @@
 		usr.verbs += /client/proc/knock

 	usr.whisper("AULIE OXIN FIERA")
-//	usr.spellvoice()

 	for(var/obj/machinery/door/G in oview(3))
 		spawn(1)
@@ -242,7 +237,6 @@
 		usr.verbs += /mob/proc/kill

 	usr.say("EI NATH")
-	usr.spellvoice()

 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 	s.set_up(4, 1, M)
@@ -265,7 +259,6 @@
 		usr.verbs += /mob/proc/tech

 	usr.say("NEC CANTIO")
-	usr.spellvoice()
 	empulse(src, 6, 10)
 	return

@@ -328,7 +321,6 @@
 	var/area/thearea = teleportlocs[A]

 	usr.say("SCYAR NILA [uppertext(A)]")
-	usr.spellvoice()

 	var/datum/effect/effect/system/harmless_smoke_spread/smoke = new /datum/effect/effect/system/harmless_smoke_spread()
 	smoke.set_up(5, 0, usr.loc)
@@ -486,7 +478,6 @@
 		usr.verbs += /client/proc/mutate

 	usr.say("BIRUZ BENNAR")
-	usr.spellvoice()

 	usr << text("\blue You feel strong! You feel pressure building behind your eyes!")
 	if (!(HULK in usr.mutations))
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -290,13 +290,3 @@ Made a proc so this is not repeated 14 (or more) times.*/
 		return 0
 	else
 		return 1
-
-/*Checks if the wizard is a mime and male/female.
-Outputs the appropriate voice if the user is not a mime.
-Made a proc here so it's not repeated several times.*/
-/mob/proc/spellvoice()
-//	if(!usr.miming)No longer necessary.
-//	if(usr.gender=="male")
-//		playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
-//	else
-//		playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
--- a/code/game/jobs/jobprocs.dm
+++ b/code/game/jobs/jobprocs.dm
@@ -8,15 +8,20 @@
 	if(usr.stat)
 		usr << "Not when you're incapicated."
 		return
-	if(!usr.miming)
+	if(!ishuman(usr))
+		return
+
+	var/mob/living/carbon/human/H = usr
+
+	if(!H.miming)
 		usr << "You still haven't atoned for your speaking transgression. Wait."
 		return
-	usr.verbs -= /client/proc/mimewall
+	H.verbs -= /client/proc/mimewall
 	spawn(300)
-		usr.verbs += /client/proc/mimewall
-	for (var/mob/V in viewers(usr))
+		H.verbs += /client/proc/mimewall
+	for (var/mob/V in viewers(H))
 		if(V!=usr)
-			V.show_message("[usr] looks as if a wall is in front of them.", 3, "", 2)
+			V.show_message("[H] looks as if a wall is in front of them.", 3, "", 2)
 	usr << "You form a wall in front of yourself."
 	var/obj/effect/forcefield/F =  new /obj/effect/forcefield(locate(usr.x,usr.y,usr.z))
 	F.icon_state = "empty"
@@ -30,10 +35,15 @@
 	set category = "Mime"
 	set name = "Speech"
 	set desc = "Toggle your speech."
-	if(usr.miming)
-		usr.miming = 0
+	if(!ishuman(usr))
+		return
+
+	var/mob/living/carbon/human/H = usr
+
+	if(H.miming)
+		H.miming = 0
 	else
-		usr << "You'll have to wait if you want to atone for your sins."
+		H << "You'll have to wait if you want to atone for your sins."
 		spawn(3000)
-			usr.miming = 1
+			H.miming = 1
 	return
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -3,11 +3,12 @@
 	var/list/turretTargets = list()

 /area/turret_protected/proc/subjectDied(target)
-	if( ismob(target) )
+	if( isliving(target) )
 		if( !issilicon(target) )
-			if( target:stat )
-				if( target in turretTargets )
-					src.Exited(target)
+			var/mob/living/L = target
+			if( L.stat )
+				if( L in turretTargets )
+					src.Exited(L)


 /area/turret_protected/Entered(O)
--- a/code/game/objects/devices/PDA/uplink.dm
+++ b/code/game/objects/devices/PDA/uplink.dm
@@ -1,250 +0,0 @@
-/obj/item/weapon/integrated_uplink
-	name = "uplink module"
-	desc = "An electronic uplink system of unknown origin."
-	icon = 'module.dmi'
-	icon_state = "power_mod"
-	var/uses = 10
-	var/obj/item/device/pda/hostpda = null
-	var/orignote = null //Restore original notes when locked.
-	var/active = 0 //Are we currently active??
-	var/menu_message = ""
-	var/lock_code = "password" //What's the password?
-
-//Communicate with traitor through the PDA's note function.
-/obj/item/weapon/integrated_uplink/proc/print_to_host(var/text)
-	if (isnull(hostpda))
-		return
-	hostpda.note = text
-
-	for (var/mob/M in viewers(1, hostpda.loc))
-		if (M.client && M.machine == hostpda)
-			hostpda.attack_self(M)
-
-	return
-
-//Let's build a menu!
-/obj/item/weapon/integrated_uplink/proc/generate_menu()
-	menu_message = "<B>Syndicate Uplink Console:</B><BR>"
-	menu_message += "Tele-Crystals left: [uses]<BR>"
-	menu_message += "<HR>"
-	menu_message += "<B>Request item:</B><BR>"
-	menu_message += "<I>Each item costs a number of tele-crystals as indicated by the number following their name.</I><BR>"
-	menu_message += "<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=revolver'>Revolver</A> (6)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=revolver_ammo'>Ammo-357</A> for use with Revolver (2)<BR>"
-//	menu_message += "<A href='byond://?src=\ref[src];buy_item=suffocation_revolver_ammo'>Ammo-418</A> for use with Revolver (3)<BR>"	//This was useless and confusing -Pete
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=xbow'>Energy Crossbow</A> (5)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=sword'>Energy Sword</A> (4)<BR>"
-	menu_message += "<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=jump'>Chameleon Jumpsuit</A> (3)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=shoes'>Syndicate Shoes</A> (3)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=card'>Syndicate Card</A> (3)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=voice'>Voice-Changer</A> (4)<BR>"
-	menu_message += "<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=imp_freedom'>Freedom Implant (with injector)</A> (3)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=imp_uplink'>Uplink Implant (5 crystals inside)</A> (10)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=paralysispen'>Paralysis Pen</A> (3)<BR>" //Note that this goes to the updated sleepypen now.
-//	menu_message += "<A href='byond://?src=\ref[src];buy_item=sleepypen'>Sleepy Pen</A> (5)<BR>" //Terrible -Pete.
-	menu_message += "<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=detomatix'>Detomatix Cartridge</A> (3)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=bomb'>Plastic Explosives</A> (2)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=powersink'>Power Sink</A> (5)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=space'>Syndicate-made Space Suit (inludes a helmet)</A> (3)<BR>"
-	menu_message += "<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=projector'>Chameleon-projector</A> (4)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=cloak'>Cloaking Device</A> (4)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=emag'>Electromagnet Card</A> (3)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=empbox'>5 EMP Grenades</A> (4)<BR>"
-	menu_message += "<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=botchat'>Binary Translator</A> (3)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=lawmod'>Hacked AI Module</A> (7)<BR>"
-	menu_message += "<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=singubeacon'>Singularity Beacon</A> (does not include a screwdriver) (7)<BR>"
-	menu_message += "<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=toolbox'>Syndicate Toolbox</A> (Includes various tools) (1)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=soap'>Syndicate Soap</A> (1)<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=balloon'>Syndicate Balloon</A> (Useless) (10)<BR>"
-	menu_message += "<BR>"
-	menu_message += "<A href='byond://?src=\ref[src];buy_item=bundle'>Syndicate Bundle</A> (Contains an assorted selection of syndicate items)(10)<BR>"
-
-	menu_message += "<HR>"
-	return
-
-/obj/item/weapon/integrated_uplink/proc/unlock()
-	if ((isnull(hostpda)) || (active))
-		return
-
-	orignote = hostpda.note
-	active = 1
-	hostpda.mode = 1 //Switch right to the notes program
-
-	generate_menu()
-	print_to_host(menu_message)
-	return
-
-/obj/item/weapon/integrated_uplink/Topic(href, href_list)
-	if ((isnull(hostpda)) || (!active))
-		return
-
-	if (usr.stat || usr.restrained() || !in_range(hostpda, usr))
-		return
-
-	if (href_list["buy_item"])
-		switch(href_list["buy_item"])
-			if("revolver")
-				if (uses >= 6)
-					uses -= 6
-					new /obj/item/weapon/gun/projectile(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","RE")
-			if("revolver_ammo")
-				if (uses >= 2)
-					uses -= 2
-					new /obj/item/ammo_magazine/a357(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","RA")
-			if("suffocation_revolver_ammo")
-				if (uses >= 3)
-					uses -= 3
-					new /obj/item/ammo_magazine/a418(get_turf(hostpda))
-			if("xbow")
-				if (uses >= 5)
-					uses -= 5
-					new /obj/item/weapon/gun/energy/crossbow(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","XB")
-			if("empbox")
-				if (uses >= 4)
-					uses -= 4
-					new /obj/item/weapon/storage/emp_kit(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","EM")
-			if("voice")
-				if (uses >= 4)
-					uses -= 4
-					new /obj/item/clothing/mask/gas/voice(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","VC")
-			if("jump")
-				if (uses >= 3)
-					uses -= 3
-					new /obj/item/clothing/under/chameleon(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","CJ")
-			if("shoes")
-				if (uses >= 3)
-					uses -= 3
-					new /obj/item/clothing/shoes/syndigaloshes(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","SH")
-			if("card")
-				if (uses >= 3)
-					uses -= 3
-					new /obj/item/weapon/card/id/syndicate(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","AC")
-			if("emag")
-				if (uses >= 3)
-					uses -= 3
-					new /obj/item/weapon/card/emag(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","EC")
-			if("imp_freedom")
-				if (uses >= 3)
-					uses -= 3
-					var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(get_turf(hostpda))
-					O.imp = new /obj/item/weapon/implant/freedom(O)
-					feedback_add_details("traitor_uplink_items_bought","FI")
-			if("imp_uplink")
-				if (uses >= 10)
-					uses -= 10
-					var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(get_turf(hostpda))
-					O.imp = new /obj/item/weapon/implant/uplink(O)
-					feedback_add_details("traitor_uplink_items_bought","UI")
-			if("sleepypen")
-				if (uses >= 5)
-					uses -= 5
-					new /obj/item/weapon/pen/sleepypen(get_turf(hostpda))
-			if("paralysispen")
-				if (uses >= 3)
-					uses -= 3
-					new /obj/item/weapon/pen/paralysis(get_turf(src))
-					feedback_add_details("traitor_uplink_items_bought","PP")
-			if("projector")
-				if (uses >= 4)
-					uses -= 4
-					new /obj/item/device/chameleon(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","CP")
-			if("cloak")
-				if (uses >= 4)
-					uses -= 4
-					new /obj/item/weapon/cloaking_device(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","CD")
-			if("sword")
-				if (uses >= 4)
-					uses -= 4
-					new /obj/item/weapon/melee/energy/sword(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","ES")
-			if("bomb")
-				if (uses >= 2)
-					uses -= 2
-					new /obj/item/weapon/plastique(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","C4")
-			if("powersink")
-				if (uses >= 5)
-					uses -= 5
-					new /obj/item/device/powersink(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","PS")
-			if("detomatix")
-				if (uses >= 3)
-					uses -= 3
-					new /obj/item/weapon/cartridge/syndicate(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","DC")
-			if("space")
-				if (uses >= 3)
-					uses -= 3
-					new /obj/item/clothing/suit/space/syndicate(get_turf(hostpda))
-					new /obj/item/clothing/head/helmet/space/syndicate(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","SS")
-			if("lawmod")
-				if (uses >= 7)
-					uses -= 7
-					new /obj/item/weapon/aiModule/syndicate(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","AI")
-			if("botchat")
-				if (uses >= 3)
-					uses -= 3
-					new /obj/item/device/encryptionkey/binary(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","BT")
-			if("singubeacon")
-				if(uses >= 7)
-					uses -= 7
-					new /obj/machinery/singularity_beacon/syndicate(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","SB")
-			if("toolbox")
-				if(uses)
-					uses--
-					new /obj/item/weapon/storage/toolbox/syndicate(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","ST")
-			if("soap")
-				if(uses)
-					uses--
-					new /obj/item/weapon/soap/syndie(get_turf(src))
-					feedback_add_details("traitor_uplink_items_bought","SP")
-			if("balloon")
-				if(uses >= 10)
-					uses -= 10
-					new /obj/item/toy/syndicateballoon(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","BS")
-			if("bundle")
-				if(uses >= 10)
-					uses -= 10
-					new /obj/item/weapon/storage/box/syndicate(get_turf(hostpda))
-					feedback_add_details("traitor_uplink_items_bought","BU")
-
-		generate_menu()
-		print_to_host(menu_message)
-		return
-
-	return
-
-/obj/item/weapon/integrated_uplink/proc/shutdown_uplink()
-	if (isnull(src.hostpda))
-		return
-	active = 0
-	hostpda.note = orignote
-	if (hostpda.mode==1)
-		hostpda.mode = 0
-		hostpda.updateDialog()
-	return
--- a/code/game/objects/items/weapons/cameras.dm
+++ b/code/game/objects/items/weapons/cameras.dm
@@ -106,10 +106,13 @@
 							else
 								holding = "They are holding \a [temp.r_hand]."

-				if(!mob_detail)
-					mob_detail = "You can see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]"
-				else
-					mob_detail += "You can also see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]"
+				if(isliving(A))
+					var/mob/living/L = A
+
+					if(!mob_detail)
+						mob_detail = "You can see [L] on the photo[L.health < 75 ? " - [L] looks hurt":""].[holding ? " [holding]":"."]"
+					else
+						mob_detail += "You can also see [L] on the photo[L.health < 75 ? " - [L] looks hurt":""].[holding ? " [holding]":"."]"

 		else
 			if(itemnumber < 5)
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -46,7 +46,7 @@ KNIFE

 // ROLLING PIN

-/obj/item/weapon/kitchen/rollingpin/attack(mob/M as mob, mob/living/user as mob)
+/obj/item/weapon/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob)
 	if ((CLUMSY in user.mutations) && prob(50))
 		user << "\red The [src] slips out of your hand and hits your head."
 		user.take_organ_damage(10)
@@ -57,23 +57,26 @@ KNIFE

 	log_attack("<font color='red'>[user.name] ([user.ckey]) used the [src.name] to attack [M.name] ([M.ckey])</font>")

-	if (M.stat < 2 && M.health < 50 && prob(90))
-		var/mob/H = M
-		// ******* Check
-		if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80)))
-			M << "\red The helmet protects you from being hit hard in the head!"
-			return
-		var/time = rand(2, 6)
-		if (prob(75))
-			M.Paralyse(time)
-		else
-			M.Stun(time)
-		if(M.stat != 2)	M.stat = 1
-		for(var/mob/O in viewers(M, null))
-			O.show_message(text("\red <B>[] has been knocked unconscious!</B>", M), 1, "\red You hear someone fall.", 2)
-	else
-		M << text("\red [] tried to knock you unconcious!",user)
-		M.eye_blurry += 3
+	var/t = user:zone_sel.selecting
+	if (t == "head")
+		if(ishuman(M))
+			var/mob/living/carbon/human/H = M
+			if (H.stat < 2 && H.health < 50 && prob(90))
+				// ******* Check
+				if (istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80))
+					H << "\red The helmet protects you from being hit hard in the head!"
+					return
+				var/time = rand(2, 6)
+				if (prob(75))
+					H.Paralyse(time)
+				else
+					H.Stun(time)
+				if(H.stat != 2)	H.stat = 1
+				for(var/mob/O in viewers(H, null))
+					O.show_message(text("\red <B>[] has been knocked unconscious!</B>", H), 1, "\red You hear someone fall.", 2)
+			else
+				H << text("\red [] tried to knock you unconscious!",user)
+				H.eye_blurry += 3

 	return

--- a/code/game/objects/items/weapons/uplinks.dm
+++ b/code/game/objects/items/weapons/uplinks.dm
@@ -1,271 +0,0 @@
-/*
-CONTAINS:
-SYNDICATE UPLINK
-*/
-
-/obj/item/weapon/syndicate_uplink/implanted
-	uses = 5
-
-/obj/item/weapon/syndicate_uplink/proc/explode()
-	var/turf/location = get_turf(src.loc)
-	if(location)
-		location.hotspot_expose(700,125)
-
-		explosion(location, 0, 0, 2, 4)
-
-	del(src.master)
-	del(src)
-	return
-
-/obj/item/weapon/syndicate_uplink/attack_self(mob/user as mob)
-	currentUser = user
-	user.machine = src
-	var/dat
-	if (src.selfdestruct)
-		dat = "Self Destructing..."
-	else
-		if (src.temp)
-			dat = "[src.temp]<BR><BR><A href='byond://?src=\ref[src];temp=1'>Clear</A>"
-		else
-			dat = "<B>Syndicate Uplink Access:</B><BR>"
-			dat += "Tele-Crystals left: [src.uses]<BR>"
-			dat += "<HR>"
-			dat += "<B>Request item:</B><BR>"
-			dat += "<I>Each item costs a number of tele-crystals as indicated by the number following their name.</I><BR>"
-			dat += "<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=revolver'>Revolver</A> (6)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=revolver_ammo'>Ammo-357</A> for use with Revolver (2)<BR>"
-//			dat += "<A href='byond://?src=\ref[src];buy_item=suffocation_revolver_ammo'>Ammo-418</A> for use with Revolver (3)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=xbow'>Energy Crossbow</A> (5)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=sword'>Energy Sword</A> (4)<BR>"
-			dat += "<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=jump'>Chameleon Jumpsuit</A> (3)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=shoes'>Syndicate Shoes</A> (3)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=card'>Syndicate Card</A> (3)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=voice'>Voice-Changer</A> (4)<BR>"
-			dat += "<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=imp_freedom'>Freedom Implant (with injector)</A> (3)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=paralysispen'>Paralysis Pen</A> (3)<BR>" //Note that this goes to the updated sleepypen now.
-//			dat += "<A href='byond://?src=\ref[src];buy_item=sleepypen'>Sleepy Pen</A> (5)<BR>" //Terrible -Pete.
-			dat += "<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=detomatix'>Detomatix Cartridge</A> (3)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=bomb'>Plastic Explosives</A> (2)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=powersink'>Power Sink</A> (5)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=space'>Syndicate-made Space Suit (inludes a helmet)</A> (3)<BR>"
-			dat += "<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=projector'>Chameleon-projector</A> (4)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=cloak'>Cloaking Device</A> (4)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=emag'>Electromagnet Card</A> (3)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=empbox'>5 EMP Grenades</A> (4)<BR>"
-			dat += "<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=botchat'>Binary Translator</A> (3)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=lawmod'>Hacked AI Module</A> (7)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=teleport'>Teleporter Circuit Board</A> (10)<BR>"
-			dat += "<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=toolbox'>Syndicate Toolbox</A> (Includes various tools) (1)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=soap'>Syndicate Soap</A> (1)<BR>"
-			dat += "<A href='byond://?src=\ref[src];buy_item=balloon'>Syndicate Balloon</A> (Useless) (10)<BR>"
-			dat += "<HR>"
-			if (src.origradio)
-				dat += "<A href='byond://?src=\ref[src];lock=1'>Lock</A><BR>"
-				dat += "<HR>"
-			dat += "<A href='byond://?src=\ref[src];selfdestruct=1'>Self-Destruct</A>"
-	user << browse(dat, "window=radio")
-	onclose(user, "radio")
-	return
-
-/obj/item/weapon/syndicate_uplink/Topic(href, href_list)
-	..()
-	if(!currentUser)
-		return
-	if (currentUser.stat || currentUser.restrained())
-		return
-	if (!( istype(currentUser, /mob/living/carbon/human)))
-		return
-	if ((currentUser.contents.Find(src) || (in_range(src, currentUser) && istype(src.loc, /turf))) || istype(src,/obj/item/weapon/syndicate_uplink/implanted))
-		currentUser.machine = src
-		if (href_list["buy_item"])
-			switch(href_list["buy_item"])
-				if("revolver")
-					if (src.uses >= 6)
-						src.uses -= 6
-						new /obj/item/weapon/gun/projectile(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","RE")
-				if("revolver_ammo")
-					if (src.uses >= 2)
-						src.uses -= 2
-						new /obj/item/ammo_magazine/a357(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","RA")
-				if("suffocation_revolver_ammo")
-					if (src.uses >= 3)
-						src.uses -= 3
-						new /obj/item/ammo_magazine/a418(get_turf(src))
-				if("xbow")
-					if (src.uses >= 5)
-						src.uses -= 5
-						new /obj/item/weapon/gun/energy/crossbow(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","XB")
-				if("empbox")
-					if (src.uses >= 4)
-						src.uses -= 4
-						new /obj/item/weapon/storage/emp_kit(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","EM")
-				if("voice")
-					if (src.uses >= 4)
-						src.uses -= 4
-						new /obj/item/clothing/mask/gas/voice(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","VC")
-				if("jump")
-					if (src.uses >= 3)
-						src.uses -= 3
-						new /obj/item/clothing/under/chameleon(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","CJ")
-				if("shoes")
-					if (uses >= 3)
-						uses -= 3
-						new /obj/item/clothing/shoes/syndigaloshes(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","SH")
-				if("card")
-					if (src.uses >= 3)
-						src.uses -= 3
-						new /obj/item/weapon/card/id/syndicate(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","AC")
-				if("emag")
-					if (src.uses >= 3)
-						src.uses -= 3
-						new /obj/item/weapon/card/emag(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","EC")
-				if("imp_freedom")
-					if (src.uses >= 3)
-						src.uses -= 3
-						var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(get_turf(src))
-						O.imp = new /obj/item/weapon/implant/freedom(O)
-						feedback_add_details("traitor_uplink_items_bought","FI")
-				if("sleepypen")
-					if (src.uses >= 5)
-						src.uses -= 5
-						new /obj/item/weapon/pen/sleepypen(get_turf(src))
-				if("paralysispen")
-					if (src.uses >= 3)
-						src.uses -= 3
-						new /obj/item/weapon/pen/paralysis(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","PP")
-				if("projector")
-					if (src.uses >= 4)
-						src.uses -= 4
-						new /obj/item/device/chameleon(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","CP")
-				if("lawmod")
-					if (src.uses >= 7)
-						src.uses -= 7
-						new /obj/item/weapon/aiModule/syndicate(get_turf(src))
-				if("cloak")
-					if (src.uses >= 4)
-						if (ticker.mode.config_tag!="nuclear" || \
-							(input(currentUser,"Spawning a cloak in nuke is generally regarded as entirely dumb, are you sure?") in list("Confirm", "Abort")) == "Confirm" \
-						)
-							if (src.uses >= 4)
-								src.uses -= 4
-								new /obj/item/weapon/cloaking_device(get_turf(src))
-								feedback_add_details("traitor_uplink_items_bought","CD")
-				if("sword")
-					if (src.uses >= 4)
-						src.uses -= 4
-						new /obj/item/weapon/melee/energy/sword(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","ES")
-				if("bomb")
-					if (src.uses >= 2)
-						src.uses -= 2
-						new /obj/item/weapon/plastique(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","C4")
-				if("powersink")
-					if (src.uses >= 5)
-						src.uses -= 5
-						new /obj/item/device/powersink(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","PS")
-				if("detomatix")
-					if (src.uses >= 3)
-					 src.uses -= 3
-					 new /obj/item/weapon/cartridge/syndicate(get_turf(src))
-					 feedback_add_details("traitor_uplink_items_bought","DC")
-				if("space")
-					if (src.uses >= 3)
-					 src.uses -= 3
-					 new /obj/item/clothing/suit/space/syndicate(get_turf(src))
-					 new /obj/item/clothing/head/helmet/space/syndicate(get_turf(src))
-					 feedback_add_details("traitor_uplink_items_bought","SS")
-				if("botchat")
-					if (src.uses >= 3)
-						src.uses -= 3
-						new /obj/item/device/radio/headset/binary(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","BT")
-				if("toolbox")
-					if(uses)
-						uses--
-						new /obj/item/weapon/storage/toolbox/syndicate(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","ST")
-				if("soap")
-					if(uses)
-						uses--
-						new /obj/item/weapon/soap/syndie(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","SP")
-				if("balloon")
-					if (src.uses >= 10)
-						uses -= 10
-						new /obj/item/toy/syndicateballoon(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","BS")
-				if("teleport")
-					if (src.uses >= 10)
-						uses -= 10
-						new /obj/item/weapon/circuitboard/teleporter(get_turf(src))
-						feedback_add_details("traitor_uplink_items_bought","TP")
-		else if (href_list["lock"] && src.origradio)
-			// presto chango, a regular radio again! (reset the freq too...)
-			shutdown_uplink()
-			return
-		else if (href_list["selfdestruct"])
-			src.temp = "<A href='byond://?src=\ref[src];selfdestruct2=1'>Self-Destruct</A>"
-		else if (href_list["selfdestruct2"])
-			src.selfdestruct = 1
-			spawn (100)
-				explode()
-				return
-		else
-			if (href_list["temp"])
-				src.temp = null
-		if (istype(src.loc, /mob))
-			attack_self(src.loc)
-		else
-			for(var/mob/M in viewers(1, src))
-				if (M.client)
-					src.attack_self(M)
-	return
-
-/obj/item/weapon/syndicate_uplink/proc/shutdown_uplink()
-	if (!src.origradio)
-		return
-	var/list/nearby = viewers(1, src)
-	for(var/mob/M in nearby)
-		if (M.client && M.machine == src)
-			M << browse(null, "window=radio")
-			M.machine = null
-
-	var/obj/item/device/radio/T = src.origradio
-	var/obj/item/weapon/syndicate_uplink/R = src
-	var/mob/L = src.loc
-	R.loc = T
-	T.loc = L
-	// R.layer = initial(R.layer)
-	R.layer = 0
-	if (istype(L))
-		if (L.client)
-			L.client.screen -= R
-		if (L.r_hand == R)
-			L.u_equip(R)
-			L.r_hand = T
-		else
-			L.u_equip(R)
-			L.l_hand = T
-		T.layer = 20
-	T.set_frequency(initial(T.frequency))
-	return
--- a/code/game/objects/items/weapons/wrappingpaper.dm
+++ b/code/game/objects/items/weapons/wrappingpaper.dm
@@ -50,20 +50,22 @@ PHOTOGRAPHS

 /obj/item/weapon/wrapping_paper/attack(mob/target as mob, mob/user as mob)
 	if (!istype(target, /mob/living/carbon/human)) return
-	if (istype(target:wear_suit, /obj/item/clothing/suit/straight_jacket) || target:stat)
+	var/mob/living/carbon/human/H = target
+
+	if (istype(H.wear_suit, /obj/item/clothing/suit/straight_jacket) || H.stat)
 		if (src.amount > 2)
-			var/obj/effect/spresent/present = new /obj/effect/spresent (target:loc)
+			var/obj/effect/spresent/present = new /obj/effect/spresent (H.loc)
 			src.amount -= 2

-			if (target:client)
-				target:client:perspective = EYE_PERSPECTIVE
-				target:client:eye = present
+			if (H.client)
+				H.client.perspective = EYE_PERSPECTIVE
+				H.client.eye = present

-			target:loc = present
-			target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been wrapped with [src.name]  by [user.name] ([user.ckey])</font>")
-			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to wrap [target.name] ([target.ckey])</font>")
+			H.loc = present
+			H.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been wrapped with [src.name]  by [user.name] ([user.ckey])</font>")
+			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to wrap [H.name] ([H.ckey])</font>")

-			log_attack("<font color='red'>[user.name] ([user.ckey]) used the [src.name] to wrap [target.name] ([target.ckey])</font>")
+			log_attack("<font color='red'>[user.name] ([user.ckey]) used the [src.name] to wrap [H.name] ([H.ckey])</font>")

 		else
 			user << "\blue You need more paper."
--- a/code/game/objects/secstorage/sbriefcase.dm
+++ b/code/game/objects/secstorage/sbriefcase.dm
@@ -30,22 +30,24 @@

 	var/t = user:zone_sel.selecting
 	if (t == "head")
-		if (M.stat < 2 && M.health < 50 && prob(90))
-			var/mob/H = M
-		// ******* Check
-			if ((istype(H, /mob/living/carbon/human) && istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80)))
-				M << "\red The helmet protects you from being hit hard in the head!"
-				return
-			var/time = rand(2, 6)
-			if (prob(75))
-				M.Paralyse(time)
+
+		if(ishuman(M))
+			var/mob/living/carbon/human/H = M
+			if (H.stat < 2 && H.health < 50 && prob(90))
+			// ******* Check
+				if (istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80))
+					H << "\red The helmet protects you from being hit hard in the head!"
+					return
+				var/time = rand(2, 6)
+				if (prob(75))
+					H.Paralyse(time)
+				else
+					H.Stun(time)
+				if(H.stat != 2)	H.stat = 1
+				for(var/mob/O in viewers(H, null))
+					O.show_message(text("\red <B>[] has been knocked unconscious!</B>", H), 1, "\red You hear someone fall.", 2)
 			else
-				M.Stun(time)
-			if(M.stat != 2)	M.stat = 1
-			for(var/mob/O in viewers(M, null))
-				O.show_message(text("\red <B>[] has been knocked unconscious!</B>", M), 1, "\red You hear someone fall.", 2)
-		else
-			M << text("\red [] tried to knock you unconcious!",user)
-			M.eye_blurry += 3
+				H << text("\red [] tried to knock you unconcious!",user)
+				H.eye_blurry += 3

 	return
--- a/code/game/objects/storage/briefcase.dm
+++ b/code/game/objects/storage/briefcase.dm
@@ -8,7 +8,7 @@
 	new /obj/item/weapon/paper(src)
 	new /obj/item/weapon/pen(src)

-/obj/item/weapon/storage/briefcase/attack(mob/M as mob, mob/living/user as mob)
+/obj/item/weapon/storage/briefcase/attack(mob/living/M as mob, mob/living/user as mob)
 	//..()

 	if ((CLUMSY in user.mutations) && prob(50))
--- a/code/game/verbs/suicide.dm
+++ b/code/game/verbs/suicide.dm
@@ -69,6 +69,10 @@

 	var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No")

+	if(alien_egg_flag)
+		src << "The alien inside you forces you to breathe, preventing you from suiciding."
+		return
+
 	if(confirm == "Yes")
 		suiciding = 1
 		//instead of killing them instantly, just put them at -175 health and let 'em gasp for a while
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -1225,7 +1225,7 @@ datum
 			reagent_state = LIQUID
 			color = "#C8A5DC" // rgb: 200, 165, 220

-			on_mob_life(var/mob/living/M as mob)
+			on_mob_life(var/mob/living/carbon/M as mob)
 				if(!M) M = holder.my_atom ///This can even heal dead people.
 				M.setCloneLoss(0)
 				M.setOxyLoss(0)
@@ -1468,7 +1468,7 @@ datum
 			description = "A strong neurotoxin that puts the subject into a death-like state."
 			color = "#669900" // rgb: 102, 153, 0

-			on_mob_life(var/mob/living/M as mob)
+			on_mob_life(var/mob/living/carbon/M as mob)
 				if(!M) M = holder.my_atom
 				M.adjustOxyLoss(0.5)
 				M.adjustToxLoss(0.5)
@@ -3821,7 +3821,7 @@ datum
 			reagent_state = LIQUID
 			color = "#2E2E61" // rgb: 46, 46, 97

-			on_mob_life(var/mob/living/M as mob)
+			on_mob_life(var/mob/living/carbon/M as mob)
 				if(!M) M = holder.my_atom
 				M.adjustOxyLoss(0.5)
 				M.adjustOxyLoss(0.5)
--- a/code/modules/mob/living/carbon/alien/humanoid/life.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm
@@ -72,17 +72,17 @@
 /mob/living/carbon/alien/humanoid
 	proc/handle_disabilities()
 		if (disabilities & 2)
-			if ((prob(1) && paralysis < 10 && r_epil < 1))
+			if ((prob(1) && paralysis < 10))
 				src << "\red You have a seizure!"
 				Paralyse(10)
 		if (disabilities & 4)
-			if ((prob(5) && paralysis <= 1 && r_ch_cou < 1))
+			if ((prob(5) && paralysis <= 1))
 				drop_item()
 				spawn( 0 )
 					emote("cough")
 					return
 		if (disabilities & 8)
-			if ((prob(10) && paralysis <= 1 && r_Tourette < 1))
+			if ((prob(10) && paralysis <= 1))
 				Stun(10)
 				spawn( 0 )
 					emote("twitch")
--- a/code/modules/mob/living/carbon/alien/say.dm
+++ b/code/modules/mob/living/carbon/alien/say.dm
@@ -5,6 +5,9 @@

 /mob/living/carbon/alien/say(var/message)

+	if (silent)
+		return
+
 	if (length(message) >= 2)
 		if (copytext(message, 1, 3) == ":a")
 			message = copytext(message, 3)
--- a/code/modules/mob/living/carbon/brain/say.dm
+++ b/code/modules/mob/living/carbon/brain/say.dm
@@ -1,4 +1,7 @@
 /mob/living/carbon/brain/say(var/message)
+	if (silent)
+		return
+
 	if(!(container && istype(container, /obj/item/device/mmi)))
 		return //No MMI, can't speak, bucko./N
 	else	..()
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -0,0 +1,4 @@
+/mob/living/carbon
+
+	var/silent = null 		//Can't talk. Value goes down every life proc.
+	var/alien_egg_flag = 0	//Have you been infected with an alien egg? Used by Human and Monkey.
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -6,48 +6,6 @@
 	icon_state = "body_m_s"


-	var/r_hair = 0.0
-	var/g_hair = 0.0
-	var/b_hair = 0.0
-	var/h_style = "Short Hair"
-	var/datum/sprite_accessory/hair/hair_style
-	var/r_facial = 0.0
-	var/g_facial = 0.0
-	var/b_facial = 0.0
-	var/f_style = "Shaved"
-	var/datum/sprite_accessory/facial_hair/facial_hair_style
-	var/r_eyes = 0.0
-	var/g_eyes = 0.0
-	var/b_eyes = 0.0
-	var/s_tone = 0.0
-	var/age = 30.0
-	var/b_type = "A+"
-
-	var/obj/item/wear_suit = null
-	var/obj/item/w_uniform = null
-	var/obj/item/shoes = null
-	var/obj/item/belt = null
-	var/obj/item/gloves = null
-	var/obj/item/glasses = null
-	var/obj/item/head = null
-	var/obj/item/ears = null
-	var/obj/item/weapon/card/id/wear_id = null
-	var/obj/item/r_store = null
-	var/obj/item/l_store = null
-	var/obj/item/s_store = null
-
-	var/icon/stand_icon = null
-	var/icon/lying_icon = null
-
-	var/hair_icon_state = "hair_a"
-	var/face_icon_state = "bald"
-
-
-	var/mutantrace = null
-
-	var/list/organs = list()
-
-
 /mob/living/carbon/human/dummy
 	real_name = "Test Dummy"
 	nodamage = 1
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -0,0 +1,54 @@
+/mob/living/carbon/human
+
+	//Hair colour and style
+	var/r_hair = 0.0
+	var/g_hair = 0.0
+	var/b_hair = 0.0
+	var/h_style = "Short Hair"
+	var/datum/sprite_accessory/hair/hair_style
+	var/hair_icon_state = "hair_a"
+
+	//Facial hair colour and style
+	var/r_facial = 0.0
+	var/g_facial = 0.0
+	var/b_facial = 0.0
+	var/f_style = "Shaved"
+	var/datum/sprite_accessory/facial_hair/facial_hair_style
+	var/face_icon_state = "bald"
+
+	//Eye colour
+	var/r_eyes = 0.0
+	var/g_eyes = 0.0
+	var/b_eyes = 0.0
+
+	var/s_tone = 0.0	//Skin tone
+
+	var/age = 30.0		//Player's age (pure fluff)
+	var/b_type = "A+"	//Player's bloodtype (Not currently used, just character fluff)
+
+	var/underwear = 1	//Which underwear the player wants
+	var/backbag = 2		//Which backpack type the player has chosen. Nothing, Satchel or Backpack.
+
+	//Equipment slots
+	var/obj/item/wear_suit = null
+	var/obj/item/w_uniform = null
+	var/obj/item/shoes = null
+	var/obj/item/belt = null
+	var/obj/item/gloves = null
+	var/obj/item/glasses = null
+	var/obj/item/head = null
+	var/obj/item/ears = null
+	var/obj/item/weapon/card/id/wear_id = null
+	var/obj/item/r_store = null
+	var/obj/item/l_store = null
+	var/obj/item/s_store = null
+
+
+	var/icon/stand_icon = null
+	var/icon/lying_icon = null
+
+	var/mutantrace = null //The type of mutant race the player is if applicable (i.e. potato-man)
+
+	var/list/organs = list()
+
+	var/miming = null //Toggle for the mime's abilities.
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -112,7 +112,7 @@

 	proc/handle_disabilities()
 		if (disabilities & 2)
-			if ((prob(1) && paralysis < 1 && r_epil < 1))
+			if ((prob(1) && paralysis < 1))
 				src << "\red You have a seizure!"
 				for(var/mob/O in viewers(src, null))
 					if(O == src)
@@ -121,13 +121,13 @@
 				Paralyse(10)
 				make_jittery(1000)
 		if (disabilities & 4)
-			if ((prob(5) && paralysis <= 1 && r_ch_cou < 1))
+			if ((prob(5) && paralysis <= 1))
 				drop_item()
 				spawn( 0 )
 					emote("cough")
 					return
 		if (disabilities & 8)
-			if ((prob(10) && paralysis <= 1 && r_Tourette < 1))
+			if ((prob(10) && paralysis <= 1))
 				Stun(10)
 				spawn( 0 )
 					switch(rand(1, 3))
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -1,7 +1,17 @@
 /mob/living/carbon/human/say(var/message)
+
+	if (silent)
+		return
+
+	//Mimes dont speak!
+	if (length(message) >= 1)
+		if (miming && copytext(message, 1, 2) != "*")
+			return
+
 	if(src.mutantrace == "lizard")
 		if(copytext(message, 1, 2) != "*")
 			message = dd_replaceText(message, "s", stutter("ss"))
+
 	if(src.mutantrace == "metroid" && prob(5))
 		if(copytext(message, 1, 2) != "*")
 			if(copytext(message, 1, 2) == ";")
--- a/code/modules/mob/living/carbon/metroid/say.dm
+++ b/code/modules/mob/living/carbon/metroid/say.dm
@@ -1,3 +1,9 @@
+/mob/living/carbon/metroid/say(var/message)
+	if (silent)
+		return
+	else
+		return ..()
+
 /mob/living/carbon/metroid/say_quote(var/text)
 	var/ending = copytext(text, length(text))

--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -82,17 +82,17 @@
 	proc/handle_disabilities()

 		if (disabilities & 2)
-			if ((prob(1) && paralysis < 10 && r_epil < 1))
+			if ((prob(1) && paralysis < 10))
 				src << "\red You have a seizure!"
 				Paralyse(10)
 		if (disabilities & 4)
-			if ((prob(5) && paralysis <= 1 && r_ch_cou < 1))
+			if ((prob(5) && paralysis <= 1))
 				drop_item()
 				spawn( 0 )
 					emote("cough")
 					return
 		if (disabilities & 8)
-			if ((prob(10) && paralysis <= 1 && r_Tourette < 1))
+			if ((prob(10) && paralysis <= 1))
 				Stun(10)
 				spawn( 0 )
 					emote("twitch")
--- a/code/modules/mob/living/carbon/monkey/say.dm
+++ b/code/modules/mob/living/carbon/monkey/say.dm
@@ -1,2 +1,8 @@
+/mob/living/carbon/monkey/say(var/message)
+	if (silent)
+		return
+	else
+		return ..()
+
 /mob/living/carbon/monkey/say_quote(var/text)
 	return "[src.say_message], \"[text]\"";
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -142,6 +142,12 @@
 /mob/living/proc/setHalLoss(var/amount)
 	halloss = amount

+/mob/living/proc/getMaxHealth()
+	return maxHealth
+
+/mob/living/proc/setMaxHealth(var/newMaxHealth)
+	maxHealth = newMaxHealth
+
 // ++++ROCKDTBEN++++ MOB PROCS //END


--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -1,7 +1,10 @@
 /mob/living

+	//Health and life related vars
+	var/maxHealth = 100 //Maximum health that should be possible.
+	var/health = 100 	//A mob's health

-	//Vars that should only be accessed via procs
+	//Damage related vars, NOTE: THESE SHOULD ONLY BE MODIFIED BY PROCS
 	var/bruteloss = 0.0	//Brutal damage caused by brute force (punching, being clubbed by a toolbox ect... this also accounts for pressure damage)
 	var/oxyloss = 0.0	//Oxygen depravation damage (no air in lungs)
 	var/toxloss = 0.0	//Toxic damage caused by being poisoned or radiated
@@ -9,9 +12,13 @@
 	var/cloneloss = 0	//Damage caused by being cloned or ejected from the cloner early. Metroids also deal cloneloss damage to victims
 	var/brainloss = 0	//'Retardation' damage caused by someone hitting you in the head with a bible or being infected with brainrot.
 	var/halloss = 0		//Hallucination damage. 'Fake' damage obtained through hallucinating or the holodeck. Sleeping should cause it to wear off.
-	//Vars that should only be accessed via procs ++END
+

 	var/hallucination = 0 //Directly affects how long a mob will hallucinate for
 	var/list/atom/hallucinations = list() //A list of hallucinated people that try to attack the mob. See /obj/effect/fake_attacker in hallucinations.dm

-	var/last_special = 0 //Used by the resist verb, likely used to prevent players from bypassing next_move by logging in/out.
+
+	var/last_special = 0 //Used by the resist verb, likely used to prevent players from bypassing next_move by logging in/out.
+
+	//Allows mobs to move through dense areas without restriction. For instance, in space or out of holder objects.
+	var/incorporeal_move = 0 //0 is off, 1 is normal, 2 is for ninjas.
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -82,16 +82,9 @@ var/list/department_radio_keys = list(
 	if (!message)
 		return

-	if (length(message) >= 1)
-		if (miming && copytext(message, 1, 2) != "*")
-			return
-
 	if (stat == 2)
 		return say_dead(message)

-	if (silent)
-		return
-
 	if (src.client)
 		if(client.muted_ic)
 			src << "\red You cannot speak in IC (muted by admins)."
@@ -249,6 +242,7 @@ var/list/department_radio_keys = list(
 				used_radios += src:radio
 			message_range = 1
 			italics = 1
+
 		if("changeling")
 			if(src.changeling)
 				for(var/mob/aChangeling in world)
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -68,8 +68,6 @@
 			message = "<B>[src]</B> [input]"

 		if ("me")
-			if(silent)
-				return
 			if (src.client)
 				if(client.muted_ic)
 					src << "You cannot send IC messages (muted by admins)."
--- a/code/modules/mob/living/simple_animal/behemoth.dm
+++ b/code/modules/mob/living/simple_animal/behemoth.dm
@@ -0,0 +1,126 @@
+/mob/living/simple_animal/constructbehemoth
+	name = "Behemoth"
+	real_name = "Behemoth"
+	original_name = "Behemoth"
+	desc = "The pinnacle of occult technology, Behemoths are the ultimate weapon in the Cult of Nar-Sie's arsenal."
+	icon = 'mob.dmi'
+	icon_state = "behemoth"
+	icon_living = "behemoth"
+	icon_dead = "shade_dead"
+	maxHealth = 750
+	health = 750
+	speak_emote = list("rumbles")
+	emote_hear = list("wails","screeches")
+	response_help  = "thinks better of touching"
+	response_disarm = "flails at"
+	response_harm   = "harmlessly punches the"
+	harm_intent_damage = 0
+	melee_damage_lower = 50
+	melee_damage_upper = 50
+	attacktext = "brutally crushes"
+	minbodytemp = 0
+	maxbodytemp = 4000
+	min_oxy = 0
+	max_co2 = 0
+	max_tox = 0
+	speed = 5
+	wall_smash = 1
+	nopush = 1
+	a_intent = "harm"
+	stop_automated_movement = 1
+	canstun = 0
+	canweaken = 0
+	var/energy = 0
+	var/max_energy = 1000
+
+
+	Life()
+		..()
+		if(stat == 2)
+			new /obj/item/weapon/ectoplasm (src.loc)
+			for(var/mob/M in viewers(src, null))
+				if((M.client && !( M.blinded )))
+					M.show_message("\red [src] collapses in a shattered heap ")
+					ghostize(0)
+			del src
+			return
+
+/mob/living/simple_animal/constructbehemoth/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(O.force)
+		if(O.force >= 11)
+			health -= O.force
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
+		else
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red \b The [O] bounces harmlessly off of [src]. ")
+	else
+		usr << "\red This weapon is ineffective, it does no damage."
+		for(var/mob/M in viewers(src, null))
+			if ((M.client && !( M.blinded )))
+				M.show_message("\red [user] gently taps [src] with the [O]. ")
+
+
+/mob/living/simple_animal/constructbehemoth/Bump(atom/movable/AM as mob|obj, yes)
+
+	spawn( 0 )
+		if ((!( yes ) || now_pushing))
+			return
+		now_pushing = 1
+		if(ismob(AM))
+			var/mob/tmob = AM
+			if(tmob.nopush)
+				now_pushing = 0
+				return
+
+			tmob.LAssailant = src
+		now_pushing = 0
+		..()
+		if (!( istype(AM, /atom/movable) ))
+			return
+		if (!( now_pushing ))
+			now_pushing = 1
+			if (!( AM.anchored ))
+				var/t = get_dir(src, AM)
+				if (istype(AM, /obj/structure/window))
+					if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
+						for(var/obj/structure/window/win in get_step(AM,t))
+							now_pushing = 0
+							return
+				step(AM, t)
+			now_pushing = null
+		return
+	return
+
+
+////////////////Powers//////////////////
+
+
+/*
+/client/proc/summon_cultist()
+	set category = "Behemoth"
+	set name = "Summon Cultist (300)"
+	set desc = "Teleport a cultist to your location"
+	if (istype(usr,/mob/living/simple_animal/constructbehemoth))
+
+		if(usr.energy<300)
+			usr << "\red You do not have enough power stored!"
+			return
+
+		if(usr.stat)
+			return
+
+		usr.energy -= 300
+	var/list/mob/living/cultists = new
+	for(var/datum/mind/H in ticker.mode.cult)
+		if (istype(H.current,/mob/living))
+			cultists+=H.current
+			var/mob/cultist = input("Choose the one who you want to summon", "Followers of Geometer") as null|anything in (cultists - usr)
+			if(!cultist)
+				return
+			if (cultist == usr) //just to be sure.
+				return
+			cultist.loc = usr.loc
+			usr.visible_message("/red [cultist] appears in a flash of red light as [usr] glows with power")*/
--- a/code/modules/mob/living/simple_animal/cat.dm
+++ b/code/modules/mob/living/simple_animal/cat.dm
@@ -0,0 +1,27 @@
+//Cat
+/mob/living/simple_animal/cat
+	name = "cat"
+	desc = "Kitty!!"
+	icon = 'mob.dmi'
+	icon_state = "cat"
+	icon_living = "cat"
+	icon_dead = "cat_dead"
+	speak = list("Meow!","Esp!","Purr!","HSSSSS")
+	speak_emote = list("purrs", "meows")
+	emote_hear = list("meows","mews")
+	emote_see = list("shakes its head", "shivers")
+	speak_chance = 1
+	turns_per_move = 5
+	see_in_dark = 6
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	response_help  = "pets the"
+	response_disarm = "gently pushes aside the"
+	response_harm   = "kicks the"
+
+//RUNTIME IS ALIVE! SQUEEEEEEEE~
+/mob/living/simple_animal/cat/Runtime
+	name = "Runtime"
+	desc = ""
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -0,0 +1,351 @@
+
+/////////////////Juggernaut///////////////
+
+/mob/living/simple_animal/constructarmoured
+	name = "Juggernaut"
+	real_name = "Juggernaut"
+	original_name = "Juggernaut"
+	desc = "A possessed suit of armour driven by the will of the restless dead"
+	icon = 'mob.dmi'
+	icon_state = "armour"
+	icon_living = "armour"
+	icon_dead = "shade_dead"
+	maxHealth = 250
+	health = 250
+	speak_emote = list("hisses")
+	emote_hear = list("wails","screeches")
+	response_help  = "thinks better of touching"
+	response_disarm = "flails at"
+	response_harm   = "harmlessly punches the"
+	harm_intent_damage = 0
+	melee_damage_lower = 30
+	melee_damage_upper = 30
+	attacktext = "smashes their armoured gauntlet into"
+	minbodytemp = 0
+	maxbodytemp = 4000
+	min_oxy = 0
+	max_co2 = 0
+	max_tox = 0
+	speed = 3
+	wall_smash = 1
+	nopush = 1
+	a_intent = "harm"
+	stop_automated_movement = 1
+	canstun = 0
+	canweaken = 0
+
+
+	Life()
+		..()
+		if(stat == 2)
+			new /obj/item/weapon/ectoplasm (src.loc)
+			for(var/mob/M in viewers(src, null))
+				if((M.client && !( M.blinded )))
+					M.show_message("\red [src] collapses in a shattered heap ")
+					ghostize(0)
+			del src
+			return
+
+/mob/living/simple_animal/constructarmoured/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(O.force)
+		if(O.force >= 11)
+			health -= O.force
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
+		else
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red \b The [O] bounces harmlessly off of [src]. ")
+	else
+		usr << "\red This weapon is ineffective, it does no damage."
+		for(var/mob/M in viewers(src, null))
+			if ((M.client && !( M.blinded )))
+				M.show_message("\red [user] gently taps [src] with the [O]. ")
+
+
+/mob/living/simple_animal/constructarmoured/Bump(atom/movable/AM as mob|obj, yes)
+
+	spawn( 0 )
+		if ((!( yes ) || now_pushing))
+			return
+		now_pushing = 1
+		if(ismob(AM))
+			var/mob/tmob = AM
+			if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
+				if(prob(5))
+					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
+					now_pushing = 0
+					return
+			if(tmob.nopush)
+				now_pushing = 0
+				return
+
+			tmob.LAssailant = src
+		now_pushing = 0
+		..()
+		if (!( istype(AM, /atom/movable) ))
+			return
+		if (!( now_pushing ))
+			now_pushing = 1
+			if (!( AM.anchored ))
+				var/t = get_dir(src, AM)
+				if (istype(AM, /obj/structure/window))
+					if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
+						for(var/obj/structure/window/win in get_step(AM,t))
+							now_pushing = 0
+							return
+				step(AM, t)
+			now_pushing = null
+		return
+	return
+
+
+/mob/living/simple_animal/constructarmoured/attack_animal(mob/living/simple_animal/M as mob)
+	if(istype(M, /mob/living/simple_animal/constructbuilder))
+		health += 10
+		M.emote("mends some of \the <EM>[src]'s</EM> wounds")
+	else
+		if(M.melee_damage_upper <= 0)
+			M.emote("[M.friendly] \the <EM>[src]</EM>")
+		else
+			for(var/mob/O in viewers(src, null))
+				O.show_message("<span class='attack'>\The <EM>[M]</EM> [M.attacktext] \the <EM>[src]</EM>!</span>", 1)
+			var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+			health -= damage
+
+
+/mob/living/simple_animal/constructarmoured/examine()
+	set src in oview()
+
+	var/msg = "<span cass='info'>*---------*\nThis is \icon[src] \a <EM>[src]</EM>!\n"
+	if (src.health < src.maxHealth)
+		msg += "<span class='warning'>"
+		if (src.health >= src.maxHealth/2)
+			msg += "It looks slightly dented.\n"
+		else
+			msg += "<B>It looks severely dented!</B>\n"
+		msg += "</span>"
+	msg += "*---------*</span>"
+
+	usr << msg
+	return
+
+/mob/living/simple_animal/constructarmoured/proc/mind_initialize(mob/G)
+	mind = new
+	mind.current = src
+	mind.assigned_role = "Juggernaut"
+	mind.key = G.key
+
+////////////////////////Wraith/////////////////////////////////////////////
+
+
+
+/mob/living/simple_animal/constructwraith
+	name = "Wraith"
+	real_name = "Wraith"
+	original_name = "Wraith"
+	desc = "A wicked bladed shell contraption piloted by a bound spirit"
+	icon = 'mob.dmi'
+	icon_state = "floating"
+	icon_living = "floating"
+	icon_dead = "shade_dead"
+	maxHealth = 75
+	health = 75
+	speak_emote = list("hisses")
+	emote_hear = list("wails","screeches")
+	response_help  = "thinks better of touching"
+	response_disarm = "flails at"
+	response_harm   = "punches the"
+	melee_damage_lower = 25
+	melee_damage_upper = 25
+	attacktext = "slashes"
+	minbodytemp = 0
+	maxbodytemp = 4000
+	min_oxy = 0
+	max_co2 = 0
+	max_tox = 0
+	speed = -1
+	a_intent = "harm"
+	stop_automated_movement = 1
+	canstun = 0
+	canweaken = 0
+	see_in_dark = 7
+
+	Life()
+		..()
+		if(stat == 2)
+			new /obj/item/weapon/ectoplasm (src.loc)
+			for(var/mob/M in viewers(src, null))
+				if((M.client && !( M.blinded )))
+					M.show_message("\red [src] collapses in a shattered heap ")
+					ghostize(0)
+			del src
+			return
+
+
+/mob/living/simple_animal/constructwraith/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(O.force)
+		health -= O.force
+		for(var/mob/M in viewers(src, null))
+			if ((M.client && !( M.blinded )))
+				M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
+	else
+		usr << "\red This weapon is ineffective, it does no damage."
+		for(var/mob/M in viewers(src, null))
+			if ((M.client && !( M.blinded )))
+				M.show_message("\red [user] gently taps [src] with the [O]. ")
+
+/mob/living/simple_animal/constructwraith/Bump(atom/movable/AM as mob|obj, yes)
+
+	spawn( 0 )
+		if ((!( yes ) || now_pushing))
+			return
+		now_pushing = 1
+		if(ismob(AM))
+			var/mob/tmob = AM
+			if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
+				if(prob(50))
+					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
+					now_pushing = 0
+					return
+			if(tmob.nopush)
+				now_pushing = 0
+				return
+
+			tmob.LAssailant = src
+		now_pushing = 0
+		..()
+		if (!( istype(AM, /atom/movable) ))
+			return
+		if (!( now_pushing ))
+			now_pushing = 1
+			if (!( AM.anchored ))
+				var/t = get_dir(src, AM)
+				if (istype(AM, /obj/structure/window))
+					if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
+						for(var/obj/structure/window/win in get_step(AM,t))
+							now_pushing = 0
+							return
+				step(AM, t)
+			now_pushing = null
+		return
+	return
+
+/mob/living/simple_animal/constructwraith/attack_animal(mob/living/simple_animal/M as mob)
+	if(istype(M, /mob/living/simple_animal/constructbuilder))
+		health += 10
+		M.emote("mends some of \the <EM>[src]'s</EM> wounds")
+	else
+		if(M.melee_damage_upper <= 0)
+			M.emote("[M.friendly] \the <EM>[src]</EM>")
+		else
+			for(var/mob/O in viewers(src, null))
+				O.show_message("<span class='attack'>\The <EM>[M]</EM> [M.attacktext] \the <EM>[src]</EM>!</span>", 1)
+			var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+			health -= damage
+
+
+
+/mob/living/simple_animal/constructwraith/examine()
+	set src in oview()
+
+	var/msg = "<span cass='info'>*---------*\nThis is \icon[src] \a <EM>[src]</EM>!\n"
+	if (src.health < src.maxHealth)
+		msg += "<span class='warning'>"
+		if (src.health >= src.maxHealth/2)
+			msg += "It looks slightly dented.\n"
+		else
+			msg += "<B>It looks severely dented!</B>\n"
+		msg += "</span>"
+	msg += "*---------*</span>"
+
+	usr << msg
+	return
+
+/mob/living/simple_animal/constructwraith/proc/mind_initialize(mob/G)
+	mind = new
+	mind.current = src
+	mind.assigned_role = "Wraith"
+	mind.key = G.key
+
+/////////////////////////////Artificer/////////////////////////
+
+/mob/living/simple_animal/constructbuilder
+	name = "Artificer"
+	real_name = "Artificer"
+	original_name = "Artificer"
+	desc = "A bulbous construct dedicated to building and maintaining The Cult of Nar-Sie's armies"
+	icon = 'mob.dmi'
+	icon_state = "artificer"
+	icon_living = "artificer"
+	icon_dead = "shade_dead"
+	maxHealth = 50
+	health = 50
+	speak_emote = list("hisses")
+	emote_hear = list("wails","screeches")
+	response_help  = "thinks better of touching"
+	response_disarm = "flails at"
+	response_harm   = "viciously beats"
+	harm_intent_damage = 5
+	melee_damage_lower = 5
+	melee_damage_upper = 5
+	attacktext = "rams"
+	minbodytemp = 0
+	maxbodytemp = 4000
+	min_oxy = 0
+	max_co2 = 0
+	max_tox = 0
+	speed = 0
+	wall_smash = 1
+	nopush = 1
+	a_intent = "harm"
+	stop_automated_movement = 1
+	canstun = 0
+	canweaken = 0
+
+	Life()
+		..()
+		if(stat == 2)
+			new /obj/item/weapon/ectoplasm (src.loc)
+			for(var/mob/M in viewers(src, null))
+				if((M.client && !( M.blinded )))
+					M.show_message("\red [src] collapses in a shattered heap ")
+					ghostize(0)
+			del src
+			return
+
+/mob/living/simple_animal/constructbuilder/attack_animal(mob/living/simple_animal/M as mob)
+	if(istype(M, /mob/living/simple_animal/constructbuilder))
+		health += 5
+		M.emote("mends some of \the <EM>[src]'s</EM> wounds")
+	else
+		if(M.melee_damage_upper <= 0)
+			M.emote("[M.friendly] \the <EM>[src]</EM>")
+		else
+			for(var/mob/O in viewers(src, null))
+				O.show_message("<span class='attack'>\The <EM>[M]</EM> [M.attacktext] \the <EM>[src]</EM>!</span>", 1)
+			var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+			health -= damage
+
+/mob/living/simple_animal/constructbuilder/examine()
+	set src in oview()
+
+	var/msg = "<span cass='info'>*---------*\nThis is \icon[src] \a <EM>[src]</EM>!\n"
+	if (src.health < src.maxHealth)
+		msg += "<span class='warning'>"
+		if (src.health >= src.maxHealth/2)
+			msg += "It looks slightly dented.\n"
+		else
+			msg += "<B>It looks severely dented!</B>\n"
+		msg += "</span>"
+	msg += "*---------*</span>"
+
+	usr << msg
+	return
+
+/mob/living/simple_animal/constructbuilder/proc/mind_initialize(mob/G)
+	mind = new
+	mind.current = src
+	mind.assigned_role = "Artificer"
+	mind.key = G.key
--- a/code/modules/mob/living/simple_animal/corgi.dm
+++ b/code/modules/mob/living/simple_animal/corgi.dm
@@ -0,0 +1,376 @@
+//Corgi
+/mob/living/simple_animal/corgi
+	name = "\improper corgi"
+	real_name = "corgi"
+	desc = "It's a corgi."
+	icon = 'mob.dmi'
+	icon_state = "corgi"
+	icon_living = "corgi"
+	icon_dead = "corgi_dead"
+	speak = list("YAP", "Woof!", "Bark!", "AUUUUUU")
+	speak_emote = list("barks", "woofs")
+	emote_hear = list("barks", "woofs", "yaps","pants")
+	emote_see = list("shakes its head", "shivers")
+	speak_chance = 1
+	turns_per_move = 10
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi
+	meat_amount = 3
+	response_help  = "pets the"
+	response_disarm = "gently pushes aside the"
+	response_harm   = "kicks the"
+	see_in_dark = 5
+	var/obj/item/inventory_head
+	var/obj/item/inventory_back
+
+/mob/living/simple_animal/corgi/Life()
+	..()
+	regenerate_icons()
+
+/mob/living/simple_animal/corgi/show_inv(mob/user as mob)
+	user.machine = src
+	if(user.stat) return
+
+	var/dat = 	"<div align='center'><b>Inventory of [name]</b></div><p>"
+	if(inventory_head)
+		dat +=	"<br><b>Head:</b> [inventory_head] (<a href='?src=\ref[src];remove_inv=head'>Remove</a>)"
+	else
+		dat +=	"<br><b>Head:</b> <a href='?src=\ref[src];add_inv=head'>Nothing</a>"
+	if(inventory_back)
+		dat +=	"<br><b>Back:</b> [inventory_back] (<a href='?src=\ref[src];remove_inv=back'>Remove</a>)"
+	else
+		dat +=	"<br><b>Back:</b> <a href='?src=\ref[src];add_inv=back'>Nothing</a>"
+
+	user << browse(dat, text("window=mob[];size=325x500", name))
+	onclose(user, "mob[real_name]")
+	return
+
+/mob/living/simple_animal/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(inventory_head && inventory_back)
+		//helmet and armor = 100% protection
+		if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) )
+			if( O.force )
+				usr << "\red This animal is wearing too much armor. You can't cause /him any damage."
+				for (var/mob/M in viewers(src, null))
+					M.show_message("\red \b [user] hits [src] with the [O], however [src] is too armored.")
+			else
+				usr << "\red This animal is wearing too much armor. You can't reach its skin."
+				for (var/mob/M in viewers(src, null))
+					M.show_message("\red [user] gently taps [src] with the [O]. ")
+			if(prob(15))
+				emote("looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression on \his face")
+			return
+	..()
+
+/mob/living/simple_animal/corgi/Topic(href, href_list)
+	if(usr.stat) return
+
+	//Removing from inventory
+	if(href_list["remove_inv"])
+		if(get_dist(src,usr) > 1 || !(ishuman(usr) || ismonkey(usr) || isrobot(usr) ||  isalienadult(usr)))
+			return
+		var/remove_from = href_list["remove_inv"]
+		switch(remove_from)
+			if("head")
+				if(inventory_head)
+					name = real_name
+					desc = initial(desc)
+					speak = list("YAP", "Woof!", "Bark!", "AUUUUUU")
+					speak_emote = list("barks", "woofs")
+					emote_hear = list("barks", "woofs", "yaps","pants")
+					emote_see = list("shakes its head", "shivers")
+					desc = "It's a corgi."
+					src.sd_SetLuminosity(0)
+					inventory_head.loc = src.loc
+					inventory_head = null
+				else
+					usr << "\red There is nothing to remove from its [remove_from]."
+					return
+			if("back")
+				if(inventory_back)
+					inventory_back.loc = src.loc
+					inventory_back = null
+				else
+					usr << "\red There is nothing to remove from its [remove_from]."
+					return
+
+		//show_inv(usr) //Commented out because changing Ian's  name and then calling up his inventory opens a new inventory...which is annoying.
+
+	//Adding things to inventory
+	else if(href_list["add_inv"])
+		if(get_dist(src,usr) > 1 || !(ishuman(usr) || ismonkey(usr) || isrobot(usr) ||  isalienadult(usr)))
+			return
+		var/add_to = href_list["add_inv"]
+		if(!usr.get_active_hand())
+			usr << "\red You have nothing in your hand to put on its [add_to]."
+			return
+		switch(add_to)
+			if("head")
+				if(inventory_head)
+					usr << "\red It's is already wearing something."
+					return
+				else
+					var/obj/item/item_to_add = usr.get_active_hand()
+					if(!item_to_add)
+						return
+
+					//Corgis are supposed to be simpler, so only a select few objects can actually be put
+					//to be compatible with them. The objects are below.
+					//Many  hats added, Some will probably be removed, just want to see which ones are popular.
+
+					var/list/allowed_types = list(
+						/obj/item/clothing/head/helmet,
+						/obj/item/clothing/glasses/sunglasses,
+						/obj/item/clothing/head/caphat,
+						/obj/item/clothing/head/collectable/captain,
+						/obj/item/clothing/head/that,
+						/obj/item/clothing/head/that,
+						/obj/item/clothing/head/kitty,
+						/obj/item/clothing/head/collectable/kitty,
+						/obj/item/clothing/head/rabbitears,
+						/obj/item/clothing/head/collectable/rabbitears,
+						/obj/item/clothing/head/beret,
+						/obj/item/clothing/head/collectable/beret,
+						/obj/item/clothing/head/det_hat,
+						/obj/item/clothing/head/nursehat,
+						/obj/item/clothing/head/pirate,
+						/obj/item/clothing/head/collectable/pirate,
+						/obj/item/clothing/head/ushanka,
+						/obj/item/clothing/head/chefhat,
+						/obj/item/clothing/head/collectable/chef,
+						/obj/item/clothing/head/collectable/police,
+						/obj/item/clothing/head/wizard/fake,
+						/obj/item/clothing/head/wizard,
+						/obj/item/clothing/head/collectable/wizard,
+						/obj/item/clothing/head/hardhat,
+						/obj/item/clothing/head/collectable/hardhat,
+						/obj/item/clothing/head/hardhat/white,
+						/obj/item/weapon/bedsheet,
+						/obj/item/clothing/head/helmet/space/santahat,
+						/obj/item/clothing/head/collectable/paper,
+						/obj/item/clothing/head/soft
+					)
+
+					if( ! ( item_to_add.type in allowed_types ) )
+						usr << "\red It doesn't seem too keen on wearing that item."
+						return
+
+					usr.drop_item()
+					item_to_add.loc = src
+					src.inventory_head = item_to_add
+					regenerate_icons()
+
+					//Various hats and items (worn on his head) change Ian's behaviour. His attributes are reset when a HAT is removed.
+
+
+					switch(inventory_head && inventory_head.type)
+						if(/obj/item/clothing/head/caphat, /obj/item/clothing/head/collectable/captain)
+							name = "Captain [real_name]"
+							desc = "Probably better than the last captain."
+						if(/obj/item/clothing/head/kitty, /obj/item/clothing/head/collectable/kitty)
+							name = "Runtime"
+							emote_see = list("coughs up a furball", "stretches")
+							emote_hear = list("purrs")
+							speak = list("Purrr", "Meow!", "MAOOOOOW!", "HISSSSS", "MEEEEEEW")
+							desc = "It's a cute little kitty-cat! ... wait ... what the hell?"
+						if(/obj/item/clothing/head/rabbitears, /obj/item/clothing/head/collectable/rabbitears)
+							name = "Hoppy"
+							emote_see = list("twitches its nose", "hops around a bit")
+							desc = "This is hoppy. It's a corgi-...urmm... bunny rabbit"
+						if(/obj/item/clothing/head/beret, /obj/item/clothing/head/collectable/beret)
+							name = "Yann"
+							desc = "Mon dieu! C'est un chien!"
+							speak = list("le woof!", "le bark!", "JAPPE!!")
+							emote_see = list("cowers in fear", "surrenders", "plays dead","looks as  though there is a wall in front of /him")
+						if(/obj/item/clothing/head/det_hat)
+							name = "Detective [real_name]"
+							desc = "[name] sees through your lies..."
+							emote_see = list("investigates the area","sniffs around for clues","searches for scooby snacks")
+						if(/obj/item/clothing/head/nursehat)
+							name = "Nurse [real_name]"
+							desc = "[name] needs 100cc of beef jerky...STAT!"
+						if(/obj/item/clothing/head/pirate, /obj/item/clothing/head/collectable/pirate)
+							name = "'[pick("Ol'","Scurvy","Black","Rum","Gammy","Bloody","Gangrene","Death","Long-John")] [pick("kibble","leg","beard","tooth","poop-deck","Threepwood","Le Chuck","corsair","Silver","Crusoe")]'"
+							desc = "Yaarghh!! Thar' be a scurvy dog!"
+							emote_see = list("hunts for treasure","stares coldly...","gnashes his tiny corgi teeth")
+							emote_hear = list("growls ferociously", "snarls")
+							speak = list("Arrrrgh!!","Grrrrrr!")
+						if(/obj/item/clothing/head/ushanka)
+							name = "[pick("Comrade","Commissar","Glorious Leader")] [real_name]"
+							desc = "A follower of Karl Barx."
+							emote_see = list("contemplates the failings of the capitalist economic model", "ponders the pros and cons of vangaurdism")
+						if(/obj/item/clothing/head/collectable/police)
+							name = "Officer [real_name]"
+							emote_see = list("drools","looks for donuts")
+							desc = "Stop right there criminal scum!"
+						if(/obj/item/clothing/head/wizard/fake,	/obj/item/clothing/head/wizard,	/obj/item/clothing/head/collectable/wizard)
+							name = "Grandwizard [real_name]"
+							speak = list("YAP", "Woof!", "Bark!", "AUUUUUU", "EI  NATH!")
+						if(/obj/item/weapon/bedsheet)
+							name = "\improper Ghost"
+							speak = list("WoooOOOooo~","AUUUUUUUUUUUUUUUUUU")
+							emote_see = list("stumbles around", "shivers")
+							emote_hear = list("howls","groans")
+							desc = "Spooky!"
+						if(/obj/item/clothing/head/helmet/space/santahat)
+							name = "Rudolph the Red-Nosed Corgi"
+							emote_hear = list("barks christmas songs", "yaps")
+							desc = "He has a very shiny nose."
+							src.sd_SetLuminosity(6)
+						if(/obj/item/clothing/head/soft)
+							name = "Corgi Tech [real_name]"
+							speak = list("Needs a stamp!", "Request DENIED!", "Fill these out in triplicate!")
+							desc = "The reason your yellow gloves have chew-marks."
+
+			if("back")
+				if(inventory_back)
+					usr << "\red It's already wearing something."
+					return
+				else
+					var/obj/item/item_to_add = usr.get_active_hand()
+					if(!item_to_add)
+						return
+
+					//Corgis are supposed to be simpler, so only a select few objects can actually be put
+					//to be compatible with them. The objects are below.
+
+					var/list/allowed_types = list(
+						/obj/item/clothing/suit/armor/vest,
+						/obj/item/device/radio
+					)
+
+					if( ! ( item_to_add.type in allowed_types ) )
+						usr << "\red This object won't fit."
+						return
+
+					usr.drop_item()
+					item_to_add.loc = src
+					src.inventory_back = item_to_add
+					regenerate_icons()
+
+		//show_inv(usr) //Commented out because changing Ian's  name and then calling up his inventory opens a new inventory...which is annoying.
+	else
+		..()
+
+//IAN! SQUEEEEEEEEE~
+/mob/living/simple_animal/corgi/Ian
+	name = "Ian"
+	real_name = "Ian"	//Intended to hold the name without altering it.
+	gender = "male"
+	desc = "It's a corgi."
+	var/turns_since_scan = 0
+	var/obj/movement_target
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
+
+/mob/living/simple_animal/corgi/Ian/Life()
+	..()
+
+	//Feeding, chasing food, FOOOOODDDD
+	if(alive && !resting && !buckled)
+		turns_since_scan++
+		if(turns_since_scan > 5)
+			turns_since_scan = 0
+			if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc) ))
+				movement_target = null
+				stop_automated_movement = 0
+			if( !movement_target || !(movement_target.loc in oview(src, 3)) )
+				movement_target = null
+				stop_automated_movement = 0
+				for(var/obj/item/weapon/reagent_containers/food/snacks/S in oview(src,3))
+					if(isturf(S.loc) || ishuman(S.loc))
+						movement_target = S
+						break
+			if(movement_target)
+				stop_automated_movement = 1
+				step_to(src,movement_target,1)
+				sleep(3)
+				step_to(src,movement_target,1)
+				sleep(3)
+				step_to(src,movement_target,1)
+
+				if(movement_target)		//Not redundant due to sleeps, Item can be gone in 6 decisecomds
+					if (movement_target.loc.x < src.x)
+						dir = WEST
+					else if (movement_target.loc.x > src.x)
+						dir = EAST
+					else if (movement_target.loc.y < src.y)
+						dir = SOUTH
+					else if (movement_target.loc.y > src.y)
+						dir = NORTH
+					else
+						dir = SOUTH
+
+				if(isturf(movement_target.loc) )
+					movement_target.attack_animal(src)
+				else if(ishuman(movement_target.loc) )
+					if(prob(20))
+						emote("stares at the [movement_target] that [movement_target.loc] has with a sad puppy-face")
+
+		if(prob(1))
+			emote(pick("dances around","chases its tail"))
+			spawn(0)
+				for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
+					dir = i
+					sleep(1)
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/corgi
+	name = "Corgi meat"
+	desc = "Tastes like... well you know..."
+
+/mob/living/simple_animal/corgi/Ian/Bump(atom/movable/AM as mob|obj, yes)
+
+	spawn( 0 )
+		if ((!( yes ) || now_pushing))
+			return
+		now_pushing = 1
+		if(ismob(AM))
+			var/mob/tmob = AM
+			if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations))
+				if(prob(70))
+					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
+					now_pushing = 0
+					return
+			if(tmob.nopush)
+				now_pushing = 0
+				return
+
+			tmob.LAssailant = src
+		now_pushing = 0
+		..()
+		if (!( istype(AM, /atom/movable) ))
+			return
+		if (!( now_pushing ))
+			now_pushing = 1
+			if (!( AM.anchored ))
+				var/t = get_dir(src, AM)
+				if (istype(AM, /obj/structure/window))
+					if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
+						for(var/obj/structure/window/win in get_step(AM,t))
+							now_pushing = 0
+							return
+				step(AM, t)
+			now_pushing = null
+		return
+	return
+//PC stuff-Sieve
+
+/mob/living/simple_animal/corgi/proc/mind_initialize(mob/G)
+	mind = new
+	mind.current = src
+	mind.assigned_role = "Corgi"
+	mind.key = G.key
+
+
+/mob/living/simple_animal/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
+	if(istype(O, /obj/item/weapon/newspaper))
+		if(alive)
+			for(var/mob/M in viewers(user, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\blue [user] baps [name] on the nose with the rolled up [O]")
+			spawn(0)
+				for(var/i in list(1,2,4,8,4,2,1,2))
+					dir = i
+					sleep(1)
+	else
+		..()
--- a/code/modules/mob/living/simple_animal/crab.dm
+++ b/code/modules/mob/living/simple_animal/crab.dm
@@ -0,0 +1,69 @@
+//Look Sir, free crabs!
+/mob/living/simple_animal/crab
+	name = "crab"
+	desc = "Free crabs!"
+	icon = 'mob.dmi'
+	icon_state = "crab"
+	icon_living = "crab"
+	icon_dead = "crab_dead"
+	speak_emote = list("clicks")
+	emote_hear = list("clicks")
+	emote_see = list("clacks")
+	speak_chance = 1
+	turns_per_move = 5
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+	response_help  = "pets the"
+	response_disarm = "gently pushes aside the"
+	response_harm   = "stomps the"
+	stop_automated_movement = 1
+	friendly = "pinches"
+
+/mob/living/simple_animal/crab/Life()
+	..()
+	//CRAB movement
+	if(!ckey && alive)
+		if(isturf(src.loc) && !resting && !buckled)		//This is so it only moves if it's not inside a closet, gentics machine, etc.
+			turns_since_move++
+			if(turns_since_move >= turns_per_move)
+				Move(get_step(src,pick(4,8)))
+				turns_since_move = 0
+
+//COFFEE! SQUEEEEEEEEE!
+/mob/living/simple_animal/crab/Coffee
+	name = "Coffee"
+	desc = "It's Coffee, the other pet!"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "stomps"
+
+//LOOK AT THIS - ..()??
+/mob/living/simple_animal/crab/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(istype(O, /obj/item/weapon/wirecutters))
+		user << "\red \b This kills the crab."
+		health -= 20
+		Die()
+	if(istype(O, /obj/item/stack/medical))
+		if(alive)
+			var/obj/item/stack/medical/MED = O
+			if(health < maxHealth)
+				if(MED.amount >= 1)
+					health = min(maxHealth, health + MED.heal_brute)
+					MED.amount -= 1
+					if(MED.amount <= 0)
+						del(MED)
+					for(var/mob/M in viewers(src, null))
+						if ((M.client && !( M.blinded )))
+							M.show_message("\blue [user] applies the [MED] on [src]")
+		else
+			user << "\blue this [src] is dead, medical items won't bring it back to life."
+	else
+		if(O.force)
+			health -= O.force
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
+		else
+			usr << "\red This weapon is ineffective, it does no damage."
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red [user] gently taps [src] with the [O]. ")
--- a/code/modules/mob/living/simple_animal/life.dm
+++ b/code/modules/mob/living/simple_animal/life.dm
@@ -0,0 +1,366 @@
+/mob/living/simple_animal
+	name = "animal"
+	var/icon_living = ""
+	var/icon_dead = ""
+	maxHealth = 20
+	var/alive = 1
+	var/list/speak = list()
+	var/list/speak_emote = list()//	Emotes while speaking IE: Ian [emote], [text] -- Ian barks, "WOOF!". Spoken text is generated from the speak variable.
+	var/speak_chance = 0
+	var/list/emote_hear = list()	//EHearable emotes
+	var/list/emote_see = list()		//Unlike speak_emote, the list of things in this variable only show by themselves with no spoken text. IE: Ian barks, Ian yaps
+	health = 20
+	var/turns_per_move = 1
+	var/turns_since_move = 0
+	universal_speak = 1
+	var/meat_amount = 0
+	var/meat_type
+	var/stop_automated_movement = 0 //Use this to temporarely stop random movement or to if you write special movement code for animals.
+
+	//Interaction
+	var/response_help   = "You try to help"
+	var/response_disarm = "You try to disarm"
+	var/response_harm   = "You try to hurt"
+	var/harm_intent_damage = 3
+
+	//Temperature effect
+	var/minbodytemp = 270
+	var/maxbodytemp = 370
+	var/heat_damage_per_tick = 3	//amount of damage applied if animal's body temperature is higher than maxbodytemp
+	var/cold_damage_per_tick = 2	//same as heat_damage_per_tick, only if the bodytemperature it's lower than minbodytemp
+
+	//Atmos effect - Yes, you can make creatures that require plasma or co2 to survive. N2O is a trace gas and handled separately, hence why it isn't here. It'd be hard to add it. Hard and me don't mix (Yes, yes make all the dick jokes you want with that.) - Errorage
+	var/min_oxy = 5
+	var/max_oxy = 0					//Leaving something at 0 means it's off - has no maximum
+	var/min_tox = 0
+	var/max_tox = 1
+	var/min_co2 = 0
+	var/max_co2 = 5
+	var/min_n2 = 0
+	var/max_n2 = 0
+	var/unsuitable_atoms_damage = 2	//This damage is taken when atmos doesn't fit all the requirements above
+
+
+	//LETTING SIMPLE ANIMALS ATTACK? WHAT COULD GO WRONG. Defaults to zero so Ian can still be cuddly
+	var/melee_damage_lower = 0
+	var/melee_damage_upper = 0
+	var/attacktext = "attacks"
+	var/attack_sound = null
+	var/friendly = "nuzzles" //If the mob does no damage with it's attack
+	var/wall_smash = 0 //if they can smash walls
+
+	var/speed = 0 //LETS SEE IF I CAN SET SPEEDS FOR SIMPLE MOBS WITHOUT DESTROYING EVERYTHING. Higher speed is slower, negative speed is faster
+
+	var/obj/item/device/radio/headset/ears = null
+/mob/living/simple_animal/New()
+	..()
+	verbs -= /mob/verb/observe
+
+/mob/living/simple_animal/Login()
+	if(src && src.client)
+		src.client.screen = null
+	..()
+
+/mob/living/simple_animal/Life()
+
+	//Health
+	if(!alive)
+		if(health > 0)
+			icon_state = icon_living
+			alive = 1
+			stat = CONSCIOUS
+			density = 1
+		return
+
+
+	if(health < 1)
+		Die()
+
+	if(health > maxHealth)
+		health = maxHealth
+
+/*
+	// Stun/Weaken
+
+	if (paralysis || stunned || weakened) //Stunned etc.
+		if (stunned > 0)
+			AdjustStunned(-1)
+			stat = 0
+		if (weakened > 0)
+			AdjustWeakened(-1)
+			lying = 1
+			stat = 0
+		if (paralysis > 0)
+			AdjustParalysis(-1)
+			blinded = 1
+			lying = 1
+			stat = 1
+		var/h = hand
+		hand = 0
+		drop_item()
+		hand = 1
+		drop_item()
+		hand = h
+
+	else	//Not stunned.
+		lying = 0
+		stat = 0
+
+	if(paralysis || stunned || weakened || buckled)
+		canmove = 0
+	else
+		canmove = 1
+*/
+	//Movement
+	if(!ckey && !stop_automated_movement)
+		if(isturf(src.loc) && !resting && !buckled && canmove)		//This is so it only moves if it's not inside a closet, gentics machine, etc.
+			turns_since_move++
+			if(turns_since_move >= turns_per_move)
+				Move(get_step(src,pick(cardinal)))
+				turns_since_move = 0
+
+
+
+
+
+
+
+	//Speaking
+	if(speak_chance)
+		if(prob(speak_chance))
+			if(speak && speak.len)
+				if((emote_hear && emote_hear.len) || (emote_see && emote_see.len))
+					var/length = speak.len
+					if(emote_hear && emote_hear.len)
+						length += emote_hear.len
+					if(emote_see && emote_see.len)
+						length += emote_see.len
+					var/randomValue = rand(1,length)
+					if(randomValue <= speak.len)
+						say(pick(speak))
+					else
+						randomValue -= speak.len
+						if(emote_see && randomValue <= emote_see.len)
+							emote(pick(emote_see),1)
+						else
+							emote(pick(emote_hear),2)
+				else
+					say(pick(speak))
+			else
+				if(!(emote_hear && emote_hear.len) && (emote_see && emote_see.len))
+					emote(pick(emote_see),1)
+				if((emote_hear && emote_hear.len) && !(emote_see && emote_see.len))
+					emote(pick(emote_hear),2)
+				if((emote_hear && emote_hear.len) && (emote_see && emote_see.len))
+					var/length = emote_hear.len + emote_see.len
+					var/pick = rand(1,length)
+					if(pick <= emote_see.len)
+						emote(pick(emote_see),1)
+					else
+						emote(pick(emote_hear),2)
+
+
+	//Atmos
+	var/atmos_suitable = 1
+
+	var/atom/A = src.loc
+	if(isturf(A))
+		var/turf/T = A
+		var/areatemp = T.temperature
+		if( abs(areatemp - bodytemperature) > 50 )
+			var/diff = areatemp - bodytemperature
+			diff = diff / 5
+			//world << "changed from [bodytemperature] by [diff] to [bodytemperature + diff]"
+			bodytemperature += diff
+
+		if(istype(T,/turf/simulated))
+			var/turf/simulated/ST = T
+			if(ST.air)
+				var/tox = ST.air.toxins
+				var/oxy = ST.air.oxygen
+				var/n2  = ST.air.nitrogen
+				var/co2 = ST.air.carbon_dioxide
+
+				if(min_oxy)
+					if(oxy < min_oxy)
+						atmos_suitable = 0
+				if(max_oxy)
+					if(oxy > max_oxy)
+						atmos_suitable = 0
+				if(min_tox)
+					if(tox < min_tox)
+						atmos_suitable = 0
+				if(max_tox)
+					if(tox > max_tox)
+						atmos_suitable = 0
+				if(min_n2)
+					if(n2 < min_n2)
+						atmos_suitable = 0
+				if(max_n2)
+					if(n2 > max_n2)
+						atmos_suitable = 0
+				if(min_co2)
+					if(co2 < min_co2)
+						atmos_suitable = 0
+				if(max_co2)
+					if(co2 > max_co2)
+						atmos_suitable = 0
+
+	//Atmos effect
+	if(bodytemperature < minbodytemp)
+		health -= cold_damage_per_tick
+	else if(bodytemperature > maxbodytemp)
+		health -= heat_damage_per_tick
+
+	if(!atmos_suitable)
+		health -= unsuitable_atoms_damage
+
+/mob/living/simple_animal/Bumped(AM as mob|obj)
+	if(!AM) return
+	if(isturf(src.loc) && !resting && !buckled)
+		if(ismob(AM))
+			var/newamloc = src.loc
+			src.loc = AM:loc
+			AM:loc = newamloc
+		else
+			..()
+
+/mob/living/simple_animal/gib()
+	if(meat_amount && meat_type)
+		for(var/i = 0; i < meat_amount; i++)
+			new meat_type(src.loc)
+	..()
+
+/mob/living/simple_animal/say_quote(var/text)
+	if(speak_emote && speak_emote.len)
+		var/emote = pick(speak_emote)
+		if(emote)
+			return "[emote], \"[text]\""
+	return "says, \"[text]\"";
+
+/mob/living/simple_animal/emote(var/act)
+	if(act)
+		if(act == "scream")	act = "makes a loud and pained whimper" //ugly hack to stop animals screaming when crushed :P
+		for (var/mob/O in viewers(src, null))
+			O.show_message("<B>[src]</B> [act].")
+
+
+/mob/living/simple_animal/attack_animal(mob/living/simple_animal/M as mob)
+	if(M.melee_damage_upper == 0)
+		M.emote("[M.friendly] [src]")
+	else
+		for(var/mob/O in viewers(src, null))
+			O.show_message("\red <B>[M]</B> [M.attacktext] [src]!", 1)
+		var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+		health -= damage
+
+/mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj)
+	if(!Proj)	return
+	src.health -= Proj.damage
+	return 0
+
+/mob/living/simple_animal/attack_hand(mob/living/carbon/human/M as mob)
+	..()
+
+	switch(M.a_intent)
+
+		if ("help")
+			if (health > 0)
+				for(var/mob/O in viewers(src, null))
+					if ((O.client && !( O.blinded )))
+						O.show_message("\blue [M] [response_help] [src]")
+
+		if ("grab")
+			if (M == src)
+				return
+			if (nopush)
+				return
+			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab( M )
+			G.assailant = M
+			G.affecting = 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)
+
+		if ("hurt")
+			health -= harm_intent_damage
+			for(var/mob/O in viewers(src, null))
+				if ((O.client && !( O.blinded )))
+					O.show_message("\red [M] [response_harm] [src]")
+
+		if ("disarm")
+			for(var/mob/O in viewers(src, null))
+				if ((O.client && !( O.blinded )))
+					O.show_message("\blue [M] [response_disarm] [src]")
+
+	return
+
+/mob/living/simple_animal/attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
+	if(istype(O, /obj/item/stack/medical))
+		if(alive)
+			var/obj/item/stack/medical/MED = O
+			if(health < maxHealth)
+				if(MED.amount >= 1)
+					health = min(maxHealth, health + MED.heal_brute)
+					MED.amount -= 1
+					if(MED.amount <= 0)
+						del(MED)
+					for(var/mob/M in viewers(src, null))
+						if ((M.client && !( M.blinded )))
+							M.show_message("\blue [user] applies the [MED] on [src]")
+		else
+			user << "\blue this [src] is dead, medical items won't bring it back to life."
+	else
+		if(O.force)
+			health -= O.force
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
+		else
+			usr << "\red This weapon is ineffective, it does no damage."
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red [user] gently taps [src] with the [O]. ")
+
+
+/mob/living/simple_animal/movement_delay()
+	var/tally = 0 //Incase I need to add stuff other than "speed" later
+
+	tally = speed
+
+	return tally
+
+/mob/living/simple_animal/Stat()
+	..()
+
+	statpanel("Status")
+	stat(null, "Health: [round((health / maxHealth) * 100)]%")
+
+/mob/living/simple_animal/proc/Die()
+	alive = 0
+	icon_state = icon_dead
+	stat = DEAD
+	density = 0
+	return
+
+/mob/living/simple_animal/ex_act(severity)
+	flick("flash", flash)
+	switch (severity)
+		if (1.0)
+			health -= 500
+			gib()
+			return
+
+		if (2.0)
+			health -= 60
+
+
+		if(3.0)
+			health -= 30
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -0,0 +1,91 @@
+/mob/living/simple_animal/parrot
+	name = "\improper Parrot"
+	desc = "It's a parrot!  No dirty words!"
+	icon = 'mob.dmi'
+	icon_state = "cat"
+	icon_living = "cat"
+	icon_dead = "cat_dead"
+	speak = list("Hi","Hello!","Cracker?","BAWWWWK george mellons griffing me")
+	speak_emote = list("squawks","says","yells")
+	emote_hear = list("squawks","bawks")
+	emote_see = list("flutters its wings", "glares at you")
+	speak_chance = 1
+	turns_per_move = 5
+	meat_type = /obj/item/weapon/reagent_containers/food/snacks/cracker/
+	response_help  = "pets the"
+	response_disarm = "gently moves aside the"
+	response_harm   = "swats the"
+
+	ears = new /obj/item/device/radio/headset/heads/ce()
+
+/mob/living/simple_animal/parrot/DrProfessor
+	name = "Doctor Professor Parrot, PhD"
+	desc = "That's the Doctor Professor.  He has more degrees than all of the engineering team put together, and has several published papers on quantum cracker theory."
+	speak = list(":e Check the singlo, you chucklefucks!",":e Wire the solars, you lazy bums!",":e WHO TOOK THE DAMN RIG SUIT?",":e OH GOD ITS FREE CALL THE SHUTTLE")
+	response_harm   = "is attacked in the face by"
+
+/obj/item/weapon/reagent_containers/food/snacks/cracker/
+	name = "Cracker"
+	desc = "It's a salted cracker."
+
+/mob/living/simple_animal/parrot/show_inv(mob/user as mob)
+	user.machine = src
+	if(user.stat) return
+
+	var/dat = 	"<div align='center'><b>Inventory of [name]</b></div><p>"
+	if(ears)
+		dat +=	"<br><b>Headset:</b> [ears] (<a href='?src=\ref[src];remove_inv=ears'>Remove</a>)"
+	else
+		dat +=	"<br><b>Headset:</b> <a href='?src=\ref[src];add_inv=ears'>Nothing</a>"
+
+	user << browse(dat, text("window=mob[];size=325x500", name))
+	onclose(user, "mob[real_name]")
+	return
+
+
+
+/mob/living/simple_animal/parrot/Topic(href, href_list)
+	if(usr.stat) return
+
+	//Removing from inventory
+	if(href_list["remove_inv"])
+		if(get_dist(src,usr) > 1 || !(ishuman(usr) || ismonkey(usr) || isrobot(usr) ||  isalienadult(usr)))
+			return
+		var/remove_from = href_list["remove_inv"]
+		switch(remove_from)
+			if("ears")
+				if(ears)
+					src.say(":e BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
+					ears.loc = src.loc
+					ears = null
+				else
+					usr << "\red There is nothing to remove from its [remove_from]."
+					return
+
+	//Adding things to inventory
+	else if(href_list["add_inv"])
+		if(get_dist(src,usr) > 1 || !(ishuman(usr) || ismonkey(usr) || isrobot(usr) ||  isalienadult(usr)))
+			return
+		var/add_to = href_list["add_inv"]
+		if(!usr.get_active_hand())
+			usr << "\red You have nothing in your hand to put on its [add_to]."
+			return
+		switch(add_to)
+			if("ears")
+				if(ears)
+					usr << "\red It's already wearing something."
+					return
+				else
+					var/obj/item/item_to_add = usr.get_active_hand()
+					if(!item_to_add)
+						return
+
+					if( !istype(item_to_add,  /obj/item/device/radio/headset) )
+						usr << "\red This object won't fit."
+						return
+
+					usr.drop_item()
+					item_to_add.loc = src
+					src.ears = item_to_add
+	else
+		..()
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -0,0 +1,59 @@
+/mob/living/simple_animal/shade
+	name = "Shade"
+	desc = "A bound spirit"
+	icon = 'mob.dmi'
+	icon_state = "shade"
+	icon_living = "shade"
+	icon_dead = "shade_dead"
+	maxHealth = 50
+	health = 50
+	speak_emote = list("hisses")
+	emote_hear = list("wails","screeches")
+	response_help  = "puts their hand through"
+	response_disarm = "flails at"
+	response_harm   = "punches the"
+	melee_damage_lower = 5
+	melee_damage_upper = 15
+	attacktext = "drains the life from"
+	minbodytemp = 0
+	maxbodytemp = 4000
+	min_oxy = 0
+	max_co2 = 0
+	max_tox = 0
+	speed = -1
+	stop_automated_movement = 1
+
+
+	Life()
+		..()
+		if(stat == 2)
+			new /obj/item/weapon/ectoplasm (src.loc)
+			for(var/mob/M in viewers(src, null))
+				if((M.client && !( M.blinded )))
+					M.show_message("\red [src] lets out a contented sigh as their form unwinds. ")
+					ghostize(0)
+			del src
+			return
+
+
+	attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
+		if(istype(O, /obj/item/device/soulstone))
+			O.transfer_soul("SHADE", src, user)
+		else
+			if(O.force)
+				health -= O.force
+				for(var/mob/M in viewers(src, null))
+					if ((M.client && !( M.blinded )))
+						M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
+			else
+				usr << "\red This weapon is ineffective, it does no damage."
+				for(var/mob/M in viewers(src, null))
+					if ((M.client && !( M.blinded )))
+						M.show_message("\red [user] gently taps [src] with the [O]. ")
+		return
+
+/mob/living/simple_animal/shade/proc/mind_initialize(mob/G)
+	mind = new
+	mind.current = src
+	mind.assigned_role = "Shade"
+	mind.key = G.key
--- a/code/modules/mob/living/simple_animal/update_icons.dm
+++ b/code/modules/mob/living/simple_animal/update_icons.dm
@@ -0,0 +1,21 @@
+/mob/living/simple_animal/corgi/regenerate_icons()
+	overlays = list()
+
+	if(inventory_head)
+		var/head_icon_state = inventory_head.icon_state
+		if(health <= 0)
+			head_icon_state += "2"
+
+		var/icon/head_icon = icon('corgi_head.dmi',head_icon_state)
+		if(head_icon)
+			overlays += head_icon
+
+	if(inventory_back)
+		var/back_icon_state = inventory_back.icon_state
+		if(health <= 0)
+			back_icon_state += "2"
+
+		var/icon/back_icon = icon('corgi_back.dmi',back_icon_state)
+		if(back_icon)
+			overlays += back_icon
+	return
--- a/code/modules/mob/living/simple_animal/worm.dm
+++ b/code/modules/mob/living/simple_animal/worm.dm
@@ -0,0 +1,199 @@
+/mob/living/simple_animal/space_worm
+	name = "space worm segment"
+	desc = "A part of a space worm."
+	icon = 'critter.dmi'
+	icon_state = "spaceworm"
+	icon_living = "spaceworm"
+	icon_dead = "spacewormdead"
+
+	speak_emote = list("transmits") //not supposed to be used under AI control
+	emote_hear = list("transmits")  //I'm just adding it so it doesn't runtime if controlled by player who speaks
+
+	response_help  = "touches"
+	response_disarm = "flails at"
+	response_harm   = "punches the"
+
+	harm_intent_damage = 2
+
+	maxHealth = 30
+	health = 30
+
+	stop_automated_movement = 1
+	animate_movement = SYNC_STEPS
+
+	minbodytemp = 0
+	maxbodytemp = 350
+	min_oxy = 0
+	max_co2 = 0
+	max_tox = 0
+
+	a_intent = "harm" //so they don't get pushed around
+
+	nopush = 1
+	wall_smash = 1
+
+	speed = -1
+
+	var/mob/living/simple_animal/space_worm/previous //next/previous segments, correspondingly
+	var/mob/living/simple_animal/space_worm/next     //head is the nextest segment
+
+	var/stomachProcessProbability = 50
+	var/digestionProbability = 20
+	var/flatPlasmaValue = 5 //flat plasma amount given for non-items
+
+	var/atom/currentlyEating //what the worm is currently eating
+	var/eatingDuration = 0 //how long he's been eating it for
+
+	head
+		name = "space worm head"
+		icon_state = "spacewormhead"
+		icon_living = "spacewormhead"
+		icon_dead = "spacewormdead"
+
+		maxHealth = 20
+		health = 20
+
+		melee_damage_lower = 10
+		melee_damage_upper = 15
+		attacktext = "bites"
+
+		animate_movement = SLIDE_STEPS
+
+		New(var/location, var/segments = 6)
+			..()
+
+			var/mob/living/simple_animal/space_worm/current = src
+
+			for(var/i = 1 to segments)
+				var/mob/living/simple_animal/space_worm/newSegment = new /mob/living/simple_animal/space_worm(loc)
+				current.Attach(newSegment)
+				current = newSegment
+
+		update_icon()
+			if(stat == CONSCIOUS || stat == UNCONSCIOUS)
+				icon_state = "spacewormhead[previous?1:0]"
+				if(previous)
+					dir = get_dir(previous,src)
+			else
+				icon_state = "spacewormheaddead"
+
+	Life()
+		..()
+
+		if(next && !(next in view(src,1)))
+			Detach()
+
+		if(stat == DEAD) //dead chunks fall off and die immediately
+			if(previous)
+				previous.Detach()
+			if(next)
+				Detach(1)
+
+		if(prob(stomachProcessProbability))
+			ProcessStomach()
+
+		update_icon()
+
+		return
+
+	Del() //if a chunk a destroyed, make a new worm out of the split halves
+		if(previous)
+			previous.Detach()
+		..()
+
+	Move()
+		var/attachementNextPosition = loc
+		if(..())
+			if(previous)
+				previous.Move(attachementNextPosition)
+			update_icon()
+
+	Bump(atom/obstacle)
+		if(currentlyEating != obstacle)
+			currentlyEating = obstacle
+			eatingDuration = 0
+
+		if(!AttemptToEat(obstacle))
+			eatingDuration++
+		else
+			currentlyEating = null
+			eatingDuration = 0
+
+		return
+
+	proc/update_icon() //only for the sake of consistency with the other update icon procs
+		if(stat == CONSCIOUS || stat == UNCONSCIOUS)
+			if(previous) //midsection
+				icon_state = "spaceworm[get_dir(src,previous) | get_dir(src,next)]" //see 3 lines below
+			else //tail
+				icon_state = "spacewormtail"
+				dir = get_dir(src,next) //next will always be present since it's not a head and if it's dead, it goes in the other if branch
+		else
+			icon_state = "spacewormdead"
+
+		return
+
+	proc/AttemptToEat(var/atom/target)
+		if(istype(target,/turf/simulated/wall))
+			if((!istype(target,/turf/simulated/wall/r_wall) && eatingDuration >= 100) || eatingDuration >= 200) //need 20 ticks to eat an rwall, 10 for a regular one
+				var/turf/simulated/wall/wall = target
+				wall.ReplaceWithFloor()
+				new /obj/item/stack/sheet/metal(src, flatPlasmaValue)
+				return 1
+		else if(istype(target,/atom/movable))
+			if(istype(target,/mob) || eatingDuration >= 50) //5 ticks to eat stuff like airlocks
+				var/atom/movable/objectOrMob = target
+				contents += objectOrMob
+				return 1
+
+		return 0
+
+	proc/Attach(var/mob/living/simple_animal/space_worm/attachement)
+		if(!attachement)
+			return
+
+		previous = attachement
+		attachement.next = src
+
+		return
+
+	proc/Detach(die = 0)
+		var/mob/living/simple_animal/space_worm/newHead = new /mob/living/simple_animal/space_worm/head(loc,0)
+		var/mob/living/simple_animal/space_worm/newHeadPrevious = previous
+
+		previous = null //so that no extra heads are spawned
+
+		newHead.Attach(newHeadPrevious)
+
+		if(die)
+			newHead.Die()
+
+		del(src)
+
+	proc/ProcessStomach()
+		for(var/atom/movable/stomachContent in contents)
+			if(prob(digestionProbability))
+				if(istype(stomachContent,/obj/item/stack)) //converts to plasma, keeping the stack value
+					if(!istype(stomachContent,/obj/item/stack/sheet/plasma))
+						var/obj/item/stack/oldStack = stomachContent
+						new /obj/item/stack/sheet/plasma(src, oldStack.amount)
+						del(oldStack)
+						continue
+				else if(istype(stomachContent,/obj/item)) //converts to plasma, keeping the w_class
+					var/obj/item/oldItem = stomachContent
+					new /obj/item/stack/sheet/plasma(src, oldItem.w_class)
+					del(oldItem)
+					continue
+				else
+					new /obj/item/stack/sheet/plasma(src, flatPlasmaValue) //just flat amount
+					del(stomachContent)
+					continue
+
+		if(previous)
+			for(var/atom/movable/stomachContent in contents) //transfer it along the digestive tract
+				previous.contents += stomachContent
+		else
+			for(var/atom/movable/stomachContent in contents) //or poop it out
+				loc.contents += stomachContent
+
+		return
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -487,9 +487,6 @@
 //	..()
 	return

-/mob/proc/get_damage()
-	return health
-
 /mob/proc/UpdateLuminosity()
 	if(src.total_luminosity == src.last_luminosity)	return 0//nothing to do here
 	src.last_luminosity = src.total_luminosity
@@ -812,12 +809,6 @@ note dizziness decrements automatically in the mob's Life() proc.
 	resting = max(resting + amount,0)
 	return

-/mob/proc/getMaxHealth()
-	return maxHealth
-
-/mob/proc/setMaxHealth(var/newMaxHealth)
-	maxHealth = newMaxHealth
-
 /*
 * Sends resource files to client cache
 */
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -5,12 +5,11 @@
 	flags = NOREACT
 	var/datum/mind/mind

+	var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak
+
 	//Not in use yet
 	var/obj/effect/organstructure/organStructure = null

-	var/maxHealth = 100 //Maximum health that should be possible. Used by living, organ and simple_mobs
-
-
 //	var/uses_hud = 0
 	var/obj/screen/flash = null
 	var/obj/screen/blind = null
@@ -40,8 +39,6 @@
 	I'll make some notes on where certain variable defines should probably go.
 	Changing this around would probably require a good look-over the pre-existing code.
 	*/
-	//var/midis = 1 //Check if midis should be played for someone - no, this is something that is tied to clients, not mobs.
-	var/alien_egg_flag = 0//Have you been infected?
 	var/obj/screen/zone_sel/zone_sel = null

 	var/emote_allowed = 1
@@ -57,7 +54,6 @@
 	var/sdisabilities = 0	//Carbon
 	var/disabilities = 0	//Carbon
 	var/atom/movable/pulling = null
-	var/stat = 0.0
 	var/next_move = null
 	var/prev_move = null
 	var/monkeyizing = null	//Carbon
@@ -91,7 +87,7 @@

 	var/timeofdeath = 0.0//Living
 	var/cpr_time = 1.0//Carbon
-	var/health = 100//Living
+

 	var/bodytemperature = 310.055	//98.7 F
 	var/drowsyness = 0.0//Carbon
@@ -122,15 +118,9 @@
 	var/obj/item/weapon/tank/internal = null//Human/Monkey
 	var/obj/item/weapon/storage/s_active = null//Carbon
 	var/obj/item/clothing/mask/wear_mask = null//Carbon
-	var/r_epil = 0
-	var/r_ch_cou = 0
-	var/r_Tourette = 0//Carbon

 	var/seer = 0 //for cult//Carbon, probably Human

-	var/miming = null //checks if the guy is a mime//Human
-	var/silent = null //Can't talk. Value goes down every life proc.//Human
-
 	var/obj/hud/hud_used = null

 	//var/list/organs = list(  ) //moved to human.
@@ -152,8 +142,6 @@

 	var/nodamage = 0

-	var/underwear = 1//Human
-	var/backbag = 2//Human
 	var/be_syndicate = 0//This really should be a client variable.
 	var/be_random_name = 0
 	var/const/blindness = 1//Carbon
@@ -206,35 +194,10 @@

 	mouse_drag_pointer = MOUSE_ACTIVE_POINTER

-/*
-//Changeling mode stuff//Carbon
-	var/changeling_level = 0
-	var/list/absorbed_dna = list()
-	var/changeling_fakedeath = 0
-	var/chem_charges = 20.00
-	var/sting_range = 1
-*/
-	var/datum/changeling/changeling = null
-
-	var/universal_speak = 0 // Set to 1 to enable the mob to speak to everyone -- TLE
-	var/obj/control_object // Hacking in to control objects -- TLE
-
-	var/robot_talk_understand = 0
-	var/alien_talk_understand = 0
-
-/*For ninjas and others. This variable is checked when a mob moves and I guess it was supposed to allow the mob to move
-through dense areas, such as walls. Setting density to 0 does the same thing. The difference here is that
-the mob is also allowed to move without any sort of restriction. For instance, in space or out of holder objects.*/
-//0 is off, 1 is normal, 2 is for ninjas.
-	var/incorporeal_move = 0
-
-
 	var/update_icon = 1 //Set to 1 to trigger update_icons() at the next life() call

 	var/UI = 'screen1_Midnight.dmi' // For changing the UI from preferences

-//	var/obj/effect/organstructure/organStructure = null //for dem organs
-
 	var/canstun = 1 	// determines if this mob can be stunned by things
 	var/canweaken = 1	// determines if this mob can be weakened/knocked down by things
 	var/nopush = 0 //Can they be shoved?
@@ -249,3 +212,13 @@ the mob is also allowed to move without any sort of restriction. For instance, i
 	var/list/radar_blips = list() // list of screen objects, radar blips
 	var/radar_open = 0 	// nonzero is radar is open

+
+	//Datum holding changeling stuff
+	var/datum/changeling/changeling = null //TODO: Move this to living or carbon -Nodrak
+
+	var/obj/control_object //Used by admins to possess objects. All mobs should have this var
+
+	//Whether or not mobs can understand other mobtypes. These stay in /mob so that ghosts can hear everything.
+	var/universal_speak = 0 // Set to 1 to enable the mob to speak to everyone -- TLE
+	var/robot_talk_understand = 0
+	var/alien_talk_understand = 0
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -278,9 +278,11 @@

 	if(mob.monkeyizing)	return//This is sota the goto stop mobs from moving var

-	if(mob.incorporeal_move)//Move though walls
-		Process_Incorpmove(direct)
-		return
+	if(isliving(mob))
+		var/mob/living/L = mob
+		if(L.incorporeal_move)//Move though walls
+			Process_Incorpmove(direct)
+			return

 	if(Process_Grab())	return
 	if(!mob.canmove)	return
@@ -413,10 +415,13 @@
 ///Allows mobs to run though walls
 /client/proc/Process_Incorpmove(direct)
 	var/turf/mobloc = get_turf(mob)
-	switch(mob.incorporeal_move)
+	if(!isliving(mob))
+		return
+	var/mob/living/L = mob
+	switch(L.incorporeal_move)
 		if(1)
-			mob.loc = get_step(mob, direct)
-			mob.dir = direct
+			L.loc = get_step(L, direct)
+			L.dir = direct
 		if(2)
 			if(prob(50))
 				var/locx
@@ -444,19 +449,19 @@
 							return
 					else
 						return
-				mob.loc = locate(locx,locy,mobloc.z)
+				L.loc = locate(locx,locy,mobloc.z)
 				spawn(0)
 					var/limit = 2//For only two trailing shadows.
-					for(var/turf/T in getline(mobloc, mob.loc))
+					for(var/turf/T in getline(mobloc, L.loc))
 						spawn(0)
-							anim(T,mob,'mob.dmi',,"shadow",,mob.dir)
+							anim(T,L,'mob.dmi',,"shadow",,L.dir)
 						limit--
 						if(limit<=0)	break
 			else
 				spawn(0)
-					anim(mobloc,mob,'mob.dmi',,"shadow",,mob.dir)
-				mob.loc = get_step(mob, direct)
-			mob.dir = direct
+					anim(mobloc,mob,'mob.dmi',,"shadow",,L.dir)
+				L.loc = get_step(L, direct)
+			L.dir = direct
 	return 1


--- a/tgstation.dme
+++ b/tgstation.dme
@@ -125,6 +125,7 @@
 #define FILE_DIR "code/modules/mob/living/silicon/decoy"
 #define FILE_DIR "code/modules/mob/living/silicon/pai"
 #define FILE_DIR "code/modules/mob/living/silicon/robot"
+#define FILE_DIR "code/modules/mob/living/simple_animal"
 #define FILE_DIR "code/modules/mob/new_player"
 #define FILE_DIR "code/modules/mob/organ"
 #define FILE_DIR "code/modules/mob/simple_animal"
@@ -188,8 +189,8 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/backup"
 #define FILE_DIR "maps/RandomZLevels"
+#define FILE_DIR "Redirector"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/AI"
 #define FILE_DIR "sound/ambience"
@@ -927,6 +928,7 @@
 #include "code\modules\mob\living\say.dm"
 #include "code\modules\mob\living\blob\blob.dm"
 #include "code\modules\mob\living\carbon\carbon.dm"
+#include "code\modules\mob\living\carbon\carbon_defines.dm"
 #include "code\modules\mob\living\carbon\alien\alien.dm"
 #include "code\modules\mob\living\carbon\alien\death.dm"
 #include "code\modules\mob\living\carbon\alien\say.dm"
@@ -968,6 +970,7 @@
 #include "code\modules\mob\living\carbon\human\human_attackpaw.dm"
 #include "code\modules\mob\living\carbon\human\human_damage.dm"
 #include "code\modules\mob\living\carbon\human\human_defense.dm"
+#include "code\modules\mob\living\carbon\human\human_defines.dm"
 #include "code\modules\mob\living\carbon\human\human_movement.dm"
 #include "code\modules\mob\living\carbon\human\inventory.dm"
 #include "code\modules\mob\living\carbon\human\life.dm"
@@ -1034,6 +1037,16 @@
 #include "code\modules\mob\living\silicon\robot\robot_movement.dm"
 #include "code\modules\mob\living\silicon\robot\say.dm"
 #include "code\modules\mob\living\silicon\robot\wires.dm"
+#include "code\modules\mob\living\simple_animal\behemoth.dm"
+#include "code\modules\mob\living\simple_animal\cat.dm"
+#include "code\modules\mob\living\simple_animal\constructs.dm"
+#include "code\modules\mob\living\simple_animal\corgi.dm"
+#include "code\modules\mob\living\simple_animal\crab.dm"
+#include "code\modules\mob\living\simple_animal\life.dm"
+#include "code\modules\mob\living\simple_animal\parrot.dm"
+#include "code\modules\mob\living\simple_animal\shade.dm"
+#include "code\modules\mob\living\simple_animal\update_icons.dm"
+#include "code\modules\mob\living\simple_animal\worm.dm"
 #include "code\modules\mob\new_player\hud.dm"
 #include "code\modules\mob\new_player\login.dm"
 #include "code\modules\mob\new_player\new_player.dm"
@@ -1043,16 +1056,6 @@
 #include "code\modules\mob\new_player\sprite_accessories.dm"
 #include "code\modules\mob\organ\organ.dm"
 #include "code\modules\mob\organ\organ_external.dm"
-#include "code\modules\mob\simple_animal\behemoth.dm"
-#include "code\modules\mob\simple_animal\cat.dm"
-#include "code\modules\mob\simple_animal\constructs.dm"
-#include "code\modules\mob\simple_animal\corgi.dm"
-#include "code\modules\mob\simple_animal\crab.dm"
-#include "code\modules\mob\simple_animal\life.dm"
-#include "code\modules\mob\simple_animal\parrot.dm"
-#include "code\modules\mob\simple_animal\shade.dm"
-#include "code\modules\mob\simple_animal\update_icons.dm"
-#include "code\modules\mob\simple_animal\worm.dm"
 #include "code\modules\paperwork\clipboard.dm"
 #include "code\modules\paperwork\filingcabinet.dm"
 #include "code\modules\paperwork\folders.dm"