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

..

preference_setup

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

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

client defines.dm

Might Fix Resource Lag

2017-12-29 03:58:25 -05:00

client procs.dm

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

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

movement.dm

…

preferences_factions.dm

Fixes up the PR.

2017-09-09 23:17:41 -04:00

preferences_savefile.dm

…

preferences_spawnpoints.dm

Polaris Sync

2017-08-28 20:52:11 -04:00

preferences_toggle_procs.dm

…

preferences_vr.dm

Preview nitpickery.

2017-11-05 22:21:20 +02:00

preferences.dm

Polaris sync

2017-10-27 15:30:24 -04:00

spam_prevention.dm

Makes automute less prone to mute cultists.

2017-07-04 23:20:44 -04:00

ui_style.dm

Adds a new hud & removes red crosses from huds. (#3846)

2017-09-17 19:07:32 -05:00