Skip to content

Commit

Permalink
Can now build Ion turrets
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kortgstation@gmail.com committed Dec 19, 2011
1 parent dc563b4 commit d370b3c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 0 deletions.
15 changes: 15 additions & 0 deletions code/game/machinery/portable_turret.dm
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,21 @@ Neutralize All Unidentified Life Signs: []<BR>"},
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"
Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/guns/energy/special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Binary file modified icons/mob/back.dmi
Binary file not shown.

0 comments on commit d370b3c

Please sign in to comment.