Changed aliens considerably.

-Aliens now take damage when they are in a hot environment. -Aliens now take more damage from fire damage. ( * 1.5 the amount) -Alien facehuggers are always active and they'll latch onto people who walk by them, and not just walk on them. Commented out "activate facehuggers". -Eggs will now open to nearby possible hosts. If they're still nearby, the facehugger will latch onto them. New icons by WJohnston. -Aliens will now see the shuttle ETA. -Drones can't evolve into queens/princesses if there's already an alive queen. -Made queen heal a little bit faster (5 to 10). The queen was regenerating at the same rate as her underlings, and the queen is much more important now. -Moved some copy+pasted stuff into the "mob/living/carbon/alien" class, so larva and humanoids shared stuff. -Disarming a cyborg stuns them a little longer. Added a piece of paper on the DJ station that helps people setup the telecommunication machines there and listen onto private frequencies. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4810 316c924e-a436-60f5-8080-3fe189b3f50e
2026-01-08 16:32:21 +00:00 · 2012-10-05 04:36:24 +00:00
parent e3d239108a
commit 2e3d42dfb1
15 changed files with 1846 additions and 1842 deletions
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -1,3 +1,7 @@
+#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"
@@ -20,10 +24,24 @@
 	var/heal_rate = 5
 	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
+	..(amount * 1.5)
+	return
+
+/mob/living/carbon/alien/adjustBruteLoss(amount) // Strong against melee weapons
+	..(amount * 0.5)
+	return
+
 /mob/living/carbon/alien/proc/getPlasma()
 	return storedPlasma

@@ -33,16 +51,101 @@
 /mob/living/carbon/alien/New()
 	..()

-	for(var/obj/item/clothing/mask/facehugger/facehugger in world)
-		if(facehugger.stat == CONSCIOUS)
-			var/image/activeIndicator = image('icons/mob/alien.dmi', loc = facehugger, icon_state = "facehugger_active")
-			activeIndicator.override = 1
-			if(client)
-				client.images += activeIndicator
+/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 toxins
+	if(locate(/obj/effect/alien/weeds) in loc)
+		if(health >= maxHealth)
+			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(50))
+			switch(getFireLoss())
+				if(1 to 50)
+					adjustFireLoss(-1)
+				if(51 to 100)
+					adjustFireLoss(-5)
+
+	// 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/IsAdvancedToolUser()
 	return has_fine_manipulation

+/mob/living/carbon/alien/Process_Spaceslipping()
+	return 0 // Don't slip in space.
+

 /mob/living/carbon/alien/Stun(amount)
 	if(status_flags & CANSTUN)
@@ -59,7 +162,7 @@ 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/carbon/C in world)
+		for (var/mob/living/carbon/C in mob_list)
 			if(C.status_flags & XENO_HOST)
 				var/I = image('icons/mob/alien.dmi', loc = C, icon_state = "infected")
 				client.images += I
@@ -77,3 +180,6 @@ Des: Removes all infected images from the alien.
 				del(I)
 	return

+#undef HEAT_DAMAGE_LEVEL_1
+#undef HEAT_DAMAGE_LEVEL_2
+#undef HEAT_DAMAGE_LEVEL_3
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -30,6 +30,7 @@ Doesn't work on other aliens/AI.*/
 		new /obj/effect/alien/weeds/node(loc)
 	return

+/*
 /mob/living/carbon/alien/humanoid/verb/ActivateHuggers()
 	set name = "Activate facehuggers (5)"
 	set desc = "Makes all nearby facehuggers activate"
@@ -41,7 +42,7 @@ Doesn't work on other aliens/AI.*/
 			F.GoActive()
 		emote("roar")
 	return
-
+*/
 /mob/living/carbon/alien/humanoid/verb/whisp(mob/M as mob in oview())
 	set name = "Whisper (10)"
 	set desc = "Whisper to someone"
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
@@ -14,23 +14,28 @@
 		src.name = text("alien drone ([rand(1, 1000)])")
 	src.real_name = src.name
 	verbs.Add(/mob/living/carbon/alien/humanoid/proc/resin,/mob/living/carbon/alien/humanoid/proc/corrosive_acid)
