 Arokha Sieyes
|
2c9bdf3ae4
|
POLARIS: Revamp logging to be consistent
|
2018-03-10 17:18:09 -05:00 |
|
|
Arokha Sieyes
|
ff228754b3
|
Merge polaris sync 01 17 2018
Planes, layers, human/update_icon()
|
2018-01-17 17:56:51 -05:00 |
|
|
Atermonera
|
30352e1c9b
|
"Communicators have a flashlight" (#4523)
|
2018-01-13 21:49:58 -06:00 |
|
|
atermonera
|
b7f7f6868a
|
Revert "Communicators have a flashlight"
This reverts commit 3db1efc5aa.
|
2018-01-12 15:24:15 -08:00 |
|
|
atermonera
|
3db1efc5aa
|
Communicators have a flashlight
|
2018-01-12 15:19:02 -08:00 |
|
|
Leshana
|
807f1c7b4b
|
Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09
# Conflicts:
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/structures/flora.dm
#
|
2018-01-09 14:40:09 -05:00 |
|
|
Atermonera
|
132e20ba52
|
Nanoui rounding
|
2018-01-05 23:04:55 -08:00 |
|
|
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
|
e004d1c4ec
|
Weather app has atmospheric scan
|
2018-01-01 23:43:24 -08: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 |
|