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

Merge remote-tracking branch 'upstream/master' into progressbars

Browse Source
This commit is contained in:
Yoshax
2016-03-30 00:31:03 +01:00
parent e51d5f9280 547b4994da
commit 9b7b8656ba
247 changed files with 3239 additions and 1978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,6 @@ var/list/_client_preferences_by_type
key = "SHOW_PROGRESS"
enabled_description = "Show"
disabled_description = "Hide"
/********************
* Admin Preferences *
********************/