cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 06:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/modules/client/preference/preferences_toggles.dm
This commit is contained in:
Tigercat2000
2016-06-30 17:40:10 -07:00
parent 82091296bd 12532b4c2c
commit 567e1576f5
98 changed files with 696 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference/preferences_toggles.dm
+2 -2
View File
@@ -186,9 +186,9 @@
set name = "Hear/Silence Instruments"
set category = "Preferences"
set desc = "Toggles hearing musical instruments like the violin and piano"
prefs.toggles ^= SOUND_INSTRUMENTS
prefs.sound ^= SOUND_INSTRUMENTS
prefs.save_preferences(src)
if(prefs.toggles & SOUND_INSTRUMENTS)
if(prefs.sound & SOUND_INSTRUMENTS)
to_chat(src, "You will now hear people playing musical instruments.")
else
to_chat(src, "You will no longer hear musical instruments.")