Arokha Sieyes 5967bb6dc5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync ...

# Conflicts:
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-6.dmm

2018-02-18 00:25:36 -06:00

..

energy

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2018-02-18 00:25:36 -06:00

launcher

Updates Tools

2017-08-03 04:49:23 -04:00

magnetic

Gun changes (#4185)

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

projectile

Adjust VOREStation guns for PolarisSS13/Polaris/#4185

2018-02-17 16:56:30 -05:00

automatic_fire.dm

Comments out the automatic firemode code (#4748)

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

energy.dm

Gun changes (#4185)

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

launcher.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

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