Leshana 7f60e98633 Merge remote-tracking branch 'polaris/stonedmc-update' into stonedmc-update ...

# Conflicts:
#	code/_helpers/game.dm
#	code/controllers/subsystem.dm
#	code/controllers/subsystems/garbage.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	maps/RandomZLevels/stationCollision.dm
#	maps/RandomZLevels/wildwest.dm
#	maps/~map_system/maps.dm
#	vorestation.dme

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

..

__defines

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

2017-06-11 15:35:42 -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 remote-tracking branch 'polaris/stonedmc-update' into stonedmc-update

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

datums

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

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

defines

…

game

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

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

js

…

modules

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

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

unit_tests

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

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

ZAS

Additional Work on NIFs

2017-06-06 01:00:46 -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

…

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

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

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