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

..

energy

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

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

launcher

Updates Tools

2017-08-03 04:49:23 -04:00

magnetic

Tweak out-of-ammo behavior on railguns

2017-12-28 18:02:43 -05:00

projectile

Polaris sync

2017-12-21 04:01:07 -05:00

energy.dm

work

2017-11-26 12:08:05 -05:00

launcher.dm

Macro Replacements. (#3574)

2017-07-19 12:47:23 -05:00

projectile.dm

Adds a metric assload of sounds.

2017-09-10 14:34:43 -04:00

vox.dm

Merge pull request #4176 from Anewbe/battery_things

2017-11-19 21:28:06 -05:00