Revert "12/21 modernizations from TG live"

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

@@ -7,10 +7,10 @@
 	name = "alien"
 	voice_name = "alien"
 	icon = 'icons/mob/alien.dmi'
-	gender = FEMALE //All xenos are girls!!
+	gender = FEMALE
 	dna = null
 	faction = list("alien")
-	ventcrawler = VENTCRAWLER_ALWAYS
+	ventcrawler = 2
 	languages_spoken = ALIEN
 	languages_understood = ALIEN
 	sight = SEE_MOBS
@@ -19,6 +19,7 @@
 	bubble_icon = "alien"
 	type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno
 	var/nightvision = 1
+	var/deathNotified = 0
 
 	var/obj/item/weapon/card/id/wear_id = null // Fix for station bounced radios -- Skie
 	var/has_fine_manipulation = 0
@@ -37,22 +38,35 @@
 	verbs += /mob/living/proc/mob_sleep
 	verbs += /mob/living/proc/lay_down
 
-	create_bodyparts() //initialize bodyparts
+	internal_organs += new /obj/item/organ/brain/alien
+	internal_organs += new /obj/item/organ/alien/hivenode
+	internal_organs += new /obj/item/organ/tongue/alien
 
-	create_internal_organs()
+	for(var/obj/item/organ/I in internal_organs)
+		I.Insert(src)
 
 	AddAbility(new/obj/effect/proc_holder/alien/nightvisiontoggle(null))
 	..()
 
-/mob/living/carbon/alien/create_internal_organs()
-	internal_organs += new /obj/item/organ/brain/alien
-	internal_organs += new /obj/item/organ/alien/hivenode
-	internal_organs += new /obj/item/organ/tongue/alien
-	..()
-
 /mob/living/carbon/alien/assess_threat() // beepsky won't hunt aliums
 	return -10
 
+/mob/living/carbon/alien/adjustToxLoss(amount)
+	return 0
+
+/mob/living/carbon/alien/adjustFireLoss(amount) // Weak to Fire
+	if(amount > 0)
+		..(amount * 2)
+	else
+		..(amount)
+	return
+
+/mob/living/carbon/alien/check_eye_prot()
+	return ..() + 2
+
+/mob/living/carbon/alien/getToxLoss()
+	return 0
+
 /mob/living/carbon/alien/handle_environment(datum/gas_mixture/environment)
 	if(!environment)
 		return
@@ -87,6 +101,35 @@
 	else
 		clear_alert("alien_fire")
 
+
+/mob/living/carbon/alien/ex_act(severity, target)
+	..()
+
+	switch (severity)
+		if (1)
+			gib()
+			return
+
+		if (2)
+			adjustBruteLoss(60)
+			adjustFireLoss(60)
+			adjustEarDamage(30,120)
+
+		if(3)
+			adjustBruteLoss(30)
+			if (prob(50))
+				Paralyse(1)
+			adjustEarDamage(15,60)
+
+	updatehealth()
+
+
+/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/reagent_check(datum/reagent/R) //can metabolize all reagents
 	return 0
 
@@ -186,5 +229,3 @@ Des: Removes all infected images from the alien.
 	if(see_override)
 		see_invisible = see_override
 
-/mob/living/carbon/alien/can_hold_items()
-	return has_fine_manipulation

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

@@ -1,10 +1,3 @@
-
-/mob/living/carbon/alien/get_eye_protection()
-	return ..() + 2 //potential cyber implants + natural eye protection
-
-/mob/living/carbon/alien/get_ear_protection()
-	return 2 //no ears
-
 /mob/living/carbon/alien/hitby(atom/movable/AM, skipcatch, hitpush)
 	..(AM, skipcatch = 1, hitpush = 0)
 
@@ -14,7 +7,11 @@ As such, they can either help or harm other aliens. Help works like the human he
 In all, this is a lot like the monkey code. /N
 */
 /mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M)
-	if(isturf(loc) && istype(loc.loc, /area/start))
+	if(!ticker || !ticker.mode)
+		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
 
@@ -26,22 +23,24 @@ In all, this is a lot like the monkey code. /N
 			AdjustParalysis(-3)
 			AdjustStunned(-3)
 			AdjustWeakened(-3)
-			visible_message("<span class='notice'>[M.name] nuzzles [src] trying to wake [p_them()] up!</span>")
+			visible_message("<span class='notice'>[M.name] nuzzles [src] trying to wake it up!</span>")
 
 		if ("grab")
 			grabbedby(M)
 
 		else
-			if(health > 0)
-				M.do_attack_animation(src, ATTACK_EFFECT_BITE)
+			if (health > 0)
+				M.do_attack_animation(src)
 				playsound(loc, 'sound/weapons/bite.ogg', 50, 1, -1)
+				var/damage = 1
 				visible_message("<span class='danger'>[M.name] bites [src]!</span>", \
-						"<span class='userdanger'>[M.name] bites [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-				adjustBruteLoss(1)
+						"<span class='userdanger'>[M.name] bites [src]!</span>")
+				adjustBruteLoss(damage)
 				add_logs(M, src, "attacked")
 				updatehealth()
 			else
 				M << "<span class='warning'>[name] is too injured for that.</span>"
+	return
 
 
 /mob/living/carbon/alien/attack_larva(mob/living/carbon/alien/larva/L)
@@ -57,11 +56,8 @@ In all, this is a lot like the monkey code. /N
 			help_shake_act(M)
 		if("grab")
 			grabbedby(M)
-		if ("harm")
-			M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
-			return 1
-		if("disarm")
-			M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
+		if ("harm", "disarm")
+			M.do_attack_animation(src)
 			return 1
 	return 0
 
@@ -69,8 +65,9 @@ In all, this is a lot like the monkey code. /N
 /mob/living/carbon/alien/attack_paw(mob/living/carbon/monkey/M)
 	if(..())
 		if (stat != DEAD)
-			var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
-			apply_damage(rand(1, 3), BRUTE, affecting)
+			adjustBruteLoss(rand(1, 3))
+			updatehealth()
+	return
 
 
 /mob/living/carbon/alien/attack_animal(mob/living/simple_animal/M)
@@ -99,28 +96,3 @@ In all, this is a lot like the monkey code. /N
 		adjustBruteLoss(damage)
 		add_logs(M, src, "attacked")
 		updatehealth()
-
-/mob/living/carbon/alien/ex_act(severity, target, origin)
-	if(origin && istype(origin, /datum/spacevine_mutation) && isvineimmune(src))
-		return
-	..()
-	switch (severity)
-		if (1)
-			gib()
-			return
-
-		if (2)
-			take_overall_damage(60, 60)
-			adjustEarDamage(30,120)
-
-		if(3)
-			take_overall_damage(30,0)
-			if(prob(50))
-				Paralyse(1)
-			adjustEarDamage(15,60)
-
-/mob/living/carbon/alien/soundbang_act(intensity = 1, stun_pwr = 1, damage_pwr = 5, deafen_pwr = 15)
-	return 0
-
-/mob/living/carbon/alien/acid_act(acidpwr, acid_volume)
-	return 0//aliens are immune to acid.

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

@@ -1,22 +0,0 @@
-
-
-/mob/living/carbon/alien/getToxLoss()
-	return 0
-
-/mob/living/carbon/alien/adjustToxLoss(amount) //alien immune to tox damage
-	return 0
-
-/mob/living/carbon/alien/adjustFireLoss(amount) // Weak to Fire
-	if(amount > 0)
-		..(amount * 2)
-	else
-		..(amount)
-
-
-
-//aliens are immune to stamina damage.
-/mob/living/carbon/alien/adjustStaminaLoss(amount, updating_stamina = 1)
-	return
-
-/mob/living/carbon/alien/setStaminaLoss(amount, updating_stamina = 1)
-	return

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

