From 1cb429bb654b922dd36a38c996ec65c2749f2872 Mon Sep 17 00:00:00 2001 From: Hornygranny Date: Fri, 10 Jan 2014 11:25:06 -0800 Subject: [PATCH 1/5] Code by Giacom. Changes alien neurotoxin spit to dumbfire. --- .../carbon/alien/humanoid/alien_powers.dm | 54 ++++++------------- code/modules/projectiles/projectile/energy.dm | 8 ++- 2 files changed, 24 insertions(+), 38 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 dd9da44d4c2..381869f91aa 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -112,43 +112,23 @@ Doesn't work on other aliens/AI.*/ return -/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 category = "Alien" - - if(powerc(50)) - if(isalien(target)) - src << "\green Your allies are not a valid target." - return - adjustToxLoss(-50) - 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. - 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(src, 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/alien/humanoid/proc/neurotoxin() // ok + set name = "Spit Neurotoxin (50)" + set desc = "Spits neurotoxin at someone, paralyzing them for a short time." + set category = "Alien" + if(powerc(50)) + adjustToxLoss(-50) + src.visible_message("\red [src] spits neurotoxin!", "\green You spit neurotoxin.") + var/turf/T = loc + var/turf/U = get_step(src, dir) // Get the tile infront of the move, based on their direction + if(!isturf(U) || !isturf(T)) + 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/alien/humanoid/proc/resin() // -- TLE set name = "Secrete Resin (75)" diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index a0b96556d4f..c0587061724 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -53,11 +53,17 @@ /obj/item/projectile/energy/neurotoxin - name = "neuro" + name = "neurotoxin spit" icon_state = "neurotoxin" damage = 5 damage_type = TOX weaken = 5 +/obj/item/projectile/energy/neurotoxin/on_hit(var/atom/target, var/blocked = 0) + if(isalien(target)) + return 0 + ..() // Execute the rest of the code. + + From 4d9715bd1b79545886e0fbc147fe06e352cd2ac8 Mon Sep 17 00:00:00 2001 From: Hornygranny Date: Fri, 10 Jan 2014 11:50:46 -0800 Subject: [PATCH 2/5] Replaced spaces with tabs. --- .../carbon/alien/humanoid/alien_powers.dm | 32 +++++++++---------- code/modules/projectiles/projectile/energy.dm | 6 ++-- 2 files changed, 19 insertions(+), 19 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 381869f91aa..2eb77be032b 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -113,22 +113,22 @@ Doesn't work on other aliens/AI.*/ /mob/living/carbon/alien/humanoid/proc/neurotoxin() // ok - set name = "Spit Neurotoxin (50)" - set desc = "Spits neurotoxin at someone, paralyzing them for a short time." - set category = "Alien" - if(powerc(50)) - adjustToxLoss(-50) - src.visible_message("\red [src] spits neurotoxin!", "\green You spit neurotoxin.") - var/turf/T = loc - var/turf/U = get_step(src, dir) // Get the tile infront of the move, based on their direction - if(!isturf(U) || !isturf(T)) - 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 + set name = "Spit Neurotoxin (50)" + set desc = "Spits neurotoxin at someone, paralyzing them for a short time." + set category = "Alien" + if(powerc(50)) + adjustToxLoss(-50) + src.visible_message("\red [src] spits neurotoxin!", "\green You spit neurotoxin.") + var/turf/T = loc + var/turf/U = get_step(src, dir) // Get the tile infront of the move, based on their direction + if(!isturf(U) || !isturf(T)) + 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/alien/humanoid/proc/resin() // -- TLE set name = "Secrete Resin (75)" diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index c0587061724..880fb2a120f 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -60,9 +60,9 @@ weaken = 5 /obj/item/projectile/energy/neurotoxin/on_hit(var/atom/target, var/blocked = 0) - if(isalien(target)) - return 0 - ..() // Execute the rest of the code. + if(isalien(target)) + return 0 + ..() // Execute the rest of the code. From b9f6c8bfeb17915efedcdf4c5637618523a6e39c Mon Sep 17 00:00:00 2001 From: Hornygranny Date: Fri, 10 Jan 2014 12:01:53 -0800 Subject: [PATCH 3/5] Extra indents removed --- .../carbon/alien/humanoid/alien_powers.dm | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 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 2eb77be032b..3c5f710240d 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -116,19 +116,19 @@ Doesn't work on other aliens/AI.*/ set name = "Spit Neurotoxin (50)" set desc = "Spits neurotoxin at someone, paralyzing them for a short time." set category = "Alien" - if(powerc(50)) - adjustToxLoss(-50) - src.visible_message("\red [src] spits neurotoxin!", "\green You spit neurotoxin.") - var/turf/T = loc - var/turf/U = get_step(src, dir) // Get the tile infront of the move, based on their direction - if(!isturf(U) || !isturf(T)) - 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 + if(powerc(50)) + adjustToxLoss(-50) + src.visible_message("\red [src] spits neurotoxin!", "\green You spit neurotoxin.") + var/turf/T = loc + var/turf/U = get_step(src, dir) // Get the tile infront of the move, based on their direction + if(!isturf(U) || !isturf(T)) + 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/alien/humanoid/proc/resin() // -- TLE set name = "Secrete Resin (75)" From ee072e6e5549a9ae23c402707c3e29f6548db08e Mon Sep 17 00:00:00 2001 From: Hornygranny Date: Fri, 10 Jan 2014 12:16:00 -0800 Subject: [PATCH 4/5] Changed neurotoxin from a child of energy to a child of bullet --- .../mob/living/carbon/alien/humanoid/alien_powers.dm | 2 +- code/modules/projectiles/projectile/bullets.dm | 12 ++++++++++++ code/modules/projectiles/projectile/energy.dm | 12 +----------- 3 files changed, 14 insertions(+), 12 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 3c5f710240d..b13b8335080 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -123,7 +123,7 @@ Doesn't work on other aliens/AI.*/ var/turf/U = get_step(src, dir) // Get the tile infront of the move, based on their direction if(!isturf(U) || !isturf(T)) return - var/obj/item/projectile/energy/neurotoxin/A = new /obj/item/projectile/energy/neurotoxin(usr.loc) + var/obj/item/projectile/bullet/neurotoxin/A = new /obj/item/projectile/bullet/neurotoxin(usr.loc) A.current = U A.yo = U.y - T.y A.xo = U.x - T.x diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index d2e0a4063f3..b2f0bf0f9ab 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -102,3 +102,15 @@ name = "syringe" icon = 'icons/obj/chemical.dmi' icon_state = "syringeproj" + +/obj/item/projectile/bullet/neurotoxin + name = "neurotoxin spit" + icon_state = "neurotoxin" + damage = 5 + damage_type = TOX + weaken = 5 + +/obj/item/projectile/bullet/neurotoxin/on_hit(var/atom/target, var/blocked = 0) + if(isalien(target)) + return 0 + ..() // Execute the rest of the code. \ No newline at end of file diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 880fb2a120f..2e3e61c032a 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -52,17 +52,7 @@ damage = 20 -/obj/item/projectile/energy/neurotoxin - name = "neurotoxin spit" - icon_state = "neurotoxin" - damage = 5 - damage_type = TOX - weaken = 5 - -/obj/item/projectile/energy/neurotoxin/on_hit(var/atom/target, var/blocked = 0) - if(isalien(target)) - return 0 - ..() // Execute the rest of the code. + From 92550c0240b2536e0c9bd7601ccfcb8df172a615 Mon Sep 17 00:00:00 2001 From: Hornygranny Date: Fri, 10 Jan 2014 12:38:44 -0800 Subject: [PATCH 5/5] Removed extra tab breaking compile --- .../carbon/alien/humanoid/alien_powers.dm | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 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 b13b8335080..530fa9cb8d0 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -116,18 +116,21 @@ Doesn't work on other aliens/AI.*/ set name = "Spit Neurotoxin (50)" set desc = "Spits neurotoxin at someone, paralyzing them for a short time." set category = "Alien" + if(powerc(50)) adjustToxLoss(-50) - src.visible_message("\red [src] spits neurotoxin!", "\green You spit neurotoxin.") - var/turf/T = loc - var/turf/U = get_step(src, dir) // Get the tile infront of the move, based on their direction - if(!isturf(U) || !isturf(T)) - return - var/obj/item/projectile/bullet/neurotoxin/A = new /obj/item/projectile/bullet/neurotoxin(usr.loc) - A.current = U - A.yo = U.y - T.y - A.xo = U.x - T.x - A.process() + src.visible_message("\red [src] spits neurotoxin!", "\green You spit neurotoxin.") + + var/turf/T = loc + var/turf/U = get_step(src, dir) // Get the tile infront of the move, based on their direction + if(!isturf(U) || !isturf(T)) + return + + var/obj/item/projectile/bullet/neurotoxin/A = new /obj/item/projectile/bullet/neurotoxin(usr.loc) + A.current = U + A.yo = U.y - T.y + A.xo = U.x - T.x + A.process() return /mob/living/carbon/alien/humanoid/proc/resin() // -- TLE