From 387b73dc8245dd6ede376f2d949e6e71afb672d1 Mon Sep 17 00:00:00 2001 From: Cannibal Hunter <135169022+CannibalHunter@users.noreply.github.com> Date: Tue, 27 Aug 2024 14:17:01 -0500 Subject: [PATCH] silent but deadly --- code/datums/mutable_appearance.dm | 3 +-- .../mob/living/carbon/human/voicepacks/genmale.dm | 2 ++ code/modules/mob/living/emote.dm | 11 +++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/code/datums/mutable_appearance.dm b/code/datums/mutable_appearance.dm index 1b095c555..c8b8fa237 100644 --- a/code/datums/mutable_appearance.dm +++ b/code/datums/mutable_appearance.dm @@ -4,8 +4,7 @@ // Mutable appearances are children of images, just so you know. -/mutable_appearance/New() - ..() +/mutable_appearance plane = FLOAT_PLANE // No clue why this is 0 by default yet images are on FLOAT_PLANE // And yes this does have to be in the constructor, BYOND ignores it if you set it as a normal var diff --git a/code/modules/mob/living/carbon/human/voicepacks/genmale.dm b/code/modules/mob/living/carbon/human/voicepacks/genmale.dm index 18869254b..67090afe8 100644 --- a/code/modules/mob/living/carbon/human/voicepacks/genmale.dm +++ b/code/modules/mob/living/carbon/human/voicepacks/genmale.dm @@ -94,5 +94,7 @@ used = 'sound/vo/attn.ogg' if("psst") used = 'sound/vo/psst.ogg' + if("fart") + used = pick('sound/vo/vart (1).ogg', 'sound/vo/vart (2).ogg', 'sound/vo/vart (3).ogg', 'sound/vo/vart (4).ogg') return used \ No newline at end of file diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 858f7e2a0..02725fe00 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -1043,6 +1043,17 @@ if(C.silent || !C.can_speak_vocal()) message = "makes a muffled hum." +/datum/emote/living/fart + key = "fart" + message = "farts." + nomsg = TRUE //silent but deadly + emote_type = EMOTE_AUDIBLE +/mob/living/carbon/human/verb/emote_fart() + set name = "Fart" + set category = "Noises" + + emote("fart", intentional = TRUE) + /datum/emote/living/smile key = "smile" key_third_person = "smiles"