Arokha Sieyes 9016ca94c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018 ...

# Conflicts:
#	code/modules/mob/mob.dm - Whitespace? No real conflict.
#	code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.

2018-01-22 12:10:19 -05:00

..

antagonist

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

area

Add checks to allow Tesla to fully dissipate once it runs out of energy.

2018-01-21 16:19:13 -05:00

dna

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20

2018-01-21 00:23:00 -05:00

gamemodes

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018

2018-01-22 12:10:19 -05:00

jobs

Compensated for addition of Planetary Department to PDAs.

2018-01-19 21:09:02 -05:00

machinery

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018

2018-01-22 12:10:19 -05:00

magic

…

mecha

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

objects

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018

2018-01-22 12:10:19 -05:00

turfs

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

vehicles

…

verbs

Polaris sync

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

atoms_movable.dm

Adds Boats, Ports /TG/ Buckling (#4527)

2018-01-14 14:58:15 -06:00

atoms.dm

3 Fixes (#4600)

2018-01-21 16:17:04 -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

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

trader_visit.dm

…