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 ad325cbbec9..162bd6b242e 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -118,16 +118,16 @@ Doesn't work on other aliens/AI.*/ 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() + 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 diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 138e2bb6ced..dc234b1ece9 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -94,4 +94,64 @@ stutter = 10 /obj/item/projectile/bullet/a762 - damage = 25 \ No newline at end of file + damage = 25 + + +/obj/item/projectile/bullet/incendiary + name = "incendiary bullet" + damage = 20 + +/obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0) + if(istype(target, /mob/living/carbon)) + var/mob/living/carbon/M = target + M.adjust_fire_stacks(1) + M.IgniteMob() + +/* +/obj/item/projectile/bullet/dart + name = "dart" + icon_state = "cbbolt" + damage = 6 + + New() + ..() + flags |= NOREACT + create_reagents(50) + + on_hit(var/atom/target, var/blocked = 0, var/hit_zone) + if(istype(target, /mob/living/carbon)) + var/mob/living/carbon/M = target + if(M.can_inject(null,0,hit_zone)) // Pass the hit zone to see if it can inject by whether it hit the head or the body. + reagents.trans_to(M, reagents.total_volume) + return 1 + else + target.visible_message("The [name] was deflected!", \ + "You were protected against the [name]!") + flags &= ~NOREACT + reagents.handle_reactions() + return 1 +*/ +/obj/item/projectile/bullet/dart/metalfoam + New() + ..() + reagents.add_reagent("aluminium", 15) + reagents.add_reagent("foaming_agent", 5) + reagents.add_reagent("pacid", 5) + +//This one is for future syringe guns update +/obj/item/projectile/bullet/dart/syringe + 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. diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 5fca5a5179a..1a452463482 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.