From 4b98dc1ff49ac138e8c9c591a2fc7b84eb1321f2 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Mon, 21 Jul 2014 10:08:02 -0400
Subject: [PATCH] Xeno nerf

---
 code/_onclick/other_mobs.dm                    | 17 +++++++++++------
 code/modules/projectiles/projectile/bullets.dm |  5 +++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index 6244fe6479d..ae857e59d46 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -127,7 +127,7 @@
 	NT.xo = U.x - T.x
 	spawn( 1)
 		NT.process()
-	next_attack = world.time + 50
+	next_attack = world.time + 100
 
 /mob/living/carbon/alien/humanoid/proc/NeuroAOE(atom/A)
 	if(world.time < next_attack)
@@ -146,7 +146,7 @@
 			D.color = "#00FF21"
 			var/turf/my_target = pick(the_targets)
 			for(var/b=0, b<5, b++)
-				step_towards(D,my_target)
+				if(!step_towards(D,my_target))	return
 				if(!D) return
 //				D.reagents.reaction(get_turf(D))
 				for(var/atom/atm in get_turf(D))
@@ -155,13 +155,18 @@
 						return
 					if(istype(atm, /mob/living/carbon))
 						var/mob/living/carbon/C = atm
-						C.Weaken(5)
-						C.take_overall_damage(20)
-						C << "You were drenched with neurotoxin!"
+						if(ishuman(C))
+							var/mob/living/carbon/human/H = C
+							if(istype(H.wear_suit, /obj/item/clothing/suit/space) && istype(H.head, /obj/item/clothing/head/helmet/space))
+								return
+						else
+							C.Weaken(5)
+							C.adjustToxLoss(20)
+							C << "You were drenched with neurotoxin!"
 //					D.reagents.reaction(atm, TOUCH)                      // Touch, since we sprayed it.
 				if(D.loc == my_target) break
 				sleep(2)
-	next_attack = world.time + 50
+	next_attack = world.time + 100
 
 
 // Babby aliens
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 6aeb899b3f6..819dbdef1f4 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -174,4 +174,9 @@
 /obj/item/projectile/bullet/neurotoxin/on_hit(var/atom/target, var/blocked = 0)
 	if(isalien(target))
 		return 0
+	if(ishuman(target))
+		var/mob/living/carbon/human/H = target
+		if(prob(H.getarmor(def_zone, "melee")))
+			H.visible_message("\red The [src.name] splatters uselessly on the armor!")
+			return 0
 	..() // Execute the rest of the code.