Leshana 780eb637d8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170614 ...

# Conflicts:
#	code/controllers/shuttle_controller.dm
#	code/modules/shuttles/shuttles_multi.dm

2017-06-14 17:54:34 -04:00

..

__defines

Converts Resleeving Transcore to be a subsystem

2017-06-11 18:32:40 -04:00

_compatibility/509

…

_helpers

Merge remote-tracking branch 'polaris/stonedmc-update' into stonedmc-update

2017-06-11 15:35:42 -04:00

_onclick

More and more Destroy() cleanups all across the board - Return qdel hints.

2017-06-10 22:41:51 -04:00

ATMOSPHERICS

Destroy() cleanups in VOREStation code

2017-06-10 22:44:03 -04:00

controllers

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

2017-06-14 17:54:34 -04:00

datums

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

2017-06-14 17:54:34 -04:00

defines

Replace 'magic' messages with Facility PA

2017-04-25 15:15:45 -04:00

game

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

2017-06-14 17:54:34 -04:00

js

…

modules

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

2017-06-14 17:54:34 -04:00

unit_tests

Merge remote-tracking branch 'polaris/stonedmc-update' into stonedmc-update

2017-06-11 15:35:42 -04:00

ZAS

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

2017-06-14 17:54:34 -04:00

_macros.dm

Adds macros to assist with lazily instantiating lists.

2017-06-08 17:20:44 -04:00

_unit_tests.dm

…

global_vr.dm

…

global.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

2017-05-08 21:07:45 -04:00

hub.dm

…

names.dm

…

stylesheet.dm

Fixes a bug with some languages

2017-03-31 17:52:15 +01:00

world.dm

Merge remote-tracking branch 'polaris/stonedmc-update' into stonedmc-update

2017-06-11 15:35:42 -04:00