From 42f18c41dac1d98de22172dc2e3b367b3d1cb80e Mon Sep 17 00:00:00 2001
From: Chompstation Bot <chompstation2bot@gmail.com>
Date: Sat, 25 Sep 2021 00:34:56 +0000
Subject: [PATCH] Adds audible belching preference toggle, makes belch emote
 respect it

---
 .../preference_setup/global/02_settings.dm     |  7 +++++++
 .../preference_setup/global/setting_datums.dm  | 12 ++++++++++++
 code/modules/client/preferences_vr.dm          | 18 ++++++++++++++++++
 code/modules/emotes/emote_define.dm            |  6 ++++++
 4 files changed, 43 insertions(+)

diff --git a/code/modules/client/preference_setup/global/02_settings.dm b/code/modules/client/preference_setup/global/02_settings.dm
index 1808ff6c65..cd2cb3681d 100644
--- a/code/modules/client/preference_setup/global/02_settings.dm
+++ b/code/modules/client/preference_setup/global/02_settings.dm
@@ -83,9 +83,16 @@
 
 	return ..()
 
+<<<<<<< HEAD
 /**
  * This can take either a single preference datum or a list of preferences, and will return true if *all* preferences in the arguments are enabled.
  */ 
+||||||| parent of 0f04ef8b32... Merge pull request #11624 from Rykka-Stormheart/shep-dev-belch-pref
+=======
+/**
+ * This can take either a single preference datum or a list of preferences, and will return true if *all* preferences in the arguments are enabled.
+ */
+>>>>>>> 0f04ef8b32... Merge pull request #11624 from Rykka-Stormheart/shep-dev-belch-pref
 /client/proc/is_preference_enabled(var/preference)
 	if(!islist(preference))
 		preference = list(preference)
diff --git a/code/modules/client/preference_setup/global/setting_datums.dm b/code/modules/client/preference_setup/global/setting_datums.dm
index bea6540149..c8a7e269fb 100644
--- a/code/modules/client/preference_setup/global/setting_datums.dm
+++ b/code/modules/client/preference_setup/global/setting_datums.dm
@@ -95,6 +95,7 @@ var/list/_client_preferences_by_type
 	key = "DIGEST_NOISES"
 	enabled_description = "Noisy"
 	disabled_description = "Silent"
+<<<<<<< HEAD
 //CHOMPEdit; belching
 /datum/client_preference/belch_noises
 	description = "Burping"
@@ -103,6 +104,17 @@ var/list/_client_preferences_by_type
 	disabled_description = "Silent"
 	enabled_by_default = FALSE
 //CHOMPEdit end
+||||||| parent of 0f04ef8b32... Merge pull request #11624 from Rykka-Stormheart/shep-dev-belch-pref
+
+=======
+	
+/datum/client_preference/belch_noises // Belching noises - pref toggle for 'em
+	description = "Burping"
+	key = "BELCH_NOISES"
+	enabled_description = "Noisy"
+	disabled_description = "Silent"
+
+>>>>>>> 0f04ef8b32... Merge pull request #11624 from Rykka-Stormheart/shep-dev-belch-pref
 /datum/client_preference/emote_noises
 	description = "Emote Noises" //MERP
 	key = "EMOTE_NOISES"
diff --git a/code/modules/client/preferences_vr.dm b/code/modules/client/preferences_vr.dm
index 35d29d87df..f95f6c6d2f 100644
--- a/code/modules/client/preferences_vr.dm
+++ b/code/modules/client/preferences_vr.dm
@@ -39,7 +39,21 @@
 	SScharacter_setup.queue_preferences_save(prefs)
 
 	feedback_add_details("admin_verb","TDigestNoise") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	
+/client/verb/toggle_belch_noises()
+	set name = "Audible belching"
+	set category = "Preferences"
+	set desc = "Toggles audible belches."
 
+	var/pref_path = /datum/client_preference/belch_noises
+
+	toggle_preference(pref_path)
+
+	to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear belching.")
+
+	SScharacter_setup.queue_preferences_save(prefs)
+
+<<<<<<< HEAD
 //CHOMPEdit: belching
 /client/verb/toggle_belch_noises()
 	set name = "Audible belching"
@@ -57,6 +71,10 @@
 	feedback_add_details("admin_verb","TBelchNoise")
 //CHOMPEdit End
 
+||||||| parent of 0f04ef8b32... Merge pull request #11624 from Rykka-Stormheart/shep-dev-belch-pref
+=======
+	feedback_add_details("admin_verb","TBelchNoise")
+>>>>>>> 0f04ef8b32... Merge pull request #11624 from Rykka-Stormheart/shep-dev-belch-pref
 
 /client/verb/toggle_emote_noises()
 	set name = "Emote Noises"
diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm
index b8f2e414a9..1eeefea5fc 100644
--- a/code/modules/emotes/emote_define.dm
+++ b/code/modules/emotes/emote_define.dm
@@ -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()
 	. = ..()