diff --git a/GainStation13/code/modules/mob/living/emote.dm b/GainStation13/code/modules/mob/living/emote.dm
index 551d0b2a..f95c92c0 100644
--- a/GainStation13/code/modules/mob/living/emote.dm
+++ b/GainStation13/code/modules/mob/living/emote.dm
@@ -19,7 +19,7 @@
if(!ishuman(user))
return FALSE
- make_noise(user, "belch", 0)
+ make_noise(user, "belch", BURPING_NOISES)
. = ..()
@@ -50,7 +50,7 @@
if(!ishuman(user))
return FALSE
- make_noise(user, "burp", 0)
+ make_noise(user, "burp", BURPING_NOISES)
. = ..()
diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm
index a1d95966..aa0efeb6 100644
--- a/code/__DEFINES/citadel_defines.dm
+++ b/code/__DEFINES/citadel_defines.dm
@@ -129,13 +129,15 @@
//Citadel toggles because bitflag memes
#define MEDIHOUND_SLEEPER (1<<0)
-#define EATING_NOISES (1<<1)
-#define DIGESTION_NOISES (1<<2)
-#define TRASH_FORCEFEED (1<<3)
+#define EATING_NOISES (1<<1) //Vore
+#define DIGESTION_NOISES (1<<2) //Vore
+
+#define TRASH_FORCEFEED (1<<3) //GS13
#define FARTING_NOISES (1<<4) //GS13
+#define BURPING_NOISES (1<<5) //GS13
//toggles on by default
-#define TOGGLES_CITADEL (EATING_NOISES|DIGESTION_NOISES|FARTING_NOISES)
+#define TOGGLES_CITADEL (EATING_NOISES|DIGESTION_NOISES|FARTING_NOISES|BURPING_NOISES)
//component stuff
#define COMSIG_COMBAT_TOGGLED "combatmode_toggled" //called by combat mode toggle on all equipped items. args: (mob/user, combatmode)
diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm
index 0f702350..bd54ef58 100644
--- a/code/__DEFINES/sound.dm
+++ b/code/__DEFINES/sound.dm
@@ -19,11 +19,12 @@
#define CHANNEL_REACTOR_ALERT 1007 // reactor sounds
//GS13 Channels
-#define CHANNEL_BRAP 1006
+#define CHANNEL_BURP 1006
+#define CHANNEL_FART 1005
//THIS SHOULD ALWAYS BE THE LOWEST ONE!
//KEEP IT UPDATED
-#define CHANNEL_HIGHEST_AVAILABLE 1005
+#define CHANNEL_HIGHEST_AVAILABLE 1004
#define SOUND_MINIMUM_PRESSURE 10
#define FALLOFF_SOUNDS 1
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 9a3e240a..c0e71527 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1021,16 +1021,18 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "Exhibitionist:[features["exhibitionist"] == TRUE ? "Yes" : "No"]
"
dat += "Hear Vore Sounds: [(cit_toggles & EATING_NOISES) ? "Yes" : "No"]
"
dat += "Hear Vore Digestion Sounds: [(cit_toggles & DIGESTION_NOISES) ? "Yes" : "No"]
"
- dat += "Hear Fart Sounds: [(cit_toggles & FARTING_NOISES) ? "Yes" : "No"]
"
- dat += "Allow trash forcefeeding (requires Trashcan quirk) [(cit_toggles & TRASH_FORCEFEED) ? "Yes" : "No"]
"
dat += "Lewdchem:[lewdchem == TRUE ? "Enabled" : "Disabled"]
"
dat += "Widescreen: [widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]
"
dat += "Auto stand: [autostand ? "Enabled" : "Disabled"]
"
dat += "Screen Shake: [(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")]
"
if (user && user.client && !user.client.prefs.screenshake==0)
dat += "Damage Screen Shake: [(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]
"
- //GS13 stuff goes here
+
+ //GS13
dat += "GS13 Preferences
"
+ dat += "Hear Burp Sounds: [(cit_toggles & BURPING_NOISES) ? "Yes" : "No"]
"
+ dat += "Hear Fart Sounds: [(cit_toggles & FARTING_NOISES) ? "Yes" : "No"]
"
+ dat += "Trashcan Forcefeeding: [(cit_toggles & TRASH_FORCEFEED) ? "Yes" : "No"]
"
dat += "Maximum Weight:[max_weight == FALSE ? "None" : max_weight]
"
dat += "NonCon - Weight Gain:[noncon_weight_gain == TRUE ? "Enabled" : "Disabled"]
"
@@ -2804,6 +2806,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
cit_toggles ^= DIGESTION_NOISES
if("toggleforcefeedtrash") //GS13
cit_toggles ^= TRASH_FORCEFEED
+ if("toggleburpingnoise") //GS13
+ cit_toggles ^= BURPING_NOISES
if("togglefartingnoise") //GS13
cit_toggles ^= FARTING_NOISES
//END CITADEL EDIT
diff --git a/modular_citadel/code/modules/client/preferences.dm b/modular_citadel/code/modules/client/preferences.dm
index d56958c9..6b8c846b 100644
--- a/modular_citadel/code/modules/client/preferences.dm
+++ b/modular_citadel/code/modules/client/preferences.dm
@@ -19,10 +19,13 @@
var/lewdchem = TRUE
//vore prefs
+ var/hound_sleeper = TRUE
var/toggleeatingnoise = TRUE
var/toggledigestionnoise = TRUE
+ //GS13
+ var/toggleburpingnoise = TRUE
var/togglefartingnoise = TRUE
- var/hound_sleeper = TRUE
+ //default toggles
var/cit_toggles = TOGGLES_CITADEL
//Hyper prefs
diff --git a/modular_citadel/code/modules/client/preferences_toggles.dm b/modular_citadel/code/modules/client/preferences_toggles.dm
index 84049e05..9d91c09c 100644
--- a/modular_citadel/code/modules/client/preferences_toggles.dm
+++ b/modular_citadel/code/modules/client/preferences_toggles.dm
@@ -20,13 +20,24 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggledigestionnoise)()
/datum/verbs/menu/Settings/Sound/toggledigestionnoise/Get_checked(client/C)
return C.prefs.cit_toggles & DIGESTION_NOISES
+TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggleburpingnoise)()
+ set name = "Toggle Burping Noises"
+ set category = "Preferences"
+ set desc = "Hear Burping noises"
+ usr.client.prefs.cit_toggles ^= BURPING_NOISES
+ usr.client.prefs.save_preferences()
+ usr.stop_sound_channel(CHANNEL_BURP)
+ to_chat(usr, "You will [(usr.client.prefs.cit_toggles & BURPING_NOISES) ? "now" : "no longer"] hear burping noises.")
+/datum/verbs/menu/Settings/Sound/toggleburpingnoise/Get_checked(client/C)
+ return C.prefs.cit_toggles & BURPING_NOISES
+
TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, togglefartingnoise)()
set name = "Toggle Farting Noises"
set category = "Preferences"
set desc = "Hear Farting noises"
usr.client.prefs.cit_toggles ^= FARTING_NOISES
usr.client.prefs.save_preferences()
- usr.stop_sound_channel(CHANNEL_BRAP)
+ usr.stop_sound_channel(CHANNEL_FART)
to_chat(usr, "You will [(usr.client.prefs.cit_toggles & FARTING_NOISES) ? "now" : "no longer"] hear farting noises.")
/datum/verbs/menu/Settings/Sound/togglefartingnoise/Get_checked(client/C)
return C.prefs.cit_toggles & FARTING_NOISES