LetterJay 8efc7711a7 Merge branch 'master' into upstream-merge-37423

2018-05-16 12:17:57 -05:00

..

ammunition

You can no longer print infinite ammunition. (#37626)

2018-05-03 08:45:17 -05:00

boxes_magazines

fixes some inconsistency in the bulldog shotgun ammo (#37548)

2018-05-09 16:24:17 -05:00

guns

Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons

2018-05-14 15:13:33 -05:00

projectile

Merge branch 'master' into upstream-merge-37423

2018-05-16 12:17:57 -05:00

gun.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

pins.dm

Fixes circuits being able to detect ghosts and fix pinless guns (#37437)

2018-04-30 04:55:55 -05:00

projectile.dm

Merge pull request #6082 from Citadel-Station-13/upstream-merge-36147

2018-04-01 01:01:55 -05:00