From 6aaea62b3267a9c40c1d78cd893a8f36c1439fd9 Mon Sep 17 00:00:00 2001 From: "kortgstation@gmail.com" Date: Mon, 19 Dec 2011 07:28:09 +0000 Subject: [PATCH] TG Update: 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 +++++++++++++++ code/modules/projectiles/guns/energy/special.dm | 1 + 2 files changed, 16 insertions(+) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index a22cbfddb6f..81e106bc1d1 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -500,6 +500,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 63e5798a4b6..5bbf52b0fc8 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"