deathride58 ea5725cc4e Merge pull request #6595 from Citadel-Station-13/upstream-merge-37549 ...

[MIRROR] Resolved var name conflict for bounce_away()

2018-05-02 01:24:36 +00:00

..

ammunition

Merge pull request #37549 from ShizCalev/bounce_away-fixes

2018-04-30 12:51:40 -05:00

boxes_magazines

Merge pull request #37501 from ShizCalev/icon-fixes

2018-04-28 14:54:45 -05:00

guns

Merge pull request #6586 from Citadel-Station-13/upstream-merge-37503

2018-04-30 11:02:16 -05:00

projectile

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

2018-04-30 00:06:58 -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