From d370b3c2a2831e0473dcb92534b0d7c802f16e3d Mon Sep 17 00:00:00 2001 From: "kortgstation@gmail.com" Date: Mon, 19 Dec 2011 07:28:09 +0000 Subject: [PATCH] Can now build Ion turrets Can now build Staff of Change turrets Staff of Change onback sprites added, Staff now fits onback. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2742 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/portable_turret.dm | 15 +++++++++++++++ .../projectiles/guns/energy/special.dm | 1 + icons/mob/back.dmi | Bin 25173 -> 25577 bytes 3 files changed, 16 insertions(+) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 7949cbae652c8..4b5b3612fecab 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -495,6 +495,21 @@ Neutralize All Unidentified Life Signs: []
"}, if(!emagged) use_power(700) else use_power(1400) + else if(istype(E, /obj/item/weapon/gun/energy/staff)) + A = new /obj/item/projectile/change( loc ) + A.original = target.loc + icon_state = "target_prism" + if(!emagged) use_power(700) + else use_power(1400) + + else if(istype(E, /obj/item/weapon/gun/energy/ionrifle)) + A = new /obj/item/projectile/ion( loc ) + A.original = target.loc + icon_state = "target_prism" + if(!emagged) use_power(700) + else use_power(1400) + + else if(istype(E, /obj/item/weapon/gun/energy/taser) || istype(E, /obj/item/weapon/gun/energy/stunrevolver)) A = new /obj/item/projectile/energy/electrode( loc ) icon_state = "target_prism" diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 63e5798a4b620..5bbf52b0fc856 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -27,6 +27,7 @@ obj/item/weapon/gun/energy/staff icon_state = "staffofchange" item_state = "staffofchange" fire_sound = 'emitter.ogg' + flags = FPRINT | TABLEPASS | CONDUCT | ONBACK w_class = 4.0 charge_cost = 200 projectile_type = "/obj/item/projectile/change" diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index a0886e9754e72cc4220e4724af6c37db5e14610b..5fce05ad5eef6b05cba6c53c61ad5d097710922c 100644 GIT binary patch delta 4847 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 delta 4440 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 r_*W37JSRCZos{!4aSOUj9Df;$