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..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 - playsound(eater.loc,'sound/items/eatfood.ogg', rand(10,50), TRUE) + //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 06f1c6fe32..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)) - playsound(H.loc,'sound/items/eatfood.ogg', rand(10,50), 1) + //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 5a762c348e..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 - playsound(M.loc,'sound/items/eatfood.ogg', rand(10,50), 1) + //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