Leshana f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06 ...

# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme

2017-03-06 20:58:38 -05:00

..

antagonist.dm

Removed the Vox Pox.

2016-02-20 11:24:19 +10:30

departmental.dm

…

escape_pods.dm

…

shuttle_console.dm

…

shuttle_emergency.dm

Ports Turbolifts from Bay.

2017-03-04 21:35:00 -05:00

shuttle_ferry.dm

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

shuttle_specops.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

shuttle_supply.dm

…

shuttle.dm

…

shuttles_multi.dm

Merge large polaris changes

2017-03-02 22:44:17 -05:00

shuttles_vr.dm

Final work on belt mining

2017-02-14 16:36:34 -05:00