GIT IS HITLER

aurora.dme

@@ -23,6 +23,7 @@
 #define FILE_DIR "icons/misc"
 #define FILE_DIR "icons/mob"
 #define FILE_DIR "icons/mob/human_races"
+#define FILE_DIR "icons/mob/human_races/xenos"
 #define FILE_DIR "icons/mob/species"
 #define FILE_DIR "icons/mob/species/armalis"
 #define FILE_DIR "icons/mob/species/skrell"
@@ -254,6 +255,7 @@
 #include "code\defines\procs\captain_announce.dm"
 #include "code\defines\procs\command_alert.dm"
 #include "code\defines\procs\dbcore.dm"
+#include "code\defines\procs\hud.dm"
 #include "code\defines\procs\sd_Alert.dm"
 #include "code\defines\procs\statistics.dm"
 #include "code\game\asteroid.dm"
@@ -1007,42 +1009,30 @@
 #include "code\modules\mob\living\living.dm"
 #include "code\modules\mob\living\living_defense.dm"
 #include "code\modules\mob\living\living_defines.dm"
+#include "code\modules\mob\living\living_powers.dm"
 #include "code\modules\mob\living\login.dm"
 #include "code\modules\mob\living\logout.dm"
 #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\carbon_powers.dm"
 #include "code\modules\mob\living\carbon\give.dm"
 #include "code\modules\mob\living\carbon\shock.dm"
-#include "code\modules\mob\living\carbon\species.dm"
 #include "code\modules\mob\living\carbon\alien\alien.dm"
+#include "code\modules\mob\living\carbon\alien\alien_attacks.dm"
+#include "code\modules\mob\living\carbon\alien\alien_damage.dm"
 #include "code\modules\mob\living\carbon\alien\death.dm"
-#include "code\modules\mob\living\carbon\alien\login.dm"
-#include "code\modules\mob\living\carbon\alien\logout.dm"
-#include "code\modules\mob\living\carbon\alien\powers.dm"
+#include "code\modules\mob\living\carbon\alien\emote.dm"
+#include "code\modules\mob\living\carbon\alien\progression.dm"
 #include "code\modules\mob\living\carbon\alien\say.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\death.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\emote.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\humanoid.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\inventory.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\life.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\login.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\queen.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\update_icons.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\caste\drone.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\caste\hunter.dm"
-#include "code\modules\mob\living\carbon\alien\humanoid\caste\sentinel.dm"
-#include "code\modules\mob\living\carbon\alien\larva\death.dm"
-#include "code\modules\mob\living\carbon\alien\larva\emote.dm"
-#include "code\modules\mob\living\carbon\alien\larva\inventory.dm"
-#include "code\modules\mob\living\carbon\alien\larva\larva.dm"
-#include "code\modules\mob\living\carbon\alien\larva\life.dm"
-#include "code\modules\mob\living\carbon\alien\larva\powers.dm"
-#include "code\modules\mob\living\carbon\alien\larva\update_icons.dm"
-#include "code\modules\mob\living\carbon\alien\special\alien_embryo.dm"
-#include "code\modules\mob\living\carbon\alien\special\facehugger.dm"
+#include "code\modules\mob\living\carbon\alien\update_icons.dm"
+#include "code\modules\mob\living\carbon\alien\diona\diona.dm"
+#include "code\modules\mob\living\carbon\alien\diona\diona_attacks.dm"
+#include "code\modules\mob\living\carbon\alien\diona\diona_powers.dm"
+#include "code\modules\mob\living\carbon\alien\diona\progression.dm"
+#include "code\modules\mob\living\carbon\alien\diona\say_understands.dm"
+#include "code\modules\mob\living\carbon\alien\diona\update_icons.dm"
 #include "code\modules\mob\living\carbon\brain\brain.dm"
 #include "code\modules\mob\living\carbon\brain\brain_item.dm"
 #include "code\modules\mob\living\carbon\brain\death.dm"
@@ -1062,12 +1052,21 @@
 #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\human_powers.dm"
+#include "code\modules\mob\living\carbon\human\human_species.dm"
 #include "code\modules\mob\living\carbon\human\inventory.dm"
 #include "code\modules\mob\living\carbon\human\life.dm"
 #include "code\modules\mob\living\carbon\human\login.dm"
+#include "code\modules\mob\living\carbon\human\logout.dm"
 #include "code\modules\mob\living\carbon\human\say.dm"
+#include "code\modules\mob\living\carbon\human\species.dm"
 #include "code\modules\mob\living\carbon\human\update_icons.dm"
 #include "code\modules\mob\living\carbon\human\whisper.dm"
+#include "code\modules\mob\living\carbon\human\alien\alien.dm"
+#include "code\modules\mob\living\carbon\human\alien\alien_embryo.dm"
+#include "code\modules\mob\living\carbon\human\alien\alien_facehugger.dm"
+#include "code\modules\mob\living\carbon\human\alien\alien_powers.dm"
+#include "code\modules\mob\living\carbon\human\alien\alien_species.dm"
 #include "code\modules\mob\living\carbon\metroid\death.dm"
 #include "code\modules\mob\living\carbon\metroid\emote.dm"
 #include "code\modules\mob\living\carbon\metroid\examine.dm"
@@ -1087,7 +1086,6 @@
 #include "code\modules\mob\living\carbon\monkey\life.dm"
 #include "code\modules\mob\living\carbon\monkey\login.dm"
 #include "code\modules\mob\living\carbon\monkey\monkey.dm"
-#include "code\modules\mob\living\carbon\monkey\powers.dm"
 #include "code\modules\mob\living\carbon\monkey\update_icons.dm"
 #include "code\modules\mob\living\silicon\alarm.dm"
 #include "code\modules\mob\living\silicon\death.dm"
@@ -1142,7 +1140,6 @@
 #include "code\modules\mob\living\silicon\robot\drone\drone_items.dm"
 #include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm"
 #include "code\modules\mob\living\simple_animal\bees.dm"
-#include "code\modules\mob\living\simple_animal\borer.dm"
 #include "code\modules\mob\living\simple_animal\constructs.dm"
 #include "code\modules\mob\living\simple_animal\corpse.dm"
 #include "code\modules\mob\living\simple_animal\parrot.dm"
@@ -1150,6 +1147,10 @@
 #include "code\modules\mob\living\simple_animal\simple_animal.dm"
 #include "code\modules\mob\living\simple_animal\vox.dm"
 #include "code\modules\mob\living\simple_animal\worm.dm"
+#include "code\modules\mob\living\simple_animal\borer\borer.dm"
+#include "code\modules\mob\living\simple_animal\borer\borer_captive.dm"
+#include "code\modules\mob\living\simple_animal\borer\borer_powers.dm"
+#include "code\modules\mob\living\simple_animal\borer\say.dm"
 #include "code\modules\mob\living\simple_animal\friendly\cat.dm"
 #include "code\modules\mob\living\simple_animal\friendly\corgi.dm"
 #include "code\modules\mob\living\simple_animal\friendly\crab.dm"
@@ -1193,8 +1194,10 @@
 #include "code\modules\nano\nanoui.dm"
 #include "code\modules\organs\blood.dm"
 #include "code\modules\organs\organ.dm"
+#include "code\modules\organs\organ_alien.dm"
 #include "code\modules\organs\organ_external.dm"
 #include "code\modules\organs\organ_internal.dm"
+#include "code\modules\organs\organ_objects.dm"
 #include "code\modules\organs\pain.dm"
 #include "code\modules\organs\wound.dm"
 #include "code\modules\paperwork\carbonpaper.dm"
@@ -1420,16 +1423,16 @@
 #include "code\modules\shuttles\shuttle_supply.dm"
 #include "code\modules\shuttles\shuttles_multi.dm"
 #include "code\modules\supermatter\supermatter.dm"
-#include "code\modules\surgery\appendix.dm"
 #include "code\modules\surgery\bones.dm"
-#include "code\modules\surgery\braincore.dm"
+#include "code\modules\surgery\brainrepair.dm"
+#include "code\modules\surgery\encased.dm"
 #include "code\modules\surgery\eye.dm"
 #include "code\modules\surgery\face.dm"
 #include "code\modules\surgery\generic.dm"
 #include "code\modules\surgery\headreattach.dm"
 #include "code\modules\surgery\implant.dm"
+#include "code\modules\surgery\organs_internal.dm"
 #include "code\modules\surgery\other.dm"
-#include "code\modules\surgery\ribcage.dm"
 #include "code\modules\surgery\robolimbs.dm"
 #include "code\modules\surgery\surgery.dm"
 #include "code\modules\telesci\bscrystal.dm"

code/ATMOSPHERICS/components/unary/vent_pump.dm

@@ -420,14 +420,16 @@
 	return
 
 /*
-	Alt-click to ventcrawl - Monkeys, aliens, slimes and mice.
+	Alt-click to vent crawl - Monkeys, aliens, slimes and mice.
 	This is a little buggy but somehow that just seems to plague ventcrawl.
 	I am sorry, I don't know why.
 */
-/obj/machinery/atmospherics/unary/vent_pump/AltClick(var/mob/living/ML)
+// Commenting this out for now, it's not critical, stated to be buggy, and seems like
+// a really clumsy way of doing this. ~Z
+/*/obj/machinery/atmospherics/unary/vent_pump/AltClick(var/mob/living/ML)
 	if(istype(ML))
 		var/list/ventcrawl_verbs = list(/mob/living/carbon/monkey/verb/ventcrawl, /mob/living/carbon/alien/verb/ventcrawl, /mob/living/carbon/slime/verb/ventcrawl,/mob/living/simple_animal/mouse/verb/ventcrawl)
 		if(length(ML.verbs & ventcrawl_verbs)) // alien queens have this removed, an istype would be complicated
 			ML.handle_ventcrawl(src)
 			return
-	..()
+	..()*/

code/WorkInProgress/Cael_Aislinn/Supermatter/Laser2.dm

@@ -111,7 +111,7 @@
 	src.hit()
 	return
 
-/obj/beam/e_beam/HasEntered(atom/movable/AM as mob|obj)
+/obj/beam/e_beam/Crossed(atom/movable/AM as mob|obj)
 	if (istype(AM, /obj/beam))
 		return
 	spawn( 0 )

code/WorkInProgress/Cib/amorph/amorph.dm

@@ -435,7 +435,7 @@
 
 // called when something steps onto an amorph
 // this could be made more general, but for now just handle mulebot
-/mob/living/carbon/amorph/HasEntered(var/atom/movable/AM)
+/mob/living/carbon/amorph/Crossed(var/atom/movable/AM)
 	var/obj/machinery/bot/mulebot/MB = AM
 	if(istype(MB))
 		MB.RunOver(src)

code/WorkInProgress/Mini/asay_trap.dm

@@ -7,6 +7,6 @@
 	unacidable = 1
 	invisibility = 101
 
-/obj/effect/admin_log_trap/HasEntered(AM as mob|obj)
+/obj/effect/admin_log_trap/Crossed(AM as mob|obj)
 	if(istype(AM,/mob))
 		message_admins("[AM] ([AM:ckey]) stepped on an alerted tile in [get_area(src)]. <a href=\"byond://?src=%admin_ref%;teleto=\ref[src.loc]\">Jump</a>", admin_ref = 1)

code/__HELPERS/logging.dm

@@ -88,7 +88,14 @@
 //SoundScopes extra stuffs
 //I'm sending debug messages through here for when an admin log is made at the same time.
 //What's the point in making 2 recorded logs for one thing.
-/proc/msg_scopes(var/msg, tell_devs = 0, override = 0)
+/proc/msg_scopes(var/msg, tell_devs = 0, override = 0, var/client = null)
+	if(client)
+		var/client/C = client
+		if(!C || !C.holder)
+			return
+		if(C.holder.hide_activity)
+			return
+
 	if(tell_devs)
 		msg = "DEBUG: [msg]"
 	else

code/_onclick/hud/hud.dm

@@ -16,6 +16,8 @@ var/datum/global_hud/global_hud = new()
 	var/list/darkMask
 	var/obj/screen/lum
 	var/obj/screen/nvg
+	var/obj/screen/thermal
+	var/obj/screen/meson
 
 /datum/global_hud/New()
 	//420erryday psychedellic colours screen overlay for when you are high
@@ -34,18 +36,32 @@ var/datum/global_hud/global_hud = new()
 
 	nvg = new /obj/screen()
 	nvg.screen_loc = "1,1"
-	nvg.icon = 'icons/obj/nvg_hud_full.dmi'
+	nvg.icon = 'icons/obj/hud_full.dmi'
 	nvg.icon_state = "nvg_hud"
 	nvg.layer = 17
 	nvg.mouse_opacity = 0
 
 	lum = new /obj/screen()
 	lum.screen_loc = "1,1"
-	lum.icon = 'icons/obj/nvg_hud_full.dmi'
+	lum.icon = 'icons/obj/hud_full.dmi'
 	lum.icon_state = "luminol_hud"
 	lum.layer = 17
 	lum.mouse_opacity = 0
 
+	thermal = new /obj/screen()
+	thermal.screen_loc = "1,1"
+	thermal.icon = 'icons/obj/hud_full.dmi'
+	thermal.icon_state = "thermal_hud"
+	thermal.layer = 17
+	thermal.mouse_opacity = 0
+
+	meson = new /obj/screen()
+	meson.screen_loc = "1,1"
+	meson.icon = 'icons/obj/hud_full.dmi'
+	meson.icon_state = "meson_hud"
+	meson.layer = 17
+	meson.mouse_opacity = 0
+
 	var/obj/screen/O
 	var/i
 	//that nasty looking dither you  get when you're short-sighted
@@ -186,15 +202,13 @@ datum/hud/New(mob/owner)
 	var/ui_alpha = mymob.client.prefs.UI_style_alpha
 
 	if(ishuman(mymob))
-		human_hud(ui_style, ui_color, ui_alpha) // Pass the player the UI style chosen in preferences
+		human_hud(ui_style, ui_color, ui_alpha, mymob) // Pass the player the UI style chosen in preferences
 	else if(ismonkey(mymob))
 		monkey_hud(ui_style)
 	else if(isbrain(mymob))
 		brain_hud(ui_style)
-	else if(islarva(mymob))
-		larva_hud()
 	else if(isalien(mymob))
-		alien_hud()
+		larva_hud()
 	else if(isAI(mymob))
 		ai_hud()
 	else if(isrobot(mymob))

code/_onclick/hud/human.dm

@@ -532,3 +532,15 @@
 					break //5 slots available, so no more can be added.
 			num++
 	src.client.screen += src.hud_used.item_action_list
+
+//Used for new human mobs created by cloning/goleming/etc.
+/mob/living/carbon/human/proc/set_cloned_appearance()
+	f_style = "Shaved"
+	if(dna.species == "Human") //no more xenos losing ears/tentacles
+		h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3")
+	undershirt = undershirt_t.Find("None")
+	if(gender == MALE)
+		underwear = underwear_m.Find("None")
+	else
+		underwear = underwear_f.Find("None")
+	regenerate_icons()

code/controllers/configuration.dm

@@ -112,6 +112,8 @@
 	var/revival_cloning = 1
 	var/revival_brain_life = -1
 
+	var/use_loyalty_implants = 0
+
 	//Used for modifying movement speed for mobs.
 	//Unversal modifiers
 	var/run_speed = 0
@@ -145,6 +147,7 @@
 	var/admin_irc = ""
 	var/python_path = "" //Path to the python executable.  Defaults to "python" on windows and "/usr/bin/env python2" on unix
 	var/use_lib_nudge = 0 //Use the C library nudge instead of the python nudge.
+	var/use_overmap = 0
 
 /datum/configuration/New()
 	var/list/L = typesof(/datum/game_mode) - /datum/game_mode
@@ -497,6 +500,9 @@
 				if("max_maint_drones")
 					config.max_maint_drones = text2num(value)
 
+				if("use_overmap")
+					config.use_overmap = 1
+
 				else
 					log_misc("Unknown setting in configuration: '[name]'")
 
@@ -542,6 +548,8 @@
 					config.bones_can_break = value
 				if("limbs_can_break")
 					config.limbs_can_break = value
+				if("use_loyalty_implants")
+					config.use_loyalty_implants = 1
 				else
 					log_misc("Unknown setting in configuration: '[name]'")
 

code/datums/datacore.dm

@@ -65,7 +65,12 @@
 		G.fields["m_stat"]		= "Stable"
 		G.fields["sex"]			= H.gender
 		G.fields["species"]		= H.get_species()
-		G.fields["photo"]		= get_id_photo(H)
+		G.fields["home_system"]	= H.home_system
+		G.fields["citizenship"]	= H.citizenship
+		G.fields["faction"]		= H.personal_faction
+		G.fields["religion"]	= H.religion
+//		G.fields["photo_front"]	= front
+//		G.fields["photo_side"]	= side
 		if(H.gen_record && !jobban_isbanned(H, "Records"))
 			G.fields["notes"] = H.gen_record
 		else
@@ -114,12 +119,23 @@
 		L.fields["name"]		= H.real_name
 		L.fields["rank"] 		= H.mind.assigned_role
 		L.fields["age"]			= H.age
+		L.fields["fingerprint"]	= md5(H.dna.uni_identity)
 		L.fields["sex"]			= H.gender
 		L.fields["b_type"]		= H.b_type
 		L.fields["b_dna"]		= H.dna.unique_enzymes
 		L.fields["enzymes"]		= H.dna.SE // Used in respawning
 		L.fields["identity"]	= H.dna.UI // "
+		L.fields["species"]		= H.get_species()
+		L.fields["home_system"]	= H.home_system
+		L.fields["citizenship"]	= H.citizenship
+		L.fields["faction"]		= H.personal_faction
+		L.fields["religion"]	= H.religion
 		L.fields["image"]		= getFlatIcon(H)	//This is god-awful
+/*		if(H.exploit_record && !jobban_isbanned(H, "Records"))
+			L.fields["exploit_record"] = H.exploit_record
+		else
+			L.fields["exploit_record"] = "No additional information acquired."
+*/
 		locked += L
 	return
 
@@ -148,7 +164,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 		preview_icon.Blend(temp, ICON_OVERLAY)
 
 	//Tail
-	if(H.species.tail && H.species.flags & HAS_TAIL)
+	if(H.species.tail)
 		temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[H.species.tail]_s")
 		preview_icon.Blend(temp, ICON_OVERLAY)
 

code/datums/diseases/appendicitis.dm

@@ -19,12 +19,10 @@
 
 	if(istype(affected_mob,/mob/living/carbon/human))
 		var/mob/living/carbon/human/H = affected_mob
-		if(H.species.name == "Diona" || H.species.name == "Machine" || H.species.name == "Vox") src.cure()
+		if(!H.internal_organs_by_name["appendix"])
+			src.cure()
 
 	if(stage == 1)
-		if(affected_mob.op_stage.appendix == 2.0)
-			// appendix is removed, can't get infected again
-			src.cure()
 		if(prob(5))
 			affected_mob << "\red You feel a stinging pain in your abdomen!"
 			affected_mob.emote("me",1,"winces slightly.")
@@ -47,7 +45,6 @@
 			var/mob/living/carbon/human/H = affected_mob
 			H << "\red Your abdomen is a world of pain!"
 			H.Weaken(10)
-			H.op_stage.appendix = 2.0
 
 			var/datum/organ/external/groin = H.get_organ("groin")
 			var/datum/wound/W = new /datum/wound/internal_bleeding(20)

code/datums/spells/inflict_handler.dm

@@ -26,8 +26,8 @@
 			if("gib_brain")
 				if(ishuman(target) || ismonkey(target))
 					var/mob/living/carbon/C = target
-					if(C.brain_op_stage != 4) // Their brain is already taken out
-						var/obj/item/brain/B = new(C.loc)
+					if(C.has_brain()) // Their brain is already taken out
+						var/obj/item/organ/brain/B = new(C.loc)
 						B.transfer_identity(C)
 				target.gib()
 			if("disintegrate")

code/defines/obj/weapon.dm

@@ -173,7 +173,7 @@
 		icon_state = "beartrap[armed]"
 		user << "<span class='notice'>[src] is now [armed ? "armed" : "disarmed"]</span>"
 
-/obj/item/weapon/legcuffs/beartrap/HasEntered(AM as mob|obj)
+/obj/item/weapon/legcuffs/beartrap/Crossed(AM as mob|obj)
 	if(armed)
 		if(ishuman(AM))
 			if(isturf(src.loc))

code/defines/procs/hud.dm

@@ -0,0 +1,82 @@
+/* Using the HUD procs is simple. Call these procs in the life.dm of the intended mob.
+Use the regular_hud_updates() proc before process_med_hud(mob) or process_sec_hud(mob) so
+the HUD updates properly! */
+
+//Medical HUD outputs. Called by the Life() proc of the mob using it, usually.
+proc/process_med_hud(var/mob/M, var/local_scanner, var/mob/Alt)
+	if(!can_process_hud(M))
+		return
+
+	var/datum/arranged_hud_process/P = arrange_hud_process(M, Alt, med_hud_users)
+	for(var/mob/living/carbon/human/patient in P.Mob.in_view(P.Turf))
+		if(P.Mob.see_invisible < patient.invisibility)
+			continue
+
+		if(!local_scanner)
+			if(istype(patient.w_uniform, /obj/item/clothing/under))
+				var/obj/item/clothing/under/U = patient.w_uniform
+				if(U.sensor_mode < 2)
+					continue
+			else
+				continue
+
+		P.Client.images += patient.hud_list[HEALTH_HUD]
+		if(local_scanner)
+			P.Client.images += patient.hud_list[STATUS_HUD]
+
+//Security HUDs. Pass a value for the second argument to enable implant viewing or other special features.
+proc/process_sec_hud(var/mob/M, var/advanced_mode, var/mob/Alt)
+	if(!can_process_hud(M))
+		return
+	var/datum/arranged_hud_process/P = arrange_hud_process(M, Alt, sec_hud_users)
+	for(var/mob/living/carbon/human/perp in P.Mob.in_view(P.Turf))
+		if(P.Mob.see_invisible < perp.invisibility)
+			continue
+
+		P.Client.images += perp.hud_list[ID_HUD]
+		if(advanced_mode)
+			P.Client.images += perp.hud_list[WANTED_HUD]
+			P.Client.images += perp.hud_list[IMPTRACK_HUD]
+			P.Client.images += perp.hud_list[IMPLOYAL_HUD]
+			P.Client.images += perp.hud_list[IMPCHEM_HUD]
+
+datum/arranged_hud_process
+	var/client/Client
+	var/mob/Mob
+	var/turf/Turf
+
+proc/arrange_hud_process(var/mob/M, var/mob/Alt, var/list/hud_list)
+	hud_list |= M
+	var/datum/arranged_hud_process/P = new
+	P.Client = M.client
+	P.Mob = Alt ? Alt : M
+	P.Turf = get_turf(P.Mob)
+	return P
+
+proc/can_process_hud(var/mob/M)
+	if(!M)
+		return 0
+	if(!M.client)
+		return 0
+	if(M.stat != CONSCIOUS)
+		return 0
+	return 1
+
+//Deletes the current HUD images so they can be refreshed with new ones.
+mob/proc/regular_hud_updates() //Used in the life.dm of mobs that can use HUDs.
+	if(client)
+		for(var/image/hud in client.images)
+			if(copytext(hud.icon_state,1,4) == "hud")
+				client.images -= hud
+	med_hud_users -= src
+	sec_hud_users -= src
+
+mob/proc/in_view(var/turf/T)
+	return view(T)
+
+/mob/aiEye/in_view(var/turf/T)
+	var/list/viewed = new
+	for(var/mob/living/carbon/human/H in mob_list)
+		if(get_dist(H, T) <= 7)
+			viewed += H
+	return viewed

code/game/atoms.dm

@@ -71,9 +71,6 @@
 /atom/proc/CheckExit()
 	return 1
 
-/atom/proc/HasEntered(atom/movable/AM as mob|obj)
-	return
-
 /atom/proc/HasProximity(atom/movable/AM as mob|obj)
 	return
 

code/game/dna/dna_modifier.dm

@@ -552,7 +552,7 @@
 	if (href_list["selectUIBlock"] && href_list["selectUISubblock"]) // This chunk of code updates selected block / sub-block based on click
 		var/select_block = text2num(href_list["selectUIBlock"])
 		var/select_subblock = text2num(href_list["selectUISubblock"])
-		if ((select_block <= 13) && (select_block >= 1))
+		if ((select_block <= DNA_UI_LENGTH) && (select_block >= 1))
 			src.selected_ui_block = select_block
 		if ((select_subblock <= DNA_BLOCK_SIZE) && (select_subblock >= 1))
 			src.selected_ui_subblock = select_subblock

code/game/dna/genes/disabilities.dm

@@ -32,7 +32,7 @@
 		M.mutations.Add(mutation)
 	if(disability)
 		M.disabilities|=disability
-	if(mutation)
+	if(sdisability)
 		M.sdisabilities|=sdisability
 	if(activation_message)
 		M << "\red [activation_message]"
@@ -43,9 +43,9 @@
 	if(mutation && (mutation in M.mutations))
 		M.mutations.Remove(mutation)
 	if(disability)
-		M.disabilities-=disability
-	if(mutation)
-		M.sdisabilities-=sdisability
+		M.disabilities &= (~disability)
+	if(sdisability)
+		M.sdisabilities &= (~sdisability)
 	if(deactivation_message)
 		M << "\red [deactivation_message]"
 	else

code/game/gamemodes/cult/cult_structures.dm

@@ -51,7 +51,7 @@
 		return
 	return
 
-/obj/effect/gateway/HasEntered(AM as mob|obj)
+/obj/effect/gateway/Crossed(AM as mob|obj)
 	spawn(0)
 		return
 	return

code/game/gamemodes/cult/runes.dm

@@ -567,8 +567,8 @@ var/list/sacrificed = list()
 					if(!(iscultist(V)))
 						victims += V//Checks for cult status and mob type
 			for(var/obj/item/I in src.loc)//Checks for MMIs/brains/Intellicards
-				if(istype(I,/obj/item/brain))
-					var/obj/item/brain/B = I
+				if(istype(I,/obj/item/organ/brain))
+					var/obj/item/organ/brain/B = I
 					victims += B.brainmob
 				else if(istype(I,/obj/item/device/mmi))
 					var/obj/item/device/mmi/B = I

code/game/gamemodes/factions.dm

@@ -125,7 +125,7 @@
 /obj/item/weapon/melee/energy/sword:4:Energy Sword;
 /obj/item/weapon/storage/box/syndicate:10:Syndicate Bundle;
 /obj/item/weapon/storage/box/emps:3:5 EMP Grenades;
-/obj/item/weapon/melee/baton/stunrod:4:Stunrod;
+/obj/item/weapon/melee/baton/stunrod/loaded:4:Stunrod;
 Whitespace:Seperator;
 Stealthy and Inconspicuous Weapons;
 /obj/item/weapon/pen/paralysis:3:Paralysis Pen;

code/game/gamemodes/game_mode.dm

