diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm.rej b/code/modules/projectiles/guns/energy/energy_gun.dm.rej new file mode 100644 index 0000000000..b99e426279 --- /dev/null +++ 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 diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index 71b1474a66..d8c4010aef 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