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

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/mob/mob.dm
#	html/changelogs/.all_changelog.yml

2017-04-10 20:41:18 -04:00

..

energy

Adds the 'Hunter' Capture Gun

2017-04-02 19:25:27 -04:00

launcher

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

projectile

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

2017-04-10 20:41:18 -04:00

energy.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

launcher.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

projectile.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

vox.dm

Tweaks the Vox weapons

2017-04-01 22:41:46 -05:00