Merge pull request #1142 from Citadel-Station-13/upstream-merge-27557

[MIRROR] Tactical Energy Gun Unique Sprites
This commit is contained in:
LetterJay
2017-05-24 12:34:07 -05:00
committed by GitHub
4 changed files with 2 additions and 0 deletions
@@ -34,6 +34,8 @@
/obj/item/weapon/gun/energy/e_gun/stun
name = "tactical energy gun"
desc = "Military issue energy gun, is able to fire stun rounds."
icon_state = "energytac"
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)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 33 KiB