@@ -1,8 +1,5 @@
-/mob/living/carbon/alien/spawn_gibs(with_bodyparts)
-	if(with_bodyparts)
-		new /obj/effect/gibspawner/xeno(loc,viruses)
-	else
-		new /obj/effect/gibspawner/xenobodypartless(loc,viruses)
+/mob/living/carbon/alien/spawn_gibs()
+	xgibs(loc, viruses)
 
 /mob/living/carbon/alien/gib_animation()
 	PoolOrNew(/obj/effect/overlay/temp/gib_animation, list(loc, "gibbed-a"))
@@ -12,3 +9,17 @@
 
 /mob/living/carbon/alien/dust_animation()
 	PoolOrNew(/obj/effect/overlay/temp/dust_animation, list(loc, "dust-a"))
+
+/mob/living/carbon/alien/proc/deathNotice(var/area/AR, var/turf/T)
+	if(src.z == 2) //Admin fuckery can continue without giving false death rattles to aliens on station or elsewhere.
+		return
+	src.deathNotified = 1
+	T = get_turf(src)
+	var/mob/living/carbon/alien/A
+	for(A in world)
+		A << "<span class='userdanger'>[src.name] has died at [T.loc.name]! </span>"
+
+/mob/living/carbon/alien/death(gibbed)
+	if(!deathNotified)
+		deathNotice()
+	..()

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

@@ -11,6 +11,7 @@ Doesn't work on other aliens/AI.*/
 	panel = "Alien"
 	var/plasma_cost = 0
 	var/check_turf = 0
+
 	var/has_action = 1
 	var/datum/action/spell_action/alien/action = null
 	var/action_icon = 'icons/mob/actions.dmi'
@@ -48,7 +49,7 @@ Doesn't work on other aliens/AI.*/
 		if(!silent)
 			user << "<span class='noticealien'>Not enough plasma stored.</span>"
 		return 0
-	if(check_turf && (!isturf(user.loc) || isspaceturf(user.loc)))
+	if(check_turf && (!isturf(user.loc) || istype(user.loc, /turf/open/space)))
 		if(!silent)
 			user << "<span class='noticealien'>Bad place for a garden!</span>"
 		return 0
@@ -140,16 +141,30 @@ Doesn't work on other aliens/AI.*/
 /obj/effect/proc_holder/alien/acid/on_lose(mob/living/carbon/user)
 	user.verbs.Remove(/mob/living/carbon/proc/corrosive_acid)
 
-/obj/effect/proc_holder/alien/acid/proc/corrode(atom/target,mob/living/carbon/user = usr)
+/obj/effect/proc_holder/alien/acid/proc/corrode(target,mob/living/carbon/user = usr)
 	if(target in oview(1,user))
-		if(target.acid_act(200, 100))
-			user.visible_message("<span class='alertalien'>[user] vomits globs of vile stuff all over [target]. It begins to sizzle and melt under the bubbling mess of acid!</span>")
-			return 1
-		else
-			user << "<span class='noticealien'>You cannot dissolve this object.</span>"
-
-
+		// OBJ CHECK
+		if(isobj(target))
+			var/obj/I = target
+			if(I.unacidable)	//So the aliens don't destroy energy fields/singularies/other aliens/etc with their acid.
+				user << "<span class='noticealien'>You cannot dissolve this object.</span>"
+				return 0
+		// TURF CHECK
+		else if(istype(target, /turf))
+			var/turf/T = target
+			// R WALL
+			if(istype(T, /turf/closed/wall/r_wall))
+				user << "<span class='noticealien'>You cannot dissolve this object.</span>"
+				return 0
+			// R FLOOR
+			if(istype(T, /turf/open/floor/engine))
+				user << "<span class='noticealien'>You cannot dissolve this object.</span>"
+				return 0
+		else// Not a type we can acid.
 			return 0
+		new /obj/effect/acid(get_turf(target), target)
+		user.visible_message("<span class='alertalien'>[user] vomits globs of vile stuff all over [target]. It begins to sizzle and melt under the bubbling mess of acid!</span>")
+		return 1
 	else
 		src << "<span class='noticealien'>Target is too far away.</span>"
 		return 0
@@ -157,10 +172,8 @@ Doesn't work on other aliens/AI.*/
 
 /obj/effect/proc_holder/alien/acid/fire(mob/living/carbon/alien/user)
 	var/O = input("Select what to dissolve:","Dissolve",null) as obj|turf in oview(1,user)
-	if(!O || user.incapacitated())
-		return 0
-	else
-		return corrode(O,user)
+	if(!O) return 0
+	return corrode(O,user)
 
 /mob/living/carbon/proc/corrosive_acid(O as obj|turf in oview(1)) // right click menu verb ugh
 	set name = "Corrossive Acid"
@@ -178,40 +191,39 @@ Doesn't work on other aliens/AI.*/
 	name = "Spit Neurotoxin"
 	desc = "Spits neurotoxin at someone, paralyzing them for a short time."
 	action_icon_state = "alien_neurotoxin_0"
-	active = FALSE
+	var/active = 0
 
 /obj/effect/proc_holder/alien/neurotoxin/fire(mob/living/carbon/user)
-	var/message
 	if(active)
-		message = "<span class='notice'>You empty your neurotoxin gland.</span>"
-		remove_ranged_ability(message)
+		user.ranged_ability = null
+		user << "<span class='notice'>You empty your neurotoxin gland.</span>"
+		active = 0
+	else if(user.ranged_ability && user.ranged_ability != src)
+		user << "<span class='warning'>You already have another aimed ability readied! Cancel it first."
+		return
 	else
-		message = "<span class='notice'>You prepare your neurotoxin gland. <B>Left-click to fire at a target!</B></span>"
-		add_ranged_ability(user, message, TRUE)
+		user.ranged_ability = src
+		active = 1
+		user << "<span class='notice'>You prepare your neurotoxin gland. <B>Left-click to fire at a target!</B></span>"
 
-/obj/effect/proc_holder/alien/neurotoxin/update_icon()
+	user.client.click_intercept = user.ranged_ability
 	action.button_icon_state = "alien_neurotoxin_[active]"
 	action.UpdateButtonIcon()
 
-/obj/effect/proc_holder/alien/neurotoxin/InterceptClickOn(mob/living/caller, params, atom/target)
-	if(..())
-		return
+/obj/effect/proc_holder/alien/neurotoxin/InterceptClickOn(mob/living/carbon/user, params, atom/target)
 	var/p_cost = 50
-	if(!iscarbon(ranged_ability_user) || ranged_ability_user.lying || ranged_ability_user.stat)
-		remove_ranged_ability(ranged_ability_user)
+	if(!iscarbon(user) || user.lying || user.stat)
 		return
-
-	var/mob/living/carbon/user = ranged_ability_user
-
+	user.next_click = world.time + 6
+	user.face_atom(target)
 	if(user.getPlasma() < p_cost)
 		user << "<span class='warning'>You need at least [p_cost] plasma to spit.</span>"
-		remove_ranged_ability()
 		return
 
 	var/turf/T = user.loc
 	var/turf/U = get_step(user, user.dir) // Get the tile infront of the move, based on their direction
 	if(!isturf(U) || !isturf(T))
-		return FALSE
+		return 0
 
 	user.visible_message("<span class='danger'>[user] spits neurotoxin!", "<span class='alertalien'>You spit neurotoxin.</span>")
 	var/obj/item/projectile/bullet/neurotoxin/A = new /obj/item/projectile/bullet/neurotoxin(user.loc)
