LetterJay e57cf81636 Merge branch 'master' into upstream-merge-37582

2018-05-21 08:35:21 -05:00

..

ammunition

Fixes oversight with foam (#37898)

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

boxes_magazines

Fixes oversight with foam (#37898)

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

guns

Merge branch 'master' into upstream-merge-37582

2018-05-21 08:35:21 -05:00

projectile

Fixes oversight with foam (#37898)

2018-05-18 08:29:48 -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