Repede 7628d85140 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	config/custom_items.txt

2018-05-23 00:13:07 -04:00

..

energy

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-04-27 21:45:13 -04:00

launcher

POLARIS: Revamp logging to be consistent

2018-03-13 18:20:58 -04:00

magnetic

Gun changes (#4185)

2018-02-12 23:12:14 -08:00

projectile

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-05-23 00:13:07 -04:00

automatic_fire.dm

Comments out the automatic firemode code (#4748)

2018-02-07 09:59:42 -08:00

energy.dm

Fix missing descriptions on guns.

2018-04-27 09:48:43 -04:00

launcher.dm

…

modular_guns.dm

RUST additions and updates, Modular guns, and Lead. (#4667)

2018-02-04 18:04:28 -06:00

projectile.dm

Gun changes (#4185)

2018-02-12 23:12:14 -08:00

vox.dm

Gun changes (#4185)

2018-02-12 23:12:14 -08:00