@@ -37,7 +37,7 @@
 /obj/item/weapon/melee/energy/sword:4:Energy Sword;
 /obj/item/weapon/storage/box/syndicate:10:Syndicate Bundle;
 /obj/item/weapon/storage/box/emps:3:5 EMP Grenades;
-/obj/item/weapon/melee/baton/stunrod:4:Stunrod;
+/obj/item/weapon/melee/baton/stunrod/loaded:4:Stunrod;
 Whitespace:Seperator;
 Stealthy and Inconspicuous Weapons;
 /obj/item/weapon/storage/box/walkingcane:5:Disguised Sword;

code/game/jobs/job/security.dm

@@ -12,11 +12,11 @@
 	access = list(access_security, access_sec_doors, access_brig, access_armory, access_court,
 			            access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
 			            access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting,
-			            access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway)
+			            access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks)
 	minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court,
 			            access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers,
 			            access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting,
-			            access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway)
+			            access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks)
 	minimal_player_age = 14
 
 	equip(var/mob/living/carbon/human/H)
@@ -58,8 +58,8 @@
 	spawn_positions = 1
 	supervisors = "the head of security"
 	selection_color = "#ffeeee"
-	access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue)
-	minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels)
+	access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_external_airlocks)
+	minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_external_airlocks)
 	minimal_player_age = 5
 
 	equip(var/mob/living/carbon/human/H)
@@ -178,8 +178,8 @@
 	spawn_positions = 5
 	supervisors = "the head of security"
 	selection_color = "#ffeeee"
-	access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue)
-	minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels)
+	access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue, access_external_airlocks)
+	minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_external_airlocks)
 	minimal_player_age = 3
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0

code/game/machinery/autolathe.dm

@@ -376,7 +376,6 @@
 	storage_capacity["glass"] = tot_rating  * 12500
 
 /obj/machinery/autolathe/dismantle()
-	..()
 	var/list/sheets = list("metal" = /obj/item/stack/sheet/metal, "glass" = /obj/item/stack/sheet/glass)
 
 	for(var/mat in stored_material)
@@ -384,4 +383,6 @@
 		var/obj/item/stack/sheet/S = new T
 		if(stored_material[mat] > S.perunit)
 			S.amount = round(stored_material[mat] / S.perunit)
-			S.loc = loc
+			S.loc = loc
+
+	..()

code/game/machinery/cloning.dm

@@ -77,9 +77,10 @@
 		if ((M.stat != 2) || (!M.client))
 			continue
 		//They need a brain!
-		if ((istype(M, /mob/living/carbon/human)) && (M:brain_op_stage >= 4.0))
-			continue
-
+		if(istype(M, /mob/living/carbon/human))
+			var/mob/living/carbon/human/H = M
+			if(H.species.has_organ["brain"] && !H.has_brain())
+				continue
 		if (M.ckey == find_key)
 			selected = M
 			break
@@ -209,9 +210,7 @@
 	H.dna.UpdateSE()
 	H.dna.UpdateUI()
 
-	H.f_style = "Shaved"
-	if(R.dna.species == "Human") //no more xenos losing ears/tentacles
-		H.h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3")
+	H.set_cloned_appearance()
 
 	for(var/datum/language/L in R.languages)
 		H.add_language(L.name)

code/game/machinery/computer/cloning.dm

@@ -337,7 +337,7 @@
 	if ((isnull(subject)) || (!(ishuman(subject))) || (!subject.dna))
 		scantemp = "Error: Unable to locate valid genetic data."
 		return
-	if (subject.brain_op_stage == 4.0)
+	if (!subject.has_brain())
 		scantemp = "Error: No signs of intelligence detected."
 		return
 	if (subject.suiciding == 1)

code/game/machinery/kitchen/deep_fryer.dm

@@ -67,6 +67,12 @@
 	if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/deepfryholder))
 		user << "<span class='userdanger'>You cannot doublefry.</span>"
 		return
+	if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/customizable/candy))
+		user << "<span class='warning'>That would probably break [src].</span>"
+		return
+	if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/cereal))
+		user << "<span class='warning'>That isn't going to fit.</span>"
+		return
 	else
 		fry_food(I, user)
 

code/game/machinery/recharger.dm

@@ -91,15 +91,7 @@ obj/machinery/recharger/process()
 
 		if(istype(charging, /obj/item/weapon/melee/baton))
 			var/obj/item/weapon/melee/baton/B = charging
-//Should really update the baton to use cells
-			if(B.charges < initial(B.charges))
-				B.charges++
-				icon_state = "recharger1"
-				use_power(150)
-			else
-				icon_state = "recharger2"
-
-/*			if(B.bcell)
+			if(B.bcell)
 				if(!B.bcell.fully_charged())
 					icon_state = icon_state_charging
 					B.bcell.give(active_power_usage*CELLRATE)
@@ -110,7 +102,6 @@ obj/machinery/recharger/process()
 			else
 				icon_state = icon_state_idle
 				update_use_power(1)
-*/
 			return
 
 /*		if(istype(charging, /obj/item/device/laptop))
@@ -147,12 +138,8 @@ obj/machinery/recharger/emp_act(severity)
 
 	else if(istype(charging, /obj/item/weapon/melee/baton))
 		var/obj/item/weapon/melee/baton/B = charging
-		//same here
-		if(B.charges)
-			B.charges = 0
-/*		if(B.bcell)
+		if(B.bcell)
 			B.bcell.charge = 0
-*/
 	..(severity)
 
 obj/machinery/recharger/update_icon()	//we have an update_icon() in addition to the stuff in process to make it feel a tiny bit snappier.

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -45,7 +45,7 @@ var/global/list/image/splatter_cache=list()
 	if(basecolor == "rainbow") basecolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]"
 	color = basecolor
 
-/obj/effect/decal/cleanable/blood/HasEntered(mob/living/carbon/human/perp)
+/obj/effect/decal/cleanable/blood/Crossed(mob/living/carbon/human/perp)
 	if (!istype(perp))
 		return
 	if(amount < 1)

code/game/objects/effects/effect_system.dm

@@ -216,7 +216,7 @@ steam.start() -- spawns the effect
 		delete()
 	return
 
-/obj/effect/effect/smoke/HasEntered(mob/living/carbon/M as mob )
+/obj/effect/effect/smoke/Crossed(mob/living/carbon/M as mob )
 	..()
 	if(istype(M))
 		affect(M)
@@ -549,7 +549,7 @@ steam.start() -- spawns the effect
 			delete()
 
 
-/obj/effect/effect/foam/HasEntered(var/atom/movable/AM)
+/obj/effect/effect/foam/Crossed(var/atom/movable/AM)
 	if(metal)
 		return
 

code/game/objects/effects/landmarks.dm

@@ -40,6 +40,10 @@
 			latejoin += loc
 			del(src)
 
+		if("JoinLateCryo")
+			latejoin_cryo += loc
+			del(src)
+
 		//prisoners
 		if("prisonwarp")
 			prisonwarp += loc

code/game/objects/effects/portals.dm

@@ -16,7 +16,7 @@
 		return
 	return
 
-/obj/effect/portal/HasEntered(AM as mob|obj)
+/obj/effect/portal/Crossed(AM as mob|obj)
 	spawn(0)
 		src.teleport(AM)
 		return

code/game/objects/effects/step_triggers.dm

@@ -9,7 +9,7 @@
 /obj/effect/step_trigger/proc/Trigger(var/atom/movable/A)
 	return 0
 
-/obj/effect/step_trigger/HasEntered(H as mob|obj)
+/obj/effect/step_trigger/Crossed(H as mob|obj)
 	..()
 	if(!H)
 		return

code/game/objects/items.dm

@@ -156,15 +156,6 @@
 
 /obj/item/attack_paw(mob/user as mob)
 
-	if(isalien(user)) // -- TLE
-		var/mob/living/carbon/alien/A = user
-
-		if(!A.has_fine_manipulation || w_class >= 4)
-			if(src in A.contents) // To stop Aliens having items stuck in their pockets
-				A.drop_from_inventory(src)
-			user << "Your claws aren't capable of such fine manipulation."
-			return
-
 	if (istype(src.loc, /obj/item/weapon/storage))
 		for(var/mob/M in range(1, src.loc))
 			if (M.s_active == src.loc)
@@ -263,6 +254,12 @@
 	if(ishuman(M))
 		//START HUMAN
 		var/mob/living/carbon/human/H = M
+		var/list/mob_equip = list()
+		if(H.species.hud && H.species.hud.equip_slots)
+			mob_equip = H.species.hud.equip_slots
+
+		if(H.species && !(slot in mob_equip))
+			return 0
 
 		switch(slot)
 			if(slot_l_hand)
@@ -306,7 +303,7 @@
 			if(slot_belt)
 				if(H.belt)
 					return 0
-				if(!H.w_uniform)
+				if(!H.w_uniform && (slot_w_uniform in mob_equip))
 					if(!disable_warning)
 						H << "\red You need a jumpsuit before you can attach this [name]."
 					return 0
@@ -354,7 +351,7 @@
 			if(slot_wear_id)
 				if(H.wear_id)
 					return 0
-				if(!H.w_uniform)
+				if(!H.w_uniform && (slot_w_uniform in mob_equip))
 					if(!disable_warning)
 						H << "\red You need a jumpsuit before you can attach this [name]."
 					return 0
@@ -364,7 +361,7 @@
 			if(slot_l_store)
 				if(H.l_store)
 					return 0
-				if(!H.w_uniform)
+				if(!H.w_uniform && (slot_w_uniform in mob_equip))
 					if(!disable_warning)
 						H << "\red You need a jumpsuit before you can attach this [name]."
 					return 0
@@ -375,7 +372,7 @@
 			if(slot_r_store)
 				if(H.r_store)
 					return 0
-				if(!H.w_uniform)
+				if(!H.w_uniform && (slot_w_uniform in mob_equip))
 					if(!disable_warning)
 						H << "\red You need a jumpsuit before you can attach this [name]."
 					return 0
@@ -387,7 +384,7 @@
 			if(slot_s_store)
 				if(H.s_store)
 					return 0
-				if(!H.wear_suit)
+				if(!H.wear_suit && (slot_wear_suit in mob_equip))
 					if(!disable_warning)
 						H << "\red You need a suit before you can attach this [name]."
 					return 0
@@ -517,8 +514,8 @@
 		user << "\red You're going to need to remove the eye covering first."
 		return
 
-	if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/slime))//Aliens don't have eyes./N     slimes also don't have eyes!
-		user << "\red You cannot locate any eyes on this creature!"
+	if(!M.has_eyes())
+		user << "\red You cannot locate any eyes on [M]!"
 		return
 
 	user.attack_log += "\[[time_stamp()]\]<font color='red'> Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>"
@@ -534,20 +531,22 @@
 		M.weakened += 4
 		M.adjustBruteLoss(10)
 		*/
-	if(M != user)
-		for(var/mob/O in (viewers(M) - user - M))
-			O.show_message("\red [M] has been stabbed in the eye with [src] by [user].", 1)
-		M << "\red [user] stabs you in the eye with [src]!"
-		user << "\red You stab [M] in the eye with [src]!"
-	else
-		user.visible_message( \
-			"\red [user] has stabbed themself with [src]!", \
-			"\red You stab yourself in the eyes with [src]!" \
-		)
+
 	if(istype(M, /mob/living/carbon/human))
+
 		var/datum/organ/internal/eyes/eyes = H.internal_organs_by_name["eyes"]
-		if(!eyes)
-			return
+
+		if(M != user)
+			for(var/mob/O in (viewers(M) - user - M))
+				O.show_message("\red [M] has been stabbed in the eye with [src] by [user].", 1)
+			M << "\red [user] stabs you in the eye with [src]!"
+			user << "\red You stab [M] in the eye with [src]!"
+		else
+			user.visible_message( \
+				"\red [user] has stabbed themself with [src]!", \
+				"\red You stab yourself in the eyes with [src]!" \
+			)
+
 		eyes.damage += rand(3,4)
 		if(eyes.damage >= eyes.min_bruised_damage)
 			if(M.stat != 2)

code/game/objects/items/apc_frame.dm

@@ -24,7 +24,7 @@
 	if (!istype(loc, /turf/simulated/floor))
 		usr << "\red APC cannot be placed on this spot."
 		return
-	if (A.requires_power == 0 || A.name == "Space")
+	if (A.requires_power == 0 || A.name == "\improper Space")
 		usr << "\red APC cannot be placed in this area."
 		return
 	if (A.get_apc())

code/game/objects/items/devices/pipe_painter.dm

@@ -6,7 +6,17 @@
 	var/list/modes = list("grey","red","blue","cyan","green","yellow","purple")
 	var/mode = "grey"
 
-/obj/item/device/pipe_painter/afterattack(atom/A, mob/user as mob)
+/obj/item/device/pipe_painter/New()
+	..()
+	modes = new()
+	for(var/C in pipe_colors)
+		modes += "[C]"
+	mode = pick(modes)
+
+/obj/item/device/pipe_painter/afterattack(atom/A, mob/user as mob, proximity)
+	if(!proximity)
+		return
+
 	if(!istype(A,/obj/machinery/atmospherics/pipe) || istype(A,/obj/machinery/atmospherics/pipe/tank) || istype(A,/obj/machinery/atmospherics/pipe/vent) || istype(A,/obj/machinery/atmospherics/pipe/simple/heat_exchanging) || istype(A,/obj/machinery/atmospherics/pipe/simple/insulated) || !in_range(user, A))
 		return
 	var/obj/machinery/atmospherics/pipe/P = A
@@ -16,9 +26,7 @@
 		user << "\red You must remove the plating first."
 		return
 
-	P.pipe_color = mode
-	user.visible_message("<span class='notice'>[user] paints \the [P] [mode].</span>","<span class='notice'>You paint \the [P] [mode].</span>")
-	P.update_icon()
+	P.change_color(pipe_colors[mode])
 
 /obj/item/device/pipe_painter/attack_self(mob/user as mob)
 	mode = input("Which colour do you want to use?","Pipe painter") in modes

code/game/objects/items/devices/scanners.dm

@@ -173,7 +173,7 @@ REAGENT SCANNER
 //		user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.")
 	if (M.has_brain_worms())
 		user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.")
-	else if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0)
+	else if (M.getBrainLoss() >= 100 || !M.has_brain())
 		user.show_message("\red Subject is brain dead.")
 	else if (M.getBrainLoss() >= 60)
 		user.show_message("\red Severe brain damage detected. Subject likely to have mental retardation.")

code/game/objects/items/devices/uplinks.dm

@@ -30,7 +30,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	for(var/D in ItemList)
 		var/list/O = text2list(D, ":")
 		if(O.len>0)
-			valid_items += O[1]		
+			valid_items += O[1]
 
 
 
@@ -147,7 +147,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 		randomItems.Add("/obj/item/weapon/melee/energy/sword") //Energy Sword
 		randomItems.Add("/obj/item/clothing/mask/gas/voice") //Voice Changer
 		randomItems.Add("/obj/item/device/chameleon") //Chameleon Projector
-		randomItems.Add("/obj/item/weapon/melee/baton/stunrod") //Stunrod
+		randomItems.Add("/obj/item/weapon/melee/baton/stunrod/loaded") //Stunrod
 
 	if(uses > 2)
 		randomItems.Add("/obj/item/weapon/storage/box/emps") //EMP Grenades
@@ -198,7 +198,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 				uses -= 6
 			if("/obj/item/weapon/gun/energy/crossbow" , "/obj/item/device/powersink" , "/obj/item/weapon/storage/box/walkingcane")
 				uses -= 5
-			if("/obj/item/weapon/melee/energy/sword" , "/obj/item/clothing/mask/gas/voice" , "/obj/item/device/chameleon" , "/obj/item/weapon/melee/baton/stunrod")
+			if("/obj/item/weapon/melee/energy/sword" , "/obj/item/clothing/mask/gas/voice" , "/obj/item/device/chameleon" , "/obj/item/weapon/melee/baton/stunrod/loaded")
 				uses -= 4
 			if("/obj/item/weapon/storage/box/emps" , "/obj/item/weapon/pen/paralysis" , "/obj/item/weapon/cartridge/syndicate" , "/obj/item/clothing/under/chameleon" , \
 			"/obj/item/weapon/card/emag" , "/obj/item/weapon/storage/box/syndie_kit/space" , "/obj/item/device/encryptionkey/binary" , \
@@ -276,7 +276,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 			feedback_add_details("traitor_uplink_items_bought","GM")
 		if("/obj/item/weapon/storage/box/syndie_kit/masks")
 			feedback_add_details("traitor_uplink_items_bought","MM")
-		if("/obj/item/weapon/melee/baton/stunrod")
+		if("/obj/item/weapon/melee/baton/stunrod/loaded")
 			feedback_add_details("traitor_uplink_items_bought","SR")
 
 

code/game/objects/items/stacks/medical.dm

@@ -157,7 +157,10 @@
 		var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
 
 		if(affecting.open == 0)
-			if(!affecting.bandage())
+			var/bandaged = affecting.bandage()
+			var/disinfected = affecting.disinfect()
+		
+			if(!(bandaged || disinfected))
 				user << "\red The wounds on [M]'s [affecting.display_name] have already been treated."
 				return 1
 			else
@@ -174,7 +177,8 @@
 					else
 						user.visible_message( 	"\blue [user] smears some bioglue over [W.desc] on [M]'s [affecting.display_name].", \
 										"\blue You smear some bioglue over [W.desc] on [M]'s [affecting.display_name]." )
-				affecting.heal_damage(heal_brute,0)
+				if (bandaged)
+					affecting.heal_damage(heal_brute,0)
 				use(1)
 		else
 			if (can_operate(H))        //Checks if mob is lying down on table for surgery

code/game/objects/items/stacks/sheets/glass.dm

@@ -284,7 +284,7 @@
 			return
 	return ..()
 
-/obj/item/weapon/shard/HasEntered(AM as mob|obj)
+/obj/item/weapon/shard/Crossed(AM as mob|obj)
 	if(ismob(AM))
 		var/mob/M = AM
 		M << "\red <B>You step in the broken glass!</B>"

code/game/objects/items/stacks/sheets/mineral.dm

@@ -51,7 +51,7 @@ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
 	w_class = 3.0
 	throw_range = 3
 	origin_tech = "materials=6"
-	perunit = 3750
+	perunit = 2000
 	sheettype = "diamond"
 
 var/global/list/datum/stack_recipe/diamond_recipes = list ( \

code/game/objects/items/toys.dm

@@ -402,7 +402,7 @@
 		playsound(src, 'sound/effects/snap.ogg', 50, 1)
 		del(src)
 
-/obj/item/toy/snappop/HasEntered(H as mob|obj)
+/obj/item/toy/snappop/Crossed(H as mob|obj)
 	if((ishuman(H))) //i guess carp and shit shouldn't set them off
 		var/mob/living/carbon/M = H
 		if(M.m_intent == "run")

code/game/objects/items/weapons/clown_items.dm

@@ -8,7 +8,7 @@
 /*
  * Banana Peals
  */
-/obj/item/weapon/bananapeel/HasEntered(AM as mob|obj)
+/obj/item/weapon/bananapeel/Crossed(AM as mob|obj)
 	if (istype(AM, /mob/living/carbon))
 		var/mob/M =	AM
 		if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP))
@@ -23,7 +23,7 @@
 /*
  * Soap
  */
-/obj/item/weapon/soap/HasEntered(AM as mob|obj) //EXACTLY the same as bananapeel for now, so it makes sense to put it in the same dm -- Urist
+/obj/item/weapon/soap/Crossed(AM as mob|obj) //EXACTLY the same as bananapeel for now, so it makes sense to put it in the same dm -- Urist
 	if (istype(AM, /mob/living/carbon))
 		var/mob/M =	AM
 		if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP))

code/game/objects/items/weapons/defib.dm

@@ -150,7 +150,7 @@
 				H.updatehealth() //forces a health update, otherwise the oxyloss adjustment wouldnt do anything
 				M.visible_message("\red [M]'s body convulses a bit.")
 				var/datum/organ/external/temp = H.get_organ("head")
-				if(H.health > -100 && !(temp.status & ORGAN_DESTROYED) && !H.suiciding && (H.brain_op_stage < 4) && toolate(M)) //!(M_NOCLONE in H.mutations) && We don't have this.
+				if(H.health > -100 && !(temp.status & ORGAN_DESTROYED) && !H.suiciding && (M.has_brain()) && toolate(M)) //!(M_NOCLONE in H.mutations) && We don't have this.
 					viewers(M) << "\blue [src] beeps: Resuscitation successful."
 					spawn(0)
 						H.stat = 1

code/game/objects/items/weapons/stunbaton.dm

@@ -1,56 +1,105 @@
 /obj/item/weapon/melee/baton
-	name = "stun baton"
+	name = "stunbaton"
 	desc = "A stun baton for incapacitating people with."
 	icon_state = "stunbaton"
 	item_state = "baton"
 	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_BELT
-	force = 10
+	force = 15
+	sharp = 0
+	edge = 0
 	throwforce = 7
 	w_class = 3
-	var/charges = 10
-	var/status = 0
-	var/mob/foundmob = "" //Used in throwing proc.
-
 	origin_tech = "combat=2"
+	attack_verb = list("beaten")
+	var/status = 0		//whether the thing is on or not
+	var/obj/item/weapon/cell/bcell = null
+	var/hitcost = 1000	//oh god why do power cells carry so much charge? We probably need to make a distinction between "industrial" sized power cells for APCs and power cells for everything else.
+	var/mob/foundmob = "" //Throwing! And proc.
 
-	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is putting the live [src.name] in \his mouth! It looks like \he's trying to commit suicide.</b>"
-		return (FIRELOSS)
+/obj/item/weapon/melee/baton/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is putting the live [name] in \his mouth! It looks like \he's trying to commit suicide.</span>")
+	return (FIRELOSS)
+
+/obj/item/weapon/melee/baton/New()
+	..()
+	update_icon()
+	return
+
+/obj/item/weapon/melee/baton/loaded/New() //this one starts with a cell pre-installed.
+	..()
+	bcell = new/obj/item/weapon/cell/high(src)
+	update_icon()
+	return
+
+/obj/item/weapon/melee/baton/proc/deductcharge(var/chrgdeductamt)
+	if(bcell)
+		if(bcell.use(chrgdeductamt))
+			return 1
+		else
+			status = 0
+			update_icon()
+			return 0
 
 /obj/item/weapon/melee/baton/update_icon()
 	if(status)
-		icon_state = "stunbaton_active"
+		icon_state = "[initial(name)]_active"
+	else if(!bcell)
+		icon_state = "[initial(name)]_nocell"
 	else
-		icon_state = "stunbaton"
+		icon_state = "[initial(name)]"
 
-/obj/item/weapon/melee/baton/attack_self(mob/user as mob)
-	if(status && (CLUMSY in user.mutations) && prob(50))
-		user << "\red You grab the [src] on the wrong side."
-		user.Weaken(30)
-		charges--
-		if(charges < 1)
+/obj/item/weapon/melee/baton/examine()
+	set src in view(1)
+	..()
+	if(bcell)
+		usr <<"<span class='notice'>The baton is [round(bcell.percent())]% charged.</span>"
+	if(!bcell)
+		usr <<"<span class='warning'>The baton does not have a power source installed.</span>"
+
+/obj/item/weapon/melee/baton/attackby(obj/item/weapon/W, mob/user)
+	if(istype(W, /obj/item/weapon/cell))
+		if(!bcell)
+			user.drop_item()
+			W.loc = src
+			bcell = W
+			user << "<span class='notice'>You install a cell in [src].</span>"
+			update_icon()
+		else
+			user << "<span class='notice'>[src] already has a cell.</span>"
+
+	else if(istype(W, /obj/item/weapon/screwdriver))
+		if(bcell)
+			bcell.updateicon()
+			bcell.loc = get_turf(src.loc)
+			bcell = null
+			user << "<span class='notice'>You remove the cell from the [src].</span>"
 			status = 0
 			update_icon()
-		return
-	if(charges > 0)
+			return
+		..()
+	return
+
+/obj/item/weapon/melee/baton/attack_self(mob/user)
+	if(bcell && bcell.charge > hitcost)
 		status = !status
-		user << "<span class='notice'>\The [src] is now [status ? "on" : "off"].</span>"
-		playsound(src.loc, "sparks", 75, 1, -1)
+		user << "<span class='notice'>[src] is now [status ? "on" : "off"].</span>"
+		playsound(loc, "sparks", 75, 1, -1)
 		update_icon()
 	else
 		status = 0
-		user << "<span class='warning'>\The [src] is out of charge.</span>"
+		if(!bcell)
+			user << "<span class='warning'>[src] does not have a power source!</span>"
+		else
+			user << "<span class='warning'>[src] is out of charge.</span>"
 	add_fingerprint(user)
 
-/obj/item/weapon/melee/baton/attack(mob/M as mob, mob/user as mob)
+
+/obj/item/weapon/melee/baton/attack(mob/M, mob/user)
 	if(status && (CLUMSY in user.mutations) && prob(50))
 		user << "<span class='danger'>You accidentally hit yourself with the [src]!</span>"
 		user.Weaken(30)
-		charges--
-		if(charges < 1)
-			status = 0
-			update_icon()
+		deductcharge(hitcost)
 		return
 
 	var/mob/living/carbon/human/H = M
@@ -61,15 +110,15 @@
 	if(user.a_intent == "hurt")
 		if(!..()) return
 		//H.apply_effect(5, WEAKEN, 0)
-		H.visible_message("<span class='danger'>[M] has been beaten with the [src] by [user]!</span>")
+		M.visible_message("<span class='danger'>[M] has been beaten with the [src] by [user]!</span>")
 
