cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 05:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-13336

Browse Source
This commit is contained in:
BlackMajor
2022-07-19 18:30:09 +12:00
committed by GitHub
parent 188ce03649 457bc45c00
commit 9ee3e2688c
28 changed files with 96 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_toggle_procs.dm
+1 -4
View File
@@ -406,8 +406,6 @@
feedback_add_details("admin_verb","TRadioSounds")
<<<<<<< HEAD
=======
/client/verb/toggle_say_sounds()
set name = "Sound Toggle: Say"
set category = "Preferences"
@@ -448,7 +446,7 @@
feedback_add_details("admin_verb","TWhisperSounds")
/client/verb/toggle_subtle_sounds()
set name = "Sound Toggle: Subtle"
set name = "Toggle Subtle Sounds"
set category = "Preferences"
set desc = "Toggle hearing a sound when somebody uses subtle."
@@ -460,7 +458,6 @@
feedback_add_details("admin_verb","TSubtleSounds")
>>>>>>> dd7585a45d... Merge pull request #13336 from Very-Soft/saysound
// Not attached to a pref datum because those are strict binary toggles
/client/verb/toggle_examine_mode()
set name = "Toggle Examine Mode"