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

..

effects

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

items

Shamelessly steal Polaris' Southern Cross jobs

2018-01-14 21:49:19 -05:00

random

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync2018

2017-12-26 23:07:58 -05:00

structures

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

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

buckling.dm

Crawling

2017-12-08 10:26:06 -08:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

Moved makepowernets() into SSmachines initialization proc.

2017-12-29 15:32:06 -05:00

items.dm

POLARIS: Planes shenanigans. Begins 'plane' work.

2018-01-14 00:39:59 -05:00

mob_spawner_vr.dm

Wilderness Optimization

2017-12-17 23:35:00 -03:00

objs.dm

Reworks cryopod storage

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

structures.dm

…

stumble_into_vr.dm

Can't open blast doors with your face

2017-11-12 16:40:41 -05:00

weapons.dm

Adds Visual Cleavage

2017-12-31 05:53:39 -05:00