-		user.attack_log += "\[[time_stamp()]\]<font color='red'> Beat [H.name] ([H.ckey]) with [src.name]</font>"
-		H.attack_log += "\[[time_stamp()]\]<font color='orange'> Beaten by [user.name] ([user.ckey]) with [src.name]</font>"
-		msg_admin_attack("[user.name] ([user.ckey]) beat [H.name] ([H.ckey]) with [src.name] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+		user.attack_log += "\[[time_stamp()]\]<font color='red'> Beat [M.name] ([M.ckey]) with [src.name]</font>"
+		M.attack_log += "\[[time_stamp()]\]<font color='orange'> Beaten by [user.name] ([user.ckey]) with [src.name]</font>"
+		msg_admin_attack("[user.name] ([user.ckey]) beat [M.name] ([M.ckey]) with [src.name] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 
-		playsound(src.loc, "swing_hit", 50, 1, -1)
+		playsound(loc, "swing_hit", 50, 1, -1)
 	else if(!status)
-		H.visible_message("<span class='warning'>[M] has been prodded with the [src] by [user]. Luckily it was off.</span>")
+		M.visible_message("<span class='warning'>[M] has been prodded with the [src] by [user]. Luckily it was off.</span>")
 		return
 
 	if(status)
@@ -77,21 +126,21 @@
 		H.apply_effect(10, WEAKEN, 0)
 		H.apply_effect(10, STUTTER, 0)
 		user.lastattacked = M
-		H.lastattacker = user
+		M.lastattacker = user
 		if(isrobot(src.loc))
 			var/mob/living/silicon/robot/R = src.loc
 			if(R && R.cell)
 				R.cell.use(50)
 		else
-			charges--
-		H.visible_message("<span class='danger'>[M] has been stunned with the [src] by [user]!</span>")
+			deductcharge(hitcost)
+		M.visible_message("<span class='danger'>[M] has been stunned with the [src] by [user]!</span>")
 
-		user.attack_log += "\[[time_stamp()]\]<font color='red'> Stunned [H.name] ([H.ckey]) with [src.name]</font>"
-		H.attack_log += "\[[time_stamp()]\]<font color='orange'> Stunned by [user.name] ([user.ckey]) with [src.name]</font>"
-		msg_admin_attack("[key_name(user)] stunned [key_name(H)] with [src.name] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>")
+		user.attack_log += "\[[time_stamp()]\]<font color='red'> Stunned [M.name] ([M.ckey]) with [src.name]</font>"
+		M.attack_log += "\[[time_stamp()]\]<font color='orange'> Stunned by [user.name] ([user.ckey]) with [src.name]</font>"
+		msg_admin_attack("[key_name(user)] stunned [key_name(M)] with [src.name] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[M.x];Y=[M.y];Z=[M.z]'>JMP</a>")
 
 		playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
-		if(charges < 1)
+		if(bcell && bcell.charge < hitcost)
 			status = 0
 			update_icon()
 
@@ -106,7 +155,7 @@
 				H.apply_effect(10, STUN, 0)
 				H.apply_effect(10, WEAKEN, 0)
 				H.apply_effect(10, STUTTER, 0)
-				charges--
+				deductcharge(hitcost)
 
 				for(var/mob/M in player_list) if(M.key == src.fingerprintslast)
 					foundmob = M
@@ -118,15 +167,20 @@
 				msg_admin_attack("Flying [src.name], last touched by ([src.fingerprintslast]) stunned [key_name(H)] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>" )
 
 /obj/item/weapon/melee/baton/emp_act(severity)
-	switch(severity)
-		if(1)
-			charges = 0
-		if(2)
-			charges = max(0, charges - 5)
-	if(charges < 1)
-		status = 0
-		update_icon()
+	if(bcell)
+		bcell.emp_act(severity)	//let's not duplicate code everywhere if we don't have to please.
+	..()
 
+//secborg stun baton module
+/obj/item/weapon/melee/baton/robot/attack_self(mob/user)
+	//try to find our power cell
+	var/mob/living/silicon/robot/R = loc
+	if (istype(R))
+		bcell = R.cell
+	return ..()
+
+/obj/item/weapon/melee/baton/robot/attackby(obj/item/weapon/W, mob/user)
+	return
 
 /*
  *
@@ -137,133 +191,19 @@
  */
 
 /obj/item/weapon/melee/baton/stunrod
-	name = "stun rod"
+	name = "stunrod"
 	desc = "A more-than-lethal weapon used to deal with high threat situations."
 	icon_state = "stunrod"
 	item_state = "stunrod"
 	flags = FPRINT | TABLEPASS
 	slot_flags = SLOT_BELT
-	force = 12
+	force = 15
 	throwforce = 8
 	w_class = 3
-
 	origin_tech = "combat=4,illegal=2"
 
-	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is putting the live [src.name] in \his mouth! It looks like \he's trying to commit suicide.</b>"
-		return (FIRELOSS)
-
-/obj/item/weapon/melee/baton/stunrod/update_icon()
-	if(status)
-		icon_state = "stunrod_active"
-		item_state = "stunrod_active"
-	else
-		icon_state = "stunrod"
-		item_state = "stunrod"
-
-/obj/item/weapon/melee/baton/stunrod/attack_self(mob/user as mob)
-	if(status && (CLUMSY in user.mutations) && prob(50))
-		user << "\red You grab the [src] on the wrong side and burn yourself."
-		user.Weaken(40)
-		charges--
-		if(charges < 1)
-			status = 0
-			update_icon()
-		return
-	if(charges > 0)
-		status = !status
-		user << "<span class='notice'>\The [src] is now [status ? "on" : "off"].</span>"
-		playsound(src.loc, "sparks", 75, 1, -1)
-		update_icon()
-	else
-		status = 0
-		user << "<span class='warning'>\The [src] is out of charge.</span>"
-	add_fingerprint(user)
-
-/obj/item/weapon/melee/baton/stunrod/attack(mob/M as mob, mob/user as mob)
-	if(status && (CLUMSY in user.mutations) && prob(50))
-		user << "<span class='danger'>You accidentally hit yourself with the [src]!</span>"
-		user.Weaken(20)
-//		user.apply_damage(10,BURN)
-		charges--
-		if(charges < 1)
-			status = 0
-			update_icon()
-		return
-
-	var/mob/living/carbon/human/H = M
-	if(isrobot(M))
-		..()
-		return
-
-	if(user.a_intent == "hurt")
-		if(!..()) return
-		H.apply_effect(5, WEAKEN, 0)
-		H.apply_damage(15, BURN)
-		H.visible_message("<span class='danger'>[M] has been beaten with the [src] by [user]!</span>")
-
-		user.attack_log += "\[[time_stamp()]\]<font color='red'> Beat [H.name] ([H.ckey]) with [src.name]</font>"
-		H.attack_log += "\[[time_stamp()]\]<font color='orange'> Beaten by [user.name] ([user.ckey]) with [src.name]</font>"
-		msg_admin_attack("[user.name] ([user.ckey]) beat [H.name] ([H.ckey]) with [src.name] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
-
-		playsound(src.loc, "swing_hit", 50, 1, -1)
-	else if(!status)
-		H.visible_message("<span class='warning'>[M] has been prodded with the [src] by [user]. Luckily it was off.</span>")
-		return
-
-	if(status)
-		H.apply_effect(5, STUN, 0)
-		H.apply_effect(5, WEAKEN, 0)
-		H.apply_effect(5, STUTTER, 0)
-		H.apply_damage(15, BURN)
-		user.lastattacked = M
-		H.lastattacker = user
-		if(isrobot(src.loc))
-			var/mob/living/silicon/robot/R = src.loc
-			if(R && R.cell)
-				R.cell.use(75)
-		else
-			charges--
-		H.visible_message("<span class='danger'>[M] has been stunned with the [src] by [user]!</span>")
-
-		user.attack_log += "\[[time_stamp()]\]<font color='red'> Stunned [H.name] ([H.ckey]) with [src.name]</font>"
-		H.attack_log += "\[[time_stamp()]\]<font color='orange'> Stunned by [user.name] ([user.ckey]) with [src.name]</font>"
-		msg_admin_attack("[key_name(user)] stunned [key_name(H)] with [src.name] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>")
-
-		playsound(src.loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
-		if(charges < 1)
-			status = 0
-			update_icon()
-
-	add_fingerprint(user)
-
-/obj/item/weapon/melee/baton/stunrod/throw_impact(atom/hit_atom)
-	. = ..()
-	if (prob(50))
-		if(istype(hit_atom, /mob/living))
-			var/mob/living/carbon/human/H = hit_atom
-			if(status)
-				H.apply_effect(5, STUN, 0)
-				H.apply_effect(5, WEAKEN, 0)
-				H.apply_effect(5, STUTTER, 0)
-				H.apply_damage(15, BURN)
-				charges--
-
-				for(var/mob/M in player_list) if(M.key == src.fingerprintslast)
-					foundmob = M
-					break
-
-				H.visible_message("<span class='danger'>[src], thrown by [foundmob.name], strikes [H] and stuns them!</span>")
-
-				H.attack_log += "\[[time_stamp()]\]<font color='orange'> Stunned by thrown [src.name] last touched by ([src.fingerprintslast])</font>"
-				msg_admin_attack("Flying [src.name], last touched by ([src.fingerprintslast]) stunned [key_name(H)] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>" )
-
-/obj/item/weapon/melee/baton/stunrod/emp_act(severity)
-	switch(severity)
-		if(1)
-			charges = 0
-		if(2)
-			charges = max(0, charges - 5)
-	if(charges < 1)
-		status = 0
-		update_icon()
+/obj/item/weapon/melee/baton/stunrod/loaded/New() //this one starts with a cell pre-installed.
+	..()
+	bcell = new/obj/item/weapon/cell/high(src)
+	update_icon()
+	return

code/game/objects/items/weapons/tanks/jetpack.dm

@@ -21,6 +21,9 @@
 /obj/item/weapon/tank/jetpack/examine()
 	set src in usr
 	..()
+	if (!in_range(src, usr))
+		return
+
 	if(air_contents.gas["oxygen"] < 10)
 		usr << text("\red <B>The meter on the [src.name] indicates you are almost out of air!</B>")
 		playsound(usr, 'sound/effects/alert.ogg', 50, 1)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -119,7 +119,7 @@
 		new /obj/item/weapon/storage/box/flashbangs(src)
 		new /obj/item/weapon/storage/belt/security(src)
 		new /obj/item/device/flash(src)
-		new /obj/item/weapon/melee/baton(src)
+		new /obj/item/weapon/melee/baton/loaded(src)
 		new /obj/item/weapon/gun/energy/gun/pistol(src)
 		new /obj/item/clothing/tie/holster/waist(src)
 		new /obj/item/weapon/melee/telebaton(src)
@@ -157,7 +157,7 @@
 		new /obj/item/weapon/storage/box/flashbangs(src)
 		new /obj/item/weapon/storage/belt/security(src)
 		new /obj/item/weapon/reagent_containers/spray/pepper(src)
-		new /obj/item/weapon/melee/baton(src)
+		new /obj/item/weapon/melee/baton/loaded(src)
 		new /obj/item/weapon/gun/energy/taser(src)
 		new /obj/item/weapon/storage/box/holobadge(src)
 		return
@@ -189,7 +189,7 @@
 		new /obj/item/device/flash(src)
 		new /obj/item/weapon/reagent_containers/spray/pepper(src)
 		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/melee/baton(src)
+		new /obj/item/weapon/melee/baton/loaded(src)
 		new /obj/item/weapon/gun/energy/taser(src)
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
 		new /obj/item/taperoll/police(src)

code/game/objects/structures/watercloset.dm

@@ -370,20 +370,21 @@
 
 	else if (istype(O, /obj/item/weapon/melee/baton))
 		var/obj/item/weapon/melee/baton/B = O
-		if (B.charges > 0 && B.status == 1)
-			flick("baton_active", src)
-			user.Stun(10)
-			user.stuttering = 10
-			user.Weaken(10)
-			if(isrobot(user))
-				var/mob/living/silicon/robot/R = user
-				R.cell.charge -= 20
-			else
-				B.charges--
-			user.visible_message( \
-				"[user] was stunned by his wet [O].", \
-				"\red You have wet \the [O], it shocks you!")
-			return
+		if(B.bcell)
+			if(B.bcell.charge > 0 && B.status == 1)
+				flick("baton_active", src)
+				user.Stun(10)
+				user.stuttering = 10
+				user.Weaken(10)
+				if(isrobot(user))
+					var/mob/living/silicon/robot/R = user
+					R.cell.charge -= 20
+				else
+					B.deductcharge(B.hitcost)
+				user.visible_message( \
+					"<span class='danger'>[user] was stunned by \his wet [O]!</span>", \
+					"<span class='userdanger'>[user] was stunned by \his wet [O]!</span>")
+				return
 
 	var/turf/location = user.loc
 	if(!isturf(location)) return
@@ -429,4 +430,4 @@
 /obj/structure/sink/puddle/attackby(obj/item/O as obj, mob/user as mob)
 	icon_state = "puddle-splash"
 	..()
-	icon_state = "puddle"
+	icon_state = "puddle"

code/global.dm

@@ -12,6 +12,8 @@ var/global/list/machines = list()
 var/global/list/processing_objects = list()
 var/global/list/active_diseases = list()
 var/global/list/events = list()
+var/global/list/med_hud_users = list() //list of all entities using a medical HUD.
+var/global/list/sec_hud_users = list() //list of all entities using a security HUD.
 		//items that ask to be called every cycle
 
 var/global/defer_powernet_rebuild = 0		// true if net rebuild will be called manually after an event

code/modules/admin/admin.dm

@@ -145,8 +145,8 @@ var/global/floorIsLava = 0
 			else if(ishuman(M))
 				body += {"<A href='?src=\ref[src];makeai=\ref[M]'>Make AI</A> |
 					<A href='?src=\ref[src];makerobot=\ref[M]'>Make Robot</A> |
-					<A href='?src=\ref[src];makealien=\ref[M]'>Make Alien</A> |
-					<A href='?src=\ref[src];makeslime=\ref[M]'>Make slime</A>
+					<A href='?src=\ref[src];makeslime=\ref[M]'>Make slime</A> |
+					<A href='?src=\ref[src];makealien=\ref[M]'>Make Alien(BROKEN)</A> |
 				"}
 
 			//Simple Animals
@@ -156,7 +156,7 @@ var/global/floorIsLava = 0
 				body += "<A href='?src=\ref[src];makeanimal=\ref[M]'>Animalize</A> | "
 
 			// DNA2 - Admin Hax
-			if(iscarbon(M))
+			if(M.dna && iscarbon(M))
 				body += "<br><br>"
 				body += "<b>DNA Blocks:</b><br><table border='2'><tr><th>&nbsp;</th><th>1</th><th>2</th><th>3</th><th>4</th><th>5</th>"
 				var/bname
@@ -189,19 +189,20 @@ var/global/floorIsLava = 0
 				<A href='?src=\ref[src];simplemake=corgi;mob=\ref[M]'>Corgi</A> |
 				<A href='?src=\ref[src];simplemake=ian;mob=\ref[M]'>Ian</A> |
 				<A href='?src=\ref[src];simplemake=crab;mob=\ref[M]'>Crab</A> |
-				<A href='?src=\ref[src];simplemake=coffee;mob=\ref[M]'>Coffee</A><br>
+				<A href='?src=\ref[src];simplemake=coffee;mob=\ref[M]'>Coffee</A> |
+				<A href='?src=\ref[src];simplemake=nymph;mob=\ref[M]'>Nymph</A><br>
 
+				Construct: <A href='?src=\ref[src];simplemake=constructarmoured;mob=\ref[M]'>Armoured</A> |
+				<A href='?src=\ref[src];simplemake=constructbuilder;mob=\ref[M]'>Builder</A> |
+				<A href='?src=\ref[src];simplemake=constructwraith;mob=\ref[M]'>Wraith</A> |
+				<A href='?src=\ref[src];simplemake=shade;mob=\ref[M]'>Shade</A><br>
+
+				<br><b>Note from sound, Aliens are broken (Disabled)</b><br>
 				Alien: <A href='?src=\ref[src];simplemake=drone;mob=\ref[M]'>Drone</A> |
 				<A href='?src=\ref[src];simplemake=hunter;mob=\ref[M]'>Hunter</A> |
 				<A href='?src=\ref[src];simplemake=queen;mob=\ref[M]'>Queen</A> |
 				<A href='?src=\ref[src];simplemake=sentinel;mob=\ref[M]'>Sentinel</A> |
 				<A href='?src=\ref[src];simplemake=larva;mob=\ref[M]'>Larva</A><br>
-
-				Construct: <A href='?src=\ref[src];simplemake=constructarmoured;mob=\ref[M]'>Armoured</A> |
-				<A href='?src=\ref[src];simplemake=constructbuilder;mob=\ref[M]'>Builder</A> |
-				<A href='?src=\ref[src];simplemake=constructwraith;mob=\ref[M]'>Wraith</A> |
-				<A href='?src=\ref[src];simplemake=shade;mob=\ref[M]'>Shade</A>
-				<br>
 			"}
 
 	if (M.client)

code/modules/admin/admin_verbs.dm

@@ -218,7 +218,8 @@ var/list/admin_verbs_debug = list(
 	/client/proc/SDQL2_query,
 	/client/proc/cmd_dev_reset_gravity,
 	/client/proc/cmd_dev_reset_floating,
-	/client/proc/fillspace
+	/client/proc/fillspace,
+	/client/proc/hide_activity
 	)
 var/list/admin_verbs_possess = list(
 	/proc/possess,
@@ -1051,4 +1052,22 @@ var/list/admin_verbs_mod = list(
 			S.ChangeTurf(/turf/simulated/floor/plating)
 	if(A.name == "Space")
 		for(var/turf/space/S in range(2,usr))
-			S.ChangeTurf(/turf/simulated/floor/plating)
+			S.ChangeTurf(/turf/simulated/floor/plating)
+
+/client/proc/hide_activity()
+	set category = "Preferences"
+	set name = "Hide Var Edits"
+	set desc = "Hide Var edit logs from devs"
+
+	if(!check_rights(R_DEBUG))
+		holder.hide_activity = 0
+		return
+
+	if(holder)
+		holder.hide_activity = !holder.hide_activity
+
+	if (holder.hide_activity)
+		usr << "Your varedits will now be hidden from developers"
+	else
+		usr << "Your varedits will now be shown to developers"
+	return

code/modules/admin/holder2.dm

@@ -12,6 +12,7 @@ var/list/admin_datums = list()
 	var/datum/feed_message/admincaster_feed_message = new /datum/feed_message   //These two will act as holders.
 	var/datum/feed_channel/admincaster_feed_channel = new /datum/feed_channel
 	var/admincaster_signature	//What you'll sign the newsfeeds as
+	var/hide_activity = 0
 
 /datum/admins/New(initial_rank = "Temporary Admin", initial_rights = 0, ckey)
 	if(!ckey)

code/modules/admin/topic.dm

@@ -288,13 +288,14 @@
 
 		switch(href_list["simplemake"])
 			if("observer")			M.change_mob_type( /mob/dead/observer , null, null, delmob )
-			if("drone")				M.change_mob_type( /mob/living/carbon/alien/humanoid/drone , null, null, delmob )
-			if("hunter")			M.change_mob_type( /mob/living/carbon/alien/humanoid/hunter , null, null, delmob )
-			if("queen")				M.change_mob_type( /mob/living/carbon/alien/humanoid/queen , null, null, delmob )
-			if("sentinel")			M.change_mob_type( /mob/living/carbon/alien/humanoid/sentinel , null, null, delmob )
-			if("larva")				M.change_mob_type( /mob/living/carbon/alien/larva , null, null, delmob )
+//			if("drone")				M.change_mob_type( /mob/living/carbon/alien/humanoid/drone , null, null, delmob )
+//			if("hunter")			M.change_mob_type( /mob/living/carbon/alien/humanoid/hunter , null, null, delmob )
+//			if("queen")				M.change_mob_type( /mob/living/carbon/alien/humanoid/queen , null, null, delmob )
+//			if("sentinel")			M.change_mob_type( /mob/living/carbon/alien/humanoid/sentinel , null, null, delmob )
+//			if("larva")				M.change_mob_type( /mob/living/carbon/alien/larva , null, null, delmob )
+			if("nymph")				M.change_mob_type( /mob/living/carbon/alien/diona , null, null, delmob )
 			if("human")				M.change_mob_type( /mob/living/carbon/human , null, null, delmob )
-			if("slime")			M.change_mob_type( /mob/living/carbon/slime , null, null, delmob )
+			if("slime")				M.change_mob_type( /mob/living/carbon/slime , null, null, delmob )
 			if("monkey")			M.change_mob_type( /mob/living/carbon/monkey , null, null, delmob )
 			if("robot")				M.change_mob_type( /mob/living/silicon/robot , null, null, delmob )
 			if("cat")				M.change_mob_type( /mob/living/simple_animal/cat , null, null, delmob )

code/modules/admin/verbs/massmodvar.dm

@@ -373,4 +373,4 @@
 
 	log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]")
 	message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]", 1)
-	msg_scopes("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]", 1)//Tell the devs
+	msg_scopes("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]]", 1, 0, src)//Tell the devs

code/modules/admin/verbs/modifyvariables.dm

@@ -504,4 +504,4 @@ var/list/forbidden_varedit_object_types = list(
 	world.log << "### VarEdit by [src]: [O.type] [variable]=[html_encode("[O.vars[variable]]")]"
 	log_admin("[key_name(src)] modified [original_name]'s [variable] to [O.vars[variable]]")
 	message_admins("[key_name_admin(src)] modified [original_name]'s [variable] to [O.vars[variable]]", 1)
-	msg_scopes("[key_name_admin(src)] modified [original_name]'s [variable] to [O.vars[variable]]", 1) // Tell dev's to but not log twice
+	msg_scopes("[key_name_admin(src)] modified [original_name]'s [variable] to [O.vars[variable]]", 1, 0, src) // Tell dev's to but not log twice

code/modules/assembly/holder.dm

@@ -104,13 +104,13 @@
 			special_assembly.HasProximity(AM)
 
 
-	HasEntered(atom/movable/AM as mob|obj)
+	Crossed(atom/movable/AM as mob|obj)
 		if(a_left)
-			a_left.HasEntered(AM)
+			a_left.Crossed(AM)
 		if(a_right)
-			a_right.HasEntered(AM)
+			a_right.Crossed(AM)
 		if(special_assembly)
-			special_assembly.HasEntered(AM)
+			special_assembly.Crossed(AM)
 
 
 	on_found(mob/finder as mob)

code/modules/assembly/infrared.dm

@@ -251,7 +251,7 @@
 	hit()
 	return
 
-/obj/effect/beam/i_beam/HasEntered(atom/movable/AM as mob|obj)
+/obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
 	if(istype(AM, /obj/effect/beam))
 		return
 	spawn(0)

code/modules/assembly/mousetrap.dm

@@ -81,7 +81,7 @@
 		..()
 
 
-	HasEntered(AM as mob|obj)
+	Crossed(AM as mob|obj)
 		if(armed)
 			if(ishuman(AM))
 				var/mob/living/carbon/H = AM

code/modules/clothing/clothing.dm

@@ -10,6 +10,10 @@
 	*/
 	var/list/sprite_sheets_refit = null
 
+//Updates the icons of the mob wearing the clothing item, if any.
+/obj/item/clothing/proc/update_clothing_icon()
+	return
+
 //BS12: Species-restricted clothing check.
 /obj/item/clothing/mob_can_equip(M as mob, slot)
 
@@ -121,6 +125,11 @@
 	if(istype(src,/obj/item/clothing/ears/offear))
 		del(src)
 
+/obj/item/clothing/ears/update_clothing_icon()
+	if (ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_ears()
+
 /obj/item/clothing/ears/offear
 	name = "Other ear"
 	w_class = 5.0
@@ -163,6 +172,10 @@ SEE_PIXELS// if an object is located on an unlit area, but some of its pixels ar
 BLIND     // can't see anything
 */
 
+/obj/item/clothing/glasses/update_clothing_icon()
+	if (ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_glasses()
 
 //Gloves
 /obj/item/clothing/gloves
@@ -185,6 +198,11 @@ BLIND     // can't see anything
 	..()
 	return
 
+/obj/item/clothing/gloves/update_clothing_icon()
+	if (ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_gloves()
+
 /obj/item/clothing/gloves/emp_act(severity)
 	if(cell)
 		//why is this not part of the powercell code?
@@ -225,6 +243,12 @@ BLIND     // can't see anything
 	slot_flags = SLOT_HEAD
 	w_class = 2.0
 
+/obj/item/clothing/head/update_clothing_icon()
+	if (ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_head()
+
+///////////////////////////////////////////////////////////////////////
 //Mask
 /obj/item/clothing/mask
 	name = "mask"
@@ -234,7 +258,13 @@ BLIND     // can't see anything
 //	body_parts_covered = FACE|EYES
 	sprite_sheets = list("Vox" = 'icons/mob/species/vox/masks.dmi')
 
+/obj/item/clothing/mask/update_clothing_icon()
+	if (ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_wear_mask()
+
 /obj/item/clothing/mask/proc/filter_air(datum/gas_mixture/air)
+	return
 
 //Shoes
 /obj/item/clothing/shoes
@@ -251,6 +281,10 @@ BLIND     // can't see anything
 	species_restricted = list("exclude","Unathi","Tajaran")
 	sprite_sheets = list("Vox" = 'icons/mob/species/vox/shoes.dmi')
 
+/obj/item/clothing/shoes/update_clothing_icon()
+	if (ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_shoes()
 
 /obj/item/proc/negates_gravity()
 	return 0
@@ -269,6 +303,10 @@ BLIND     // can't see anything
 	siemens_coefficient = 0.9
 	w_class = 3
 
+/obj/item/clothing/suit/update_clothing_icon()
+	if (ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_wear_suit()
 //Spacesuit
 //Note: Everything in modules/clothing/spacesuits should have the entire suit grouped together.
 //      Meaning the the suit is defined directly after the corrisponding helmet. Just like below!
@@ -361,6 +399,11 @@ BLIND     // can't see anything
 	var/basecolor
 	sprite_sheets = list("Vox" = 'icons/mob/species/vox/uniform.dmi')
 
+/obj/item/clothing/under/update_clothing_icon()
+	if (ismob(src.loc))
+		var/mob/M = src.loc
+		M.update_inv_w_uniform()
+
 /obj/item/clothing/under/attackby(obj/item/I, mob/user)
 	if(hastie)
 		hastie.attackby(I, user)
@@ -486,7 +529,7 @@ BLIND     // can't see anything
 	if(basecolor + "_d_s" in icon_states('icons/mob/uniform.dmi'))
 		body_parts_covered = "[basecolor]" ? LEGS|LOWER_TORSO : UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 		item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]"
-		usr.update_inv_w_uniform()
+		update_clothing_icon()
 		if(rolled_down)
 			usr << "You roll [src] up"
 			rolled_down = 0
@@ -509,7 +552,7 @@ BLIND     // can't see anything
 		basecolor = item_color
 	if(basecolor + "_r_s" in icon_states('icons/mob/uniform.dmi'))
 		item_color = item_color == "[basecolor]" ? "[basecolor]_r" : "[basecolor]"
-		usr.update_inv_w_uniform()
+		update_clothing_icon()
 		if(rolled_sleeves)
 			usr << "You roll [src] sleeves down"
 			rolled_sleeves = 0
@@ -527,10 +570,7 @@ BLIND     // can't see anything
 
 	hastie.on_removed(user)
 	hastie = null
-
-	if(istype(loc, /mob/living/carbon/human))
-		var/mob/living/carbon/human/H = loc
-		H.update_inv_w_uniform()
+	update_clothing_icon()
 
 /obj/item/clothing/under/verb/removetie()
 	set name = "Remove Accessory"

code/modules/clothing/glasses/glasses.dm

@@ -9,15 +9,38 @@
 	//var/darkness_view = 0//Base human is 2
 	//var/invisa_view = 0
 	var/prescription = 0
+	var/toggleable = 0
+	var/active = 1
+	var/obj/screen/overlay = null
+	body_parts_covered = EYES
+
+/obj/item/clothing/glasses/attack_self(mob/user)
+	if(toggleable)
+		if(active)
+			active = 0
+			icon_state = "degoggles"
+			user.update_inv_glasses()
+			usr << "You deactivate the optical matrix on the [src]."
+		else
+			active = 1
+			icon_state = initial(icon_state)
+			user.update_inv_glasses()
+			usr << "You activate the optical matrix on the [src]."
 
 /obj/item/clothing/glasses/meson
 	name = "Optical Meson Scanner"
 	desc = "Used for seeing walls, floors, and stuff through anything."
 	icon_state = "meson"
 	item_state = "glasses"
+	icon_action_button = "action_meson" //This doesn't actually matter, the action button is generated from the current icon_state. But, this is the only way to get it to show up.
 	origin_tech = "magnets=2;engineering=2"
+	toggleable = 1
 	vision_flags = SEE_TURFS
 
+/obj/item/clothing/glasses/meson/New()
+	..()
+	overlay = global_hud.meson
+
 /obj/item/clothing/glasses/meson/prescription
 	name = "prescription mesons"
 	desc = "Optical Meson Scanner with prescription lenses."
@@ -37,24 +60,32 @@
 	origin_tech = "magnets=2"
 	darkness_view = 7
 
+/obj/item/clothing/glasses/night/New()
+	..()
+	overlay = global_hud.nvg
+
 /obj/item/clothing/glasses/eyepatch
 	name = "eyepatch"
 	desc = "Yarr."
 	icon_state = "eyepatch"
 	item_state = "eyepatch"
+	body_parts_covered = 0
 
 /obj/item/clothing/glasses/monocle
 	name = "monocle"
 	desc = "Such a dapper eyepiece!"
 	icon_state = "monocle"
 	item_state = "headset" // lol
+	body_parts_covered = 0
 
 /obj/item/clothing/glasses/material
 	name = "Optical Material Scanner"
 	desc = "Very confusing glasses."
 	icon_state = "material"
 	item_state = "glasses"
+	icon_action_button = "action_material"
 	origin_tech = "magnets=3;engineering=3"
+	toggleable = 1
 	vision_flags = SEE_OBJS
 
 /obj/item/clothing/glasses/regular
@@ -63,6 +94,7 @@
 	icon_state = "glasses"
 	item_state = "glasses"
 	prescription = 1
+	body_parts_covered = 0
 
 /obj/item/clothing/glasses/regular/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/clothing/glasses/hud/health))
@@ -93,12 +125,14 @@
 	name = "3D glasses"
 	icon_state = "3d"
 	item_state = "3d"
+	body_parts_covered = 0
 
 /obj/item/clothing/glasses/gglasses
 	name = "Green Glasses"
 	desc = "Forest green glasses, like the kind you'd wear when hatching a nasty scheme."
 	icon_state = "gglasses"
 	item_state = "gglasses"
+	body_parts_covered = 0
 
 /obj/item/clothing/glasses/sunglasses
 	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes."
@@ -130,12 +164,14 @@
 			src.up = !src.up
 			src.flags |= GLASSESCOVERSEYES
 			flags_inv |= HIDEEYES
+			body_parts_covered |= EYES
 			icon_state = initial(icon_state)
 			usr << "You flip \the [src] down to protect your eyes."
 		else
 			src.up = !src.up
 			src.flags &= ~HEADCOVERSEYES
 			flags_inv &= ~HIDEEYES
+			body_parts_covered &= ~EYES
 			icon_state = "[initial(icon_state)]up"
 			usr << "You push \the [src] up out of your face."
 
@@ -186,6 +222,7 @@
 	icon_state = "thermal"
 	item_state = "glasses"
 	origin_tech = "magnets=3"
+	toggleable = 1
 	vision_flags = SEE_MOBS
 	invisa_view = 2
 
@@ -201,10 +238,15 @@
 					M.disabilities &= ~NEARSIGHTED
 		..()
 
+/obj/item/clothing/glasses/thermal/New()
+	..()
+	overlay = global_hud.thermal
+
 /obj/item/clothing/glasses/thermal/syndi	//These are now a traitor item, concealed as mesons.	-Pete
 	name = "Optical Meson Scanner"
 	desc = "Used for seeing walls, floors, and stuff through anything."
 	icon_state = "meson"
+	icon_action_button = "action_meson"
 	origin_tech = "magnets=3;syndicate=4"
 
 /obj/item/clothing/glasses/thermal/monocle
@@ -212,15 +254,20 @@
 	desc = "A monocle thermal."
 	icon_state = "thermoncle"
 	flags = null //doesn't protect eyes because it's a monocle, duh
+	toggleable = 0
+	body_parts_covered = 0
 
 /obj/item/clothing/glasses/thermal/eyepatch
 	name = "Optical Thermal Eyepatch"
 	desc = "An eyepatch with built-in thermal optics"
 	icon_state = "eyepatch"
 	item_state = "eyepatch"
+	toggleable = 0
+	body_parts_covered = 0
 
 /obj/item/clothing/glasses/thermal/jensen
 	name = "Optical Thermal Implants"
 	desc = "A set of implantable lenses designed to augment your vision"
 	icon_state = "thermalimplants"
 	item_state = "syringe_kit"
+	toggleable = 0

code/modules/clothing/glasses/hud.dm

@@ -14,18 +14,11 @@
 	name = "Health Scanner HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
 	icon_state = "healthhud"
-
+	body_parts_covered = 0
 
 
 /obj/item/clothing/glasses/hud/health/process_hud(var/mob/M)
-	if(!M)	return
-	if(!M.client)	return
-	var/client/C = M.client
-	for(var/mob/living/carbon/human/patient in view(get_turf(M)))
-		if(M.see_invisible < patient.invisibility)
-			continue
-		C.images += patient.hud_list[HEALTH_HUD]
-		C.images += patient.hud_list[STATUS_HUD]
+	process_med_hud(M, 1)
 
 /obj/item/clothing/glasses/hud/health/prescription
 	name = "prescription glasses/HUD assembly"
@@ -46,6 +39,7 @@
 	name = "Security HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records."
 	icon_state = "securityhud"
+	body_parts_covered = 0
 	var/global/list/jobs[0]
 
 /obj/item/clothing/glasses/hud/security/prescription
@@ -72,16 +66,4 @@
 	invisa_view = 2
 
 /obj/item/clothing/glasses/hud/security/process_hud(var/mob/M)
-
-	if(!M)	return
-	if(!M.client)	return
-	var/client/C = M.client
-	for(var/mob/living/carbon/human/perp in view(get_turf(M)))
-		if(M.see_invisible < perp.invisibility)
-			continue
-		if(!C) continue
-		C.images += perp.hud_list[ID_HUD]
-		C.images += perp.hud_list[WANTED_HUD]
-		C.images += perp.hud_list[IMPTRACK_HUD]
-		C.images += perp.hud_list[IMPLOYAL_HUD]
-		C.images += perp.hud_list[IMPCHEM_HUD]
+	process_sec_hud(M, 1)

code/modules/customitems/item_defines.dm

@@ -292,6 +292,7 @@
 	icon_state = "tool_flask"
 	volume = 60
 
+/*
 /obj/item/weapon/melee/baton/fluff/omnivac_baton //Tiger Claw - Zander Moon - omnivac - DONE
 	name = "Tiger Claw"
 	desc = "A small energy dagger given to Golden Tigers meant to incapacitate people quickly."
@@ -325,7 +326,7 @@
 		status = 0
 		user << "<span class='warning'>\The [src] is out of charge.</span>"
 	add_fingerprint(user)
-
+*/
 /*
 /obj/item/device/modkit/fluff/omnivac_modkit //Ornate box - Zander Moon - omnivac - SPRITE
 	name = "ornate box"

code/modules/flufftext/Hallucination.dm

@@ -252,7 +252,7 @@ proc/check_panel(mob/M)
 
 		return
 
-	HasEntered(var/mob/M, somenumber)
+	Crossed(var/mob/M, somenumber)
 		if(M == my_target)
 			step_away(src,my_target,2)
 			if(prob(30))

code/modules/food/cooker.dm

@@ -49,9 +49,18 @@ obj/machinery/cooker/proc/checkValid(obj/item/check, mob/user)
 /*	if(istype(check, /obj/item/flag))
 		user << "<span class='warning'>That isn't going to fit.</span>"
 		return 0*/
-	if(!istype(check, /obj/item/weapon/reagent_containers/food))
+	if(!istype(check, /obj/item/weapon/reagent_containers/food/snacks))
 		user << "<span class='warning'>That isn't going to work.</span>"
 		return 0
+	if(istype(check, /obj/item/weapon/reagent_containers/food/snacks/customizable/candy))
+		user << "<span class='warning'>That would probably break [src].</span>"
+		return 0
+	if(istype(check, /obj/item/weapon/reagent_containers/food/snacks/cereal))
+		user << "<span class='warning'>That isn't going to fit.</span>"
+		return 0
+	if(istype(check, /obj/item/weapon/reagent_containers/food/snacks/deepfryholder))
+		user << "<span class='userdanger'>You cannot cook this twice.</span>"
+		return 0
 	return 1
 
 obj/machinery/cooker/proc/setIcon(obj/item/copyme, obj/item/copyto)

code/modules/food/oven.dm

@@ -16,13 +16,23 @@
 	updatefood()
 
 /obj/machinery/cooking/attackby(obj/item/I, mob/user)
+
 	if(on)
 		user << "The machine is already running."
 		return
 	else
-		if(!istype(I, /obj/item/weapon/reagent_containers/food))
+		if(!istype(I, /obj/item/weapon/reagent_containers/food/snacks))
 			user << "You think yourself better than to place [I] in there"
 			return
+		if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/deepfryholder))
+			user << "<span class='userdanger'>You cannot cook this twice.</span>"
+			return
+		if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/customizable/candy))
+			user << "<span class='warning'>That would probably taste bad.</span>"
+			return
+		if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/cereal))
+			user << "<span class='warning'>That isn't going to be nice.</span>"
+			return
 
 		var/obj/item/F = I
 		var/obj/item/weapon/reagent_containers/food/snacks/customizable/C

code/modules/food/recipes_microwave.dm

@@ -135,7 +135,7 @@ I said no!
 /datum/recipe/brainburger
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/bun,
-		/obj/item/brain
+		/obj/item/organ/brain
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/brainburger
 
@@ -1071,7 +1071,7 @@ I said no!
 		/obj/item/weapon/reagent_containers/food/snacks/egg,
 		/obj/item/weapon/reagent_containers/food/snacks/egg,
 		/obj/item/weapon/reagent_containers/food/snacks/egg,
-		/obj/item/brain
+		/obj/item/organ/brain
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake
 

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

@@ -270,11 +270,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(jobban_isbanned(M, "AntagHUD"))
 		src << "\red <B>You have been banned from using this feature</B>"
 		return
-	if(config.antag_hud_restricted && !M.has_enabled_antagHUD && !client.holder)
+	if(config.antag_hud_restricted && !M.has_enabled_antagHUD && !(client.holder.rights & (R_ADMIN|R_MOD)))
 		var/response = alert(src, "If you turn this on, you will not be able to take any part in the round.","Are you sure you want to turn this feature on?","Yes","No")
 		if(response == "No") return
 		M.can_reenter_corpse = 0
-	if(!M.has_enabled_antagHUD && !client.holder)
+	if(!M.has_enabled_antagHUD && !(client.holder.rights & (R_ADMIN|R_MOD)))
 		M.has_enabled_antagHUD = 1
 	if(M.antagHUD)
 		M.antagHUD = 0

code/modules/mob/hear_say.dm

@@ -14,12 +14,12 @@
 		return
 
 	var/style = "body"
-	
+
 	//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
 	if (language && (language.flags & NONVERBAL))
 		if (!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src)))
 			message = stars(message)
-	
+
 	if(!say_understands(speaker,language))
 		if(istype(speaker,/mob/living/simple_animal))
 			var/mob/living/simple_animal/S = speaker
@@ -77,7 +77,7 @@
 	if (language && (language.flags & NONVERBAL))
 		if (!speaker || (src.sdisabilities & BLIND || src.blinded) || !(speaker in view(src)))
 			message = stars(message)
-	
+
 	if(!say_understands(speaker,language))
 		if(istype(speaker,/mob/living/simple_animal))
 			var/mob/living/simple_animal/S = speaker
@@ -164,9 +164,31 @@
 /mob/proc/hear_signlang(var/message, var/verb = "gestures", var/datum/language/language, var/mob/speaker = null)
 	if(!client)
 		return
-	
+
+	if(sleeping || stat == 1)
+		return
+
+	var/speaker_name
+	var/alt_name
+
+//	var/mob/S = speaker
+//	if(!S && !S.head && !istype(S.head, /obj/item/clothing/head/helmet))
+	speaker_name = speaker.real_name
+//	else
+//		speaker_name = "unknown"
+
+	var/track = null
+	if(istype(src, /mob/dead/observer))
+		if(speaker_name != speaker.real_name && speaker.real_name)
+			speaker_name = "[speaker.real_name] ([speaker_name])"
+		track = "(<a href='byond://?src=\ref[src];track=\ref[speaker]'>follow</a>) "
+
+		if(client.prefs.toggles & CHAT_GHOSTEARS && speaker in view(src))
+			message = "<b>[message]</b>"
+
+
 	if(say_understands(speaker, language))
-		message = "<B>[speaker.real_name]</B> [verb], \"[message]\""
+		message = "<span class='game say'><span class='name'>[speaker.real_name]</span>[alt_name] [track][verb], <span class='message'>\"[message]\"</span></span>"
 	else
 		message = "<B>[speaker.real_name]</B> gestures."
 
@@ -175,7 +197,9 @@
 			H.show_message(message)
 		for(var/mob/living/M in src.contents)
 			M.show_message(message)
-	src.show_message(message)
+	src << message
+
+////////////////////////////////////////////////////////////////////////
 
 /mob/proc/hear_sleep(var/message)
 	var/heard = ""

code/modules/mob/language.dm

@@ -6,16 +6,49 @@
 	var/name = "an unknown language" // Fluff name of language if any.
 	var/desc = "A language."         // Short description for 'Check Languages'.
 	var/speech_verb = "says"         // 'says', 'hisses', 'farts'.
+	var/ask_verb = "asks"            // Used when sentence ends in a ?
+	var/exclaim_verb = "exclaims"    // Used when sentence ends in a !
 	var/signlang_verb = list()       // list of emotes that might be displayed if this language has NONVERBAL or SIGNLANG flags
 	var/colour = "body"         // CSS style to use for strings in this language.
 	var/key = "x"                    // Character used to speak in language eg. :o for Unathi.
 	var/flags = 0                    // Various language flags.
 	var/native                       // If set, non-native speakers will have trouble speaking.
 
+/datum/language/proc/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
+
+	log_say("[key_name(speaker)] : ([name]) [message]")
+
+	for(var/mob/player in player_list)
+
+		var/understood = 0
+
+		if(istype(player,/mob/dead))
+			understood = 1
+		else if((src in player.languages) && check_special_condition(player))
+			understood = 1
+
+		if(understood)
+			if(!speaker_mask) speaker_mask = speaker.name
+			var/msg = "<i><span class='game say'>[name], <span class='name'>[speaker_mask]</span> <span class='message'>[speech_verb], \"<span class='[colour]'>[message]</span><span class='message'>\"</span></span></i>"
+			player << "[msg]"
+
+/datum/language/proc/check_special_condition(var/mob/other)
+	return 1
+
+/datum/language/proc/get_spoken_verb(var/msg_end)
+	switch(msg_end)
+		if("!")
+			return exclaim_verb
+		if("?")
+			return ask_verb
+	return speech_verb
+
 /datum/language/unathi
 	name = "Sinta'unathi"
 	desc = "The common language of Moghes, composed of sibilant hisses and rattles. Spoken natively by Unathi."
 	speech_verb = "hisses"
+	ask_verb = "hisses"
+	exclaim_verb = "roars"
 	colour = "soghun"
 	key = "o"
 	flags = WHITELISTED
@@ -24,6 +57,8 @@
 	name = "Siik'Maas"
 	desc = "An expressive language that combines yowls and chirps with posture, tail and ears. Native to the Tajaran."
 	speech_verb = "mrowls"
+	ask_verb = "mrowls"
+	exclaim_verb = "yowls"
 	colour = "tajaran"
 	key = "j"
 	flags = WHITELISTED
@@ -32,6 +67,8 @@
 	name = "Skrellian"
 	desc = "A melodic and complex language spoken by the Skrell of Qerrbalak. Some of the notes are inaudible to humans."
 	speech_verb = "warbles"
+	ask_verb = "warbles"
+	exclaim_verb = "warbles"
 	colour = "skrell"
 	key = "k"
 	flags = WHITELISTED
@@ -40,6 +77,8 @@
 	name = "Vox-pidgin"
 	desc = "The common tongue of the various Vox ships making up the Shoal. It sounds like chaotic shrieking to everyone else."
 	speech_verb = "shrieks"
+	ask_verb = "creels"
+	exclaim_verb = "SHRIEKS"
 	colour = "vox"
 	key = "v"
 	flags = RESTRICTED
@@ -48,10 +87,27 @@
 	name = "Rootspeak"
 	desc = "A creaking, subvocal language spoken instinctively by the Dionaea. Due to the unique makeup of the average Diona, a phrase of Rootspeak can be a combination of anywhere from one to twelve individual voices and notes."
 	speech_verb = "creaks and rustles"
+	ask_verb = "creaks"
+	exclaim_verb = "rustles"
 	colour = "soghun"
 	key = "q"
 	flags = RESTRICTED
 
+/datum/language/common
+	name = "Ceti Basic"
+	desc = "The common galactic tongue."
+	speech_verb = "says"
+	key = "0"
+	flags = RESTRICTED
+
+/datum/language/common/get_spoken_verb(var/msg_end)
+	switch(msg_end)
+		if("!")
+			return pick("exclaims","shouts","yells") //TODO: make the basic proc handle lists of verbs.
+		if("?")
+			return ask_verb
+	return speech_verb
+
 /datum/language/human
 	name = "Sol Common"
 	desc = "A bastardized hybrid of informal English and elements of Mandarin Chinese; the common language of the Sol system."
@@ -90,6 +146,143 @@
 	key = "4"
 	flags = SIGNLANG
 
+////////////////////////////////////
+//Not sure if stuff but yeah
+////////////////////////////////////
+/datum/language/xenocommon
+	name = "Xenomorph"
+	colour = "alien"
+	desc = "The common tongue of the xenomorphs."
+	speech_verb = "hisses"
+	ask_verb = "hisses"
+	exclaim_verb = "hisses"
+	key = "5"
+	flags = RESTRICTED
+
+/datum/language/xenos
+	name = "Hivemind"
+	desc = "Xenomorphs have the strange ability to commune over a psychic hivemind."
+	speech_verb = "hisses"
+	ask_verb = "hisses"
+	exclaim_verb = "hisses"
+	colour = "alien"
+	key = "a"
+	flags = RESTRICTED | HIVEMIND
+
+/datum/language/xenos/check_special_condition(var/mob/other)
+
+	var/mob/living/carbon/M = other
+	if(!istype(M))
+		return 1
+	if(locate(/datum/organ/internal/xenos/hivenode) in M.internal_organs)
+		return 1
+
+	return 0
+
+/datum/language/ling
+	name = "Changeling"
+	desc = "Although they are normally wary and suspicious of each other, changelings can commune over a distance."
+	speech_verb = "says"
+	colour = "changeling"
+	key = "g"
+	flags = RESTRICTED | HIVEMIND
+
+/datum/language/ling/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
+
+	if(speaker.mind && speaker.mind.changeling)
+		..(speaker,message,speaker.mind.changeling.changelingID)
+	else
+		..(speaker,message)
+
+/datum/language/corticalborer
+	name = "Cortical Link"
+	desc = "Cortical borers possess a strange link between their tiny minds."
+	speech_verb = "sings"
+	ask_verb = "sings"
+	exclaim_verb = "sings"
+	colour = "alien"
+	key = "x"
+	flags = RESTRICTED | HIVEMIND
+
+/datum/language/corticalborer/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
+
+	var/mob/living/simple_animal/borer/B
+
+	if(istype(speaker,/mob/living/carbon))
+		var/mob/living/carbon/M = speaker
+		B = M.has_brain_worms()
+	else if(istype(speaker,/mob/living/simple_animal/borer))
+		B = speaker
+
+	if(B)
+		speaker_mask = B.truename
+	..(speaker,message,speaker_mask)
+
+/datum/language/binary
+	name = "Robot Talk"
+	desc = "Most human stations support free-use communications protocols and routing hubs for synthetic use."
+	colour = "say_quote"
+	speech_verb = "states"
+	ask_verb = "queries"
+	exclaim_verb = "declares"
+	key = "b"
+	flags = RESTRICTED | HIVEMIND
+	var/drone_only
+
+/datum/language/binary/broadcast(var/mob/living/speaker,var/message,var/speaker_mask)
+
+	if(!speaker.binarycheck())
+		return
+
+	if (!message)
+		return
+
+	var/message_start = "<i><span class='game say'>[name], <span class='name'>[speaker.name]</span>"
+	var/message_body = "<span class='message'>[speaker.say_quote(message)], \"[message]\"</span></span></i>"
+
+	for (var/mob/M in dead_mob_list)
+		if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain)) //No meta-evesdropping
+			M.show_message("[message_start] [message_body]", 2)
+
+	for (var/mob/living/S in living_mob_list)
+
+		if(drone_only && !istype(S,/mob/living/silicon/robot/drone))
+			continue
+		else if(istype(S , /mob/living/silicon/ai))
+			message_start = "<i><span class='game say'>[name], <a href='byond://?src=\ref[S];track2=\ref[S];track=\ref[src];trackname=[html_encode(speaker.name)]'><span class='name'>[speaker.name]</span></a>"
+		else if (!S.binarycheck())
+			continue
+
+		S.show_message("[message_start] [message_body]", 2)
+
+	var/list/listening = hearers(1, src)
+	listening -= src
+
+	for (var/mob/living/M in listening)
+		if(istype(M, /mob/living/silicon) || M.binarycheck())
+			continue
+		M.show_message("<i><span class='game say'><span class='name'>synthesised voice</span> <span class='message'>beeps, \"beep beep beep\"</span></span></i>",2)
+/*
+	//robot binary xmitter component power usage
+	if (isrobot(speaker))
+		var/mob/living/silicon/robot/R = speaker
+		var/datum/robot_component/C = R.components["comms"]
+		R.cell_use_power(C.active_usage)
+*/
+/datum/language/binary/drone
+	name = "Drone Talk"
+	desc = "A heavily encoded damage control coordination stream."
+	speech_verb = "transmits"
+	ask_verb = "transmits"
+	exclaim_verb = "transmits"
+	colour = "say_quote"
+	key = "d"
+	flags = RESTRICTED | HIVEMIND
+	drone_only = 1
+///////////////////////////////////////
+//Yeah but stuff if sure not
+///////////////////////////////////////
+
 // Language handling.
 /mob/proc/add_language(var/language)
 

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

