cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-09 15:05:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92 from surftheseawing/brap

Browse Source 
Add toggle for farting noises and other small changes
This commit is contained in:
GDLW
2023-04-14 22:56:45 +02:00
committed by GitHub
parent 3cfca17d59 eea9b8b0ef
commit 10f1c7fbbb
13 changed files with 76 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/modules/mob/living/brap.dm
+7 -26
View File
@@ -4,36 +4,17 @@
message = " "
emote_type = EMOTE_AUDIBLE
/datum/emote/living/brap/select_message_type(mob/user)
/datum/emote/living/brap/select_message_type(var/mob/user)
return pick("farts loudly!", "cuts a fat one!", "rips absolute ass!")
/datum/emote/living/brap/run_emote(mob/living/user, params)
/datum/emote/living/brap/run_emote(var/mob/living/user, params)
if(!ishuman(user))
return FALSE
var/fartSoundChoice = rand(7)
switch(fartSoundChoice)
if(0)
playsound(user, 'GainStation13/sound/voice/brap3.ogg', 50, 1, -1)
if(1)
playsound(user, 'GainStation13/sound/voice/brap4.ogg', 50, 1, -1)
if(2)
playsound(user, 'GainStation13/sound/voice/brap2.ogg', 50, 1, -1)
if(3)
playsound(user, 'GainStation13/sound/voice/brap1.ogg', 50, 1, -1)
if(4)
playsound(user, 'GainStation13/sound/voice/brap5.ogg', 50, 1, -1)
if(5)
playsound(user, 'GainStation13/sound/voice/brap6.ogg', 50, 1, -1)
if(6)
playsound(user, 'GainStation13/sound/voice/brap7.ogg', 50, 1, -1)
if(7)
playsound(user, 'GainStation13/sound/voice/brap8.ogg', 50, 1, -1)
var/turf/source = get_turf(user)
var/sound/farting = sound(get_sfx("fart"))
for(var/mob/living/M in get_hearers_in_view(3, source))
if(M.client && M.client.prefs.cit_toggles & FARTING_NOISES)
SEND_SOUND(M, farting)
. = ..()
code/__DEFINES/citadel_defines.dm
+4 -2
View File
@@ -125,15 +125,17 @@
#define STAMINA_SOFTCRIT_TRADITIONAL 0 //same as STAMINA_SOFTCRIT except for the more traditional health calculations
#define STAMINA_CRIT_TRADITIONAL -40 //ditto, but for STAMINA_CRIT
#define CRAWLUNDER_DELAY 30 //Delay for crawling under a standing mob
#define CRAWLUNDER_DELAY 30 //Delay for crawling under a standing mob
//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 FARTING_NOISES (1<<4) //GS13
#define TOGGLES_CITADEL (EATING_NOISES|DIGESTION_NOISES)
//toggles on by default
#define TOGGLES_CITADEL (EATING_NOISES|DIGESTION_NOISES|FARTING_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
+4 -6
View File
@@ -10,7 +10,6 @@
#define CHANNEL_BUZZ 1018
#define CHANNEL_BICYCLE 1017
//CIT CHANNELS - TRY NOT TO REGRESS
#define CHANNEL_PRED 1010
#define CHANNEL_DIGEST 1009
@@ -19,17 +18,16 @@
//Hyperstation Channels
#define CHANNEL_REACTOR_ALERT 1007 // reactor sounds
//GS13 Channels
#define CHANNEL_BRAP 1006
//THIS SHOULD ALWAYS BE THE LOWEST ONE!
//KEEP IT UPDATED
#define CHANNEL_HIGHEST_AVAILABLE 1006 //CIT CHANGE - COMPENSATES FOR VORESOUND CHANNELS
#define CHANNEL_HIGHEST_AVAILABLE 1005
#define SOUND_MINIMUM_PRESSURE 10
#define FALLOFF_SOUNDS 1
//Ambience types
#define GENERIC list('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg',\
@@ -136,4 +134,4 @@
#define PICKUP_SOUND_VOLUME 40
#define DROP_SOUND_VOLUME 50
#define YEET_SOUND_VOLUME 90
#define YEET_SOUND_VOLUME 90
code/__DEFINES/traits.dm
+4 -3
View File
@@ -197,9 +197,10 @@
#define TRAIT_CUM_PLUS "cum_plus"
#define TRAIT_NEVER_CLONE "donotclone"
#define TRAIT_COLDBLOODED "coldblooded" // Your body is literal room temperature. Does not make you immune to the temp.
#define TRAIT_FLIMSY "flimsy" //you have 20% less maxhealth
#define TRAIT_TRASHCAN "trashcan" //Im the TRASH MAN! (Shamlessly stolen from hyper for local trash eater, flint)
#define TRAIT_FLIMSY "flimsy" //you have 20% less maxhealth
#define TRAIT_TRASHCAN "trashcan" //Im the TRASH MAN! (Shamlessly stolen from hyper for local trash eater, flint)
#define TRAIT_FAT_GOOD "fat_good"
#define TRAIT_FAT_BAD "fat_bad"
//Hyper
#define TRAIT_VIRILE "virile" //you have 20% more chance of impreg
code/controllers/subsystem/processing/quirks.dm
+2 -1
View File
@@ -26,7 +26,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
list("Ananas Affinity","Ananas Aversion"),
list("Alcohol Tolerance","Light Drinker"),
list("Social Anxiety","Mute"),
list("Prosthetic Limb (Left Arm)","Prosthetic Limb (Right Arm)","Prosthetic Limb (Left Leg)","Prosthetic Limb (Right Leg)","Prosthetic Limb")
list("Prosthetic Limb (Left Arm)","Prosthetic Limb (Right Arm)","Prosthetic Limb (Left Leg)","Prosthetic Limb (Right Leg)","Prosthetic Limb"),
list("Fat Affinity","Fat Aversion")
)
return ..()
code/datums/components/mood.dm
+4 -1
View File
@@ -297,7 +297,10 @@
switch(L.fatness)
if(FATNESS_LEVEL_FAT to INFINITY)
add_event(null, "fatness", /datum/mood_event/fat)
if(HAS_TRAIT(L, TRAIT_FAT_GOOD))
add_event(null, "fatness", /datum/mood_event/fat_good)
else if(HAS_TRAIT(L, TRAIT_FAT_BAD))
add_event(null, "fatness", /datum/mood_event/fat_bad)
/datum/component/mood/proc/HandleNutrition(mob/living/L)
switch(L.nutrition)
code/datums/mood_events/needs_events.dm
+6 -2
View File
@@ -1,6 +1,10 @@
//nutrition
/datum/mood_event/fat
description = "<span class='warning'><B>I'm so fat...</B></span>\n" //yay for fats!
/datum/mood_event/fat_bad
description = "<span class='warning'><B>I'm so fat...</B></span>\n"
mood_change = -4
/datum/mood_event/fat_good
description = "<span class='nicegreen'><B>I'm so fat!</B></span>\n"
mood_change = 4
/datum/mood_event/wellfed
code/datums/traits/neutral.dm
+16
View File
@@ -207,3 +207,19 @@
if(H)
var/datum/species/species = H.dna.species
species.disliked_food = initial(species.disliked_food)
/datum/quirk/fatness_liker
name = "Fat Affinity"
desc = "You like being fat, alot, maybe even a little bit too much. Being fat gives you a bigger mood boost."
mob_trait = TRAIT_FAT_GOOD
value = 0
category = CATEGORY_MOODS
medical_record_text = "Patient seems overly content with gaining weight."
/datum/quirk/fatness_hater
name = "Fat Aversion"
desc = "You dislike being fat. Being fat brings your mood down, alot."
mob_trait = TRAIT_FAT_BAD
value = 0
category = CATEGORY_MOODS
medical_record_text = "Patient seems distressed by gaining weight."
code/game/sound.dm
+9
View File
@@ -227,4 +227,13 @@
if("slosh")
soundin = pick('sound/effects/slosh1.ogg', 'sound/effects/slosh2.ogg')
//END OF CIT CHANGES
if("fart") //GS13
soundin = pick( 'GainStation13/sound/voice/brap1.ogg',
'GainStation13/sound/voice/brap2.ogg',
'GainStation13/sound/voice/brap3.ogg',
'GainStation13/sound/voice/brap4.ogg',
'GainStation13/sound/voice/brap5.ogg',
'GainStation13/sound/voice/brap6.ogg',
'GainStation13/sound/voice/brap7.ogg',
'GainStation13/sound/voice/brap8.ogg')
return soundin
code/modules/client/preferences.dm
+6 -5
View File
@@ -240,7 +240,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/unlock_content = 0
var/vip = 0
//visable pins!
//visible pins!
var/list/pins = list()
var/list/ignoring = list()
@@ -946,7 +946,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "<b>Color:</b></a><BR>"
dat += "<span style='border: 1px solid #161616; background-color: #[features["belly_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=belly_color;task=input'>Change</a><br>"
dat += "<b>Hide on Round-Start:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=hide_belly'>[features["hide_belly"] == 1 ? "Yes" : "No"]</a>"
dat += "<b>Manual belly size change (Found in Climax menu):</b><a style='display:block;width:50px' href='?_src_=prefs;preference=inflatable_belly'>[features["inflatable_belly"] == 1 ? "Yes" : "No"]</a>"
dat += "<b>Inflation (climax with and manual belly size change in arousal menu):</b><a style='display:block;width:50px' href='?_src_=prefs;preference=inflatable_belly'>[features["inflatable_belly"] == 1 ? "Yes" : "No"]</a>"
dat += "</td>"
@@ -1021,6 +1021,7 @@ 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>"
@@ -2797,14 +2798,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
// Citadel edit - Prefs don't work outside of this. :c
if("hound_sleeper")
cit_toggles ^= MEDIHOUND_SLEEPER
if("toggleeatingnoise")
cit_toggles ^= EATING_NOISES
if("toggledigestionnoise")
cit_toggles ^= DIGESTION_NOISES
if("toggleforcefeedtrash") //gs13 added for flint
if("toggleforcefeedtrash") //GS13
cit_toggles ^= TRASH_FORCEFEED
if("togglefartingnoise") //GS13
cit_toggles ^= FARTING_NOISES
//END CITADEL EDIT
if("ambientocclusion")
hyperstation/code/modules/arousal/arousalhud.dm
+2 -2
View File
@@ -11,7 +11,7 @@
for(var/obj/item/organ/genital/G in U.internal_organs)
if(!G.nochange)
if(!G.dontlist)
dat += "<a href='byond://?src=[REF(src)];hide[G.name]=1'>[G.mode == "hidden" ? "[G.name] <font color='red'>(Hidden)</font>" : (G.mode == "clothes" ? "[G.name] <font color='yellow'>(Hidden by Clothes)</font>" : (G.mode == "visable" ? "[G.name] <font color='green'>(Visable)</font>" : "[G.name] <font color='green'>(Visable)</font>"))]</a><BR>"
dat += "<a href='byond://?src=[REF(src)];hide[G.name]=1'>[G.mode == "hidden" ? "[G.name] <font color='red'>(Hidden)</font>" : (G.mode == "clothes" ? "[G.name] <font color='yellow'>(Hidden by Clothes)</font>" : (G.mode == "visible" ? "[G.name] <font color='green'>(Visible)</font>" : "[G.name] <font color='green'>(Visible)</font>"))]</a><BR>"
dat += {"<BR><B>Contexual Options</B><BR><HR>"}
var/obj/item/organ/genital/penis/P = user.getorganslot("penis")
@@ -40,7 +40,7 @@
var/obj/item/organ/genital/belly/Belly = user.getorganslot("belly")
if(Belly)
if(Belly.inflatable)
dat += "<a href='byond://?src=[REF(src)];shrink_belly=1'>Decrease belly</A>"
dat += "<a href='byond://?src=[REF(src)];shrink_belly=1'>Decrease belly size</A>"
dat += "(Shrink your belly down a size)<BR>"
dat += "<a href='byond://?src=[REF(src)];inflate_belly=1'>Increase belly size</A>"
dat += "(Bloat your belly up a size)<BR>"
modular_citadel/code/modules/client/preferences.dm
+1
View File
@@ -21,6 +21,7 @@
//vore prefs
var/toggleeatingnoise = TRUE
var/toggledigestionnoise = TRUE
var/togglefartingnoise = TRUE
var/hound_sleeper = TRUE
var/cit_toggles = TOGGLES_CITADEL
modular_citadel/code/modules/client/preferences_toggles.dm
+11 -1
View File
@@ -9,7 +9,6 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggleeatingnoise)()
/datum/verbs/menu/Settings/Sound/toggleeatingnoise/Get_checked(client/C)
return C.prefs.cit_toggles & EATING_NOISES
TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggledigestionnoise)()
set name = "Toggle Digestion Noises"
set category = "Preferences"
@@ -21,6 +20,17 @@ 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, 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)
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
TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, togglehoundsleeper)()
set name = "Toggle Voracious Hound Sleepers"
set category = "Preferences"