diff --git a/GainStation13/code/modules/mob/living/emote.dm b/GainStation13/code/modules/mob/living/emote.dm index 68e8c0f3..7d1ada5d 100644 --- a/GainStation13/code/modules/mob/living/emote.dm +++ b/GainStation13/code/modules/mob/living/emote.dm @@ -60,3 +60,34 @@ /datum/emote/living/burunyu/run_emote(mob/living/user, params) playsound(user, 'GainStation13/sound/voice/funnycat.ogg', 50, 1, -1) . = ..() + + +/datum/emote/living/belch + key = "belch" + key_third_person = "belches loudly" + message = " belches" + emote_type = EMOTE_AUDIBLE + + + //god hates me for this -Metha + +/datum/emote/living/belch/run_emote(mob/living/user, params) + if(ishuman(user)) + + var/fartSoundChoice = rand(5) + + switch(fartSoundChoice) + if (0) playsound(user, 'GainStation13/sound/voice/belch3.ogg', 50, 1, -1) + + if (1) playsound(user, 'GainStation13/sound/voice/belch4.ogg', 50, 1, -1) + + if (2) playsound(user, 'GainStation13/sound/voice/belch2.ogg', 50, 1, -1) + + if (3) playsound(user, 'GainStation13/sound/voice/belch1.ogg', 50, 1, -1) + + if (4) playsound(user, 'GainStation13/sound/voice/belch5.ogg', 50, 1, -1) + + if (5) playsound(user, 'GainStation13/sound/voice/belch6.ogg', 50, 1, -1) + + + . = ..() \ No newline at end of file diff --git a/GainStation13/sound/voice/belch1.ogg b/GainStation13/sound/voice/belch1.ogg new file mode 100644 index 00000000..a94c32a4 Binary files /dev/null and b/GainStation13/sound/voice/belch1.ogg differ diff --git a/GainStation13/sound/voice/belch2.ogg b/GainStation13/sound/voice/belch2.ogg new file mode 100644 index 00000000..2eaaa306 Binary files /dev/null and b/GainStation13/sound/voice/belch2.ogg differ diff --git a/GainStation13/sound/voice/belch3.ogg b/GainStation13/sound/voice/belch3.ogg new file mode 100644 index 00000000..60c7ec53 Binary files /dev/null and b/GainStation13/sound/voice/belch3.ogg differ diff --git a/GainStation13/sound/voice/belch4.ogg b/GainStation13/sound/voice/belch4.ogg new file mode 100644 index 00000000..f573d047 Binary files /dev/null and b/GainStation13/sound/voice/belch4.ogg differ diff --git a/GainStation13/sound/voice/belch5.ogg b/GainStation13/sound/voice/belch5.ogg new file mode 100644 index 00000000..446ee538 Binary files /dev/null and b/GainStation13/sound/voice/belch5.ogg differ diff --git a/GainStation13/sound/voice/belch6.ogg b/GainStation13/sound/voice/belch6.ogg new file mode 100644 index 00000000..e73e8c7d Binary files /dev/null and b/GainStation13/sound/voice/belch6.ogg differ diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 2d1b0b57..cdc2bb14 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -277,7 +277,7 @@ /obj/item/storage/fancy/rollingpapers name = "rolling paper pack" - desc = "A pack of Kinaris brand rolling papers." + desc = "A pack of GATO brand rolling papers." w_class = WEIGHT_CLASS_TINY icon = 'icons/obj/cigarettes.dmi' icon_state = "cig_paper_pack" diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index 7b66a913..c938e4ab 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -105,7 +105,7 @@ icon_state = "screwdriver_nt" /obj/item/paper/guides/antag/nuke_instructions - info = "How to break into a Kinaris self-destruct terminal and remove its plutonium core:
\ + info = "How to break into a GATO self-destruct terminal and remove its plutonium core:
\