@@ -1,213 +1,59 @@
-#define HEAT_DAMAGE_LEVEL_1 2 //Amount of damage applied when your body temperature just passes the 360.15k safety point
-#define HEAT_DAMAGE_LEVEL_2 4 //Amount of damage applied when your body temperature passes the 400K point
-#define HEAT_DAMAGE_LEVEL_3 8 //Amount of damage applied when your body temperature passes the 1000K point
-
 /mob/living/carbon/alien
 	name = "alien"
-	voice_name = "alien"
-	speak_emote = list("hisses")
+	desc = "What IS that?"
 	icon = 'icons/mob/alien.dmi'
+	icon_state = "alien"
+	pass_flags = PASSTABLE
+	melee_damage_lower = 1
+	melee_damage_upper = 3
+	attacktext = "bites"
+	attack_sound = null
+	friendly = "nuzzles"
+	wall_smash = 0
+	health = 100
+	maxHealth = 100
+
+	var/adult_form
+	var/dead_icon
+	var/amount_grown = 0
+	var/max_grown = 10
+	var/time_of_birth
+	var/language
+
+/mob/living/carbon/alien/New()
+
+	time_of_birth = world.time
+
+	verbs += /mob/living/proc/ventcrawl
+	verbs += /mob/living/proc/hide
+
+	var/datum/reagents/R = new/datum/reagents(100)
+	reagents = R
+	R.my_atom = src
+
+	name = "[initial(name)] ([rand(1, 1000)])"
+	real_name = name
+	regenerate_icons()
+
+	if(language)
+		add_language(language)
+
 	gender = NEUTER
