Leshana e08cbef044 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04 ...

# Conflicts:
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm

2018-04-06 15:40:06 -04:00

..

energy

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23

2018-02-23 21:55:42 -05: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/PolarisSS13/Polaris into polaris-sync-2018-04-04

2018-04-06 15:40:06 -04: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

…

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