Robustin eb7f2ddc99 Merge branch 'master' of https://github.com/tgstation/tgstation into GG3 ...

# Conflicts:
#	icons/obj/guns/projectile.dmi

2017-05-21 17:54:44 -04:00

..

ammo_boxes.dm

Make energy guns able to use burst fire. (#21005)

2016-11-02 16:16:21 +13:00

external_mag.dm

more gang guns

2017-05-12 16:04:44 -04:00

internal_mag.dm

Warden Compact Combat Shotgun (#27427)

2017-05-21 13:44:03 -04:00