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

..

laser.dm

Fixes 'varient'

2018-01-08 16:42:20 -05:00

netgun_vr.dm

Ports 'head' guns from Eris, change Hunter sprite

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

nuclear.dm

Swaps non-mounted recharging guns to batteries

2017-10-27 20:43:31 -05:00

particle.dm

Allows emitters to blast through rocks again.

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

pulse.dm

…

special.dm

more grammer

2017-12-11 20:33:59 -05:00

stun_vr.dm

…

stun.dm

Swaps non-mounted recharging guns to batteries

2017-10-27 20:43:31 -05:00

temperature.dm

work

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