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

Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates

Browse Source 
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
This commit is contained in:
Repede
2020-05-18 20:30:52 -04:00
parent bc14674961 4860fc3ac6
commit 3f4f33bbd8
63 changed files with 299 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_vr.dm
+1 -1
View File
@@ -54,7 +54,7 @@
feedback_add_details("admin_verb","TEmoteNoise") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/verb/toggle_ghost_quiets()
set name = "Whisper/Subtle Vis"
set name = "Toggle Whisper/Subtle Vis"
set category = "Preferences"
set desc = "Toggle ghosts viewing your subtles/whispers."