-	dna = null
-
-	var/storedPlasma = 250
-	var/max_plasma = 500
-
-	alien_talk_understand = 1
-
-	var/obj/item/weapon/card/id/wear_id = null // Fix for station bounced radios -- Skie
-	var/has_fine_manipulation = 0
-
-	var/move_delay_add = 0 // movement delay to add
-
-	status_flags = CANPARALYSE|CANPUSH
-	var/heal_rate = 1
-	var/plasma_rate = 5
-
-	var/oxygen_alert = 0
-	var/toxins_alert = 0
-	var/fire_alert = 0
-
-	var/heat_protection = 0.5
-
-/mob/living/carbon/alien/adjustToxLoss(amount)
-	storedPlasma = min(max(storedPlasma + amount,0),max_plasma) //upper limit of max_plasma, lower limit of 0
-	return
-
-/mob/living/carbon/alien/adjustFireLoss(amount) // Weak to Fire
-	if(amount > 0)
-		..(amount * 2)
-	else
-		..(amount)
-	return
-
-/mob/living/carbon/alien/proc/getPlasma()
-	return storedPlasma
-
-/mob/living/carbon/alien/eyecheck()
-	return 2
-
-/mob/living/carbon/alien/updatehealth()
-	if(status_flags & GODMODE)
-		health = maxHealth
-		stat = CONSCIOUS
-	else
-		//oxyloss is only used for suicide
-		//toxloss isn't used for aliens, its actually used as alien powers!!
-		health = maxHealth - getOxyLoss() - getFireLoss() - getBruteLoss() - getCloneLoss()
-
-/mob/living/carbon/alien/proc/handle_environment(var/datum/gas_mixture/environment)
-
-	//If there are alien weeds on the ground then heal if needed or give some plasma
-	if(locate(/obj/effect/alien/weeds) in loc)
-		if(health >= maxHealth - getCloneLoss())
-			adjustToxLoss(plasma_rate)
-		else
-			adjustBruteLoss(-heal_rate)
-			adjustFireLoss(-heal_rate)
-			adjustOxyLoss(-heal_rate)
-
-	if(!environment)
-		return
-	var/loc_temp = T0C
-	if(istype(loc, /obj/mecha))
-		var/obj/mecha/M = loc
-		loc_temp =  M.return_temperature()
-	else if(istype(get_turf(src), /turf/space))
-		var/turf/heat_turf = get_turf(src)
-		loc_temp = heat_turf.temperature
-	else if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell))
-		loc_temp = loc:air_contents.temperature
-	else
-		loc_temp = environment.temperature
-
-	//world << "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Fire protection: [heat_protection] - Location: [loc] - src: [src]"
-
-	// Aliens are now weak to fire.
-
-	//After then, it reacts to the surrounding atmosphere based on your thermal protection
-	if(loc_temp > bodytemperature)
-		//Place is hotter than we are
-		var/thermal_protection = heat_protection //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
-		if(thermal_protection < 1)
-			bodytemperature += (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR)
-	else
-		bodytemperature += 1 * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR)
-	//	bodytemperature -= max((loc_temp - bodytemperature / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM)
-
-	// +/- 50 degrees from 310.15K is the 'safe' zone, where no damage is dealt.
-	if(bodytemperature > 360.15)
-		//Body temperature is too hot.
-		fire_alert = max(fire_alert, 1)
-		switch(bodytemperature)
-			if(360 to 400)
-				apply_damage(HEAT_DAMAGE_LEVEL_1, BURN)
-				fire_alert = max(fire_alert, 2)
-			if(400 to 1000)
-				apply_damage(HEAT_DAMAGE_LEVEL_2, BURN)
-				fire_alert = max(fire_alert, 2)
-			if(1000 to INFINITY)
-				apply_damage(HEAT_DAMAGE_LEVEL_3, BURN)
-				fire_alert = max(fire_alert, 2)
-	return
-
-/mob/living/carbon/alien/proc/handle_mutations_and_radiation()
-
-	if(getFireLoss())
-		if((COLD_RESISTANCE in mutations) || prob(5))
-			adjustFireLoss(-1)
-
-	// Aliens love radiation nom nom nom
-	if (radiation)
-		if (radiation > 100)
-			radiation = 100
-
-		if (radiation < 0)
-			radiation = 0
-
-		switch(radiation)
-			if(1 to 49)
-				radiation--
-				if(prob(25))
-					adjustToxLoss(1)
-
-			if(50 to 74)
-				radiation -= 2
-				adjustToxLoss(1)
-				if(prob(5))
-					radiation -= 5
-
-			if(75 to 100)
-				radiation -= 3
-				adjustToxLoss(3)
-
-/mob/living/carbon/alien/handle_fire()//Aliens on fire code
-	if(..())
-		return
-	bodytemperature += BODYTEMP_HEATING_MAX //If you're on fire, you heat up!
-	return
-
-/mob/living/carbon/alien/IsAdvancedToolUser()
-	return has_fine_manipulation
-
-/mob/living/carbon/alien/Process_Spaceslipping()
-	return 0 // Don't slip in space.
-
-/mob/living/carbon/alien/Stat()
-
-	statpanel("Status")
-	stat(null, "Intent: [a_intent]")
-	stat(null, "Move Mode: [m_intent]")
 
 	..()
 
-	if (client.statpanel == "Status")
-		stat(null, "Plasma Stored: [getPlasma()]/[max_plasma]")
-
-	if(emergency_shuttle)
-		var/eta_status = emergency_shuttle.get_status_panel_eta()
-		if(eta_status)
-			stat(null, eta_status)
-
-/mob/living/carbon/alien/Stun(amount)
-	if(status_flags & CANSTUN)
-		stunned = max(max(stunned,amount),0) //can't go below 0, getting a low amount of stun doesn't lower your current stun
-	else
-		// add some movement delay
-		move_delay_add = min(move_delay_add + round(amount / 2), 10) // a maximum delay of 10
+/mob/living/carbon/alien/u_equip(obj/item/W as obj)
 	return
 
-/mob/living/carbon/alien/getDNA()
-	return null
+/mob/living/carbon/alien/Stat()
+	..()
+	stat(null, "Progress: [amount_grown]/[max_grown]")
 
-/mob/living/carbon/alien/setDNA()
-	return
+/mob/living/carbon/alien/restrained()
+	return 0
 
-/*----------------------------------------
-Proc: AddInfectionImages()
-Des: Gives the client of the alien an image on each infected mob.
-----------------------------------------*/
-/mob/living/carbon/alien/proc/AddInfectionImages()
-	if (client)
-		for (var/mob/living/C in mob_list)
-			if(C.status_flags & XENO_HOST)
-				var/obj/item/alien_embryo/A = locate() in C
-				var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[A.stage]")
-				client.images += I
-	return
+/mob/living/carbon/alien/show_inv(mob/user as mob)
+	return //Consider adding cuffs and hats to this, for the sake of fun.
 
-
-/*----------------------------------------
-Proc: RemoveInfectionImages()
-Des: Removes all infected images from the alien.
-----------------------------------------*/
-/mob/living/carbon/alien/proc/RemoveInfectionImages()
-	if (client)
-		for(var/image/I in client.images)
-			if(dd_hasprefix_case(I.icon_state, "infected"))
-				del(I)
-	return
-
-#undef HEAT_DAMAGE_LEVEL_1
-#undef HEAT_DAMAGE_LEVEL_2
-#undef HEAT_DAMAGE_LEVEL_3
+/mob/living/carbon/alien/can_use_vents()
+	return

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

@@ -0,0 +1,183 @@
+//There has to be a better way to define this shit. ~ Z
+//can't equip anything
+/mob/living/carbon/alien/attack_ui(slot_id)
+	return
+
+/mob/living/carbon/alien/meteorhit(O as obj)
+	for(var/mob/M in viewers(src, null))
+		if ((M.client && !( M.blinded )))
+			M.show_message(text("\red [] has been hit by []", src, O), 1)
+	if (health > 0)
+		adjustBruteLoss((istype(O, /obj/effect/meteor/small) ? 10 : 25))
+		adjustFireLoss(30)
+
+		updatehealth()
+	return
+
+/mob/living/carbon/alien/attack_animal(mob/living/M as mob)
+
+	if(istype(M,/mob/living/simple_animal))
+		var/mob/living/simple_animal/S = M
+		if(S.melee_damage_upper == 0)
+			S.emote("[S.friendly] [src]")
+		else
+			for(var/mob/O in viewers(src, null))
+				O.show_message("\red <B>[S]</B> [S.attacktext] [src]!", 1)
+			var/damage = rand(S.melee_damage_lower, S.melee_damage_upper)
+			adjustBruteLoss(damage)
+			S.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
+			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [S.name] ([S.ckey])</font>")
+			updatehealth()
+
+/mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M as mob)
+	if(!(istype(M, /mob/living/carbon/monkey)))	return//Fix for aliens receiving double messages when attacking other aliens.
+
+	if (!ticker)
+		M << "You cannot attack people before the game has started."
+		return
+
+	if (istype(loc, /turf) && istype(loc.loc, /area/start))
+		M << "No attacking people at spawn, you jackass."
+		return
+	..()
+
+	switch(M.a_intent)
+
+		if ("help")
+			help_shake_act(M)
+		else
+			if (istype(wear_mask, /obj/item/clothing/mask/muzzle))
+				return
+			if (health > 0)
+				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
+				for(var/mob/O in viewers(src, null))
+					if ((O.client && !( O.blinded )))
+						O.show_message(text("\red <B>[M.name] has bit [src]!</B>"), 1)
+				adjustBruteLoss(rand(1, 3))
+				updatehealth()
+	return
+
+
+/mob/living/carbon/alien/attack_slime(mob/living/carbon/slime/M as mob)
+	if (!ticker)
+		M << "You cannot attack people before the game has started."
+		return
+
+	if(M.Victim) return // can't attack while eating!
+
+	if (health > -100)
+
+		for(var/mob/O in viewers(src, null))
+			if ((O.client && !( O.blinded )))
+				O.show_message(text("\red <B>The [M.name] glomps []!</B>", src), 1)
+
+		var/damage = rand(1, 3)
+
+		if(M.is_adult)
+			damage = rand(20, 40)
+		else
+			damage = rand(5, 35)
+
+		adjustBruteLoss(damage)
+
+
+		updatehealth()
+
+	return
+
+/mob/living/carbon/alien/attack_hand(mob/living/carbon/human/M as mob)
+	if (!ticker)
+		M << "You cannot attack people before the game has started."
+		return
+
+	if (istype(loc, /turf) && istype(loc.loc, /area/start))
+		M << "No attacking people at spawn, you jackass."
+		return
+
+	..()
+
+	if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves))
+		var/obj/item/clothing/gloves/G = M.gloves
+		if(G.cell)
+			if(M.a_intent == "hurt")//Stungloves. Any contact will stun the alien.
+				if(G.cell.charge >= 2500)
+					G.cell.use(2500)
+
+					Weaken(5)
+					if (stuttering < 5)
+						stuttering = 5
+					Stun(5)
+
+					for(var/mob/O in viewers(src, null))
+						if ((O.client && !( O.blinded )))
+							O.show_message("\red <B>[src] has been touched with the stun gloves by [M]!</B>", 1, "\red You hear someone fall.", 2)
+					return
+				else
+					M << "\red Not enough charge! "
+					return
+
+	switch(M.a_intent)
+
+		if ("help")
+			if (health > 0)
+				help_shake_act(M)
+			else
+				if (M.health >= -75.0)
+					if ((M.head && M.head.flags & 4) || (M.wear_mask && !( M.wear_mask.flags & 32 )) )
+						M << "\blue <B>Remove that mask!</B>"
+						return
+					var/obj/effect/equip_e/human/O = new /obj/effect/equip_e/human(  )
+					O.source = M
+					O.target = src
+					O.s_loc = M.loc
+					O.t_loc = loc
+					O.place = "CPR"
+					requests += O
+					spawn( 0 )
+						O.process()
+						return
+
+		if ("grab")
+			if (M == src)
+				return
+			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab( M, M, src )
+
+			M.put_in_active_hand(G)
+
+			grabbed_by += G
+			G.synch()
+
+			LAssailant = M
+
+			playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+			for(var/mob/O in viewers(src, null))
+				if ((O.client && !( O.blinded )))
+					O.show_message(text("\red [] has grabbed [] passively!", M, src), 1)
+
+		else
+			var/damage = rand(1, 9)
+			if (prob(90))
+				if (HULK in M.mutations)
+					damage += 5
+					spawn(0)
+						Paralyse(1)
+						step_away(src,M,15)
+						sleep(3)
+						step_away(src,M,15)
+				playsound(loc, "punch", 25, 1, -1)
+				for(var/mob/O in viewers(src, null))
+					if ((O.client && !( O.blinded )))
+						O.show_message(text("\red <B>[] has punched []!</B>", M, src), 1)
+				if (damage > 4.9)
+					Weaken(rand(10,15))
+					for(var/mob/O in viewers(M, null))
+						if ((O.client && !( O.blinded )))
+							O.show_message(text("\red <B>[] has weakened []!</B>", M, src), 1, "\red You hear someone fall.", 2)
+				adjustBruteLoss(damage)
+				updatehealth()
+			else
+				playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+				for(var/mob/O in viewers(src, null))
+					if ((O.client && !( O.blinded )))
+						O.show_message(text("\red <B>[] has attempted to punch []!</B>", M, src), 1)
+	return

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

@@ -0,0 +1,56 @@
+/mob/living/carbon/alien/ex_act(severity)
+
+	if(!blinded)
+		flick("flash", flash)
+
+	var/b_loss = null
+	var/f_loss = null
+	switch (severity)
+		if (1.0)
+			b_loss += 500
+			gib()
+			return
+
+		if (2.0)
+
+			b_loss += 60
+
+			f_loss += 60
+
+			ear_damage += 30
+			ear_deaf += 120
+
+		if(3.0)
+			b_loss += 30
+			if (prob(50))
+				Paralyse(1)
+			ear_damage += 15
+			ear_deaf += 60
+
+	adjustBruteLoss(b_loss)
+	adjustFireLoss(f_loss)
+
+	updatehealth()
+
+
+
+/mob/living/carbon/alien/blob_act()
+	if (stat == 2)
+		return
+	var/shielded = 0
+
+	var/damage = null
+	if (stat != 2)
+		damage = rand(10,30)
+
+	if(shielded)
+		damage /= 4
+
+		//paralysis += 1
+
+	show_message("\red The blob attacks you!")
+
+	adjustFireLoss(damage)
+
+	updatehealth()
+	return

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

@@ -1,41 +1,13 @@
-/mob/living/carbon/alien/gib()
-	death(1)
-	var/atom/movable/overlay/animation = null
-	monkeyizing = 1
-	canmove = 0
-	icon = null
-	invisibility = 101
+/mob/living/carbon/alien/death(gibbed)
 
-	animation = new(loc)
-	animation.icon_state = "blank"
-	animation.icon = 'icons/mob/mob.dmi'
-	animation.master = src
+	if(stat == DEAD)	return
+	if(healths)			healths.icon_state = "health6"
+	stat = DEAD
 
-	flick("gibbed-a", animation)
-	xgibs(loc, viruses)
-	dead_mob_list -= src
+	if(dead_icon) icon_state = dead_icon
 
-	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+	if(!gibbed)
+		update_canmove()
+		if(client)	blind.layer = 0
 
-/mob/living/carbon/alien/dust()
-	death(1)
-	var/atom/movable/overlay/animation = null
-	monkeyizing = 1
-	canmove = 0
-	icon = null
-	invisibility = 101
-
-	animation = new(loc)
-	animation.icon_state = "blank"
-	animation.icon = 'icons/mob/mob.dmi'
-	animation.master = src
-
-	flick("dust-a", animation)
-	new /obj/effect/decal/remains/xeno(loc)
-	dead_mob_list -= src
-
-	spawn(15)
-		if(animation)	del(animation)
-		if(src)			del(src)
+	return ..(gibbed)

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

@@ -0,0 +1,25 @@
+/mob/living/carbon/alien/diona
+	name = "diona nymph"
+	voice_name = "diona nymph"
+	adult_form = /mob/living/carbon/human
+	speak_emote = list("chirrups")
+	icon_state = "nymph"
+	language = "Rootspeak"
+
+	amount_grown = 0
+	max_grown = 5 // Target number of donors.
+
+	var/list/donors = list()
+	var/last_checked_stage = 0
+
+	universal_understand = 0 // Dionaea do not need to speak to people
+	universal_speak = 0      // before becoming an adult. Use *chirp.
+	holder_type = /obj/item/weapon/holder/diona
+
+/mob/living/carbon/alien/diona/New()
+
+	..()
+	verbs += /mob/living/carbon/proc/eat_weeds
+	verbs += /mob/living/carbon/proc/fertilize_plant
+	verbs += /mob/living/carbon/alien/diona/proc/steal_blood
+	verbs += /mob/living/carbon/alien/diona/proc/merge

code/modules/mob/living/carbon/alien/diona/diona_attacks.dm

@@ -0,0 +1,14 @@
+/mob/living/carbon/alien/diona/attack_hand(mob/living/carbon/human/M as mob)
+
+	//Let people pick the little buggers up.
+	if(M.a_intent == "help")
+		if(M.species && M.species.name == "Diona")
+			M << "You feel your being twine with that of [src] as it merges with your biomass."
+			src << "You feel your being twine with that of [M] as you merge with its biomass."
+			src.verbs += /mob/living/carbon/alien/diona/proc/split
+			src.verbs -= /mob/living/carbon/alien/diona/proc/merge
+			src.loc = M
+		else
+			get_scooped(M)
+
+	..()

code/modules/mob/living/carbon/alien/diona/diona_powers.dm

@@ -0,0 +1,90 @@
+//Verbs after this point.
+/mob/living/carbon/alien/diona/proc/merge()
+
+	set category = "Abilities"
+	set name = "Merge with gestalt"
+	set desc = "Merge with another diona."
+
+	if(istype(src.loc,/mob/living/carbon))
+		src.verbs -= /mob/living/carbon/alien/diona/proc/merge
+		return
+
+	var/list/choices = list()
+	for(var/mob/living/carbon/C in view(1,src))
+
+		if(!(src.Adjacent(C)) || !(C.client)) continue
+
+		if(istype(C,/mob/living/carbon/human))
+			var/mob/living/carbon/human/D = C
+			if(D.species && D.species.name == "Diona")
+				choices += C
+
+	var/mob/living/M = input(src,"Who do you wish to merge with?") in null|choices
+
+	if(!M || !src || !(src.Adjacent(M))) return
+
+	if(istype(M,/mob/living/carbon/human))
+		M << "You feel your being twine with that of [src] as it merges with your biomass."
+		M.status_flags |= PASSEMOTES
+
+		src << "You feel your being twine with that of [M] as you merge with its biomass."
+		src.loc = M
+		src.verbs += /mob/living/carbon/alien/diona/proc/split
+		src.verbs -= /mob/living/carbon/alien/diona/proc/merge
+	else
+		return
+
+/mob/living/carbon/alien/diona/proc/split()
+
+	set category = "Abilities"
+	set name = "Split from gestalt"
+	set desc = "Split away from your gestalt as a lone nymph."
+
+	if(!(istype(src.loc,/mob/living/carbon)))
+		src.verbs -= /mob/living/carbon/alien/diona/proc/split
+		return
+
+	src.loc << "You feel a pang of loss as [src] splits away from your biomass."
+	src << "You wiggle out of the depths of [src.loc]'s biomass and plop to the ground."
+
+	var/mob/living/M = src.loc
+
+	src.loc = get_turf(src)
+	src.verbs -= /mob/living/carbon/alien/diona/proc/split
+	src.verbs += /mob/living/carbon/alien/diona/proc/merge
+
+	if(istype(M))
+		for(var/atom/A in M.contents)
+			if(istype(A,/mob/living/simple_animal/borer) || istype(A,/obj/item/weapon/holder))
+				return
+	M.status_flags &= ~PASSEMOTES
+
+/mob/living/carbon/alien/diona/proc/steal_blood()
+	set category = "Abilities"
+	set name = "Steal Blood"
+	set desc = "Take a blood sample from a suitable donor."
+
+	var/list/choices = list()
+	for(var/mob/living/carbon/human/H in oview(1,src))
+		if(src.Adjacent(H))
+			choices += H
+
+	var/mob/living/carbon/human/M = input(src,"Who do you wish to take a sample from?") in null|choices
+
+	if(!M || !src) return
+
+	if(M.species.flags & NO_BLOOD)
+		src << "\red That donor has no blood to take."
+		return
+
+	if(donors.Find(M.real_name))
+		src << "\red That donor offers you nothing new."
+		return
+
+	src.visible_message("\red [src] flicks out a feeler and neatly steals a sample of [M]'s blood.","\red You flick out a feeler and neatly steal a sample of [M]'s blood.")
+	donors += M.real_name
+	for(var/datum/language/L in M.languages)
+		languages |= L
+
+	spawn(25)
+		update_progression()

code/modules/mob/living/carbon/alien/diona/life.dm

@@ -0,0 +1,20 @@
+//Dionaea regenerate health and nutrition in light.
+/mob/living/carbon/alien/diona/handle_environment(datum/gas_mixture/environment)
+
+	var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
+	if(isturf(loc)) //else, there's considered to be no light
+		var/turf/T = loc
+		var/area/A = T.loc
+		if(A)
+			if(A.lighting_use_dynamic)	light_amount = min(10,T.lighting_lumcount) - 5 //hardcapped so it's not abused by having a ton of flashlights
+			else						light_amount =  5
+
+	nutrition += light_amount
+
+	if(nutrition > 500)
+		nutrition = 500
+	if(light_amount > 2) //if there's enough light, heal
+		adjustBruteLoss(-1)
+		adjustFireLoss(-1)
+		adjustToxLoss(-1)
+		adjustOxyLoss(-1)

code/modules/mob/living/carbon/alien/diona/progression.dm

@@ -0,0 +1,40 @@
+/mob/living/carbon/alien/diona/confirm_evolution()
+
+	if(!is_alien_whitelisted(src, "Diona") && config.usealienwhitelist)
+		src << alert("You are currently not whitelisted to play as a full diona.")
+		return null
+
+	if(amount_grown < max_grown)
+		src << "You are not yet ready for your growth..."
+		return null
+
+	src.split()
+
+	if(istype(loc,/obj/item/weapon/holder/diona))
+		var/obj/item/weapon/holder/diona/L = loc
+		src.loc = L.loc
+		del(L)
+
+	src.visible_message("\red [src] begins to shift and quiver, and erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea.","\red You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of at least a dozen new dionaea. We have attained our gestalt form.")
+	return "Diona"
+
+/mob/living/carbon/alien/diona/show_evolution_blurb()
+	//TODO
+	return
+
+/mob/living/carbon/alien/diona/update_progression()
+
+	amount_grown = donors.len
+
+	if(amount_grown <= last_checked_stage)
+		return
+
+	// Only fire off these messages once.
+	last_checked_stage = amount_grown
+	if(amount_grown == max_grown)
+		src << "\green You feel ready to move on to your next stage of growth."
+	else if(amount_grown == 3)
+		universal_understand = 1
+		src << "\green You feel your awareness expand, and realize you know how to understand the creatures around you."
+	else
+		src << "\green The blood seeps into your small form, and you draw out the echoes of memories and personality from it, working them into your budding mind."

code/modules/mob/living/carbon/alien/diona/say_understands.dm

@@ -0,0 +1,6 @@
+/mob/living/carbon/alien/diona/say_understands(var/mob/other,var/datum/language/speaking = null)
+
+	if (istype(other, /mob/living/carbon/human) && !speaking)
+		if(languages.len >= 2) // They have sucked down some blood.
+			return 1
+	return ..()

code/modules/mob/living/carbon/alien/diona/update_icons.dm

@@ -0,0 +1,8 @@
+/mob/living/carbon/alien/diona/update_icons()
+
+	if(stat == DEAD)
+		icon_state = "[initial(icon_state)]_dead"
+	else if(lying || resting || stunned)
+		icon_state = "[initial(icon_state)]_sleep"
+	else
+		icon_state = "[initial(icon_state)]"

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

