deathride58 742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization ...

# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi

2017-12-08 19:58:41 -05:00

..

bayonets.dmi

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

2017-12-08 19:58:41 -05:00

cit_guns.dmi

Revamps the recolor system of the Mk.37, gives variants appropriate firing pins, and adds a minor outline to the Model D sprite

2017-10-23 18:11:16 +08:00

energy.dmi

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

flashlights.dmi

[READY] Adds ability to add bayonets to weapons - Only enabled on kinetic accelerators - refactors gunlight/bayonet sprites to ballistics too (#1191)

2017-05-27 13:36:44 -07:00

magic.dmi

Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!

2017-09-10 17:08:36 -05:00

minigun.dmi

…

projectile.dmi

Readds missing CTF weapon sprites (#2164)

2017-07-28 02:53:32 -07:00

toy.dmi

…

VGguns.dmi

…