Leshana 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19 ...

# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.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-19 17:52:25 -05:00

..

preference_setup

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19

2018-01-19 17:52:25 -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

Add a verb to the Preferences panel to toggle jukebox music.

2017-03-27 20:31:15 -04:00

preferences_vr.dm

Fixes character setup preview backround changing.

2018-01-17 18:15:24 -05:00

preferences.dm

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05: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