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

..

ammunition

9mm pistol updates (#4480)

2018-01-14 14:45:15 -06:00

guns

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

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

projectile

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

2018-02-17 00:35:29 -05:00

targeting

Can't aim at invisible things

2017-10-23 12:11:11 -05:00

ammunition.dm

Reworks cryopod storage

2017-10-20 19:14:45 +01:00

dnalocking.dm

…

effects.dm

…

gun.dm

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

2018-02-17 00:35:29 -05:00

projectile.dm

Gun changes (#4185)

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