Merge pull request #5654 from CHOMPStation2/upstream-merge-14432

[MIRROR] [MIRROR] Ports Aurora Skrell emotes + fixes warble emote
This commit is contained in:
Nadyr
2023-02-07 13:28:14 -05:00
committed by GitHub
6 changed files with 22 additions and 0 deletions

View File

@@ -190,6 +190,21 @@
emote_sound = 'sound/effects/warble.ogg' // Copyright CC BY 3.0 alienistcog (freesound.org) for the sound. emote_sound = 'sound/effects/warble.ogg' // Copyright CC BY 3.0 alienistcog (freesound.org) for the sound.
emote_message_3p = "warbles." emote_message_3p = "warbles."
/decl/emote/audible/croon
key = "croon"
emote_message_3p = "croons..."
emote_sound = list('sound/voice/croon1.ogg', 'sound/voice/croon2.ogg')
/decl/emote/audible/lwarble
key = "lwarble"
emote_message_3p = "lets out a low, throaty warble!"
emote_sound = 'sound/voice/lwarble.ogg'
/decl/emote/audible/croak
key = "croak"
emote_message_3p = "croaks!"
emote_sound = 'sound/voice/croak.ogg'
/decl/emote/audible/vox_shriek /decl/emote/audible/vox_shriek
key = "shriek" key = "shriek"
emote_message_3p = "SHRIEKS!" emote_message_3p = "SHRIEKS!"

View File

@@ -382,6 +382,13 @@
O_INTESTINE = /obj/item/organ/internal/intestine/skrell O_INTESTINE = /obj/item/organ/internal/intestine/skrell
) )
default_emotes = list(
/decl/emote/audible/warble,
/decl/emote/audible/lwarble,
/decl/emote/audible/croon,
/decl/emote/audible/croak
)
/datum/species/skrell/can_breathe_water() /datum/species/skrell/can_breathe_water()
return TRUE return TRUE

BIN
sound/voice/croak.ogg Normal file

Binary file not shown.

BIN
sound/voice/croon1.ogg Normal file

Binary file not shown.

BIN
sound/voice/croon2.ogg Normal file

Binary file not shown.

BIN
sound/voice/lwarble.ogg Normal file

Binary file not shown.