@@ -0,0 +1,127 @@
+/mob/living/carbon/alien/emote(var/act,var/m_type=1,var/message = null)
+
+	var/param = null
+	if (findtext(act, "-", 1, null))
+		var/t1 = findtext(act, "-", 1, null)
+		param = copytext(act, t1 + 1, length(act) + 1)
+		act = copytext(act, 1, t1)
+
+	if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
+		act = copytext(act,1,length(act))
+	var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle)
+
+	switch(act)
+		if ("me")
+			if(silent)
+				return
+			if (src.client)
+				if (client.prefs.muted & MUTE_IC)
+					src << "\red You cannot send IC messages (muted)."
+					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
+			if (stat)
+				return
+			if(!(message))
+				return
+			return custom_emote(m_type, message)
+
+		if ("custom")
+			return custom_emote(m_type, message)
+		if("sign")
+			if (!src.restrained())
+				message = text("<B>The alien</B> signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))
+				m_type = 1
+		if ("burp")
+			if (!muzzled)
+				message = "<B>[src]</B> burps."
+				m_type = 2
+		if("scratch")
+			if (!src.restrained())
+				message = "<B>The [src.name]</B> scratches."
+				m_type = 1
+		if("whimper")
+			if (!muzzled)
+				message = "<B>The [src.name]</B> whimpers."
+				m_type = 2
+		if("tail")
+			message = "<B>The [src.name]</B> waves its tail."
+			m_type = 1
+		if("gasp")
+			message = "<B>The [src.name]</B> gasps."
+			m_type = 2
+		if("shiver")
+			message = "<B>The [src.name]</B> shivers."
+			m_type = 2
+		if("drool")
+			message = "<B>The [src.name]</B> drools."
+			m_type = 1
+		if("scretch")
+			if (!muzzled)
+				message = "<B>The [src.name]</B> scretches."
+				m_type = 2
+		if("choke")
+			message = "<B>The [src.name]</B> chokes."
+			m_type = 2
+		if("moan")
+			message = "<B>The [src.name]</B> moans!"
+			m_type = 2
+		if("nod")
+			message = "<B>The [src.name]</B> nods its head."
+			m_type = 1
+//		if("sit")
+//			message = "<B>The [src.name]</B> sits down." //Larvan can't sit down, /N
+//			m_type = 1
+		if("sway")
+			message = "<B>The [src.name]</B> sways around dizzily."
+			m_type = 1
+		if("sulk")
+			message = "<B>The [src.name]</B> sulks down sadly."
+			m_type = 1
+		if("twitch")
+			message = "<B>The [src.name]</B> twitches violently."
+			m_type = 1
+		if("dance")
+			if (!src.restrained())
+				message = "<B>The [src.name]</B> dances around happily."
+				m_type = 1
+		if("roll")
+			if (!src.restrained())
+				message = "<B>The [src.name]</B> rolls."
+				m_type = 1
+		if("shake")
+			message = "<B>The [src.name]</B> shakes its head."
+			m_type = 1
+		if("gnarl")
+			if (!muzzled)
+				message = "<B>The [src.name]</B> gnarls and shows its teeth.."
+				m_type = 2
+		if("jump")
+			message = "<B>The [src.name]</B> jumps!"
+			m_type = 1
+		if("hiss_")
+			message = "<B>The [src.name]</B> hisses softly."
+			m_type = 1
+		if("collapse")
+			Paralyse(2)
+			message = text("<B>[]</B> collapses!", src)
+			m_type = 2
+		if("chirp")
+			message = "<B>The [src.name]</B> chirps!"
+			playsound(src.loc, 'sound/misc/nymphchirp.ogg', 50, 0)
+			m_type = 2
+		if("help")
+			src << "burp, chirp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roll, scratch,\nscretch, shake, sign-#, sulk, sway, tail, twitch, whimper"
+		else
+			src << text("Invalid Emote: []", act)
+	if ((message && src.stat == 0))
+		log_emote("[name]/[key] : [message]")
+		if (m_type & 1)
+			for(var/mob/O in viewers(src, null))
+				O.show_message(message, m_type)
+				//Foreach goto(703)
+		else
+			for(var/mob/O in hearers(src, null))
+				O.show_message(message, m_type)
+				//Foreach goto(746)
+	return

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

@@ -7,7 +7,7 @@
 	status_flags = CANPARALYSE
 	heal_rate = 5
 	plasma_rate = 20
-
+	var/move_delay_add = 0
 
 /mob/living/carbon/alien/humanoid/queen/New()
 	var/datum/reagents/R = new/datum/reagents(100)

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

@@ -1,375 +1,20 @@
 /mob/living/carbon/alien/larva
 	name = "alien larva"
 	real_name = "alien larva"
-	icon_state = "larva0"
-	pass_flags = PASSTABLE
+	adult_form = /mob/living/carbon/human
+	speak_emote = list("hisses")
+	icon_state = "larva"
+	language = "Hivemind"
+	melee_damage_lower = 3
+	melee_damage_upper = 6
+
+	amount_grown = 0
+	max_grown = 200
 
 	maxHealth = 25
 	health = 25
-	storedPlasma = 50
-	max_plasma = 50
 
-	var/amount_grown = 0
-	var/max_grown = 200
-	var/time_of_birth
-
-//This is fine right now, if we're adding organ specific damage this needs to be updated
 /mob/living/carbon/alien/larva/New()
-	var/datum/reagents/R = new/datum/reagents(100)
-	reagents = R
-	R.my_atom = src
-	if(name == "alien larva")
-		name = "alien larva ([rand(1, 1000)])"
-	real_name = name
-	regenerate_icons()
 	..()
-
-//This is fine, works the same as a human
-/mob/living/carbon/alien/larva/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.status_flags & CANPUSH))
-					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)
-				step(AM, t)
-			now_pushing = null
-		return
-	return
-
-//This needs to be fixed
-/mob/living/carbon/alien/larva/Stat()
-	..()
-	stat(null, "Progress: [amount_grown]/[max_grown]")
-
-/mob/living/carbon/alien/larva/adjustToxLoss(amount)
-	if(stat != DEAD)
-		amount_grown = min(amount_grown + 1, max_grown)
-	..(amount)
-
-
-/mob/living/carbon/alien/larva/ex_act(severity)
-	if(!blinded)
-		flick("flash", flash)
-
-	var/b_loss = null
-	var/f_loss = null
-	switch (severity)
-		if (1.0)
-			b_loss += 500
-			gib()
-			return
-
-		if (2.0)
-
-			b_loss += 60
-
-			f_loss += 60
-
-			ear_damage += 30
-			ear_deaf += 120
-
-		if(3.0)
-			b_loss += 30
-			if (prob(50))
-				Paralyse(1)
-			ear_damage += 15
-			ear_deaf += 60
-
-	adjustBruteLoss(b_loss)
-	adjustFireLoss(f_loss)
-
-	updatehealth()
-
-
-
-/mob/living/carbon/alien/larva/blob_act()
-	if (stat == 2)
-		return
-	var/shielded = 0
-
-	var/damage = null
-	if (stat != 2)
-		damage = rand(10,30)
-
-	if(shielded)
-		damage /= 4
-
-		//paralysis += 1
-
-	show_message("\red The blob attacks you!")
-
-	adjustFireLoss(damage)
-
-	updatehealth()
-	return
-
-
-//can't equip anything
-/mob/living/carbon/alien/larva/attack_ui(slot_id)
-	return
-
-/mob/living/carbon/alien/larva/meteorhit(O as obj)
-	for(var/mob/M in viewers(src, null))
-		if ((M.client && !( M.blinded )))
-			M.show_message(text("\red [] has been hit by []", src, O), 1)
-	if (health > 0)
-		adjustBruteLoss((istype(O, /obj/effect/meteor/small) ? 10 : 25))
-		adjustFireLoss(30)
-
-		updatehealth()
-	return
-
-
-/mob/living/carbon/alien/larva/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)
-		adjustBruteLoss(damage)
-		M.attack_log += text("\[[time_stamp()]\] <font color='red'>attacked [src.name] ([src.ckey])</font>")
-		src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [M.name] ([M.ckey])</font>")
-		updatehealth()
-
-
-
-/mob/living/carbon/alien/larva/attack_paw(mob/living/carbon/monkey/M as mob)
-	if(!(istype(M, /mob/living/carbon/monkey)))	return//Fix for aliens receiving double messages when attacking other aliens.
-
-	if (!ticker)
-		M << "You cannot attack people before the game has started."
-		return
-
-	if (istype(loc, /turf) && istype(loc.loc, /area/start))
-		M << "No attacking people at spawn, you jackass."
-		return
-	..()
-
-	switch(M.a_intent)
-
-		if ("help")
-			help_shake_act(M)
-		else
-			if (istype(wear_mask, /obj/item/clothing/mask/muzzle))
-				return
-			if (health > 0)
-				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message(text("\red <B>[M.name] has bit [src]!</B>"), 1)
-				adjustBruteLoss(rand(1, 3))
-				updatehealth()
-	return
-
-
-/mob/living/carbon/alien/larva/attack_slime(mob/living/carbon/slime/M as mob)
-	if (!ticker)
-		M << "You cannot attack people before the game has started."
-		return
-
-	if(M.Victim) return // can't attack while eating!
-
-	if (health > -100)
-
-		for(var/mob/O in viewers(src, null))
-			if ((O.client && !( O.blinded )))
-				O.show_message(text("\red <B>The [M.name] glomps []!</B>", src), 1)
-
-		var/damage = rand(1, 3)
-
-		if(M.is_adult)
-			damage = rand(20, 40)
-		else
-			damage = rand(5, 35)
-
-		adjustBruteLoss(damage)
-
-
-		updatehealth()
-
-	return
-
-/mob/living/carbon/alien/larva/attack_hand(mob/living/carbon/human/M as mob)
-	if (!ticker)
-		M << "You cannot attack people before the game has started."
-		return
-
-	if (istype(loc, /turf) && istype(loc.loc, /area/start))
-		M << "No attacking people at spawn, you jackass."
-		return
-
-	..()
-
-	if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves))
-		var/obj/item/clothing/gloves/G = M.gloves
-		if(G.cell)
-			if(M.a_intent == "hurt")//Stungloves. Any contact will stun the alien.
-				if(G.cell.charge >= 2500)
-					G.cell.use(2500)
-
-					Weaken(5)
-					if (stuttering < 5)
-						stuttering = 5
-					Stun(5)
-
-					for(var/mob/O in viewers(src, null))
-						if ((O.client && !( O.blinded )))
-							O.show_message("\red <B>[src] has been touched with the stun gloves by [M]!</B>", 1, "\red You hear someone fall.", 2)
-					return
-				else
-					M << "\red Not enough charge! "
-					return
-
-	switch(M.a_intent)
-
-		if ("help")
-			if (health > 0)
-				help_shake_act(M)
-			else
-				if (M.health >= -75.0)
-					if ((M.head && M.head.flags & 4) || (M.wear_mask && !( M.wear_mask.flags & 32 )) )
-						M << "\blue <B>Remove that mask!</B>"
-						return
-					var/obj/effect/equip_e/human/O = new /obj/effect/equip_e/human(  )
-					O.source = M
-					O.target = src
-					O.s_loc = M.loc
-					O.t_loc = loc
-					O.place = "CPR"
-					requests += O
-					spawn( 0 )
-						O.process()
-						return
-
-		if ("grab")
-			if (M == src)
-				return
-			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab( M, M, src )
-
-			M.put_in_active_hand(G)
-
-			grabbed_by += G
-			G.synch()
-
-			LAssailant = M
-
-			playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-			for(var/mob/O in viewers(src, null))
-				if ((O.client && !( O.blinded )))
-					O.show_message(text("\red [] has grabbed [] passively!", M, src), 1)
-
-		else
-			var/damage = rand(1, 9)
-			if (prob(90))
-				if (HULK in M.mutations)
-					damage += 5
-					spawn(0)
-						Paralyse(1)
-						step_away(src,M,15)
-						sleep(3)
-						step_away(src,M,15)
-				playsound(loc, "punch", 25, 1, -1)
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message(text("\red <B>[] has punched []!</B>", M, src), 1)
-				if (damage > 4.9)
-					Weaken(rand(10,15))
-					for(var/mob/O in viewers(M, null))
-						if ((O.client && !( O.blinded )))
-							O.show_message(text("\red <B>[] has weakened []!</B>", M, src), 1, "\red You hear someone fall.", 2)
-				adjustBruteLoss(damage)
-				updatehealth()
-			else
-				playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message(text("\red <B>[] has attempted to punch []!</B>", M, src), 1)
-	return
-
-/mob/living/carbon/alien/larva/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
-	if (!ticker)
-		M << "You cannot attack people before the game has started."
-		return
-
-	if (istype(loc, /turf) && istype(loc.loc, /area/start))
-		M << "No attacking people at spawn, you jackass."
-		return
-
-	..()
-
-	switch(M.a_intent)
-
-		if ("help")
-			sleeping = max(0,sleeping-5)
-			resting = 0
-			AdjustParalysis(-3)
-			AdjustStunned(-3)
-			AdjustWeakened(-3)
-			for(var/mob/O in viewers(src, null))
-				if ((O.client && !( O.blinded )))
-					O.show_message(text("\blue [M.name] nuzzles [] trying to wake it up!", src), 1)
-
-		else
-			if (health > 0)
-				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
-				var/damage = rand(1, 3)
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message(text("\red <B>[M.name] has bit []!</B>", src), 1)
-				adjustBruteLoss(damage)
-				updatehealth()
-			else
-				M << "\green <B>[name] is too injured for that.</B>"
-	return
-
-/mob/living/carbon/alien/larva/restrained()
-	return 0
-
-/mob/living/carbon/alien/larva/var/co2overloadtime = null
-/mob/living/carbon/alien/larva/var/temperature_resistance = T0C+75
-
-// new damage icon system
-// now constructs damage icon for each organ from mask * damage field
-
-
-/mob/living/carbon/alien/larva/show_inv(mob/user as mob)
-
-	user.set_machine(src)
-	var/dat = {"
-	<B><HR><FONT size=3>[name]</FONT></B>
-	<BR><HR><BR>
-	<BR><A href='?src=\ref[user];mach_close=mob[name]'>Close</A>
-	<BR>"}
-	user << browse(dat, text("window=mob[name];size=340x480"))
-	onclose(user, "mob[name]")
-	return
-
-/* Commented out because it's duplicated in life.dm
-/mob/living/carbon/alien/larva/proc/grow() // Larvae can grow into full fledged Xenos if they survive long enough -- TLE
-	if(icon_state == "larva_l" && !canmove) // This is a shit death check. It is made of shit and death. Fix later.
-		return
-	else
-		var/mob/living/carbon/alien/humanoid/A = new(loc)
-		A.key = key
-		del(src) */
+	add_language("Xenomorph") //Bonus language.
+	internal_organs += new /datum/organ/internal/xenos/hivenode(src)

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

@@ -1,369 +1,12 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
-/mob/living/carbon/alien/larva
-
-	var/temperature_alert = 0
-
-
-/mob/living/carbon/alien/larva/Life()
-	set invisibility = 0
-	set background = 1
-
-	if (monkeyizing)
-		return
-
-	..()
-	var/datum/gas_mixture/enviroment = loc.return_air()
-	if (stat != DEAD) //still breathing
-
-		// GROW!
-		if(amount_grown < max_grown)
-			amount_grown++
-
-		//First, resolve location and get a breath
-		if(air_master.current_cycle%4==2)
-			//Only try to take a breath every 4 seconds, unless suffocating
-			spawn(0) breathe()
-		else //Still give containing object the chance to interact
-			if(istype(loc, /obj/))
-				var/obj/location_as_object = loc
-				location_as_object.handle_internal_lifeform(src, 0)
-		//Mutations and radiation
-		handle_mutations_and_radiation()
-
-		//Chemicals in the body
-		handle_chemicals_in_body()
-
-
-	//Apparently, the person who wrote this code designed it so that
-	//blinded get reset each cycle and then get activated later in the
-	//code. Very ugly. I dont care. Moving this stuff here so its easy
-	//to find it.
-	blinded = null
-
-	//Handle temperature/pressure differences between body and environment
-	handle_environment(enviroment)
-
-	//stuff in the stomach
-	//handle_stomach()
-
-	//Status updates, death etc.
-	handle_regular_status_updates()
-	update_canmove()
-
-	// Grabbing
-	for(var/obj/item/weapon/grab/G in src)
-		G.process()
-
-	//some kind of bug in canmove() isn't properly calling update_icons, so this is here as a placeholder
-	update_icons()
-
-	if(client)
-		handle_regular_hud_updates()
-
-
-/mob/living/carbon/alien/larva
-
-	proc/breathe()
-
-		if(reagents.has_reagent("lexorin")) return
-		if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return
-
-		var/datum/gas_mixture/environment = loc.return_air()
-		var/datum/gas_mixture/breath
-		// HACK NEED CHANGING LATER
-		if(health < 0)
-			losebreath++
-
-		if(losebreath>0) //Suffocating so do not take a breath
-			losebreath--
-			if (prob(75)) //High chance of gasping for air
-				spawn emote("gasp")
-			if(istype(loc, /obj/))
-				var/obj/location_as_object = loc
-				location_as_object.handle_internal_lifeform(src, 0)
-		else
-			//First, check for air from internal atmosphere (using an air tank and mask generally)
-			breath = get_breath_from_internal(BREATH_VOLUME)
-
-			//No breath from internal atmosphere so get breath from location
-			if(!breath)
-				if(istype(loc, /obj/))
-					var/obj/location_as_object = loc
-					breath = location_as_object.handle_internal_lifeform(src, BREATH_VOLUME)
-				else if(istype(loc, /turf/))
-					var/breath_moles = 0
-					/*if(environment.return_pressure() > ONE_ATMOSPHERE)
-						// Loads of air around (pressure effect will be handled elsewhere), so lets just take a enough to fill our lungs at normal atmos pressure (using n = Pv/RT)
-						breath_moles = (ONE_ATMOSPHERE*BREATH_VOLUME/R_IDEAL_GAS_EQUATION*environment.temperature)
-					else*/
-						// Not enough air around, take a percentage of what's there to model this properly
-					breath_moles = environment.total_moles*BREATH_PERCENTAGE
-
-					breath = loc.remove_air(breath_moles)
-
-					// Handle chem smoke effect  -- Doohl
-					for(var/obj/effect/effect/smoke/chem/smoke in view(1, src))
-						if(smoke.reagents.total_volume)
-							smoke.reagents.reaction(src, INGEST)
-							spawn(5)
-								if(smoke)
-									smoke.reagents.copy_to(src, 10) // I dunno, maybe the reagents enter the blood stream through the lungs?
-							break // If they breathe in the nasty stuff once, no need to continue checking
-
-
-			else //Still give containing object the chance to interact
-				if(istype(loc, /obj/))
-					var/obj/location_as_object = loc
-					location_as_object.handle_internal_lifeform(src, 0)
-
-		handle_breath(breath)
-
-		if(breath)
-			loc.assume_air(breath)
-
-
-	proc/get_breath_from_internal(volume_needed)
-		if(internal)
-			if (!contents.Find(internal))
-				internal = null
-			if (!wear_mask || !(wear_mask.flags & MASKINTERNALS) )
-				internal = null
-			if(internal)
-				if (internals)
-					internals.icon_state = "internal1"
-				return internal.remove_air_volume(volume_needed)
-			else
-				if (internals)
-					internals.icon_state = "internal0"
-		return null
-
-	proc/handle_breath(datum/gas_mixture/breath)
-		if(status_flags & GODMODE)
-			return
-
-		if(!breath || (breath.total_moles == 0))
-			//Aliens breathe in vaccuum
-			return 0
-
-		var/toxins_used = 0
-		var/breath_pressure = (breath.total_moles * R_IDEAL_GAS_EQUATION * breath.temperature) / BREATH_VOLUME
-
-		//Partial pressure of the phoron in our breath
-		var/Toxins_pp = (breath.gas["toxins"] / breath.total_moles) * breath_pressure
-
-		if(Toxins_pp) // Detect toxins in air
-
-			adjustToxLoss(breath.gas["toxins"] * 250)
-			toxins_alert = max(toxins_alert, 1)
-
-			toxins_used = breath.gas["toxins"]
-
-		else
-			toxins_alert = 0
-
-		//Breathe in toxins and out oxygen
-		breath.adjust_gas("toxins", -toxins_used)
-		breath.adjust_gas("oxygen", toxins_used)
-
-		if(breath.temperature > (T0C+66) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :(
-			if(prob(20))
-				src << "\red You feel a searing heat in your lungs!"
-			fire_alert = max(fire_alert, 1)
-		else
-			fire_alert = 0
-
-		//Temporary fixes to the alerts.
-
-		return 1
-
-
-	proc/handle_chemicals_in_body()
-		if(reagents) reagents.metabolize(src)
-
-		if(FAT in mutations)
-			if(nutrition < 100)
-				if(prob(round((50 - nutrition) / 100)))
-					src << "\blue You feel fit again!"
-					mutations.Add(FAT)
-/*		else
-			if(nutrition > 500)
-				if(prob(5 + round((nutrition - max_grown) / 2)))
-					src << "\red You suddenly feel blubbery!"
-					mutations.Add(FAT)
-FUCK YOU MORE FAT CODE -Hawk*/
-		if (nutrition > 0)
-			nutrition-= HUNGER_FACTOR
-
-		if (drowsyness)
-			drowsyness--
-			eye_blurry = max(2, eye_blurry)
-			if (prob(5))
-				sleeping += 1
-				Paralyse(5)
-
-		confused = max(0, confused - 1)
-		// decrement dizziness counter, clamped to 0
-		if(resting)
-			dizziness = max(0, dizziness - 5)
-			jitteriness = max(0, jitteriness - 5)
-		else
-			dizziness = max(0, dizziness - 1)
-			jitteriness = max(0, jitteriness - 1)
-
-		updatehealth()
-
-		return //TODO: DEFERRED
-
-	proc/handle_regular_status_updates()
-		updatehealth()
-
-		if(stat == DEAD)	//DEAD. BROWN BREAD. SWIMMING WITH THE SPESS CARP
-			blinded = 1
-			silent = 0
-		else				//ALIVE. LIGHTS ARE ON
-			if(health < -25 || brain_op_stage == 4.0)
-				death()
-				blinded = 1
-				silent = 0
-				return 1
-
-			//UNCONSCIOUS. NO-ONE IS HOME
-			if( (getOxyLoss() > 25) || (0 > health) )
-				//if( health <= 20 && prob(1) )
-				//	spawn(0)
-				//		emote("gasp")
-				if(!reagents.has_reagent("inaprovaline"))
-					adjustOxyLoss(1)
-				Paralyse(3)
-
-			if(paralysis)
-				AdjustParalysis(-2)
-				blinded = 1
-				stat = UNCONSCIOUS
-			else if(sleeping)
-				sleeping = max(sleeping-1, 0)
-				blinded = 1
-				stat = UNCONSCIOUS
-				if( prob(10) && health )
-					spawn(0)
-						emote("hiss_")
-			//CONSCIOUS
-			else
-				stat = CONSCIOUS
-
-			/*	What in the living hell is this?*/
-			if(move_delay_add > 0)
-				move_delay_add = max(0, move_delay_add - rand(1, 2))
-
-			//Eyes
-			if(sdisabilities & BLIND)	//disabled-blind, doesn't get better on its own
-				blinded = 1
-			else if(eye_blind)			//blindness, heals slowly over time
-				eye_blind = max(eye_blind-1,0)
-				blinded = 1
-			else if(eye_blurry)	//blurry eyes heal slowly
-				eye_blurry = max(eye_blurry-1, 0)
-
-			//Ears
-			if(sdisabilities & DEAF)	//disabled-deaf, doesn't get better on its own
-				ear_deaf = max(ear_deaf, 1)
-			else if(ear_deaf)			//deafness, heals slowly over time
-				ear_deaf = max(ear_deaf-1, 0)
-			else if(ear_damage < 25)	//ear damage heals slowly under this threshold.
-				ear_damage = max(ear_damage-0.05, 0)
-
-			//Other
-			handle_statuses()
-		return 1
-
-
-	proc/handle_regular_hud_updates()
-
-		if (stat == 2 || (XRAY in mutations))
-			sight |= SEE_TURFS
-			sight |= SEE_MOBS
-			sight |= SEE_OBJS
-			see_in_dark = 8
-			see_invisible = SEE_INVISIBLE_LEVEL_TWO
-		else if (stat != 2)
-			sight |= SEE_MOBS
-			sight &= ~SEE_TURFS
-			sight &= ~SEE_OBJS
-			see_in_dark = 4
-			see_invisible = SEE_INVISIBLE_LEVEL_TWO
-
-		if (healths)
-			if (stat != 2)
-				switch(health)
-					if(25 to INFINITY)
-						healths.icon_state = "health0"
-					if(19 to 25)
-						healths.icon_state = "health1"
-					if(13 to 19)
-						healths.icon_state = "health2"
-					if(7 to 13)
-						healths.icon_state = "health3"
-					if(0 to 7)
-						healths.icon_state = "health4"
-					else
-						healths.icon_state = "health5"
-			else
-				healths.icon_state = "health6"
-
-		if(pullin)	pullin.icon_state = "pull[pulling ? 1 : 0]"
-
-
-		if (toxin)	toxin.icon_state = "tox[toxins_alert ? 1 : 0]"
-		if (oxygen) oxygen.icon_state = "oxy[oxygen_alert ? 1 : 0]"
-		if (fire) fire.icon_state = "fire[fire_alert ? 1 : 0]"
-		//NOTE: the alerts dont reset when youre out of danger. dont blame me,
-		//blame the person who coded them. Temporary fix added.
-		if (client)
-			client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)
-
-		if ((blind && stat != 2))
-			if ((blinded))
-				blind.layer = 18
-			else
-				blind.layer = 0
-
-				if (disabilities & NEARSIGHTED)
-					client.screen += global_hud.vimpaired
-
-				if (eye_blurry)
-					client.screen += global_hud.blurry
-
-				if (druggy)
-					client.screen += global_hud.druggy
-
-		if (stat != 2)
-			if (machine)
-				if (!( machine.check_eye(src) ))
-					reset_view(null)
-			else
-				if(client && !client.adminobs)
-					reset_view(null)
-
-		return 1
-
-	proc/handle_random_events()
-		return
-
-
-	proc/handle_stomach()
-		spawn(0)
-			for(var/mob/living/M in stomach_contents)
-				if(M.loc != src)
-					stomach_contents.Remove(M)
-					continue
-				if(istype(M, /mob/living/carbon) && stat != 2)
-					if(M.stat == 2)
-						M.death(1)
-						stomach_contents.Remove(M)
-						del(M)
-						continue
-					if(air_master.current_cycle%3==1)
-						if(!(M.status_flags & GODMODE))
-							M.adjustBruteLoss(5)
-						nutrition += 10
+//Larvae regenerate health and nutrition from plasma and alien weeds.
+/mob/living/carbon/alien/larva/handle_environment(var/datum/gas_mixture/environment)
+
+	if(!environment) return
+
+	var/turf/T = get_turf(src)
+	if(environment.gas["phoron"] > 0 || (T && locate(/obj/effect/alien/weeds) in T.contents))
+		update_progression()
+		adjustBruteLoss(-1)
+		adjustFireLoss(-1)
+		adjustToxLoss(-1)
+		adjustOxyLoss(-1)

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

@@ -0,0 +1,17 @@
+/mob/living/carbon/alien/larva/update_progression()
+	if(amount_grown < max_grown)
+		amount_grown++
+	return
+
+/mob/living/carbon/alien/larva/confirm_evolution()
+
+	src << "\blue <b>You are growing into a beautiful alien! It is time to choose a caste.</b>"
+	src << "\blue There are three to choose from:"
+	src << "<B>Hunters</B> \blue are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves."
+	src << "<B>Sentinels</B> \blue are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters."
+	src << "<B>Drones</B> \blue are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen."
+	var/alien_caste = alert(src, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone")
+	return alien_caste ? "Xenomorph [alien_caste]" : null
+
+/mob/living/carbon/alien/larva/show_evolution_blurb()
+	return

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

@@ -0,0 +1,191 @@
+// Alien larva are quite simple.
+/mob/living/carbon/alien/Life()
+
+	set invisibility = 0
+	set background = 1
+
+	if (monkeyizing)	return
+	if(!loc)			return
+
+	..()
+
+	if (stat != DEAD) //still breathing
+
+		// GROW!
+		update_progression()
+
+		// Radiation.
+		handle_mutations_and_radiation()
+
+		// Chemicals in the body
+		handle_chemicals_in_body()
+
+	blinded = null
+
+	if(loc)
+		handle_environment(loc.return_air())
+
+	//Status updates, death etc.
+	handle_regular_status_updates()
+	update_canmove()
+	update_icons()
+
+	if(client)
+		handle_regular_hud_updates()
+
+/mob/living/carbon/alien/proc/handle_chemicals_in_body()
+	return // Nothing yet. Maybe check it out at a later date.
+
+/mob/living/carbon/alien/proc/handle_mutations_and_radiation()
+
+	// Currently both Dionaea and larvae like to eat radiation, so I'm defining the
+	// rad absorbtion here. This will need to be changed if other baby aliens are added.
+
+	if(!radiation)
+		return
+
+	var/rads = radiation/25
+	radiation -= rads
+	nutrition += rads
+	heal_overall_damage(rads,rads)
+	adjustOxyLoss(-(rads))
+	adjustToxLoss(-(rads))
+	return
+
+/mob/living/carbon/alien/proc/handle_regular_status_updates()
+
+	if(status_flags & GODMODE)	return 0
+
+	if(stat == DEAD)
+		blinded = 1
+		silent = 0
+	else
+		updatehealth()
+
+		if(health <= 0)
+			death()
+			blinded = 1
+			silent = 0
+			return 1
+
+		if(paralysis)
+			AdjustParalysis(-1)
+			blinded = 1
+			stat = UNCONSCIOUS
+			if(halloss > 0)
+				adjustHalLoss(-3)
+		else if(sleeping)
+
+			adjustHalLoss(-3)
+			if (mind)
+				if((mind.active && client != null) || immune_to_ssd)
+					sleeping = max(sleeping-1, 0)
+			blinded = 1
+			stat = UNCONSCIOUS
+
+		else if(resting)
+			if(halloss > 0)
+				adjustHalLoss(-3)
+
+		else
+			stat = CONSCIOUS
+			if(halloss > 0)
+				adjustHalLoss(-1)
+
+		// Eyes and blindness.
+		if(!has_eyes())
+			eye_blind =  1
+			blinded =    1
+			eye_blurry = 1
+		else if(eye_blind)
+			eye_blind =  max(eye_blind-1,0)
+			blinded =    1
+		else if(eye_blurry)
+			eye_blurry = max(eye_blurry-1, 0)
+
+		//Ears
+		if(sdisabilities & DEAF)	//disabled-deaf, doesn't get better on its own
+			ear_deaf = max(ear_deaf, 1)
+		else if(ear_deaf)			//deafness, heals slowly over time
+			ear_deaf = max(ear_deaf-1, 0)
+			ear_damage = max(ear_damage-0.05, 0)
+
+		update_icons()
+
+	return 1
+
+/mob/living/carbon/alien/proc/handle_regular_hud_updates()
+
+	if (stat == 2 || (XRAY in src.mutations))
+		sight |= SEE_TURFS
+		sight |= SEE_MOBS
+		sight |= SEE_OBJS
+		see_in_dark = 8
+		see_invisible = SEE_INVISIBLE_LEVEL_TWO
+	else if (stat != 2)
+		sight &= ~SEE_TURFS
+		sight &= ~SEE_MOBS
+		sight &= ~SEE_OBJS
+		see_in_dark = 2
+		see_invisible = SEE_INVISIBLE_LIVING
+
+	if (healths)
+		if (stat != 2)
+			switch(health)
+				if(100 to INFINITY)
+					healths.icon_state = "health0"
+				if(80 to 100)
+					healths.icon_state = "health1"
+				if(60 to 80)
+					healths.icon_state = "health2"
+				if(40 to 60)
+					healths.icon_state = "health3"
+				if(20 to 40)
+					healths.icon_state = "health4"
+				if(0 to 20)
+					healths.icon_state = "health5"
+				else
+					healths.icon_state = "health6"
+		else
+			healths.icon_state = "health7"
+
+	if(pullin)
+		pullin.icon_state = "pull[pulling ? 1 : 0]"
+
+	if (client)
+		client.screen.Remove(global_hud.blurry,global_hud.druggy,global_hud.vimpaired)
+
+	if ((blind && stat != 2))
+		if ((blinded))
+			blind.layer = 18
+		else
+			blind.layer = 0
+			if (disabilities & NEARSIGHTED)
+				client.screen += global_hud.vimpaired
+			if (eye_blurry)
+				client.screen += global_hud.blurry
+			if (druggy)
+				client.screen += global_hud.druggy
+
+	if (stat != 2)
+		if (machine)
+			if (!( machine.check_eye(src) ))
+				reset_view(null)
+		else
+			if(client && !client.adminobs)
+				reset_view(null)
+
+	return 1
+
+/mob/living/carbon/alien/proc/handle_environment(var/datum/gas_mixture/environment)
+	// Both alien subtypes survive in vaccum and suffer in high temperatures,
+	// so I'll just define this once, for both (see radiation comment above)
+	if(!environment) return
+
+	if(environment.temperature > (T0C+66))
+		adjustFireLoss((environment.temperature - (T0C+66))/5) // Might be too high, check in testing.
+		if (fire) fire.icon_state = "fire2"
+		if(prob(20))
+			src << "\red You feel a searing heat!"
+	else
+		if (fire) fire.icon_state = "fire0"

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

@@ -0,0 +1,50 @@
+/mob/living/carbon/alien/verb/evolve()
+
+	set name = "Evolve"
+	set desc = "Evolve into your adult form."
+	set category = "Abilities"
+
+	if(stat != CONSCIOUS)
+		return
+
+	if(!adult_form)
+		verbs -= /mob/living/carbon/alien/verb/evolve
+		return
+
+	if(handcuffed || legcuffed)
+		src << "\red You cannot evolve when you are cuffed."
+		return
+
+	if(amount_grown < max_grown)
+		src << "\red You are not fully grown."
+		return
+
+	// confirm_evolution() handles choices and other specific requirements.
+	var/new_species = confirm_evolution()
+	if(!new_species || !adult_form )
+		return
+
+	var/mob/living/carbon/human/adult = new adult_form(get_turf(src))
+	adult.set_species(new_species)
+	show_evolution_blurb()
+
+	if(mind)
+		mind.transfer_to(adult)
+	else
+		adult.key = src.key
+
+	for (var/obj/item/W in src.contents)
+		src.drop_from_inventory(W)
+
+	for(var/datum/language/L in languages)
+		adult.add_language(L.name)
+	del(src)
+
+/mob/living/carbon/alien/proc/update_progression()
+	return
+
+/mob/living/carbon/alien/proc/confirm_evolution()
+	return
+
+/mob/living/carbon/alien/proc/show_evolution_blurb()
+	return

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

@@ -0,0 +1,20 @@
+/mob/living/carbon/alien/regenerate_icons()
+	overlays = list()
+	update_icons()
+
+/mob/living/carbon/alien/update_icons()
+
+	var/state = 0
+	if(amount_grown > max_grown*0.75)
+		state = 2
+	else if(amount_grown > max_grown*0.25)
+		state = 1
+
+	if(stat == DEAD)
+		icon_state = "[initial(icon_state)][state]_dead"
+	else if (stunned)
+		icon_state = "[initial(icon_state)][state]_stun"
+	else if(lying || resting)
+		icon_state = "[initial(icon_state)][state]_sleep"
+	else
+		icon_state = "[initial(icon_state)][state]"

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

@@ -22,10 +22,16 @@
 	var/obj/mecha = null//This does not appear to be used outside of reference in mecha.dm.
 
 	attackby(var/obj/item/O as obj, var/mob/user as mob)
-		if(istype(O,/obj/item/brain) && !brainmob) //Time to stick a brain in it --NEO
-			if(!O:brainmob)
+		if(istype(O,/obj/item/organ/brain) && !brainmob) //Time to stick a brain in it --NEO
+
+			var/obj/item/organ/brain/B = O
+			if(B.health <= 0)
+				user << "\red That brain is well and truly dead."
+				return
+			else if(!B.brainmob)
 				user << "\red You aren't sure where this brain came from, but you're pretty sure it's a useless brain."
 				return
+
 			for(var/mob/V in viewers(src, null))
 				V.show_message(text("\blue [user] sticks \a [O] into \the [src]."))
 
@@ -61,6 +67,7 @@
 			return
 		..()
 
+	//TODO: ORGAN REMOVAL UPDATE. Make the brain remain in the MMI so it doesn't lose organ data.
 	attack_self(mob/user as mob)
 		if(!brainmob)
 			user << "\red You upend the MMI, but there's nothing in it."
@@ -68,7 +75,7 @@
 			user << "\red You upend the MMI, but the brain is clamped into place."
 		else
 			user << "\blue You upend the MMI, spilling the brain onto the floor."
-			var/obj/item/brain/brain = new(user.loc)
+			var/obj/item/organ/brain/brain = new(user.loc)
 			brainmob.container = null//Reset brainmob mmi var.
 			brainmob.loc = brain//Throw mob into brain.
 			living_mob_list -= brainmob//Get outta here

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

@@ -1,7 +1,7 @@
-/obj/item/brain
+/obj/item/organ/brain
 	name = "brain"
-	desc = "A piece of juicy meat found in a persons head."
-	icon = 'icons/obj/surgery.dmi'
+	health = 400 //They need to live awhile longer than other organs.
+	desc = "A piece of juicy meat found in a person's head."
 	icon_state = "brain2"
 	flags = TABLEPASS
 	force = 1.0
@@ -11,32 +11,38 @@
 	throw_range = 5
 	origin_tech = "biotech=3"
 	attack_verb = list("attacked", "slapped", "whacked")
+	prosthetic_name = "cyberbrain"
+	prosthetic_icon = "brain-prosthetic"
+	organ_tag = "brain"
 
 	var/mob/living/carbon/brain/brainmob = null
 
-	New()
-		..()
-		//Shifting the brain "mob" over to the brain object so it's easier to keep track of. --NEO
-		//WASSSSSUUUPPPP /N
-		spawn(5)
-			if(brainmob && brainmob.client)
-				brainmob.client.screen.len = null //clear the hud
+/obj/item/organ/brain/xeno
+	name = "thinkpan"
+	desc = "It looks kind of like an enormous wad of purple bubblegum."
+	icon = 'icons/mob/alien.dmi'
+	icon_state = "chitin"
 
-	proc
-		transfer_identity(var/mob/living/carbon/H)
-			name = "[H]'s brain"
-			brainmob = new(src)
-			brainmob.name = H.real_name
-			brainmob.real_name = H.real_name
-			brainmob.dna = H.dna.Clone()
-			brainmob.timeofhostdeath = H.timeofdeath
-			if(H.mind)
-				H.mind.transfer_to(brainmob)
+/obj/item/organ/brain/New()
+	..()
+	spawn(5)
+		if(brainmob && brainmob.client)
+			brainmob.client.screen.len = null //clear the hud
 
-			brainmob << "\blue You feel slightly disoriented. That's normal when you're just a brain."
-			callHook("debrain", list(brainmob))
+/obj/item/organ/brain/proc/transfer_identity(var/mob/living/carbon/H)
+	name = "[H]'s brain"
+	brainmob = new(src)
+	brainmob.name = H.real_name
+	brainmob.real_name = H.real_name
+	brainmob.dna = H.dna.Clone()
+	brainmob.timeofhostdeath = H.timeofdeath
+	if(H.mind)
+		H.mind.transfer_to(brainmob)
 
-/obj/item/brain/examine() // -- TLE
+	brainmob << "\blue You feel slightly disoriented. That's normal when you're just a brain."
+	callHook("debrain", list(brainmob))
+
+/obj/item/organ/brain/examine() // -- TLE
 	set src in oview(12)
 	if (!( usr ))
 		return
@@ -47,53 +53,27 @@
 	else
 		usr << "This one seems particularly lifeless. Perhaps it will regain some of its luster later.."
 
-/obj/item/brain/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
-	if(!istype(M, /mob))
-		return
+/obj/item/organ/brain/removed(var/mob/living/target,var/mob/living/user)
 
-	add_fingerprint(user)
+	..()
 
-	if(!(user.zone_sel.selecting == ("head")) || !istype(M, /mob/living/carbon/human))
-		return ..()
+	var/mob/living/simple_animal/borer/borer = target.has_brain_worms()
 
-	if(	!(locate(/obj/machinery/optable, M.loc) && M.resting) && ( !(locate(/obj/structure/table/, M.loc) && M.lying) && prob(50) ) )
-		return ..()
+	if(borer)
+		borer.detatch() //Should remove borer if the brain is removed - RR
 
-	var/mob/living/carbon/human/H = M
-	if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
-		// you can't stab someone in the eyes wearing a mask!
-		user << "\blue You're going to need to remove their head cover first."
-		return
+	var/mob/living/carbon/human/H = target
+	var/obj/item/organ/brain/B = src
+	if(istype(B) && istype(H))
+		B.transfer_identity(target)
 
-//since these people will be dead M != usr
+/obj/item/organ/brain/replaced(var/mob/living/target)
 
-	if(M:brain_op_stage == 4.0)
-		for(var/mob/O in viewers(M, null))
-			if(O == (user || M))
-				continue
-			if(M == user)
-				O.show_message(text("\red [user] inserts [src] into his head!"), 1)
-			else
-				O.show_message(text("\red [M] has [src] inserted into his head by [user]."), 1)
-
-		if(M != user)
-			M << "\red [user] inserts [src] into your head!"
-			user << "\red You insert [src] into [M]'s head!"
-		else
-			user << "\red You insert [src] into your head!"
-
-		//this might actually be outdated since barring badminnery, a debrain'd body will have any client sucked out to the brain's internal mob. Leaving it anyway to be safe. --NEO
-		if(M.key)//Revised. /N
-			M.ghostize()
+	if(target.key)
+		target.ghostize()
 
+	if(brainmob)
 		if(brainmob.mind)
-			brainmob.mind.transfer_to(M)
+			brainmob.mind.transfer_to(target)
 		else
-			M.key = brainmob.key
-
-		M:brain_op_stage = 3.0
-
-		del(src)
-	else
-		..()
-	return
+			target.key = brainmob.key

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

@@ -36,7 +36,7 @@
 	if(container && istype(container, /obj/item/device/mmi))
 		del(container)//Gets rid of the MMI if there is one
 	if(loc)
-		if(istype(loc,/obj/item/brain))
+		if(istype(loc,/obj/item/organ/brain))
 			del(loc)//Gets rid of the brain item
 	spawn(15)
 		if(animation)	del(animation)

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

@@ -10,7 +10,6 @@
 	construction_time = 75
 	var/searching = 0
 	var/askDelay = 10 * 60 * 1
-	mob/living/carbon/brain/brainmob = null
 	req_access = list(access_robotics)
 	locked = 0
 	mecha = null//This does not appear to be used outside of reference in mecha.dm.
@@ -140,7 +139,7 @@
 	src.brainmob.robot_talk_understand = 1
 	src.brainmob.stat = 0
 	src.brainmob.silent = 0
-	src.brainmob.brain_op_stage = 4.0
+//	src.brainmob.brain_op_stage = 4.0
 	dead_mob_list -= src.brainmob
 
 	..()

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

@@ -423,7 +423,7 @@
 		return
 	if(alert(src,"You sure you want to sleep for a while?","Sleep","Yes","No") == "Yes")
 		usr.sleeping = 20 //Short nap
-
+/*
 //Brain slug proc for voluntary removal of control.
 /mob/living/carbon/proc/release_control()
 
@@ -492,3 +492,4 @@
 	else
 		src << "You do not have enough chemicals stored to reproduce."
 		return
+*/

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

@@ -1,7 +1,6 @@
 /mob/living/carbon/
 	gender = MALE
 	var/list/stomach_contents = list()
-	var/brain_op_stage = 0.0
 	var/list/datum/disease2/disease/virus2 = list()
 	var/antibodies = 0
 	var/last_eating = 0 	//Not sure what this does... I found it hidden in food.dm

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

@@ -0,0 +1,99 @@
+//TODO: Consider renaming carbon/monkey to carbon/small.
+
+/mob/living/carbon/proc/fertilize_plant()
+
+	set category = "Abilities"
+	set name = "Fertilize plant"
+	set desc = "Turn your food into nutrients for plants."
+
+	var/list/trays = list()
+	for(var/obj/machinery/portable_atmospherics/hydroponics/tray in range(1))
+		if(tray.nutrilevel < 10 && src.Adjacent(tray))
+			trays += tray
+
+	var/obj/machinery/portable_atmospherics/hydroponics/target = input("Select a tray:") as null|anything in trays
+
+	if(!src || !target || target.nutrilevel == 10) return //Sanity check.
+
+	src.nutrition -= ((10-target.nutrilevel)*5)
+	target.nutrilevel = 10
+	src.visible_message("\red [src] secretes a trickle of green liquid, refilling [target]'s nutrient tray.","\red You secrete a trickle of green liquid from your tail, refilling [target]'s nutrient tray.")
+
+/mob/living/carbon/proc/eat_weeds()
+
+	set category = "Abilities"
+	set name = "Eat Weeds"
+	set desc = "Clean the weeds out of soil or a hydroponics tray."
+
+	var/list/trays = list()
+	for(var/obj/machinery/portable_atmospherics/hydroponics/tray in range(1))
+		if(tray.weedlevel > 0 && src.Adjacent(tray))
+			trays += tray
+
+	var/obj/machinery/portable_atmospherics/hydroponics/target = input("Select a tray:") as null|anything in trays
+
+	if(!src || !target || target.weedlevel == 0) return //Sanity check.
+
+	src.reagents.add_reagent("nutriment", target.weedlevel)
+	target.weedlevel = 0
+	src.visible_message("\red [src] begins rooting through [target], ripping out weeds and eating them noisily.","\red You begin rooting through [target], ripping out weeds and eating them noisily.")
+
+//Brain slug proc for voluntary removal of control.
+/mob/living/carbon/proc/release_control()
+
+	set category = "Abilities"
+	set name = "Release Control"
+	set desc = "Release control of your host's body."
+
+	var/mob/living/simple_animal/borer/B = has_brain_worms()
+
+	if(B && B.host_brain)
+		src << "\red <B>You withdraw your probosci, releasing control of [B.host_brain]</B>"
+
+		B.detatch()
+
+		verbs -= /mob/living/carbon/proc/release_control
+		verbs -= /mob/living/carbon/proc/punish_host
+		verbs -= /mob/living/carbon/proc/spawn_larvae
+
+	else
+		src << "\red <B>ERROR NO BORER OR BRAINMOB DETECTED IN THIS MOB, THIS IS A BUG !</B>"
+
+//Brain slug proc for tormenting the host.
+/mob/living/carbon/proc/punish_host()
+	set category = "Abilities"
+	set name = "Torment host"
+	set desc = "Punish your host with agony."
+
+	var/mob/living/simple_animal/borer/B = has_brain_worms()
+
+	if(!B)
+		return
+
+	if(B.host_brain.ckey)
+		src << "\red <B>You send a punishing spike of psychic agony lancing into your host's brain.</B>"
+		B.host_brain << "\red <B><FONT size=3>Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!</FONT></B>"
+
+/mob/living/carbon/proc/spawn_larvae()
+	set category = "Abilities"
+	set name = "Reproduce"
+	set desc = "Spawn several young."
+
+	var/mob/living/simple_animal/borer/B = has_brain_worms()
+
+	if(!B)
+		return
+
+	if(B.chemicals >= 100)
+		src << "\red <B>Your host twitches and quivers as you rapidly excrete a larva from your sluglike body.</B>"
+		visible_message("\red <B>[src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!</B>")
+		B.chemicals -= 100
+		B.has_reproduced = 1
+
+		new /obj/effect/decal/cleanable/vomit(get_turf(src))
+		playsound(loc, 'sound/effects/splat.ogg', 50, 1)
+		new /mob/living/simple_animal/borer(get_turf(src))
+
+	else
+		src << "You do not have enough chemicals stored to reproduce."
+		return

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

@@ -0,0 +1,88 @@
+proc/create_new_xenomorph(var/alien_caste,var/target)
+
+	target = get_turf(target)
+	if(!target || !alien_caste) return
+
+	var/mob/living/carbon/human/new_alien = new(target)
+	new_alien.set_species("Xenomorph [alien_caste]")
+	return new_alien
+
+/mob/living/carbon/human/xdrone/New(var/new_loc)
+	h_style = "Bald"
+	..(new_loc, "Xenomorph Drone")
+
+/mob/living/carbon/human/xsentinel/New(var/new_loc)
+	h_style = "Bald"
+	..(new_loc, "Xenomorph Sentinel")
+
+/mob/living/carbon/human/xhunter/New(var/new_loc)
+	h_style = "Bald"
+	..(new_loc, "Xenomorph Hunter")
+
+/mob/living/carbon/human/xqueen/New(var/new_loc)
+	h_style = "Bald"
+	..(new_loc, "Xenomorph Queen")
+
+// I feel like we should generalize/condense down all the various icon-rendering antag procs.
+/*----------------------------------------
+Proc: AddInfectionImages()
+Des: Gives the client of the alien an image on each infected mob.
+----------------------------------------*/
+/mob/living/carbon/human/proc/AddInfectionImages()
+	if (client)
+		for (var/mob/living/C in mob_list)
+			if(C.status_flags & XENO_HOST)
+				var/obj/item/alien_embryo/A = locate() in C
+				var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[A.stage]")
+				client.images += I
+	return
+
+/*----------------------------------------
+Proc: RemoveInfectionImages()
+Des: Removes all infected images from the alien.
+----------------------------------------*/
+/mob/living/carbon/human/proc/RemoveInfectionImages()
+	if (client)
+		for(var/image/I in client.images)
+			if(dd_hasprefix_case(I.icon_state, "infected"))
+				del(I)
+	return
+
+/* TODO: Convert this over.
+/mob/living/carbon/human/alien/show_inv(mob/user as mob)
+
+	user.set_machine(src)
+	var/dat = {"
+	<B><HR><FONT size=3>[name]</FONT></B>
+	<BR><HR>
+	<BR><B>Left Hand:</B> <A href='?src=\ref[src];item=l_hand'>[(l_hand ? text("[]", l_hand) : "Nothing")]</A>
+	<BR><B>Right Hand:</B> <A href='?src=\ref[src];item=r_hand'>[(r_hand ? text("[]", r_hand) : "Nothing")]</A>
+	<BR><B>Head:</B> <A href='?src=\ref[src];item=head'>[(head ? text("[]", head) : "Nothing")]</A>
+	<BR><B>(Exo)Suit:</B> <A href='?src=\ref[src];item=suit'>[(wear_suit ? text("[]", wear_suit) : "Nothing")]</A>
+	<BR><A href='?src=\ref[src];item=pockets'>Empty Pouches</A>
+	<BR><A href='?src=\ref[user];mach_close=mob[name]'>Close</A>
+	<BR>"}
+	user << browse(dat, text("window=mob[name];size=340x480"))
+	onclose(user, "mob[name]")
+	return
+	*/
+
+/* TODO: Convert this over.
+/mob/living/carbon/human/alien/queen/large
+	icon = 'icons/mob/alienqueen.dmi'
+	icon_state = "queen_s"
+	pixel_x = -16
+
+/mob/living/carbon/human/alien/queen/large/update_icons()
+	lying_prev = lying	//so we don't update overlays for lying/standing unless our stance changes again
+	update_hud()		//TODO: remove the need for this to be here
+	overlays.Cut()
+	if(lying)
+		if(resting)					icon_state = "queen_sleep"
+		else						icon_state = "queen_l"
+		for(var/image/I in overlays_lying)
+			overlays += I
+	else
+		icon_state = "queen_s"
+		for(var/image/I in overlays_standing)
+			overlays += I*/

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

@@ -0,0 +1,159 @@
+// This is to replace the previous datum/disease/alien_embryo for slightly improved handling and maintainability
+// It functions almost identically (see code/datums/diseases/alien_embryo.dm)
+
+/obj/item/alien_embryo
+	name = "alien embryo"
+	desc = "All slimy and yuck."
+	icon = 'icons/mob/alien.dmi'
+	icon_state = "larva0_dead"
+	var/mob/living/affected_mob
+	var/stage = 0
+
+/obj/item/alien_embryo/New()
+	if(istype(loc, /mob/living))
+		affected_mob = loc
+		processing_objects.Add(src)
+		spawn(0)
+			AddInfectionImages(affected_mob)
+	else
+		del(src)
+
+/obj/item/alien_embryo/Del()
+	if(affected_mob)
+		affected_mob.status_flags &= ~(XENO_HOST)
+		spawn(0)
+			RemoveInfectionImages(affected_mob)
+	..()
+
+/obj/item/alien_embryo/process()
+	if(!affected_mob)	return
+	if(loc != affected_mob)
+		affected_mob.status_flags &= ~(XENO_HOST)
+		processing_objects.Remove(src)
+		spawn(0)
+			RemoveInfectionImages(affected_mob)
+			affected_mob = null
+		return
+
+	if(stage < 5 && prob(3))
+		stage++
+		spawn(0)
+			RefreshInfectionImage(affected_mob)
+
+	switch(stage)
+		if(2, 3)
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(1))
+				affected_mob << "\red Your throat feels sore."
+			if(prob(1))
+				affected_mob << "\red Mucous runs down the back of your throat."
+		if(4)
+			if(prob(1))
+				affected_mob.emote("sneeze")
+			if(prob(1))
+				affected_mob.emote("cough")
+			if(prob(2))
+				affected_mob << "\red Your muscles ache."
+				if(prob(20))
+					affected_mob.take_organ_damage(1)
+			if(prob(2))
+				affected_mob << "\red Your stomach hurts."
+				if(prob(20))
+					affected_mob.adjustToxLoss(1)
+					affected_mob.updatehealth()
+		if(5)
+			affected_mob << "\red You feel something tearing its way out of your stomach..."
+			affected_mob.adjustToxLoss(10)
+			affected_mob.updatehealth()
+			if(prob(50))
+				AttemptGrow()
+
+/obj/item/alien_embryo/proc/AttemptGrow(var/gib_on_success = 1)
+	var/list/candidates = get_alien_candidates()
+	var/picked = null
+
+	// To stop clientless larva, we will check that our host has a client
+	// if we find no ghosts to become the alien. If the host has a client
+	// he will become the alien but if he doesn't then we will set the stage
+	// to 2, so we don't do a process heavy check everytime.
+
+	if(candidates.len)
+		picked = pick(candidates)
+	else if(affected_mob.client)
+		picked = affected_mob.key
+	else
+		stage = 4 // Let's try again later.
+		return
+
+	if(affected_mob.lying)
+		affected_mob.overlays += image('icons/mob/alien.dmi', loc = affected_mob, icon_state = "burst_lie")
+	else
+		affected_mob.overlays += image('icons/mob/alien.dmi', loc = affected_mob, icon_state = "burst_stand")
+	spawn(6)
+		var/mob/living/carbon/alien/larva/new_xeno = new(affected_mob.loc)
+		new_xeno.key = picked
+		new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100)	//To get the player's attention
+		if(gib_on_success)
+			affected_mob.gib()
+		del(src)
+
+/*----------------------------------------
+Proc: RefreshInfectionImage()
+Des: Removes all infection images from aliens and places an infection image on all infected mobs for aliens.
+----------------------------------------*/
+/obj/item/alien_embryo/proc/RefreshInfectionImage()
+
+	for(var/mob/living/carbon/alien in player_list)
+
+		if(!locate(/datum/organ/internal/xenos/hivenode) in alien.internal_organs)
+			continue
+
+		if(alien.client)
+			for(var/image/I in alien.client.images)
+				if(dd_hasprefix_case(I.icon_state, "infected"))
+					del(I)
+			for(var/mob/living/L in mob_list)
+				if(iscorgi(L) || iscarbon(L))
+					if(L.status_flags & XENO_HOST)
+						var/I = image('icons/mob/alien.dmi', loc = L, icon_state = "infected[stage]")
+						alien.client.images += I
+
+/*----------------------------------------
+Proc: AddInfectionImages(C)
+Des: Checks if the passed mob (C) is infected with the alien egg, then gives each alien client an infected image at C.
+----------------------------------------*/
+/obj/item/alien_embryo/proc/AddInfectionImages(var/mob/living/C)
+	if(C)
+
+		for(var/mob/living/carbon/alien in player_list)
+
+			if(!locate(/datum/organ/internal/xenos/hivenode) in alien.internal_organs)
+				continue
+
+			if(alien.client)
+				if(C.status_flags & XENO_HOST)
+					var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected[stage]")
+					alien.client.images += I
+
+/*----------------------------------------
+Proc: RemoveInfectionImage(C)
+Des: Removes the alien infection image from all aliens in the world located in passed mob (C).
+----------------------------------------*/
+
+/obj/item/alien_embryo/proc/RemoveInfectionImages(var/mob/living/C)
+
+	if(C)
+
+		for(var/mob/living/carbon/alien in player_list)
+
+			if(!locate(/datum/organ/internal/xenos/hivenode) in alien.internal_organs)
+				continue
+
+			if(alien.client)
+				for(var/image/I in alien.client.images)
+					if(I.loc == C)
+						if(dd_hasprefix_case(I.icon_state, "infected"))
+							del(I)

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

@@ -0,0 +1,240 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
+//TODO: Make these simple_animals
+
+var/const/MIN_IMPREGNATION_TIME = 100 //time it takes to impregnate someone
+var/const/MAX_IMPREGNATION_TIME = 150
+
+var/const/MIN_ACTIVE_TIME = 200 //time between being dropped and going idle
+var/const/MAX_ACTIVE_TIME = 400
+
+/obj/item/clothing/mask/facehugger
+	name = "alien"
+	desc = "It has some sort of a tube at the end of its tail."
+	icon = 'icons/mob/alien.dmi'
+	icon_state = "facehugger"
+	item_state = "facehugger"
+	w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4
+	flags = FPRINT | TABLEPASS | MASKCOVERSMOUTH | MASKCOVERSEYES | MASKINTERNALS
+	body_parts_covered = FACE|EYES
+	throw_range = 5
+
+	var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case
+	var/sterile = 0
+	var/strength = 5
+	var/attached = 0
+
+/obj/item/clothing/mask/facehugger/attack_paw(user as mob) //can be picked up by aliens
+	attack_hand(user)
+	return
+
+/obj/item/clothing/mask/facehugger/attack_hand(user as mob)
+
+	if((stat == CONSCIOUS && !sterile))
+		if(Attach(user))
+			return
+
+	..()
+
+/obj/item/clothing/mask/facehugger/attack(mob/living/M as mob, mob/user as mob)
+	..()
+	user.drop_from_inventory(src)
+	Attach(M)
+
+/obj/item/clothing/mask/facehugger/New()
+	if(aliens_allowed)
+		..()
+	else
+		del(src)
+
+/obj/item/clothing/mask/facehugger/examine()
+	..()
+	switch(stat)
+		if(DEAD,UNCONSCIOUS)
+			usr << "\red \b [src] is not moving."
+		if(CONSCIOUS)
+			usr << "\red \b [src] seems to be active."
+	if (sterile)
+		usr << "\red \b It looks like the proboscis has been removed."
+	return
+
+/obj/item/clothing/mask/facehugger/attackby()
+	Die()
+	return
+
+/obj/item/clothing/mask/facehugger/bullet_act()
+	Die()
+	return
+
+/obj/item/clothing/mask/facehugger/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+	if(exposed_temperature > 300)
+		Die()
+	return
+
+/obj/item/clothing/mask/facehugger/equipped(mob/M)
+	Attach(M)
+
+/obj/item/clothing/mask/facehugger/Crossed(atom/target)
+	HasProximity(target)
+	return
+
+/obj/item/clothing/mask/facehugger/on_found(mob/finder as mob)
+	if(stat == CONSCIOUS)
+		HasProximity(finder)
+		return 1
+	return
+
+/obj/item/clothing/mask/facehugger/HasProximity(atom/movable/AM as mob|obj)
+	if(CanHug(AM))
+		Attach(AM)
+
+/obj/item/clothing/mask/facehugger/throw_at(atom/target, range, speed)
+	..()
+	if(stat == CONSCIOUS)
+		icon_state = "[initial(icon_state)]_thrown"
+		spawn(15)
+			if(icon_state == "[initial(icon_state)]_thrown")
+				icon_state = "[initial(icon_state)]"
+
+/obj/item/clothing/mask/facehugger/throw_impact(atom/hit_atom)
+	..()
+	if(stat == CONSCIOUS)
+		icon_state = "[initial(icon_state)]"
+		Attach(hit_atom)
+		throwing = 0
+
+/obj/item/clothing/mask/facehugger/proc/Attach(M as mob)
+
+	if((!iscorgi(M) && !iscarbon(M)))
+		return
+
+	if(attached)
+		return
+
+	var/mob/living/carbon/C = M
+	if(istype(C) && locate(/datum/organ/internal/xenos/hivenode) in C.internal_organs)
+		return
+
+
+	attached++
+	spawn(MAX_IMPREGNATION_TIME)
+		attached = 0
+
+	var/mob/living/L = M //just so I don't need to use :
+
+	if(loc == L) return
+	if(stat != CONSCIOUS)	return
+	if(!sterile) L.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage
+
+	L.visible_message("\red \b [src] leaps at [L]'s face!")
+
+	if(ishuman(L))
+		var/mob/living/carbon/human/H = L
+		if(H.head && H.head.flags & HEADCOVERSMOUTH)
+			H.visible_message("\red \b [src] smashes against [H]'s [H.head]!")
+			Die()
+			return
+
+	if(iscarbon(M))
+		var/mob/living/carbon/target = L
+
+		if(target.wear_mask)
+			if(prob(20))	return
+			var/obj/item/clothing/W = target.wear_mask
+			if(!W.canremove)	return
+			target.drop_from_inventory(W)
+
+			target.visible_message("\red \b [src] tears [W] off of [target]'s face!")
+
+		target.equip_to_slot(src, slot_wear_mask)
+		target.contents += src // Monkey sanity check - Snapshot
+
+		if(!sterile) L.Paralyse(MAX_IMPREGNATION_TIME/6) //something like 25 ticks = 20 seconds with the default settings
+	else if (iscorgi(M))
+		var/mob/living/simple_animal/corgi/corgi = M
+		src.loc = corgi
+		corgi.facehugger = src
+		corgi.wear_mask = src
+		//C.regenerate_icons()
+
+	GoIdle() //so it doesn't jump the people that tear it off
+
+	spawn(rand(MIN_IMPREGNATION_TIME,MAX_IMPREGNATION_TIME))
+		Impregnate(L)
+
+	return
+
+/obj/item/clothing/mask/facehugger/proc/Impregnate(mob/living/target as mob)
+	if(!target || target.wear_mask != src || target.stat == DEAD) //was taken off or something
+		return
+
+	if(!sterile)
+		//target.contract_disease(new /datum/disease/alien_embryo(0)) //so infection chance is same as virus infection chance
+		new /obj/item/alien_embryo(target)
+		target.status_flags |= XENO_HOST
+
+		target.visible_message("\red \b [src] falls limp after violating [target]'s face!")
+
+		Die()
+		icon_state = "[initial(icon_state)]_impregnated"
+
+		if(iscorgi(target))
+			var/mob/living/simple_animal/corgi/C = target
+			src.loc = get_turf(C)
+			C.facehugger = null
+	else
+		target.visible_message("\red \b [src] violates [target]'s face!")
+	return
+
+/obj/item/clothing/mask/facehugger/proc/GoActive()
+	if(stat == DEAD || stat == CONSCIOUS)
+		return
+
+	stat = CONSCIOUS
+	icon_state = "[initial(icon_state)]"
+
+	return
+
+/obj/item/clothing/mask/facehugger/proc/GoIdle()
+	if(stat == DEAD || stat == UNCONSCIOUS)
+		return
+
+/*		RemoveActiveIndicators()	*/
+
+	stat = UNCONSCIOUS
+	icon_state = "[initial(icon_state)]_inactive"
+
+	spawn(rand(MIN_ACTIVE_TIME,MAX_ACTIVE_TIME))
+		GoActive()
+	return
+
+/obj/item/clothing/mask/facehugger/proc/Die()
+	if(stat == DEAD)
+		return
+
+/*		RemoveActiveIndicators()	*/
+
+	icon_state = "[initial(icon_state)]_dead"
+	stat = DEAD
+
+	src.visible_message("\red \b[src] curls up into a ball!")
+
+	return
+
+/proc/CanHug(var/mob/M)
+
+	if(iscorgi(M))
+		return 1
+
+	if(!iscarbon(M))
+		return 0
+
+	var/mob/living/carbon/C = M
+	if(istype(C) && locate(/datum/organ/internal/xenos/hivenode) in C.internal_organs)
+		return 0
+
+	if(ishuman(C))
+		var/mob/living/carbon/human/H = C
+		if(H.head && H.head.flags & HEADCOVERSMOUTH)
+			return 0
+	return 1

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

@@ -0,0 +1,233 @@
+/proc/alien_queen_exists(var/ignore_self,var/mob/living/carbon/human/self)
+	for(var/mob/living/carbon/human/Q in living_mob_list)
+		if(self && ignore_self && self == Q)
+			continue
+		if(Q.species.name != "Xenomorph Queen")
+			continue
+		if(!Q.key || !Q.client || Q.stat)
+			continue
+		return 1
+	return 0
+
+/mob/living/carbon/human/proc/gain_plasma(var/amount)
+
+	var/datum/organ/internal/xenos/plasmavessel/I = internal_organs_by_name["plasma vessel"]
+	if(!istype(I)) return
+
+	if(amount)
+		I.stored_plasma += amount
+	I.stored_plasma = max(0,min(I.stored_plasma,I.max_plasma))
+
+/mob/living/carbon/human/proc/check_alien_ability(var/cost,var/needs_foundation,var/needs_organ)
+
+	var/datum/organ/internal/xenos/plasmavessel/P = internal_organs_by_name["plasma vessel"]
+	if(!istype(P))
+		src << "<span class='danger'>Your plasma vessel has been removed!</span>"
+		return
+
+	if(needs_organ)
+		var/datum/organ/internal/I = internal_organs_by_name[needs_organ]
+		if(!I)
+			src << "<span class='danger'>Your [needs_organ] has been removed!</span>"
+			return
+		else if((I.status & ORGAN_CUT_AWAY) || I.is_broken())
+			src << "<span class='danger'>Your [needs_organ] is too damaged to function!</span>"
+			return
+
+	if(P.stored_plasma < cost)
+		src << "\red You don't have enough phoron stored to do that."
+		return 0
+
+	if(needs_foundation)
+		var/turf/T = get_turf(src)
+		var/has_foundation
+		if(T)
+			//TODO: Work out the actual conditions this needs.
+			if(!(istype(T,/turf/space)))
+				has_foundation = 1
+		if(!has_foundation)
+			src << "\red You need a solid foundation to do that on."
+			return 0
+
+	P.stored_plasma -= cost
+	return 1
+
+// Free abilities.
+/mob/living/carbon/human/proc/transfer_plasma(mob/living/carbon/human/M as mob in oview())
+	set name = "Transfer Plasma"
+	set desc = "Transfer Plasma to another alien"
+	set category = "Abilities"
+
+	if (get_dist(src,M) <= 1)
+		src << "\green You need to be closer."
+		return
+
+	var/datum/organ/internal/xenos/plasmavessel/I = M.internal_organs_by_name["plasma vessel"]
+	if(!istype(I))
+		src << "\green Their plasma vessel is missing."
+		return
+
+	var/amount = input("Amount:", "Transfer Plasma to [M]") as num
+	if (amount)
+		amount = abs(round(amount))
+		if(check_alien_ability(amount,0,"plasma vessel"))
+			M.gain_plasma(amount)
+			M << "\green [src] has transfered [amount] plasma to you."
+			src << "\green You have transferred [amount] plasma to [M]"
+	return
+
+// Queen verbs.
+/mob/living/carbon/human/proc/lay_egg()
+
+	set name = "Lay Egg (75)"
+	set desc = "Lay an egg to produce huggers to impregnate prey with."
+	set category = "Abilities"
+
+	if(!aliens_allowed)
+		src << "You begin to lay an egg, but hesitate. You suspect it isn't allowed."
+		verbs -= /mob/living/carbon/human/proc/lay_egg
+		return
+
+	if(locate(/obj/effect/alien/egg) in get_turf(src))
+		src << "There's already an egg here."
+		return
+
+	if(check_alien_ability(75,1,"egg sac"))
+		for(var/mob/O in viewers(src, null))
+			O.show_message(text("\green <B>[src] has laid an egg!</B>"), 1)
+		new /obj/effect/alien/egg(loc)
+
+	return
+
+// Drone verbs.
+/mob/living/carbon/human/proc/evolve()
+	set name = "Evolve (500)"
+	set desc = "Produce an interal egg sac capable of spawning children. Only one queen can exist at a time."
+	set category = "Abilities"
+
+	if(alien_queen_exists())
+		src << "<span class='notice'>We already have an active queen.</span>"
+		return
+
+	if(check_alien_ability(500))
+		src << "\green You begin to evolve!"
+		for(var/mob/O in viewers(src, null))
+			O.show_message(text("\green <B>[src] begins to twist and contort!</B>"), 1)
+		src.set_species("Xenomorph Queen")
+
+	return
+
+/mob/living/carbon/human/proc/plant()
+	set name = "Plant Weeds (50)"
+	set desc = "Plants some alien weeds"
+	set category = "Abilities"
+
+	if(check_alien_ability(50,1,"resin spinner"))
+		for(var/mob/O in viewers(src, null))
+			O.show_message(text("\green <B>[src] has planted some alien weeds!</B>"), 1)
+		new /obj/effect/alien/weeds/node(loc)
+	return
+
+/mob/living/carbon/human/proc/corrosive_acid(O as obj|turf in oview(1)) //If they right click to corrode, an error will flash if its an invalid target./N
+	set name = "Corrosive Acid (200)"
+	set desc = "Drench an object in acid, destroying it over time."
+	set category = "Abilities"
+
+	if(!O in oview(1))
+		src << "\green [O] is too far away."
+		return
+
+	// OBJ CHECK
+	if(isobj(O))
+		var/obj/I = O
+		if(I.unacidable)	//So the aliens don't destroy energy fields/singularies/other aliens/etc with their acid.
+			src << "\green You cannot dissolve this object."
+			return
+
+	// TURF CHECK
+	else if(istype(O, /turf/simulated))
+		var/turf/T = O
+		// R WALL
+		if(istype(T, /turf/simulated/wall/r_wall))
+			src << "\green You cannot dissolve this object."
+			return
+		// R FLOOR
+		if(istype(T, /turf/simulated/floor/engine))
+			src << "\green You cannot dissolve this object."
+			return
+		else// Not a type we can acid.
+			return
+
+	if(check_alien_ability(200,0,"acid gland"))
+		new /obj/effect/alien/acid(get_turf(O), O)
+		visible_message("\green <B>[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!</B>")
+
+	return
+
+/mob/living/carbon/human/proc/neurotoxin(mob/target as mob in oview())
+	set name = "Spit Neurotoxin (50)"
+	set desc = "Spits neurotoxin at someone, paralyzing them for a short time if they are not wearing protective gear."
+	set category = "Abilities"
+
+	if(!check_alien_ability(50,0,"acid gland"))
+		return
+
+	if(stat || paralysis || stunned || weakened || lying || restrained() || buckled)
+		src << "You cannot spit neurotoxin in your current state."
+		return
+
+	src << "\green You spit neurotoxin at [target]."
+
+	for(var/mob/O in oviewers())
+		if ((O.client && !(O.blinded )))
+			O << "\red [src] spits neurotoxin at [target]!"
+
+	//I'm not motivated enough to revise this. Prjectile code in general needs update.
+	// Maybe change this to use throw_at? ~ Z
+	var/turf/T = loc
+	var/turf/U = (istype(target, /atom/movable) ? target.loc : target)
+
+	if(!U || !T)
+		return
+	while(U && !istype(U,/turf))
+		U = U.loc
+	if(!istype(T, /turf))
+		return
+	if (U == T)
+		usr.bullet_act(new /obj/item/projectile/energy/neurotoxin(usr.loc), get_organ_target())
+		return
+	if(!istype(U, /turf))
+		return
+
+	var/obj/item/projectile/energy/neurotoxin/A = new /obj/item/projectile/energy/neurotoxin(usr.loc)
+	A.current = U
+	A.yo = U.y - T.y
+	A.xo = U.x - T.x
+	A.process()
+	return
+
+/mob/living/carbon/human/proc/resin() // -- TLE
+	set name = "Secrete Resin (75)"
+	set desc = "Secrete tough malleable resin."
+	set category = "Abilities"
+
+	var/choice = input("Choose what you wish to shape.","Resin building") as null|anything in list("resin door","resin wall","resin membrane","resin nest") //would do it through typesof but then the player choice would have the type path and we don't want the internal workings to be exposed ICly - Urist
+	if(!choice)
+		return
+
+	if(!check_alien_ability(75,1,"resin spinner"))
+		return
+
+	src << "\green You shape a [choice]."
+	for(var/mob/O in viewers(src, null))
+		O.show_message(text("\red <B>[src] vomits up a thick purple substance and begins to shape it!</B>"), 1)
+	switch(choice)
+		if("resin door")
+			new /obj/structure/mineral_door/resin(loc)
+		if("resin wall")
+			new /obj/effect/alien/resin/wall(loc)
+		if("resin membrane")
+			new /obj/effect/alien/resin/membrane(loc)
+		if("resin nest")
+			new /obj/structure/stool/bed/nest(loc)
+	return

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

@@ -0,0 +1,276 @@
+//Stand-in until this is made more lore-friendly.
+/datum/species/xenos
+	name = "Xenomorph"
+	name_plural = "Xenomorphs"
+
+	default_language = "Xenomorph"
+	language = "Hivemind"
+	unarmed_type = /datum/unarmed_attack/claws/strong
+	secondary_unarmed_type = /datum/unarmed_attack/bite/strong
+	hud_type = /datum/hud_data/alien
+	rarity_value = 3
+
+	has_fine_manipulation = 0
+	insulated = 1
+	gluttonous = 2
+
+	eyes = "blank_eyes"
+
+	brute_mod = 0.5 // Hardened carapace.
+	burn_mod = 2    // Weak to fire.
+
+	warning_low_pressure = 50
+	hazard_low_pressure = -1
+
+	cold_level_1 = 50
+	cold_level_2 = -1
+	cold_level_3 = -1
+
+	flags = NO_BREATHE | NO_SCAN | NO_PAIN | NO_SLIP | NO_POISON
+
+	reagent_tag = IS_XENOS
+
+	blood_color = "#05EE05"
+	flesh_color = "#282846"
+	gibbed_anim = "gibbed-a"
+	dusted_anim = "dust-a"
+	death_message = "lets out a waning guttural screech, green blood bubbling from its maw."
+	death_sound = 'sound/voice/hiss6.ogg'
+
+	speech_sounds = list('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
+	speech_chance = 100
+
+	breath_type = null
+	poison_type = null
+
+	has_organ = list(
+		"heart" =           /datum/organ/internal/heart,
+		"brain" =           /datum/organ/internal/brain/xeno,
+		"plasma vessel" =   /datum/organ/internal/xenos/plasmavessel,
+		"hive node" =       /datum/organ/internal/xenos/hivenode,
+		"nutrient vessel" = /datum/organ/internal/diona/nutrients
+		)
+
+	var/alien_number = 0
+	var/caste_name = "creature" // Used to update alien name.
+	var/weeds_heal_rate = 1     // Health regen on weeds.
+	var/weeds_plasma_rate = 5   // Plasma regen on weeds.
+
+/datum/species/xenos/can_understand(var/mob/other)
+
+	if(istype(other,/mob/living/carbon/alien/larva))
+		return 1
+
+	return 0
+
+/datum/species/xenos/hug(var/mob/living/carbon/human/H,var/mob/living/target)
+	H.visible_message("<span class='notice'>[H] caresses [target] with its scythe-like arm.</span>", \
+					"<span class='notice'>You caress [target] with your scythe-like arm.</span>")
+
+/datum/species/xenos/handle_post_spawn(var/mob/living/carbon/human/H)
+
+	if(H.mind)
+		H.mind.assigned_role = "Alien"
+		H.mind.special_role = "Alien"
+
+	alien_number++ //Keep track of how many aliens we've had so far.
+	H.real_name = "alien [caste_name] ([alien_number])"
+	H.name = H.real_name
+
+	..()
+
+/datum/species/xenos/handle_environment_special(var/mob/living/carbon/human/H)
+
+	var/turf/T = H.loc
+	if(!T) return
+	var/datum/gas_mixture/environment = T.return_air()
+	if(!environment) return
+
+	if(environment.gas["phoron"] > 0 || locate(/obj/effect/alien/weeds) in T)
+		if(H.health >= H.maxHealth - H.getCloneLoss())
+			var/datum/organ/internal/xenos/plasmavessel/P = H.internal_organs_by_name["plasma vessel"]
+			P.stored_plasma += weeds_plasma_rate
+			P.stored_plasma = min(max(P.stored_plasma,0),P.max_plasma)
+		else
+			H.adjustBruteLoss(-weeds_heal_rate)
+			H.adjustFireLoss(-weeds_heal_rate)
+			H.adjustOxyLoss(-weeds_heal_rate)
+			H.adjustToxLoss(-weeds_heal_rate)
+	..()
+
+
+/datum/species/xenos/handle_login_special(var/mob/living/carbon/human/H)
+	H.AddInfectionImages()
+	..()
+
+/datum/species/xenos/handle_logout_special(var/mob/living/carbon/human/H)
+	H.RemoveInfectionImages()
+	..()
+
+/datum/species/xenos/drone
+	name = "Xenomorph Drone"
+	caste_name = "drone"
+	weeds_plasma_rate = 15
+	slowdown = 2
+	tail = "xenos_drone_tail"
+	rarity_value = 5
+
+	icobase = 'icons/mob/human_races/xenos/r_xenos_drone.dmi'
+	deform =  'icons/mob/human_races/xenos/r_xenos_drone.dmi'
+
+	has_organ = list(
+		"heart" =           /datum/organ/internal/heart,
+		"brain" =           /datum/organ/internal/brain/xeno,
+		"plasma vessel" =   /datum/organ/internal/xenos/plasmavessel/queen,
+		"acid gland" =      /datum/organ/internal/xenos/acidgland,
+		"hive node" =       /datum/organ/internal/xenos/hivenode,
+		"resin spinner" =   /datum/organ/internal/xenos/resinspinner,
+		"nutrient vessel" = /datum/organ/internal/diona/nutrients
+		)
+
+	inherent_verbs = list(
+		/mob/living/proc/ventcrawl,
+		/mob/living/carbon/human/proc/regurgitate,
+		/mob/living/carbon/human/proc/plant,
+		/mob/living/carbon/human/proc/transfer_plasma,
+		/mob/living/carbon/human/proc/evolve,
+		/mob/living/carbon/human/proc/resin,
+		/mob/living/carbon/human/proc/corrosive_acid
+		)
+
+/datum/species/xenos/drone/handle_post_spawn(var/mob/living/carbon/human/H)
+
+	var/mob/living/carbon/human/A = H
+	if(!istype(A))
+		return ..()
+	..()
+
+/datum/species/xenos/hunter
+
+	name = "Xenomorph Hunter"
+	weeds_plasma_rate = 5
+	caste_name = "hunter"
+	slowdown = -1
+	total_health = 150
+	tail = "xenos_hunter_tail"
+
+	icobase = 'icons/mob/human_races/xenos/r_xenos_hunter.dmi'
+	deform =  'icons/mob/human_races/xenos/r_xenos_hunter.dmi'
+
+	has_organ = list(
+		"heart" =           /datum/organ/internal/heart,
+		"brain" =           /datum/organ/internal/brain/xeno,
+		"plasma vessel" =   /datum/organ/internal/xenos/plasmavessel/hunter,
+		"hive node" =       /datum/organ/internal/xenos/hivenode,
+		"nutrient vessel" = /datum/organ/internal/diona/nutrients
+		)
+
+	inherent_verbs = list(
+		/mob/living/proc/ventcrawl,
+		/mob/living/carbon/human/proc/tackle,
+		/mob/living/carbon/human/proc/gut,
+		/mob/living/carbon/human/proc/leap,
+		/mob/living/carbon/human/proc/psychic_whisper,
+		/mob/living/carbon/human/proc/regurgitate
+		)
+
+/datum/species/xenos/sentinel
+	name = "Xenomorph Sentinel"
+	weeds_plasma_rate = 10
+	caste_name = "sentinel"
+	slowdown = 1
+	total_health = 125
+	tail = "xenos_sentinel_tail"
+
+	icobase = 'icons/mob/human_races/xenos/r_xenos_sentinel.dmi'
+	deform =  'icons/mob/human_races/xenos/r_xenos_sentinel.dmi'
+
+	has_organ = list(
+		"heart" =           /datum/organ/internal/heart,
+		"brain" =           /datum/organ/internal/brain/xeno,
+		"plasma vessel" =   /datum/organ/internal/xenos/plasmavessel/sentinel,
+		"acid gland" =      /datum/organ/internal/xenos/acidgland,
+		"hive node" =       /datum/organ/internal/xenos/hivenode,
+		"nutrient vessel" = /datum/organ/internal/diona/nutrients
+		)
+
+	inherent_verbs = list(
+		/mob/living/proc/ventcrawl,
+		/mob/living/carbon/human/proc/tackle,
+		/mob/living/carbon/human/proc/regurgitate,
+		/mob/living/carbon/human/proc/transfer_plasma,
+		/mob/living/carbon/human/proc/corrosive_acid,
+		/mob/living/carbon/human/proc/neurotoxin
+		)
+
+/datum/species/xenos/queen
+
+	name = "Xenomorph Queen"
+	total_health = 250
+	weeds_heal_rate = 5
+	weeds_plasma_rate = 20
+	caste_name = "queen"
+	slowdown = 5
+	tail = "xenos_queen_tail"
+	rarity_value = 10
+
+	icobase = 'icons/mob/human_races/xenos/r_xenos_queen.dmi'
+	deform =  'icons/mob/human_races/xenos/r_xenos_queen.dmi'
+
+	has_organ = list(
+		"heart" =           /datum/organ/internal/heart,
+		"brain" =           /datum/organ/internal/brain/xeno,
+		"egg sac" =         /datum/organ/internal/xenos/eggsac,
+		"plasma vessel" =   /datum/organ/internal/xenos/plasmavessel/queen,
+		"acid gland" =      /datum/organ/internal/xenos/acidgland,
+		"hive node" =       /datum/organ/internal/xenos/hivenode,
+		"resin spinner" =   /datum/organ/internal/xenos/resinspinner,
+		"nutrient vessel" = /datum/organ/internal/diona/nutrients
+		)
+
+	inherent_verbs = list(
+		/mob/living/proc/ventcrawl,
+		/mob/living/carbon/human/proc/psychic_whisper,
+		/mob/living/carbon/human/proc/regurgitate,
+		/mob/living/carbon/human/proc/lay_egg,
+		/mob/living/carbon/human/proc/plant,
+		/mob/living/carbon/human/proc/transfer_plasma,
+		/mob/living/carbon/human/proc/corrosive_acid,
+		/mob/living/carbon/human/proc/neurotoxin,
+		/mob/living/carbon/human/proc/resin
+		)
+
+	//maxHealth = 250
+	//health = 250
+
+/datum/species/xenos/queen/handle_login_special(var/mob/living/carbon/human/H)
+	..()
+	// Make sure only one official queen exists at any point.
+	if(!alien_queen_exists(1,H))
+		H.real_name = "alien queen ([alien_number])"
+		H.name = H.real_name
+	else
+		H.real_name = "alien princess ([alien_number])"
+		H.name = H.real_name
+
+/datum/hud_data/alien
+
+	icon = 'icons/mob/screen1_alien.dmi'
+	has_a_intent =  1
+	has_m_intent =  1
+	has_warnings =  1
+	has_hands =     1
+	has_drop =      1
+	has_throw =     1
+	has_resist =    1
+	has_pressure =  0
+	has_nutrition = 0
+	has_bodytemp =  0
+	has_internals = 0
+
+	gear = list(
+		"o_clothing" =   list("loc" = ui_belt,      "slot" = slot_wear_suit, "state" = "equip",  "dir" = SOUTH),
+		"head" =         list("loc" = ui_id,        "slot" = slot_head,      "state" = "hair"),
+		"storage1" =     list("loc" = ui_storage1,  "slot" = slot_l_store,   "state" = "pocket"),
+		"storage2" =     list("loc" = ui_storage2,  "slot" = slot_r_store,   "state" = "pocket"),
+		)

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

@@ -21,8 +21,10 @@
 
 	flick("gibbed-h", animation)
 	if(species)
+		flick(species.gibbed_anim, animation)
 		hgibs(loc, viruses, dna, species.flesh_color, species.blood_color)
 	else
+		flick("gibbed-h", animation)
 		hgibs(loc, viruses, dna)
 
 	spawn(15)
@@ -42,8 +44,8 @@
 	animation.icon = 'icons/mob/mob.dmi'
 	animation.master = src
 
-	flick("dust-h", animation)
-	new /obj/effect/decal/remains/human(loc)
+	flick(species.dusted_anim, animation)
+	new species.remains_type(loc)
 
 	spawn(15)
 		if(animation)	del(animation)