diff --git a/.vscode/settings.json b/.vscode/settings.json index fb9cb43db606..deb10825250a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -12,4 +12,4 @@ }, "files.eol": "\n", "gitlens.advanced.blame.customArguments": ["-w"] -} \ No newline at end of file +} diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index b32cf00cac2e..d16b5b0a1b19 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -75,9 +75,7 @@ var/mob/living/carbon/human/H = user if(H.mind?.miming) return - if(iscatperson(H)) - return pick('sound/voice/feline/scream1.ogg', 'sound/voice/feline/scream2.ogg') - else if(ishumanbasic(H)) + if(ishumanbasic(H) || iscatperson(H)) if(user.gender == FEMALE) return pick('sound/voice/human/femalescream_1.ogg', 'sound/voice/human/femalescream_2.ogg', 'sound/voice/human/femalescream_3.ogg', 'sound/voice/human/femalescream_4.ogg', 'sound/voice/human/femalescream_5.ogg') else @@ -89,23 +87,6 @@ else if(H.dna?.species?.screamsound) //yogs start: grabs scream from screamsound located in the appropriate species file. return H.dna.species.screamsound //yogs end - current added screams: lizard, preternis. -/datum/emote/living/carbon/meow - key = "meow" - key_third_person = "meows" - message = "meows." - emote_type = EMOTE_AUDIBLE - -/datum/emote/living/carbon/meow/can_run_emote(mob/living/user, status_check = TRUE, intentional) - if(!ishuman(user)) - return - var/mob/living/carbon/human/H = user - if(iscatperson(H)) - return TRUE - else - return FALSE - -/datum/emote/living/carbon/meow/get_sound(mob/living/user) - return pick('sound/voice/feline/meow1.ogg', 'sound/voice/feline/meow2.ogg') /datum/emote/living/carbon/human/pale key = "pale" diff --git a/sound/voice/feline/meow1.ogg b/sound/voice/feline/meow1.ogg deleted file mode 100644 index f3df6c70a45b..000000000000 Binary files a/sound/voice/feline/meow1.ogg and /dev/null differ diff --git a/sound/voice/feline/meow2.ogg b/sound/voice/feline/meow2.ogg deleted file mode 100644 index aa5dfc59f691..000000000000 Binary files a/sound/voice/feline/meow2.ogg and /dev/null differ diff --git a/sound/voice/feline/scream1.ogg b/sound/voice/feline/scream1.ogg deleted file mode 100644 index 155cfd0eb165..000000000000 Binary files a/sound/voice/feline/scream1.ogg and /dev/null differ diff --git a/sound/voice/feline/scream2.ogg b/sound/voice/feline/scream2.ogg deleted file mode 100644 index 3291328212dc..000000000000 Binary files a/sound/voice/feline/scream2.ogg and /dev/null differ