Adds audible belching preference toggle, makes belch emote respect it

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)

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"