LetterJay ea9b3622fd Merge branch 'master' into upstream-merge-37476 ...

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

2018-05-20 23:11:16 -05:00

..

beam_rifle.dm

Merge branch 'master' into upstream-merge-37476

2018-05-20 23:11:16 -05:00

blastcannon.dm

Fixes Blast Cannon (#37503)

2018-04-30 04:53:32 -05:00

chem_gun.dm

[MIRROR] Splits projectiles into different files for readability (#5800)

2018-03-05 14:13:08 -06:00

grenade_launcher.dm

[MIRROR] Splits projectiles into different files for readability (#5800)

2018-03-05 14:13:08 -06:00

medbeam.dm

slighty upgrades the medbeam (#37451)

2018-05-03 19:14:32 -05:00

syringe_gun.dm

[MIRROR] Splits projectiles into different files for readability (#5800)

2018-03-05 14:13:08 -06:00