LetterJay 5f27ac30c7 Merge branch 'master' into upstream-merge-37582

2018-05-22 07:22:42 -05:00

..

ammunition

Merge branch 'master' into upstream-merge-37476

2018-05-20 23:12:07 -05:00

boxes_magazines

Merge branch 'master' into upstream-merge-37476

2018-05-20 23:12:07 -05:00

guns

Merge branch 'master' into upstream-merge-37582

2018-05-22 07:22:42 -05:00

projectile

Fixes oversight with foam (#37898)

2018-05-18 08:29:48 -05:00

gun.dm

Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00: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