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

Merge branch 'master' into upstream-merge-13352

Browse Source
This commit is contained in:
Nadyr
2022-07-20 20:16:05 -04:00
committed by GitHub
parent 69eba2c403 16d0830751
commit 094984f9be
134 changed files with 1076 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/client/preferences_toggle_procs.dm
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"
@@ -460,7 +458,6 @@
feedback_add_details("admin_verb","TSubtleSounds")
>>>>>>> 103d0e094b... Merge pull request #13352 from Very-Soft/master
// Not attached to a pref datum because those are strict binary toggles
/client/verb/toggle_examine_mode()
set name = "Toggle Examine Mode"