@@ -221,25 +233,12 @@ Doesn't work on other aliens/AI.*/
 	user.newtonian_move(get_dir(U, T))
 	user.adjustPlasma(-p_cost)
 
-	return TRUE
+	return 1
 
 /obj/effect/proc_holder/alien/neurotoxin/on_lose(mob/living/carbon/user)
 	if(user.ranged_ability == src)
 		user.ranged_ability = null
 
-/obj/effect/proc_holder/alien/neurotoxin/add_ranged_ability(mob/living/user, msg)
-	..()
-	if(isalienadult(user))
-		var/mob/living/carbon/alien/humanoid/A = user
-		A.drooling = 1
-		A.update_icons()
-
-/obj/effect/proc_holder/alien/neurotoxin/remove_ranged_ability(mob/living/user, msg)
-	..()
-	if(isalienadult(user))
-		var/mob/living/carbon/alien/humanoid/A = user
-		A.drooling = 0
-		A.update_icons()
 
 /obj/effect/proc_holder/alien/resin
 	name = "Secrete Resin"
@@ -309,7 +308,7 @@ Doesn't work on other aliens/AI.*/
 /obj/effect/proc_holder/alien/sneak
 	name = "Sneak"
 	desc = "Blend into the shadows to stalk your prey."
-	active = 0
+	var/active = 0
 
 	action_icon_state = "alien_sneak"
 

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

@@ -7,14 +7,11 @@
 
 
 /mob/living/carbon/alien/humanoid/drone/New()
-	AddAbility(new/obj/effect/proc_holder/alien/evolve(null))
-	..()
-
-
-/mob/living/carbon/alien/humanoid/drone/create_internal_organs()
 	internal_organs += new /obj/item/organ/alien/plasmavessel/large
 	internal_organs += new /obj/item/organ/alien/resinspinner
 	internal_organs += new /obj/item/organ/alien/acid
+
+	AddAbility(new/obj/effect/proc_holder/alien/evolve(null))
 	..()
 
 /mob/living/carbon/alien/humanoid/drone/movement_delay()
@@ -39,7 +36,7 @@
 	if(!isturf(user.loc))
 		user << "<span class='notice'>You can't evolve here!</span>"
 		return 0
-	if(!get_alien_type(/mob/living/carbon/alien/humanoid/royal))
+	if(!alien_type_present(/mob/living/carbon/alien/humanoid/royal))
 		var/mob/living/carbon/alien/humanoid/royal/praetorian/new_xeno = new (user.loc)
 		user.alien_evolve(new_xeno)
 		return 1

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

@@ -6,7 +6,7 @@
 	icon_state = "alienh_s"
 	var/obj/screen/leap_icon = null
 
-/mob/living/carbon/alien/humanoid/hunter/create_internal_organs()
+/mob/living/carbon/alien/humanoid/hunter/New()
 	internal_organs += new /obj/item/organ/alien/plasmavessel/small
 	..()
 
@@ -45,18 +45,16 @@
 	if(leaping || stat || buckled || lying)
 		return
 
-	if(!has_gravity() || !A.has_gravity())
+	if(!has_gravity(src) || !has_gravity(A))
 		src << "<span class='alertalien'>It is unsafe to leap without gravity!</span>"
 		//It's also extremely buggy visually, so it's balance+bugfix
 		return
 
 	else //Maybe uses plasma in the future, although that wouldn't make any sense...
 		leaping = 1
-		weather_immunities += "lava"
 		update_icons()
 		throw_at(A,MAX_ALIEN_LEAP_DIST,1, spin=0, diagonals_first = 1)
 		leaping = 0
-		weather_immunities -= "lava"
 		update_icons()
 
 /mob/living/carbon/alien/humanoid/hunter/throw_impact(atom/A)
@@ -65,20 +63,18 @@
 		return ..()
 
 	if(A)
-		if(isliving(A))
+		if(istype(A, /mob/living))
 			var/mob/living/L = A
 			var/blocked = 0
 			if(ishuman(A))
 				var/mob/living/carbon/human/H = A
-				if(H.check_shields(0, "the [name]", src, attack_type = LEAP_ATTACK))
+				if(H.check_shields(90, "the [name]", src, attack_type = THROWN_PROJECTILE_ATTACK))
 					blocked = 1
 			if(!blocked)
 				L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
 				L.Weaken(5)
 				sleep(2)//Runtime prevention (infinite bump() calls on hulks)
 				step_towards(src,L)
-			else
-				Weaken(2, 1, 1)
 
 			toggle_leap(0)
 			pounce_cooldown = !pounce_cooldown
@@ -86,7 +82,7 @@
 				pounce_cooldown = !pounce_cooldown
 		else if(A.density && !A.CanPass(src))
 			visible_message("<span class ='danger'>[src] smashes into [A]!</span>", "<span class ='alertalien'>[src] smashes into [A]!</span>")
-			Weaken(2, 1, 1)
+			weakened = 2
 
 		if(leaping)
 			leaping = 0

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

@@ -11,18 +11,14 @@
 
 	real_name = name
 
-	AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse/xeno(src))
-	AddAbility(new /obj/effect/proc_holder/alien/royal/praetorian/evolve())
-	..()
-
-/mob/living/carbon/alien/humanoid/royal/praetorian/create_internal_organs()
 	internal_organs += new /obj/item/organ/alien/plasmavessel/large
 	internal_organs += new /obj/item/organ/alien/resinspinner
 	internal_organs += new /obj/item/organ/alien/acid
 	internal_organs += new /obj/item/organ/alien/neurotoxin
+	AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse/xeno(src))
+	AddAbility(new /obj/effect/proc_holder/alien/royal/praetorian/evolve())
 	..()
 
-
 /mob/living/carbon/alien/humanoid/royal/praetorian/movement_delay()
 	. = ..()
 	. += 1
@@ -42,7 +38,7 @@
 	if(node.recent_queen_death)
 		user << "<span class='danger'>You are still too burdened with guilt to evolve into a queen.</span>"
 		return 0
-	if(!get_alien_type(/mob/living/carbon/alien/humanoid/royal/queen))
+	if(!alien_type_present(/mob/living/carbon/alien/humanoid/royal/queen))
 		var/mob/living/carbon/alien/humanoid/royal/queen/new_xeno = new (user.loc)
 		user.alien_evolve(new_xeno)
 		if(new_xeno.client.prefs.unlock_content)

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

@@ -7,15 +7,11 @@
 
 
 /mob/living/carbon/alien/humanoid/sentinel/New()
-	AddAbility(new /obj/effect/proc_holder/alien/sneak)
-	..()
-
-/mob/living/carbon/alien/humanoid/sentinel/create_internal_organs()
 	internal_organs += new /obj/item/organ/alien/plasmavessel
 	internal_organs += new /obj/item/organ/alien/acid
 	internal_organs += new /obj/item/organ/alien/neurotoxin
+	AddAbility(new /obj/effect/proc_holder/alien/sneak)
 	..()
 
-
 /mob/living/carbon/alien/humanoid/sentinel/movement_delay()
 	. = ..()

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

@@ -1,15 +1,22 @@
 /mob/living/carbon/alien/humanoid/death(gibbed)
 	if(stat == DEAD)
 		return
-
 	stat = DEAD
 
+	if(!deathNotified) //Did we message the other aliens that we died?
+		deathNotice()  //If not, do so now. This proc will change the deathNotified var to 1 so it never happens again.
+
 	if(!gibbed)
 		playsound(loc, 'sound/voice/hiss6.ogg', 80, 1, 1)
 		visible_message("<span class='name'>[src]</span> lets out a waning guttural screech, green blood bubbling from its maw...")
 		update_canmove()
 		update_icons()
 		status_flags |= CANPUSH