-	verbs -= /mob/living/carbon/alien/humanoid/verb/ActivateHuggers	//<-- pointless
+	//verbs -= /mob/living/carbon/alien/humanoid/verb/ActivateHuggers	//<-- pointless
 	add_to_mob_list(src)
 //Drones use the same base as generic humanoids.
 //Drone verbs

 /mob/living/carbon/alien/humanoid/drone/verb/evolve() // -- TLE
 	set name = "Evolve (500)"
-	set desc = "Produce an interal egg sac capable of spawning children"
+	set desc = "Produce an interal egg sac capable of spawning children. Only one queen can exist at a time."
 	set category = "Alien"

 	if(powerc(500))
-		adjustToxLoss(-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)
-		var/mob/living/carbon/alien/humanoid/queen/new_xeno = new (loc)
-		new_xeno.UI = UI
-		mind.transfer_to(new_xeno)
-		del(src)
+		// Queen check
+		var/mob/living/carbon/alien/humanoid/queen/Q = locate(/mob/living/carbon/alien/humanoid/queen) in living_mob_list
+		if(!Q)
+			adjustToxLoss(-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)
+			var/mob/living/carbon/alien/humanoid/queen/new_xeno = new (loc)
+			new_xeno.UI = UI
+			mind.transfer_to(new_xeno)
+			del(src)
+		else
+			src << "<span class='notice'>We already have an alive queen.</span>"
 	return
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -74,6 +74,12 @@
 	if (client.statpanel == "Status")
 		stat(null, "Plasma Stored: [getPlasma()]")

+	if(emergency_shuttle)
+		if(emergency_shuttle.online && emergency_shuttle.location < 2)
+			var/timeleft = emergency_shuttle.timeleft()
+			if (timeleft)
+				stat(null, "ETA-[(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]")
+
 ///mob/living/carbon/alien/humanoid/bullet_act(var/obj/item/projectile/Proj) taken care of in living

 /mob/living/carbon/alien/humanoid/emp_act(severity)
@@ -427,7 +433,7 @@
 				if ((HULK in M.mutations) || (SUPRSTR in M.augmentations))//HULK SMASH
 					damage += 14
 					spawn(0)
-						Paralyse(5)
+						Weaken(damage) // Why can a hulk knock an alien out but not knock out a human? Damage is robust enough.
 						step_away(src,M,15)
 						sleep(3)
 						step_away(src,M,15)
--- a/code/modules/mob/living/carbon/alien/humanoid/life.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm
@@ -1,9 +1,9 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32

 /mob/living/carbon/alien/humanoid
-	var/oxygen_alert = 0
-	var/toxins_alert = 0
-	var/fire_alert = 0
+	oxygen_alert = 0
+	toxins_alert = 0
+	fire_alert = 0

 	var/temperature_alert = 0

@@ -17,6 +17,8 @@

 	..()

+	var/datum/gas_mixture/environment = loc.return_air()
+
 	if (stat != DEAD) //still breathing

 		//First, resolve location and get a breath
@@ -49,7 +51,7 @@
 	//handle_virus_updates() There is no disease that affects aliens

 	//Handle temperature/pressure differences between body and environment
-	handle_environment()
+	handle_environment(environment)

 	//stuff in the stomach
 	handle_stomach()
@@ -90,60 +92,6 @@
 				stuttering = max(10, stuttering)


