From 07dac128c15ab89ed6d1ba3325364d5e358028d2 Mon Sep 17 00:00:00 2001 From: "kortgstation@gmail.com" Date: Tue, 6 Dec 2011 04:50:42 +0000 Subject: [PATCH] Gyrojet bolts now explode on contact with mobs and walls. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2626 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/turf.dm | 6 ++++++ code/modules/projectiles/projectile/bullets.dm | 6 ------ code/modules/projectiles/projectile/special.dm | 12 ++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/code/game/turf.dm b/code/game/turf.dm index 8446c1a4d14..e2d55d8104d 100644 --- a/code/game/turf.dm +++ b/code/game/turf.dm @@ -33,6 +33,12 @@ ..() return 0 +/turf/bullet_act(var/obj/item/projectile/Proj) + if(istype(Proj ,/obj/item/projectile/bullet/gyro)) + explosion(src, -1, 0, 2) + ..() + return 0 + /turf/Enter(atom/movable/mover as mob|obj, atom/forget as mob|obj|turf|area) if (!mover || !isturf(mover.loc)) return 1 diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 2d7da580fe5..74d2e4ce730 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -34,12 +34,6 @@ damage = 20 -/obj/item/projectile/bullet/gyro - name ="gyro" - icon_state= "bolter" - damage = 50 - - /obj/item/projectile/bullet/stunshot name = "stunshot" damage = 5 diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 530dd7f0f70..052c237146d 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -12,6 +12,18 @@ return 1 +/obj/item/projectile/bullet/gyro + name ="gyro" + icon_state= "bolter" + damage = 50 + flag = "bullet" + + + on_hit(var/atom/target, var/blocked = 0) + explosion(target, -1, 0, 2) + return 1 + + /obj/item/projectile/temp name = "freeze beam"