+		if(fireloss >= (maxHealth/2))
+			spawn(10)
+			visible_message("<span class='warning'>[src] starts shaking...</span>")
+			spawn(30)
+				src.gib()
 
 	return ..()
 
@@ -25,4 +32,20 @@
 		if(istype(node)) // just in case someone would ever add a diffirent node to hivenode slot
 			node.queen_death()
 
-	return ..(gibbed)
+	return ..(gibbed)
+
+/mob/living/carbon/alien/humanoid/gib()
+	visible_message("<span class='danger'>[src] explodes in a shower of acid blood and gibs!</span>")
+	for(var/mob/living/M in viewers(2, src))
+		if(ishuman(M))
+			M << "<span class='userdanger'>You're sprayed with acid blood!</span>"
+			M.adjustFireLoss(15)
+			M.reagents.add_reagent("xblood",5)
+		else if(ismonkey(M))
+			M << "<span class='userdanger'>You're sprayed with acid blood!</span>"
+			M.adjustFireLoss(15)
+			M.reagents.add_reagent("xblood",5)
+		else if(!isalien(M))
+			M << "<span class='userdanger'>You're sprayed with acid blood!</span>"
+			M.adjustFireLoss(15)
+	..()

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

@@ -3,7 +3,6 @@
 	icon_state = "alien_s"
 	pass_flags = PASSTABLE
 	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
-	limb_destroyer = 1
 	var/obj/item/r_store = null
 	var/obj/item/l_store = null
 	var/caste = ""
@@ -14,35 +13,89 @@
 	var/custom_pixel_x_offset = 0 //for admin fuckery.
 	var/custom_pixel_y_offset = 0
 	var/sneaking = 0 //For sneaky-sneaky mode and appropriate slowdown
-	var/drooling = 0 //For Neruotoxic spit overlays
-	bodyparts = list(/obj/item/bodypart/chest/alien, /obj/item/bodypart/head/alien, /obj/item/bodypart/l_arm/alien,
-					 /obj/item/bodypart/r_arm/alien, /obj/item/bodypart/r_leg/alien, /obj/item/bodypart/l_leg/alien)
-
 
 //This is fine right now, if we're adding organ specific damage this needs to be updated
 /mob/living/carbon/alien/humanoid/New()
 	AddAbility(new/obj/effect/proc_holder/alien/regurgitate(null))
 	..()
 
+
 /mob/living/carbon/alien/humanoid/movement_delay()
 	. = ..()
 	. += move_delay_add + config.alien_delay + sneaking	//move_delay_add is used to slow aliens with stuns
 
+/mob/living/carbon/alien/humanoid/emp_act(severity)
+	if(r_store) r_store.emp_act(severity)
+	if(l_store) l_store.emp_act(severity)
+	..()
+
+/mob/living/carbon/alien/humanoid/attack_hulk(mob/living/carbon/human/user)
+	if(user.a_intent == "harm")
+		..(user, 1)
+		adjustBruteLoss(15)
+		var/hitverb = "punched"
+		if(mob_size < MOB_SIZE_LARGE)
+			Paralyse(1)
+			step_away(src,user,15)
+			sleep(1)
+			step_away(src,user,15)
+			hitverb = "slammed"
+		playsound(loc, "punch", 25, 1, -1)
+		visible_message("<span class='danger'>[user] has [hitverb] [src]!</span>", \
+		"<span class='userdanger'>[user] has [hitverb] [src]!</span>")
+		return 1
+
+/mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M)
+	if(..())
+		switch(M.a_intent)
+			if ("harm")
+				var/damage = rand(1, 9)
+				if (prob(90))
+					playsound(loc, "punch", 25, 1, -1)
+					visible_message("<span class='danger'>[M] has punched [src]!</span>", \
+							"<span class='userdanger'>[M] has punched [src]!</span>")
+					if ((stat != DEAD) && (damage > 9 || prob(5)))//Regular humans have a very small chance of weakening an alien.
+						Paralyse(2)
+						visible_message("<span class='danger'>[M] has weakened [src]!</span>", \
+								"<span class='userdanger'>[M] has weakened [src]!</span>")
+					adjustBruteLoss(damage)
+					add_logs(M, src, "attacked")
+					updatehealth()
+				else
+					playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+					visible_message("<span class='danger'>[M] has attempted to punch [src]!</span>")
+
+			if ("disarm")
+				if (!lying)
+					if (prob(5))
+						Paralyse(2)
+						playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+						add_logs(M, src, "pushed")
+						visible_message("<span class='danger'>[M] has pushed down [src]!</span>", \
+							"<span class='userdanger'>[M] has pushed down [src]!</span>")
+					else
+						if (prob(50))
+							drop_item()
+							playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+							visible_message("<span class='danger'>[M] has disarmed [src]!</span>", \
+							"<span class='userdanger'>[M] has disarmed [src]!</span>")
+						else
+							playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+							visible_message("<span class='danger'>[M] has attempted to disarm [src]!</span>")
+
 /mob/living/carbon/alien/humanoid/restrained(ignore_grab)
 	. = handcuffed
 
 
 /mob/living/carbon/alien/humanoid/show_inv(mob/user)
 	user.set_machine(src)
