cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	maps/southern_cross/southern_cross-1.dmm
This commit is contained in:
Leshana
2018-02-24 13:19:10 -05:00
parent a43acad170 74a4e993ee
commit 4ebbf1ce7a
28 changed files with 311122 additions and 11355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/client/preference_setup/global/setting_datums.dm
View File

@@ -117,6 +117,13 @@ var/list/_client_preferences_by_type
enabled_description = "Show"
disabled_description = "Hide"
/datum/client_preference/hotkeys_default
description ="Hotkeys Default"
key = "HUD_HOTKEYS"
enabled_description = "Enabled"
disabled_description = "Disabled"
enabled_by_default = FALSE // Backwards compatibility
/datum/client_preference/show_typing_indicator
description ="Typing indicator"
key = "SHOW_TYPING"