2 Commits

Author	SHA1	Message	Date
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
Atermonera	7870ee529c	Adds a weather app to the communicator ... Splits communicator.dm into multiple files Also a few bits from my PDA->communicator project, should be commented out	2017-12-28 21:33:23 -08:00