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

..

laser.dm

Gun changes (#4185)

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

netgun_vr.dm

Ports 'head' guns from Eris, change Hunter sprite

2017-05-09 02:42:32 -04:00

nuclear.dm

unions no longer make firearms (#4836)

2018-02-17 20:40:15 -08:00

particle.dm

Allows emitters to blast through rocks again.

2017-09-29 01:05:40 -04:00

pulse.dm

Gun changes (#4185)

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

special_vr.dm

squashed commits - ion pistol refactor and away mission emp nerf

2018-02-11 09:27:40 +00:00

special.dm

VOREStation Specific Merge Changes

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

stun_vr.dm

Security non-lethal balance

2017-02-13 15:49:35 +00:00

stun.dm

Gun changes (#4185)

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

temperature.dm

work

2017-09-04 21:52:47 -04:00