From d09d7bf313c49756ed25026c80cfee0253062a23 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Mon, 3 Dec 2012 13:50:57 +1000 Subject: [PATCH] changed alien neurotoxin to bio type projectile (which means it's stopped by protective gear like biosuits), fixed a runtime Signed-off-by: Cael_Aislinn --- .../mob/living/carbon/alien/humanoid/alien_powers.dm | 6 +++--- code/modules/projectiles/projectile.dm | 2 +- code/modules/projectiles/projectile/special.dm | 10 +++++++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm index a366503ac5..0c25c79199 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -106,7 +106,7 @@ I kind of like the right click only--the window version can get a little confusi /mob/living/carbon/alien/humanoid/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." + set desc = "Spits neurotoxin at someone, paralyzing them for a short time if they are not wearing protective gear." set category = "Alien" if(powerc(50)) @@ -129,12 +129,12 @@ I kind of like the right click only--the window version can get a little confusi if(!istype(T, /turf)) return if (U == T) - usr.bullet_act(src, get_organ_target()) + usr.bullet_act(new /obj/item/projectile/neurotoxin(usr.loc), get_organ_target()) return if(!istype(U, /turf)) return - var/obj/item/projectile/energy/dart/A = new /obj/item/projectile/energy/dart(usr.loc) + var/obj/item/projectile/neurotoxin/A = new /obj/item/projectile/neurotoxin(usr.loc) A.current = U A.yo = U.y - T.y diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 067ef207ac..248b064427 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -36,7 +36,7 @@ var/damage = 10 var/damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE are the only things that should be in here var/nodamage = 0 //Determines if the projectile will skip any damage inflictions - var/flag = "bullet" //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb + var/flag = "bullet" //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb //Cael - bio and rad are also valid var/projectile_type = "/obj/item/projectile" var/kill_count = 50 //This will de-increment every process(). When 0, it will delete the projectile. //Effects diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 7225b022cf..6188ce47aa 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -122,4 +122,12 @@ else if (istype(target, /mob/living/carbon/)) M.show_message("\blue The radiation beam dissipates harmlessly through your body.") else - return 1 \ No newline at end of file + return 1 + +/obj/item/projectile/neurotoxin + name = "neurotoxin" + icon_state = "toxin" + damage = 5 + damage_type = TOX + weaken = 5 + flag = "bio"