-	proc/handle_mutations_and_radiation()
-
-		if(getFireLoss())
-			if((COLD_RESISTANCE in mutations) || prob(50))
-				switch(getFireLoss())
-					if(1 to 50)
-						adjustFireLoss(-1)
-					if(51 to 100)
-						adjustFireLoss(-5)
-
-		if ((HULK in mutations) && health <= 25)
-			mutations.Remove(HULK)
-			src << "\red You suddenly feel very weak."
-			Weaken(3)
-			emote("collapse")
-
-		if (radiation)
-			if (radiation > 100)
-				radiation = 100
-				Weaken(10)
-				src << "\red You feel weak."
-				emote("collapse")
-
-			if (radiation < 0)
-				radiation = 0
-
-			switch(radiation)
-				if(1 to 49)
-					radiation--
-					if(prob(25))
-						adjustToxLoss(1)
-						updatehealth()
-
-				if(50 to 74)
-					radiation -= 2
-					adjustToxLoss(1)
-					if(prob(5))
-						radiation -= 5
-						Weaken(3)
-						src << "\red You feel weak."
-						emote("collapse")
-					updatehealth()
-
-				if(75 to 100)
-					radiation -= 3
-					adjustToxLoss(3)
-					if(prob(1))
-						src << "\red You mutate!"
-						randmutb(src)
-						domutcheck(src,null)
-						emote("gasp")
-					updatehealth()
-
-
 	proc/breathe()
 		if(reagents)
 			if(reagents.has_reagent("lexorin")) return
@@ -257,18 +205,6 @@

 		return 1

-	proc/handle_environment()
-
-		//If there are alien weeds on the ground then heal if needed or give some toxins
-		if(locate(/obj/effect/alien/weeds) in loc)
-			if(health >= maxHealth)
-				adjustToxLoss(plasma_rate)
-
-			else
-				adjustBruteLoss(-heal_rate)
-				adjustFireLoss(-heal_rate)
-				adjustOxyLoss(-heal_rate)
-


 	proc/adjust_body_temperature(current, loc_temp, boost)
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -6,7 +6,7 @@
 	health = 250
 	icon_state = "alienq_s"
 	nopush = 1
-	heal_rate = 5
+	heal_rate = 10 // Let's regenerate more than our average underling.
 	plasma_rate = 20


--- a/code/modules/mob/living/carbon/alien/larva/life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/life.dm
@@ -1,9 +1,6 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32

 /mob/living/carbon/alien/larva
-	var/oxygen_alert = 0
-	var/toxins_alert = 0
-	var/fire_alert = 0

 	var/temperature_alert = 0

@@ -16,8 +13,13 @@
 		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
@@ -43,7 +45,7 @@
 	//handle_virus_updates() There is no disease that affects larva

 	//Handle temperature/pressure differences between body and environment
-	handle_environment()
+	handle_environment(enviroment)

 	//stuff in the stomach
 	//handle_stomach()
@@ -61,43 +63,6 @@


 /mob/living/carbon/alien/larva
-	proc/handle_mutations_and_radiation()
-
-		//grow!! but not if metroid or dead
-		if(stat != DEAD && amount_grown < max_grown)
-			amount_grown++
-
-		if (radiation)
-			if (radiation > 100)
-				radiation = 100
-				Weaken(10)
-				src << "\red You feel weak."
-				emote("collapse")
-
-			if (radiation < 0)
-				radiation = 0
-
-			switch(radiation)
-				if(1 to 49)
-					radiation--
-					if(prob(25))
-						adjustToxLoss(1)
-						updatehealth()
-
-				if(50 to 74)
-					radiation -= 2
-					adjustToxLoss(1)
-					if(prob(5))
-						radiation -= 5
-						Weaken(3)
-						src << "\red You feel weak."
-						emote("collapse")
-					updatehealth()
-
-				if(75 to 100)
-					radiation -= 3
-					adjustToxLoss(3)
-					updatehealth()

 	proc/breathe()

@@ -212,19 +177,6 @@

 		return 1

-	proc/handle_environment()
-
-		//If there are alien weeds on the ground then heal if needed or give some toxins
-		if(locate(/obj/effect/alien/weeds) in loc)
-			if(health >= maxHealth)
-				adjustToxLoss(plasma_rate)
-			else
-				adjustBruteLoss(-heal_rate)
-				adjustFireLoss(-heal_rate)
-				adjustOxyLoss(-heal_rate)
-
-		return
-

 	proc/handle_chemicals_in_body()
 		if(reagents) reagents.metabolize(src)
