From e624d5f416e657ebc80f397e2fe12cba05ee6823 Mon Sep 17 00:00:00 2001 From: ReoDaProtovali <84661000+ReoDaProtovali@users.noreply.github.com> Date: Wed, 15 May 2024 17:10:40 -0500 Subject: [PATCH 1/2] Fixes yet more emotes Cant do anything wrong --- .../code/modules/mob/living/emote_ported.dm | 11 +---------- .../{scream/moth1.ogg => moth/scream_moth.ogg} | Bin 2 files changed, 1 insertion(+), 10 deletions(-) rename sound/voice/{scream/moth1.ogg => moth/scream_moth.ogg} (100%) diff --git a/GainStation13/code/modules/mob/living/emote_ported.dm b/GainStation13/code/modules/mob/living/emote_ported.dm index 8441c2ab..ac1d9b5c 100644 --- a/GainStation13/code/modules/mob/living/emote_ported.dm +++ b/GainStation13/code/modules/mob/living/emote_ported.dm @@ -97,15 +97,6 @@ //Rewrites of the above start. -/datum/emote/living/carbon/teshsneeze - key = "teshsneeze" - key_third_person = "sneezes" - message = "sneezes." - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/teshsneeze/get_sound() - return pick('GainStation13/sound/voice/teshari/teshsneeze.ogg', 'GainStation13/sound/voice/teshari/teshsneezeb.ogg') - /datum/emote/living/carbon/racc key = "racc_chitter" key_third_person = "raccchitters" @@ -174,7 +165,7 @@ emote_type = EMOTE_AUDIBLE /datum/emote/living/cough/teshcough/get_sound() - return pick('GainStation13/sound/voice/teshari/teshcougha.ogg', 'GainStation13/sound/voice/teshari/teshcoughb.ogg') + return pick('GainStation13/sound/voice/teshari/tesharicougha.ogg', 'GainStation13/sound/voice/teshari/tesharicoughb.ogg') /datum/emote/living/carbon/teshscream key = "teshscream" diff --git a/sound/voice/scream/moth1.ogg b/sound/voice/moth/scream_moth.ogg similarity index 100% rename from sound/voice/scream/moth1.ogg rename to sound/voice/moth/scream_moth.ogg From a8ad1a6715b48b003673b77ee0a2a0c4b574c920 Mon Sep 17 00:00:00 2001 From: ReoDaProtovali <84661000+ReoDaProtovali@users.noreply.github.com> Date: Wed, 15 May 2024 17:14:46 -0500 Subject: [PATCH 2/2] Typo --- GainStation13/code/modules/mob/living/emote_ported.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GainStation13/code/modules/mob/living/emote_ported.dm b/GainStation13/code/modules/mob/living/emote_ported.dm index ac1d9b5c..a6e5b0fe 100644 --- a/GainStation13/code/modules/mob/living/emote_ported.dm +++ b/GainStation13/code/modules/mob/living/emote_ported.dm @@ -193,7 +193,7 @@ sound = pick(bigsound) return ..() */ - if(user.size_multipler >= 1.5) + if(user.size_multiplier >= 1.5) sound = pick(bigsound) else sound = pick(smolsound)