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

Adds audible belching preference toggle, makes belch emote respect it

Browse Source
This commit is contained in:
Chompstation Bot
2021-09-25 00:34:56 +00:00
parent 5ab51812da
commit 42f18c41da
4 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/emotes/emote_define.dm
View File

@@ -42,8 +42,14 @@ var/global/list/emotes_by_key
var/check_range // falsy, or a range outside which the emote will not work
var/conscious = TRUE // Do we need to be awake to emote this?
var/emote_range = 0 // If >0, restricts emote visibility to viewers within range.
<<<<<<< HEAD
var/sound_preferences = list(/datum/client_preference/emote_noises)
||||||| parent of 0f04ef8b32... Merge pull request #11624 from Rykka-Stormheart/shep-dev-belch-pref
=======
var/sound_preferences = list(/datum/client_preference/emote_noises) // Default emote sound_preferences is just emote_noises. Belch emote overrides this list for pref-checks.
>>>>>>> 0f04ef8b32... Merge pull request #11624 from Rykka-Stormheart/shep-dev-belch-pref
/decl/emote/Initialize()
. = ..()