Leshana 5d5f052eb7 Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10 ...

# Conflicts:
#	code/game/machinery/atmoalter/area_atmos_computer.dm

2018-01-15 13:27:39 -05:00

..

ammunition

Merge pull request #4310 from Neerti/11/19/2017_hunting_rounds

2017-11-21 00:29:12 -06:00

guns

Merge remote-tracking branch 'polaris-upstream/master' commit '613c5984eeeed2757fe7f15877973f81f526323c' into polaris-sync-2018-01-10

2018-01-15 13:27:39 -05:00

projectile

Polaris sync

2017-12-21 04:01:07 -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

Polaris sync

2017-10-27 15:30:24 -04:00

projectile.dm

Adds Hunting Rounds

2017-11-19 23:59:17 -05:00