From 43b74111886767930865ca4a6eac6d62a032a739 Mon Sep 17 00:00:00 2001
From: SeepingVisage <160535199+SeepingVisage@users.noreply.github.com>
Date: Mon, 28 Jul 2025 00:42:14 -0400
Subject: [PATCH 1/2] makes (hopefully) every eating food sound call prefed
because im sick of it when 5 people in the bar eat like 100 things at once, now you can mute that specifically.
---
GainStation13/code/clothing/bluespace_collar.dm | 8 ++++----
GainStation13/code/mechanics/metal_cruncher.dm | 2 +-
GainStation13/code/modules/food_and_drinks/metal_food.dm | 2 +-
code/datums/components/edible.dm | 2 +-
code/datums/elements/trash.dm | 2 +-
code/modules/food_and_drinks/food/snacks.dm | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/GainStation13/code/clothing/bluespace_collar.dm b/GainStation13/code/clothing/bluespace_collar.dm
index 098e6e542f..70393b53cf 100644
--- a/GainStation13/code/clothing/bluespace_collar.dm
+++ b/GainStation13/code/clothing/bluespace_collar.dm
@@ -73,8 +73,8 @@
if(owner.reagents)
if(eater.satiety > -200)
eater.satiety -= owner.junkiness
- playsound(eater.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
- playsound(original_eater.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
+ playsound_prefed(eater.loc,'sound/items/eatfood.ogg', EATING_NOISES, rand(10,50), 1)
+ playsound_prefed(original_eater.loc,'sound/items/eatfood.ogg', EATING_NOISES, rand(10,50), 1)
eater.visible_message("[eater]'s belly seems to visibly distend a bit further'!", "You feel your stomach get filled by food!")
var/bitevolume = 1
if(HAS_TRAIT(original_eater, TRAIT_VORACIOUS))
@@ -105,8 +105,8 @@
return FALSE
if(eater.satiety > -200)
eater.satiety -= foodstuff.junkiness
- playsound(original_eater.loc,'sound/items/eatfood.ogg', rand(10,50), TRUE)
- playsound(eater.loc,'sound/items/eatfood.ogg', rand(10,50), TRUE)
+ playsound_prefed(original_eater.loc,'sound/items/eatfood.ogg', EATING_NOISES, rand(10,50), TRUE)
+ playsound_prefed(eater.loc,'sound/items/eatfood.ogg', EATING_NOISES, rand(10,50), TRUE)
eater.visible_message("[eater]'s belly seems to visibly distend a bit further'!", "You feel your stomach get filled by something!")
var/mob/living/carbon/human/human_eater = original_eater
if(istype(human_eater))
diff --git a/GainStation13/code/mechanics/metal_cruncher.dm b/GainStation13/code/mechanics/metal_cruncher.dm
index 136764899a..6a606bab0c 100644
--- a/GainStation13/code/mechanics/metal_cruncher.dm
+++ b/GainStation13/code/mechanics/metal_cruncher.dm
@@ -16,7 +16,7 @@
user.visible_message("[user] crunches on some of [src].", "You crunch on some of [src].")
else
M.visible_message("[user] attempts to feed some of [src] to [M].", "[user] attempts to feed some of [src] to [M].")
- playsound(M,'sound/items/eatfood.ogg', rand(10,50), 1)
+ playsound_prefed(M,'sound/items/eatfood.ogg', EATING_NOISES, rand(10,50), 1)
use(1)
M.nutrition += crunch_value
//if(HAS_TRAIT(M, TRAIT_VORACIOUS))
diff --git a/GainStation13/code/modules/food_and_drinks/metal_food.dm b/GainStation13/code/modules/food_and_drinks/metal_food.dm
index 519d287272..7528f12f32 100644
--- a/GainStation13/code/modules/food_and_drinks/metal_food.dm
+++ b/GainStation13/code/modules/food_and_drinks/metal_food.dm
@@ -19,7 +19,7 @@
user.visible_message("[user] crunches on some of [src].", "You crunch on some of [src].")
else
M.visible_message("[user] attempts to feed some of [src] to [M].", "[user] attempts to feed some of [src] to [M].")
- playsound(M,'sound/items/eatfood.ogg', rand(10,50), 1)
+ playsound_prefed(M,'sound/items/eatfood.ogg', EATING_NOISES, rand(10,50), 1)
use(1)
M.nutrition += crunch_value
if(crunch_left == 0)
diff --git a/code/datums/components/edible.dm b/code/datums/components/edible.dm
index 9219116a60..1818ba108d 100644
--- a/code/datums/components/edible.dm
+++ b/code/datums/components/edible.dm
@@ -165,7 +165,7 @@ Behavior that's still missing from this component that original food items had t
return FALSE
if(eater.satiety > -200)
eater.satiety -= junkiness
- playsound(eater.loc,'sound/items/eatfood.ogg', rand(10,50), TRUE)
+ playsound_prefed(eater.loc,'sound/items/eatfood.ogg', EATING_NOISES, rand(10,50), TRUE)
var/mob/living/carbon/human/human_eater = eater
if(istype(human_eater))
var/bitevolume = 1
diff --git a/code/datums/elements/trash.dm b/code/datums/elements/trash.dm
index 06f1c6fe32..e86ef0f77b 100644
--- a/code/datums/elements/trash.dm
+++ b/code/datums/elements/trash.dm
@@ -9,7 +9,7 @@
if((M == user || user.vore_flags & TRASH_FORCEFEED) && ishuman(user))
var/mob/living/carbon/human/H = user
if(HAS_TRAIT(H, TRAIT_TRASHCAN))
- playsound(H.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
+ playsound_prefed(H.loc,'sound/items/eatfood.ogg', EATING_NOISES, rand(10,50), 1)
if(H.vore_selected)
H.visible_message("[H] [H.vore_selected.vore_verb]s the [source.name] into their [H.vore_selected.name]",
"You [H.vore_selected.vore_verb] the [source.name] into your [H.vore_selected.name]")
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index 5a762c348e..ec9cedf22b 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -172,7 +172,7 @@ All foods are distributed among various categories. Use common sense.
if(reagents) //Handle ingestion of the reagent.
if(M.satiety > -200)
M.satiety -= junkiness
- playsound(M.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
+ playsound_prefed(M.loc,'sound/items/eatfood.ogg', EATING_NOISES, rand(10,50), 1)
var/bitevolume = 1
if(HAS_TRAIT(M, TRAIT_VORACIOUS))
bitevolume = bitevolume * 0.67
From fdf9cb24daf058be84917f299166a81dd15477d0 Mon Sep 17 00:00:00 2001
From: SeepingVisage <160535199+SeepingVisage@users.noreply.github.com>
Date: Thu, 31 Jul 2025 20:13:07 -0400
Subject: [PATCH 2/2] GS13 edit comments
adds GS13 edit comments that were missing
---
code/datums/components/edible.dm | 2 ++
code/datums/elements/trash.dm | 2 ++
code/modules/food_and_drinks/food/snacks.dm | 2 ++
3 files changed, 6 insertions(+)
diff --git a/code/datums/components/edible.dm b/code/datums/components/edible.dm
index 1818ba108d..f9096ef0d3 100644
--- a/code/datums/components/edible.dm
+++ b/code/datums/components/edible.dm
@@ -165,7 +165,9 @@ Behavior that's still missing from this component that original food items had t
return FALSE
if(eater.satiety > -200)
eater.satiety -= junkiness
+ //GS13 Edit- Eating sound prefs
playsound_prefed(eater.loc,'sound/items/eatfood.ogg', EATING_NOISES, rand(10,50), TRUE)
+ //GS13 Edit end
var/mob/living/carbon/human/human_eater = eater
if(istype(human_eater))
var/bitevolume = 1
diff --git a/code/datums/elements/trash.dm b/code/datums/elements/trash.dm
index e86ef0f77b..e4819602ce 100644
--- a/code/datums/elements/trash.dm
+++ b/code/datums/elements/trash.dm
@@ -9,7 +9,9 @@
if((M == user || user.vore_flags & TRASH_FORCEFEED) && ishuman(user))
var/mob/living/carbon/human/H = user
if(HAS_TRAIT(H, TRAIT_TRASHCAN))
+ //GS13 Edit - Eating sound prefs
playsound_prefed(H.loc,'sound/items/eatfood.ogg', EATING_NOISES, rand(10,50), 1)
+ //GS13 Edit end
if(H.vore_selected)
H.visible_message("[H] [H.vore_selected.vore_verb]s the [source.name] into their [H.vore_selected.name]",
"You [H.vore_selected.vore_verb] the [source.name] into your [H.vore_selected.name]")
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index ec9cedf22b..d41ec91f6e 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -172,7 +172,9 @@ All foods are distributed among various categories. Use common sense.
if(reagents) //Handle ingestion of the reagent.
if(M.satiety > -200)
M.satiety -= junkiness
+ //GS13 Edit - Eating sound prefs
playsound_prefed(M.loc,'sound/items/eatfood.ogg', EATING_NOISES, rand(10,50), 1)
+ //GS13 Edit end
var/bitevolume = 1
if(HAS_TRAIT(M, TRAIT_VORACIOUS))
bitevolume = bitevolume * 0.67