-	var/list/dat = list()
-	dat += {"
+	var/dat = {"
 	<HR>
 	<B><FONT size=3>[name]</FONT></B>
-	<HR>"}
-	for(var/i in 1 to held_items.len)
-		var/obj/item/I = get_item_for_held_index(i)
-		dat += "<BR><B>[get_held_index_name(i)]:</B><A href='?src=\ref[src];item=[slot_hands];hand_index=[i]'>[(I && !(I.flags & ABSTRACT)) ? I : "<font color=grey>Empty</font>"]</a>"
-	dat += "<BR><A href='?src=\ref[src];pouches=1'>Empty Pouches</A>"
+	<HR>
+	<BR><B>Left Hand:</B> <A href='?src=\ref[src];item=[slot_l_hand]'>		[l_hand		? l_hand	: "Nothing"]</A>
+	<BR><B>Right Hand:</B> <A href='?src=\ref[src];item=[slot_r_hand]'>		[r_hand		? r_hand	: "Nothing"]</A>
+	<BR><A href='?src=\ref[src];pouches=1'>Empty Pouches</A>"}
 
 	if(handcuffed)
 		dat += "<BR><A href='?src=\ref[src];item=[slot_handcuffed]'>Handcuffed</A>"
@@ -53,7 +106,7 @@
 	<BR>
 	<BR><A href='?src=\ref[user];mach_close=mob\ref[src]'>Close</A>
 	"}
-	user << browse(dat.Join(), "window=mob\ref[src];size=325x500")
+	user << browse(dat, "window=mob\ref[src];size=325x500")
 	onclose(user, "mob\ref[src]")
 
 
@@ -94,29 +147,39 @@
 	else
 		return initial(pixel_x)
 
+/mob/living/carbon/alien/humanoid/check_ear_prot()
+	return 1
+
 /mob/living/carbon/alien/humanoid/get_permeability_protection()
 	return 0.8
 
 /mob/living/carbon/alien/humanoid/alien_evolve(mob/living/carbon/alien/humanoid/new_xeno)
-	drop_all_held_items()
+	drop_l_hand()
+	drop_r_hand()
 	for(var/atom/movable/A in stomach_contents)
 		stomach_contents.Remove(A)
 		new_xeno.stomach_contents.Add(A)
 		A.loc = new_xeno
 	..()
 
-//For alien evolution/promotion/queen finder procs. Checks for an active alien of that type
-/proc/get_alien_type(var/alienpath)
+//For alien evolution/promotion procs. Checks for
+proc/alien_type_present(var/alienpath)
 	for(var/mob/living/carbon/alien/humanoid/A in living_mob_list)
 		if(!istype(A, alienpath))
 			continue
 		if(!A.key || A.stat == DEAD) //Only living aliens with a ckey are valid.
 			continue
-		return A
-	return FALSE
+		return 1
+	return 0
 
 
 /mob/living/carbon/alien/humanoid/check_breath(datum/gas_mixture/breath)
 	if(breath && breath.total_moles() > 0 && !sneaking)
 		playsound(get_turf(src), pick('sound/voice/lowHiss2.ogg', 'sound/voice/lowHiss3.ogg', 'sound/voice/lowHiss4.ogg'), 50, 0, -5)
 	..()
+
+/mob/living/carbon/alien/humanoid/grabbedby(mob/living/carbon/user, supress_message = 0)
+	if(user == src && pulling && grab_state >= GRAB_AGGRESSIVE && !pulling.anchored && iscarbon(pulling))
+		devour_mob(pulling, devour_time = 60)
+	else
+		..()

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

@@ -1,68 +0,0 @@
-
-/mob/living/carbon/alien/humanoid/grabbedby(mob/living/carbon/user, supress_message = 0)
-	if(user == src && pulling && grab_state >= GRAB_AGGRESSIVE && !pulling.anchored && iscarbon(pulling))
-		devour_mob(pulling, devour_time = 60)
-	else
-		..()
-
-/mob/living/carbon/alien/humanoid/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
-	if(user.a_intent == INTENT_HARM)
-		..(user, 1)
-		adjustBruteLoss(15)
-		var/hitverb = "punched"
-		if(mob_size < MOB_SIZE_LARGE)
-			step_away(src,user,15)
-			sleep(1)
-			step_away(src,user,15)
-			hitverb = "slammed"
-		playsound(loc, "punch", 25, 1, -1)
-		visible_message("<span class='danger'>[user] has [hitverb] [src]!</span>", \
-		"<span class='userdanger'>[user] has [hitverb] [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-		return 1
-
-/mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M)
-	if(..())
-		switch(M.a_intent)
-			if ("harm")
-				var/damage = rand(1, 9)
-				if (prob(90))
-					playsound(loc, "punch", 25, 1, -1)
-					visible_message("<span class='danger'>[M] has punched [src]!</span>", \
-							"<span class='userdanger'>[M] has punched [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-					if ((stat != DEAD) && (damage > 9 || prob(5)))//Regular humans have a very small chance of weakening an alien.
-						Paralyse(2)
-						visible_message("<span class='danger'>[M] has weakened [src]!</span>", \
-								"<span class='userdanger'>[M] has weakened [src]!</span>")
-					var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
-					apply_damage(damage, BRUTE, affecting)
-					add_logs(M, src, "attacked")
-				else
-					playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
-					visible_message("<span class='userdanger'>[M] has attempted to punch [src]!</span>", \
-						"<span class='userdanger'>[M] has attempted to punch [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-
-			if ("disarm")
-				if (!lying)
-					if (prob(5))
-						Paralyse(2)
-						playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-						add_logs(M, src, "pushed")
-						visible_message("<span class='danger'>[M] has pushed down [src]!</span>", \
-							"<span class='userdanger'>[M] has pushed down [src]!</span>")
-					else
-						if (prob(50))
-							drop_item()
-							playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-							visible_message("<span class='danger'>[M] has disarmed [src]!</span>", \
-							"<span class='userdanger'>[M] has disarmed [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-						else
-							playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
-							visible_message("<span class='userdanger'>[M] has attempted to disarm [src]!</span>",\
-								"<span class='userdanger'>[M] has attempted to disarm [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-
-
-
-/mob/living/carbon/alien/humanoid/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect, end_pixel_y)
-	if(!no_effect && !visual_effect_icon)
-		visual_effect_icon = ATTACK_EFFECT_CLAW
-	..()

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

@@ -1,4 +1,4 @@
-
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
 
 /mob/living/carbon/alien/humanoid/proc/adjust_body_temperature(current, loc_temp, boost)
 	var/temperature = current

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

@@ -2,7 +2,7 @@
 	//Common stuffs for Praetorian and Queen
 	icon = 'icons/mob/alienqueen.dmi'
 	status_flags = 0
-	ventcrawler = VENTCRAWLER_NONE //pull over that ass too fat
+	ventcrawler = 0 //pull over that ass too fat
 	unique_name = 0
 	pixel_x = -16
 	bubble_icon = "alienroyal"
@@ -22,27 +22,7 @@
 	maxHealth = 400
 	health = 400
 	icon_state = "alienq"
-	var/datum/action/small_sprite/smallsprite = new/datum/action/small_sprite()
 
-/datum/action/small_sprite
-	name = "Toggle Giant Sprite - Others will always see you as giant"
-	button_icon_state = "smallqueen"
-	background_icon_state = "bg_alien"
-	var/small = 0
-
-/datum/action/small_sprite/Trigger()
-	..()
-	if(!small)
-		var/image/I = image(icon = 'icons/mob/alien.dmi' , icon_state = "alienq_running", loc = owner)
-		I.override = 1
-		I.pixel_x -= owner.pixel_x
-		I.pixel_y -= owner.pixel_y
-		owner.add_alt_appearance("smallqueen", I, list(owner))
-
-		small = 1
-	else
-		owner.remove_alt_appearance("smallqueen")
-		small = 0
 
 /mob/living/carbon/alien/humanoid/royal/queen/New()
 	//there should only be one queen
@@ -57,22 +37,18 @@
 
 	real_name = src.name
 
-	AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse/xeno(src))
-	AddAbility(new/obj/effect/proc_holder/alien/royal/queen/promote())
-	smallsprite.Grant(src)
-	..()
-
-/mob/living/carbon/alien/humanoid/royal/queen/create_internal_organs()
 	internal_organs += new /obj/item/organ/alien/plasmavessel/large/queen
 	internal_organs += new /obj/item/organ/alien/resinspinner
 	internal_organs += new /obj/item/organ/alien/acid
 	internal_organs += new /obj/item/organ/alien/neurotoxin
 	internal_organs += new /obj/item/organ/alien/eggsac
+	AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse/xeno(src))
+	AddAbility(new/obj/effect/proc_holder/alien/royal/queen/promote())
 	..()
 
 /mob/living/carbon/alien/humanoid/royal/queen/movement_delay()
 	. = ..()
-	. += 3
+	. += 5
 
 //Queen verbs
 /obj/effect/proc_holder/alien/lay_egg
@@ -102,7 +78,7 @@
 
 /obj/effect/proc_holder/alien/royal/queen/promote/fire(mob/living/carbon/alien/user)
 	var/obj/item/queenpromote/prom
-	if(get_alien_type(/mob/living/carbon/alien/humanoid/royal/praetorian/))
+	if(alien_type_present(/mob/living/carbon/alien/humanoid/royal/praetorian/))
 		user << "<span class='noticealien'>You already have a Praetorian!</span>"
 		return 0
 	else
@@ -123,14 +99,14 @@
 	name = "\improper royal parasite"
 	desc = "Inject this into one of your grown children to promote her to a Praetorian!"
 	icon_state = "alien_medal"
-	flags = ABSTRACT|NODROP|DROPDEL
+	flags = ABSTRACT|NODROP
 	icon = 'icons/mob/alien.dmi'
 
 /obj/item/queenpromote/attack(mob/living/M, mob/living/carbon/alien/humanoid/user)
 	if(!isalienadult(M) || istype(M, /mob/living/carbon/alien/humanoid/royal))
 		user << "<span class='noticealien'>You may only use this with your adult, non-royal children!</span>"
 		return
-	if(get_alien_type(/mob/living/carbon/alien/humanoid/royal/praetorian/))
+	if(alien_type_present(/mob/living/carbon/alien/humanoid/royal/praetorian/))
 		user << "<span class='noticealien'>You already have a Praetorian!</span>"
 		return
 
@@ -185,4 +161,4 @@
 	desc = ""
 	icon_state = "alienq"
 	caste = "q"
-	update_icons()
+	update_icons()

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

@@ -20,12 +20,8 @@
 		icon_state = "alien[caste]_sleep"
 	else if(mob_size == MOB_SIZE_LARGE)
 		icon_state = "alien[caste]"
-		if(drooling)
-			add_overlay("alienspit_[caste]")
 	else
 		icon_state = "alien[caste]_s"
-		if(drooling)
-			add_overlay("alienspit_s")
 
 	if(leaping)
 		if(alt_icon == initial(alt_icon))
@@ -54,40 +50,28 @@
 	..()
 	update_icons()
 
-/mob/living/carbon/alien/humanoid/update_inv_handcuffed()
-	remove_overlay(HANDCUFF_LAYER)
-	var/cuff_icon = "aliencuff_s"
-	var/dmi_file = 'icons/mob/alien.dmi'
-
-	if(mob_size == MOB_SIZE_LARGE)
-		cuff_icon = "aliencuff_[caste]"
-		dmi_file = 'icons/mob/alienqueen.dmi'
-
-	if(handcuffed)
-		overlays_standing[HANDCUFF_LAYER] = image(dmi_file,icon_state= cuff_icon, layer =-HANDCUFF_LAYER)
-		apply_overlay(HANDCUFF_LAYER)
-
 //Royals have bigger sprites, so inhand things must be handled differently.
-/mob/living/carbon/alien/humanoid/royal/update_inv_hands()
+/mob/living/carbon/alien/humanoid/royal/update_inv_r_hand()
 	..()
-	remove_overlay(HANDS_LAYER)
-	var/list/hands = list()
-
-	var/obj/item/l_hand = get_item_for_held_index(1)
-	if(l_hand)
-		var/itm_state = l_hand.item_state
-		if(!itm_state)
-			itm_state = l_hand.icon_state
-		var/image/I = image("icon" = alt_inhands_file , "icon_state"="[itm_state][caste]_l", "layer"=-HANDS_LAYER)
-		hands += I
-
-	var/obj/item/r_hand = get_item_for_held_index(2)
+	remove_overlay(R_HAND_LAYER)
 	if(r_hand)
 		var/itm_state = r_hand.item_state
 		if(!itm_state)
 			itm_state = r_hand.icon_state
-		var/image/I = image("icon" = alt_inhands_file , "icon_state"="[itm_state][caste]_r", "layer"=-HANDS_LAYER)
-		hands += I
 
-	overlays_standing[HANDS_LAYER] = hands
-	apply_overlay(HANDS_LAYER)
+		var/image/I = image("icon" = alt_inhands_file , "icon_state"="[itm_state][caste]_r", "layer"=-R_HAND_LAYER)
+		overlays_standing[R_HAND_LAYER] = I
+
+		apply_overlay(R_HAND_LAYER)
+
+/mob/living/carbon/alien/humanoid/royal/update_inv_l_hand()
+	..()
+	remove_overlay(L_HAND_LAYER)
+	if(l_hand)
+		var/itm_state = l_hand.item_state
+		if(!itm_state)
+			itm_state = l_hand.icon_state
+
+		var/image/I = image("icon" = alt_inhands_file , "icon_state"="[itm_state][caste]_l", "layer"=-L_HAND_LAYER)
+		overlays_standing[L_HAND_LAYER] = I
+		apply_overlay(L_HAND_LAYER)

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

@@ -8,18 +8,3 @@
 		visible_message("<span class='name'>[src]</span> lets out a waning high-pitched cry.")
 
 	return ..(gibbed)
-
-/mob/living/carbon/alien/larva/spawn_gibs(with_bodyparts)
-	if(with_bodyparts)
-		new /obj/effect/gibspawner/larva(loc,viruses)
-	else
-		new /obj/effect/gibspawner/larvabodypartless(loc,viruses)
-
-/mob/living/carbon/alien/larva/gib_animation()
-	PoolOrNew(/obj/effect/overlay/temp/gib_animation, list(loc, "gibbed-l"))
-
-/mob/living/carbon/alien/larva/spawn_dust()
-	new /obj/effect/decal/remains/xeno(loc)
-
-/mob/living/carbon/alien/larva/dust_animation()
-	PoolOrNew(/obj/effect/overlay/temp/dust_animation, list(loc, "dust-l"))

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

@@ -14,20 +14,16 @@
 	var/time_of_birth
 
 	rotate_on_lying = 0
-	bodyparts = list(/obj/item/bodypart/chest/larva, /obj/item/bodypart/head/larva)
-
 
 //This is fine right now, if we're adding organ specific damage this needs to be updated
 /mob/living/carbon/alien/larva/New()
+	regenerate_icons()
+	internal_organs += new /obj/item/organ/alien/plasmavessel/small/tiny
 
 	AddAbility(new/obj/effect/proc_holder/alien/hide(null))
 	AddAbility(new/obj/effect/proc_holder/alien/larva_evolve(null))
 	..()
 
-/mob/living/carbon/alien/larva/create_internal_organs()
-	internal_organs += new /obj/item/organ/alien/plasmavessel/small/tiny
-	..()
-
 //This needs to be fixed
 /mob/living/carbon/alien/larva/Stat()
 	..()
@@ -43,6 +39,37 @@
 /mob/living/carbon/alien/larva/attack_ui(slot_id)
 	return
 
+/mob/living/carbon/alien/larva/attack_hulk(mob/living/carbon/human/user)
+	if(user.a_intent == "harm")
+		..(user, 1)
+		adjustBruteLoss(5 + rand(1,9))
+		Paralyse(1)
+		spawn()
+			step_away(src,user,15)
+			sleep(1)
+			step_away(src,user,15)
+		return 1
+
+/mob/living/carbon/alien/larva/attack_hand(mob/living/carbon/human/M)
+	if(..())
+		var/damage = rand(1, 9)
+		if (prob(90))
+			playsound(loc, "punch", 25, 1, -1)
+			add_logs(M, src, "attacked")
+			visible_message("<span class='danger'>[M] has kicked [src]!</span>", \
+					"<span class='userdanger'>[M] has kicked [src]!</span>")
+			if ((stat != DEAD) && (damage > 4.9))
+				Paralyse(rand(5,10))
+
+			adjustBruteLoss(damage)
+			updatehealth()
+		else
+			playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+			visible_message("<span class='danger'>[M] has attempted to kick [src]!</span>", \
+					"<span class='userdanger'>[M] has attempted to kick [src]!</span>")
+
+	return
+
 /mob/living/carbon/alien/larva/restrained(ignore_grab)
 	. = 0
 

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

@@ -1,34 +0,0 @@
-
-
-/mob/living/carbon/alien/larva/attack_hand(mob/living/carbon/human/M)
-	if(..())
-		var/damage = rand(1, 9)
-		if (prob(90))
-			playsound(loc, "punch", 25, 1, -1)
-			add_logs(M, src, "attacked")
-			visible_message("<span class='danger'>[M] has kicked [src]!</span>", \
-					"<span class='userdanger'>[M] has kicked [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-			if ((stat != DEAD) && (damage > 4.9))
-				Paralyse(rand(5,10))
-
-			var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
-			apply_damage(damage, BRUTE, affecting)
-		else
-			playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
-			visible_message("<span class='danger'>[M] has attempted to kick [src]!</span>", \
-					"<span class='userdanger'>[M] has attempted to kick [src]!</span>", null, COMBAT_MESSAGE_RANGE)
-
-/mob/living/carbon/alien/larva/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0)
-	if(user.a_intent == INTENT_HARM)
-		..(user, 1)
-		adjustBruteLoss(5 + rand(1,9))
-		spawn()
-			step_away(src,user,15)
-			sleep(1)
-			step_away(src,user,15)
-		return 1
-
-/mob/living/carbon/alien/larva/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect, end_pixel_y)
-	if(!no_effect && !visual_effect_icon)
-		visual_effect_icon = ATTACK_EFFECT_BITE
-	..()

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

@@ -1,4 +1,4 @@
-
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
 
 /mob/living/carbon/alien/larva/Life()
 	set invisibility = 0
@@ -6,7 +6,7 @@
 
 	if (notransform)
 		return
-	if(..()) //not dead
+	if(..())
 		// GROW!
 		if(amount_grown < max_grown)
 			amount_grown++
@@ -20,7 +20,7 @@
 		if(health<= -maxHealth || !getorgan(/obj/item/organ/brain))
 			death()
 			return
-		if(paralysis || sleeping || getOxyLoss() > 50 || (status_flags & FAKEDEATH) || health <= HEALTH_THRESHOLD_CRIT)
+		if(paralysis || sleeping || getOxyLoss() > 50 || (status_flags & FAKEDEATH) || health <= config.health_threshold_crit)
 			if(stat == CONSCIOUS)
 				stat = UNCONSCIOUS
 				blind_eyes(1)

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

@@ -5,7 +5,7 @@
 
 /mob/living/carbon/alien/larva/update_icons()
 	var/state = 0
-	if(amount_grown > 80)
+	if(amount_grown > 150)
 		state = 2
 	else if(amount_grown > 50)
 		state = 1

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

@@ -1,6 +1,3 @@
-/mob/living/carbon/alien/Life()
-	findQueen()
-	return..()
 
 /mob/living/carbon/alien/check_breath(datum/gas_mixture/breath)
 	if(status_flags & GODMODE)
@@ -45,10 +42,4 @@
 		move_delay_add = max(0, move_delay_add - rand(1, 2))
 
 /mob/living/carbon/alien/handle_changeling()
-	return
-
-/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

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

@@ -31,7 +31,7 @@
 	name = "plasma vessel"
 	icon_state = "plasma"
 	origin_tech = "biotech=5;plasmatech=4"
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = 3
 	zone = "chest"
 	slot = "plasmavessel"
 	alien_powers = list(/obj/effect/proc_holder/alien/plant, /obj/effect/proc_holder/alien/transfer)
@@ -49,7 +49,7 @@
 /obj/item/organ/alien/plasmavessel/large
 	name = "large plasma vessel"
 	icon_state = "plasma_large"
-	w_class = WEIGHT_CLASS_BULKY
+	w_class = 4
 	storedPlasma = 200
 	max_plasma = 500
 	plasma_rate = 15
@@ -61,7 +61,7 @@
 /obj/item/organ/alien/plasmavessel/small
 	name = "small plasma vessel"
 	icon_state = "plasma_small"
-	w_class = WEIGHT_CLASS_SMALL
+	w_class = 2
 	storedPlasma = 100
 	max_plasma = 150
 	plasma_rate = 5
@@ -69,7 +69,7 @@
 /obj/item/organ/alien/plasmavessel/small/tiny
 	name = "tiny plasma vessel"
 	icon_state = "plasma_tiny"
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 	max_plasma = 100
 	alien_powers = list(/obj/effect/proc_holder/alien/transfer)
 
@@ -107,7 +107,7 @@
 	zone = "head"
 	slot = "hivenode"
 	origin_tech = "biotech=5;magnets=4;bluespace=3"
-	w_class = WEIGHT_CLASS_TINY
+	w_class = 1
 	var/recent_queen_death = 0 //Indicates if the queen died recently, aliens are heavily weakened while this is active.
 	alien_powers = list(/obj/effect/proc_holder/alien/whisper)
 
@@ -182,6 +182,6 @@
 	icon_state = "eggsac"
 	zone = "groin"
 	slot = "eggsac"
-	w_class = WEIGHT_CLASS_BULKY
+	w_class = 4
 	origin_tech = "biotech=6"
 	alien_powers = list(/obj/effect/proc_holder/alien/lay_egg)

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

@@ -4,31 +4,4 @@
 		hud_used.alien_plasma_display.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='magenta'>[round(getPlasma())]</font></div>"
 
 /mob/living/carbon/alien/larva/updatePlasmaDisplay()
-	return
-
-/mob/living/carbon/alien/proc/findQueen()
-	if(hud_used)
-		hud_used.alien_queen_finder.cut_overlays()
-		var/mob/queen = get_alien_type(/mob/living/carbon/alien/humanoid/royal/queen)
-		if(!queen)
-			return
-		var/turf/Q = get_turf(queen)
-		var/turf/A = get_turf(src)
-		if(Q.z != A.z) //The queen is on a different Z level, we cannot sense that far.
-			return
-		var/Qdir = get_dir(src, Q)
-		var/Qdist = get_dist(src, Q)
-		image(icon,loc,icon_state,layer,dir)
-		var/finder_icon = "finder_center" //Overlay showed when adjacent to or on top of the queen!
-		switch(Qdist)
-			if(2 to 7)
-				finder_icon = "finder_near"
-			if(8 to 20)
-				finder_icon = "finder_med"
-			if(21 to INFINITY)
-				finder_icon = "finder_far"
-		var/image/finder_eye = image('icons/mob/screen_alien.dmi', icon_state = finder_icon, dir = Qdir)
-		hud_used.alien_queen_finder.add_overlay(finder_eye)
-
-/mob/living/carbon/alien/humanoid/royal/queen/findQueen()
-	return //Queen already knows where she is. Hopefully.
+	return

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

@@ -41,7 +41,7 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
 			if(prob(4))
 				owner << "<span class='danger'>Your muscles ache.</span>"
 				if(prob(20))
-					owner.take_bodypart_damage(1)
+					owner.take_organ_damage(1)
 			if(prob(4))
 				owner << "<span class='danger'>Your stomach hurts.</span>"
 				if(prob(20))
@@ -99,7 +99,7 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
 			new_xeno.notransform = 0
 			new_xeno.invisibility = 0
 		if(gib_on_success)
-			owner.gib(TRUE)
+			owner.gib()
 		else
 			owner.adjustBruteLoss(40)
 			owner.overlays -= overlay

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

@@ -1,4 +1,4 @@
-
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
 
 //TODO: Make these simple_animals
 
@@ -14,7 +14,7 @@ var/const/MAX_ACTIVE_TIME = 400
 	icon = 'icons/mob/alien.dmi'
 	icon_state = "facehugger"
 	item_state = "facehugger"
-	w_class = WEIGHT_CLASS_TINY //note: can be picked up by aliens unlike most other items of w_class below 4
+	w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4
 	flags = MASKINTERNALS
 	throw_range = 5
 	tint = 3
@@ -23,8 +23,8 @@ var/const/MAX_ACTIVE_TIME = 400
 
 	var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case
 
-	var/sterile = FALSE
-	var/real = TRUE //0 for the toy, 1 for real. Sure I could istype, but fuck that.
+	var/sterile = 0
+	var/real = 1 //0 for the toy, 1 for real. Sure I could istype, but fuck that.
 	var/strength = 5
 
 	var/attached = 0
@@ -33,16 +33,6 @@ var/const/MAX_ACTIVE_TIME = 400
 	name = "Lamarr"
 	sterile = 1
 
-/obj/item/clothing/mask/facehugger/dead
-	icon_state = "facehugger_dead"
-	item_state = "facehugger_inactive"
-	stat = DEAD
-
-/obj/item/clothing/mask/facehugger/impregnated
-	icon_state = "facehugger_impregnated"
-	item_state = "facehugger_impregnated"
-	stat = DEAD
-
 /obj/item/clothing/mask/facehugger/attack_alien(mob/user) //can be picked up by aliens
 	attack_hand(user)
 	return
@@ -78,6 +68,7 @@ var/const/MAX_ACTIVE_TIME = 400
 /obj/item/clothing/mask/facehugger/bullet_act(obj/item/projectile/P)
 	if(P.damage)
 		Die()
+	return
 
 /obj/item/clothing/mask/facehugger/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 300)
@@ -101,7 +92,7 @@ var/const/MAX_ACTIVE_TIME = 400
 		return Attach(AM)
 	return 0
 
-/obj/item/clothing/mask/facehugger/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0)
+/obj/item/clothing/mask/facehugger/throw_at(atom/target, range, speed, mob/thrower, spin)
 	if(!..())
 		return
 	if(stat == CONSCIOUS)
