Tactical Energy Gun Unique Sprites

2017-05-24 00:13:03 -05:00
parent e0ada1b4c6
commit ab7e9539bd
2 changed files with 10 additions and 0 deletions
--- a/code/modules/projectiles/guns/energy/energy_gun.dm.rej
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm.rej
@@ -0,0 +1,10 @@
+diff a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm	(rejected hunks)
+@@ -35,7 +35,7 @@
+ 	name = "tactical energy gun"
+ 	desc = "Military issue energy gun, is able to fire stun rounds."
+ 	icon_state = "energytac"
+-	item_state = "energy"
+	ammo_x_offset = 2
+ 	ammo_type = list(/obj/item/ammo_casing/energy/electrode/spec, /obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
+ 
+ /obj/item/weapon/gun/energy/e_gun/mini/practice_phaser
--- a/icons/obj/guns/energy.dmi
+++ b/icons/obj/guns/energy.dmi