Leshana 28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 ...

# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme

2018-01-04 22:44:04 -05:00

..

_docs.dm

Revert "Revert "Revert "Revert "Revert "Revert "Revert "Switches us to the Southern Cross for testing""""""" (#4491)

2018-01-01 23:36:36 -08:00

Airflow.dm

work

2017-09-04 21:52:47 -04:00

Atom.dm

…

Connection.dm

…

ConnectionGroup.dm

…

ConnectionManager.dm

Small ZAS Optimization

2017-05-10 20:12:13 -04:00

Controller.dm

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

Debug.dm

…

Diagnostic.dm

Success!

2017-10-27 13:43:05 -04:00

Fire.dm

…

Phoron.dm

Polaris sync

2017-12-21 04:01:07 -05:00

Turf.dm

Converts /datum/gas_mixture/var/graphic to a lazy list.

2017-06-10 10:13:55 -04:00

Variable Settings.dm

…

Zone.dm

Converts /datum/gas_mixture/var/graphic to a lazy list.

2017-06-10 10:13:55 -04:00