@@ -116,82 +107,62 @@ var/const/MAX_ACTIVE_TIME = 400
 		icon_state = "[initial(icon_state)]"
 		Attach(hit_atom)
 
-/obj/item/clothing/mask/facehugger/proc/valid_to_attach(mob/living/M)
-	// valid targets: corgis, carbons except aliens and devils
-	// facehugger state early exit checks
-	if(stat != CONSCIOUS)
-		return FALSE
-	if(attached)
-		return FALSE
-	if(!iscorgi(M) && !iscarbon(M))
-		return FALSE
-	if(iscarbon(M))
-		// disallowed carbons
-		if(isalien(M) || isdevil(M))
-			return FALSE
-		var/mob/living/carbon/target = M
-		// gotta have a head to be implanted (no changelings or sentient plants)
-		if(!target.get_bodypart("head"))
-			return FALSE
-
-		if(target.getorgan(/obj/item/organ/alien/hivenode) || target.getorgan(/obj/item/organ/body_egg/alien_embryo))
-			return FALSE
-		// carbon, has head, not alien or devil, has no hivenode or embryo: valid
-		return TRUE
-	else if(iscorgi(M))
-		// corgi: valid
-		return TRUE
-
 /obj/item/clothing/mask/facehugger/proc/Attach(mob/living/M)
