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

Add toggle for burping noises

Browse Source 
Move burping and farting toggles to GS13 Preferences section
This commit is contained in:
psq95
2023-04-16 17:54:30 +01:00
parent e4c7935e64
commit 03a8a7e232
6 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/modules/mob/living/emote.dm
+2 -2
View File
@@ -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)
. = ..()
code/__DEFINES/citadel_defines.dm
+6 -4
View File
@@ -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)
code/__DEFINES/sound.dm
+3 -2
View File
@@ -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
code/modules/client/preferences.dm
+7 -3
View File
@@ -1021,16 +1021,18 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<b>Exhibitionist:</b><a href='?_src_=prefs;preference=exhibitionist'>[features["exhibitionist"] == TRUE ? "Yes" : "No"]</a><BR>"
dat += "<b>Hear Vore Sounds:</b> <a href='?_src_=prefs;preference=toggleeatingnoise'>[(cit_toggles & EATING_NOISES) ? "Yes" : "No"]</a><br>"
dat += "<b>Hear Vore Digestion Sounds:</b> <a href='?_src_=prefs;preference=toggledigestionnoise'>[(cit_toggles & DIGESTION_NOISES) ? "Yes" : "No"]</a><br>"
dat += "<b>Hear Fart Sounds:</b> <a href='?_src_=prefs;preference=togglefartingnoise'>[(cit_toggles & FARTING_NOISES) ? "Yes" : "No"]</a><br>"
dat += "<b>Allow trash forcefeeding (requires Trashcan quirk)</b> <a href='?_src_=prefs;preference=toggleforcefeedtrash'>[(cit_toggles & TRASH_FORCEFEED) ? "Yes" : "No"]</a><br>"
dat += "<b>Lewdchem:</b><a href='?_src_=prefs;preference=lewdchem'>[lewdchem == TRUE ? "Enabled" : "Disabled"]</a><BR>"
dat += "<b>Widescreen:</b> <a href='?_src_=prefs;preference=widescreenpref'>[widescreenpref ? "Enabled ([CONFIG_GET(string/default_view)])" : "Disabled (15x15)"]</a><br>"
dat += "<b>Auto stand:</b> <a href='?_src_=prefs;preference=autostand'>[autostand ? "Enabled" : "Disabled"]</a><br>"
dat += "<b>Screen Shake:</b> <a href='?_src_=prefs;preference=screenshake'>[(screenshake==100) ? "Full" : ((screenshake==0) ? "None" : "[screenshake]")]</a><br>"
if (user && user.client && !user.client.prefs.screenshake==0)
dat += "<b>Damage Screen Shake:</b> <a href='?_src_=prefs;preference=damagescreenshake'>[(damagescreenshake==1) ? "On" : ((damagescreenshake==0) ? "Off" : "Only when down")]</a><br>"
//GS13 stuff goes here
//GS13
dat += "<h2>GS13 Preferences</h2>"
dat += "<b>Hear Burp Sounds:</b> <a href='?_src_=prefs;preference=toggleburpingnoise'>[(cit_toggles & BURPING_NOISES) ? "Yes" : "No"]</a><br>"
dat += "<b>Hear Fart Sounds:</b> <a href='?_src_=prefs;preference=togglefartingnoise'>[(cit_toggles & FARTING_NOISES) ? "Yes" : "No"]</a><br>"
dat += "<b>Trashcan Forcefeeding:</b> <a href='?_src_=prefs;preference=toggleforcefeedtrash'>[(cit_toggles & TRASH_FORCEFEED) ? "Yes" : "No"]</a><br>"
dat += "<b>Maximum Weight:</b><a href='?_src_=prefs;preference=max_fatness'>[max_weight == FALSE ? "None" : max_weight]</a><BR>"
dat += "<b>NonCon - Weight Gain:</b><a href='?_src_=prefs;preference=noncon_weight_gain'>[noncon_weight_gain == TRUE ? "Enabled" : "Disabled"]</a><BR>"
@@ -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
modular_citadel/code/modules/client/preferences.dm
+4 -1
View File
@@ -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
modular_citadel/code/modules/client/preferences_toggles.dm
+12 -1
View File
@@ -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