@@ -286,7 +238,7 @@
 				Paralyse(3)

 			if(paralysis)
-				AdjustParalysis(-1)
+				AdjustParalysis(-2)
 				blinded = 1
 				stat = UNCONSCIOUS
 			else if(sleeping)
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -16,7 +16,7 @@ var/const/MAX_ACTIVE_TIME = 600
 	w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4
 	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH|MASKCOVERSEYES

-	var/stat = UNCONSCIOUS //UNCONSCIOUS is the idle state in this case
+	var/stat = CONSCIOUS //UNCONSCIOUS is the idle state in this case

 	var/sterile = 0

@@ -24,235 +24,185 @@ var/const/MAX_ACTIVE_TIME = 600

 	var/attached = 0

-	attack_paw(user as mob) //can be picked up by aliens
-		if(isalien(user))
-			attack_hand(user)
-			return
-		else
-			..()
-			return
-
-	attack_hand(user as mob)
-		if(stat == CONSCIOUS && !isalien(user))
-			Attach(user)
-			return
-		else
-			..()
-			return
-
-	attack(mob/living/M as mob, mob/user as mob)
+/obj/item/clothing/mask/facehugger/attack_paw(user as mob) //can be picked up by aliens
+	if(isalien(user))
+		attack_hand(user)
+		return
+	else
 		..()
-		user.drop_from_inventory(src)
-		Attach(M)
-
-	New()
-		if(aliens_allowed)
-			..()
-		else
-			del(src)
-
-	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

-	attackby()
+/obj/item/clothing/mask/facehugger/attack_hand(user as mob)
+	if(stat == CONSCIOUS && !isalien(user))
+		Attach(user)
+		return
+	else
+		..()
+		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/temperature_expose(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/HasEntered(atom/target)
+	Attach(target)
+	return
+
+/obj/item/clothing/mask/facehugger/dropped()
+	..()
+	GoActive()
+	return
+
+/obj/item/clothing/mask/facehugger/throw_impact(atom/hit_atom)
+	Attach(hit_atom)
+	return
+
+/obj/item/clothing/mask/facehugger/proc/Attach(M as mob)
+	if(!iscarbon(M) || isalien(M))
 		return
-
-	bullet_act()
-		Die()
+	if(attached)
 		return
+	else
+		attached++
+		spawn(MAX_IMPREGNATION_TIME)
+			attached = 0

-	temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-		if(exposed_temperature > 300)
-			Die()
-		return
+	var/mob/living/L = M //just so I don't need to use :

-	equipped(mob/M)
-		Attach(M)
+	if(stat != CONSCIOUS)	return
+	if(!sterile) L.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage

-	HasEntered(atom/target)
-		Attach(target)
-		return
+	var/mob/living/carbon/target = L

-	dropped()
-		..()
-		GoActive()
-		return
+	for(var/mob/O in viewers(target, null))
+		O.show_message("\red \b [src] leaps at [target]'s face!", 1)

-	throw_impact(atom/hit_atom)
-		Attach(hit_atom)
-		return
-
-	proc/Attach(M as mob)
-		if(!isliving(M) || isalien(M))
-			return
-		if(attached)
-			return
-		else
-			attached++
-			spawn(MAX_IMPREGNATION_TIME)
-				attached = 0
-
-		var/mob/living/L = M //just so I don't need to use :
-
-		if(stat != CONSCIOUS)	return
-		if(!sterile) L.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage
-
-		if(issilicon(L))
-			for(var/mob/O in viewers(src, null))
-				O.show_message("\red \b [src] smashes against [L]'s frame!", 1)
+	if(ishuman(target))
+		var/mob/living/carbon/human/H = target
+		if(H.head && H.head.flags & HEADCOVERSMOUTH)
+			for(var/mob/O in viewers(H, null))
+				O.show_message("\red \b [src] smashes against [H]'s [H.head]!", 1)
 			Die()
 			return

-		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)

 		for(var/mob/O in viewers(target, null))