-	if(!valid_to_attach(M))
-		return FALSE
-	// passed initial checks - time to leap!
+	if(!isliving(M))
+		return 0
+	if((!iscorgi(M) && !iscarbon(M)) || isalien(M))
+		return 0
+	if(attached)
+		return 0
+	else
+		attached++
+		spawn(MAX_IMPREGNATION_TIME)
+			attached = 0
+	if(M.getorgan(/obj/item/organ/alien/hivenode))
+		return 0
+	if(M.getorgan(/obj/item/organ/body_egg/alien_embryo))
+		return 0
+	if(stat != CONSCIOUS)
+		return 0
+	if(!sterile) M.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage
 	M.visible_message("<span class='danger'>[src] leaps at [M]'s face!</span>", \
-							"<span class='userdanger'>[src] leaps at [M]'s face!</span>")
-
-	// probiscis-blocker handling
+						"<span class='userdanger'>[src] leaps at [M]'s face!</span>")
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		if(H.is_mouth_covered(head_only = 1))
+			H.visible_message("<span class='danger'>[src] smashes against [H]'s [H.head]!</span>", \
+								"<span class='userdanger'>[src] smashes against [H]'s [H.head]!</span>")
+			Die()
+			return 0
 	if(iscarbon(M))
 		var/mob/living/carbon/target = M
 		if(target.wear_mask)
