Leshana 33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01 ...

# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml

2018-05-10 13:48:20 -04:00

..

energy

Adds the Kinetic Accelerator

2018-04-24 12:59:23 -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 commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01

2018-05-10 13:48:20 -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

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