-			O.show_message("\red \b [src] leaps at [target]'s face!", 1)
+			O.show_message("\red \b [src] tears [W] off of [target]'s face!", 1)

-		if(ishuman(target))
-			var/mob/living/carbon/human/H = target
-			if(H.head && H.head.flags & HEADCOVERSMOUTH)
-				for(var/mob/O in viewers(H, null))
-					O.show_message("\red \b [src] smashes against [H]'s [H.head]!", 1)
-				Die()
-				return
+	loc = target
+	layer = 20
+	target.wear_mask = src
+	target.update_inv_wear_mask()

-		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)
+	GoIdle() //so it doesn't jump the people that tear it off

-			for(var/mob/O in viewers(target, null))
-				O.show_message("\red \b [src] tears [W] off of [target]'s face!", 1)
+	if(!sterile) target.Paralyse(MAX_IMPREGNATION_TIME/6) //something like 25 ticks = 20 seconds with the default settings

-		loc = target
-		layer = 20
-		target.wear_mask = src
-		target.update_inv_wear_mask()
-
-		GoIdle() //so it doesn't jump the people that tear it off
-
-		if(!sterile) target.Paralyse(MAX_IMPREGNATION_TIME/6) //something like 25 ticks = 20 seconds with the default settings
-
-		spawn(rand(MIN_IMPREGNATION_TIME,MAX_IMPREGNATION_TIME))
-			Impregnate(target)
-
-		return
-
-	proc/Impregnate(mob/living/carbon/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
-			for(var/datum/disease/alien_embryo/A in target.viruses)
-				target.status_flags |= XENO_HOST
-				break
-
-			for(var/mob/O in viewers(target,null))
-				O.show_message("\red \b [src] falls limp after violating [target]'s face!", 1)
-
-			Die()
-		else
-			for(var/mob/O in viewers(target,null))
-				O.show_message("\red \b [src] violates [target]'s face!", 1)
-		target.update_inv_wear_mask()
-		return
-
-	proc/GoActive()
-		if(stat == DEAD || stat == CONSCIOUS)
-			return
-
-		stat = CONSCIOUS
-
-/*		for(var/mob/living/carbon/alien/alien in world)
-			var/image/activeIndicator = image('icons/mob/alien.dmi', loc = src, icon_state = "facehugger_active")
-			activeIndicator.override = 1
-			if(alien && alien.client)
-				alien.client.images += activeIndicator	*/
-
-		spawn(rand(MIN_ACTIVE_TIME,MAX_ACTIVE_TIME))
-			GoIdle()
-
-		return
-
-	proc/GoIdle()
-		if(stat == DEAD || stat == UNCONSCIOUS)
-			return
-
-/*		RemoveActiveIndicators()	*/
-
-		stat = UNCONSCIOUS
-
-		return
-
-	proc/Die()
-		if(stat == DEAD)
-			return
-
-/*		RemoveActiveIndicators()	*/
-
-		icon_state = "facehugger_dead"
-		stat = DEAD
-
-		for(var/mob/O in viewers(src, null))
-			O.show_message("\red \b[src] curls up into a ball!", 1)
-
-		return
-
-/*	proc/RemoveActiveIndicators() //removes the "active" facehugger indicator from all aliens in the world for this hugger
-		for(var/mob/living/carbon/alien/alien in world)
-			if(alien.client)
-				for(var/image/image in alien.client.images)
-					if(image.icon_state == "facehugger_active" && image.loc == src)
-						del(image)
-
-		return	*/
-
-/obj/item/clothing/mask/facehugger/angry
-	stat = CONSCIOUS
-
-/obj/item/clothing/mask/facehugger/angry/HasProximity(atom/movable/AM as mob|obj)
-	if(istype(AM , /mob/living/))
-		Attach(AM)
-
-
-/*
-/obj/item/clothing/mask/facehugger/angry/New()
-	processing_objects.Add(src)
-
-/obj/item/clothing/mask/facehugger/angry/process()
-	if(!src || src.stat == (DEAD))
-		return
-
-	for(var/mob/living/carbon/C in range(1,src))
-		Attach(C)
-		return
-
-	for(var/mob/living/carbon/C in range(5,src))
-		if(isInSight(C,src))
-			step_to(src,C,0)
-			spawn(5)
-				if(C in range(1,src))
-					Attach(C)
-			return
-
-	step_rand(src)
+	spawn(rand(MIN_IMPREGNATION_TIME,MAX_IMPREGNATION_TIME))
+		Impregnate(target)

 	return

-/obj/item/clothing/mask/facehugger/angry/Attach(var/mob/M as mob)
+/obj/item/clothing/mask/facehugger/proc/Impregnate(mob/living/carbon/target as mob)
+	if(!target || target.wear_mask != src || target.stat == DEAD) //was taken off or something
+		return

-	..(M)
-	processing_objects.Remove(src)
+	if(!sterile)
+		target.contract_disease(new /datum/disease/alien_embryo(0)) //so infection chance is same as virus infection chance
+		for(var/datum/disease/alien_embryo/A in target.viruses)
+			target.status_flags |= XENO_HOST
+			break

-*/
+		for(var/mob/O in viewers(target,null))
+			O.show_message("\red \b [src] falls limp after violating [target]'s face!", 1)
+
+		Die()
+	else
+		for(var/mob/O in viewers(target,null))
+			O.show_message("\red \b [src] violates [target]'s face!", 1)
+	target.update_inv_wear_mask()
+	return
+
+/obj/item/clothing/mask/facehugger/proc/GoActive()
+	if(stat == DEAD || stat == CONSCIOUS)
+		return
+
+	stat = CONSCIOUS
+
+/*		for(var/mob/living/carbon/alien/alien in world)
+		var/image/activeIndicator = image('icons/mob/alien.dmi', loc = src, icon_state = "facehugger_active")
+		activeIndicator.override = 1
+		if(alien && alien.client)
+			alien.client.images += activeIndicator	*/
+
+	spawn(rand(MIN_ACTIVE_TIME,MAX_ACTIVE_TIME))
+		GoIdle()
+
+	return
+
+/obj/item/clothing/mask/facehugger/proc/GoIdle()
+	if(stat == DEAD || stat == UNCONSCIOUS)
+		return
+
+/*		RemoveActiveIndicators()	*/
+
+	stat = UNCONSCIOUS
+
+	return
+
+/obj/item/clothing/mask/facehugger/proc/Die()
+	if(stat == DEAD)
+		return
+
+/*		RemoveActiveIndicators()	*/
+
+	icon_state = "facehugger_dead"
+	stat = DEAD
+
+	for(var/mob/O in viewers(src, null))
+		O.show_message("\red \b[src] curls up into a ball!", 1)
+
+	return
+
+/obj/item/clothing/mask/facehugger/HasProximity(atom/movable/AM as mob|obj)
+	if(istype(AM , /mob/living/))
+		Attach(AM)
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -618,7 +618,7 @@
 		if ("disarm")
 			if(!(lying))
 				if (rand(1,100) <= 85)
-					Stun(5)
+					Stun(10)
 					step(src,get_dir(M,src))
 					spawn(5) step(src,get_dir(M,src))
 					playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1)
--- a/code/modules/mob/mob_cleanup.dm
+++ b/code/modules/mob/mob_cleanup.dm
@@ -3,7 +3,11 @@
 Put (mob/proc)s here that are in dire need of a code cleanup.
 */

-
+/mob/living/proc/has_disease(var/datum/disease/virus)
+	for(var/datum/disease/D in viruses)
+		if(istype(D, virus))
+			return 1
+	return 0

 // This proc has some procs that should be extracted from it. I believe we can develop some helper procs from it - Rockdtben
 /mob/proc/contract_disease(var/datum/disease/virus, var/skip_this = 0, var/force_species_check=1)