+			if(prob(20))
+				return 0
 			var/obj/item/clothing/W = target.wear_mask
 			if(W.flags & NODROP)
-				return FALSE
-			if(!istype(W,/obj/item/clothing/mask/facehugger))
-				target.unEquip(W)
-				target.visible_message("<span class='danger'>[src] tears [W] off of [target]'s face!</span>", \
+				return 0
+			target.unEquip(W)
+
+			target.visible_message("<span class='danger'>[src] tears [W] off of [target]'s face!</span>", \
 									"<span class='userdanger'>[src] tears [W] off of [target]'s face!</span>")
 
-		if(ishuman(M))
-			var/mob/living/carbon/human/H = M
-			if(H.is_mouth_covered(head_only = 1))
-				H.visible_message("<span class='danger'>[src] smashes against [H]'s [H.head]!</span>", \
-									"<span class='userdanger'>[src] smashes against [H]'s [H.head]!</span>")
-				Die()
-				return FALSE
 		src.loc = target
-		target.equip_to_slot_if_possible(src, slot_wear_mask, 0, 1, 1)
-	// early returns and validity checks done: attach.
-	attached++
-	//ensure we detach once we no longer need to be attached
-	spawn(MAX_IMPREGNATION_TIME)
-		attached = 0
-
-	if (iscorgi(M))
+		target.equip_to_slot(src, slot_wear_mask,,0)
+		if(!sterile)
+			M.Paralyse(MAX_IMPREGNATION_TIME/6) //something like 25 ticks = 20 seconds with the default settings
+	else if (iscorgi(M))
 		var/mob/living/simple_animal/pet/dog/corgi/C = M
 		loc = C
 		C.facehugger = src
 		C.regenerate_icons()
 
-	if(!sterile)
-		M.take_bodypart_damage(strength,0) //done here so that humans in helmets take damage
-		M.Paralyse(MAX_IMPREGNATION_TIME/6) //something like 25 ticks = 20 seconds with the default settings
-
 	GoIdle() //so it doesn't jump the people that tear it off
 
 	spawn(rand(MIN_IMPREGNATION_TIME,MAX_IMPREGNATION_TIME))
 		Impregnate(M)
 
-	return TRUE // time for a smoke
+	return 1
 
 /obj/item/clothing/mask/facehugger/proc/Impregnate(mob/living/target)
 	if(!target || target.stat == DEAD) //was taken off or something
@@ -211,7 +182,7 @@ var/const/MAX_ACTIVE_TIME = 400
 		icon_state = "[initial(icon_state)]_impregnated"
 
 		var/obj/item/bodypart/chest/LC = target.get_bodypart("chest")
-		if((!LC || LC.status != BODYPART_ROBOTIC) && !target.getorgan(/obj/item/organ/body_egg/alien_embryo))
+		if((!LC || LC.status != ORGAN_ROBOTIC) && !target.getorgan(/obj/item/organ/body_egg/alien_embryo))
 			new /obj/item/organ/body_egg/alien_embryo(target)
 
 		if(iscorgi(target))

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

@@ -1,11 +0,0 @@
-
-
-
-/mob/living/carbon/alien/update_damage_overlays() //aliens don't have damage overlays.
-	return
-
-/mob/living/carbon/alien/update_body() // we don't use the bodyparts or body layers for aliens.
-	return
-
-/mob/living/carbon/alien/update_body_parts()//we don't use the bodyparts layer for aliens.
-	return