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

..

antagonist

Fixes 'varient'

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

area

Redoes the small cruiser

2018-01-02 03:17:48 -05:00

dna

Allows xenochimeras to choose icon base

2017-12-02 16:04:20 -05:00

gamemodes

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

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

jobs

Shamelessly steal Polaris' Southern Cross jobs

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

machinery

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

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

magic

…

mecha

POLARIS: Planes shenanigans. Begins 'plane' work.

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

objects

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

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

turfs

Stop explosions or singularity or whatnot from ripping holes in space.

2018-01-13 00:02:53 -05:00

vehicles

…

verbs

Polaris sync

2017-11-17 19:27:03 -05:00

atoms_movable.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob

2017-11-29 22:43:05 -05:00

atoms.dm

Prepare Atmospherics Machinery for SSatoms (#4501)

2018-01-06 10:52:56 -06:00

base_turf.dm

…

json.dm

…

periodic_news.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

socket_talk.dm

…

sound.dm

Polaris sync

2017-11-17 19:27:03 -05:00

supplyshuttle.dm

Added supply shuttle export reports

2018-01-08 20:28:47 -05:00

trader_visit.dm

…