cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 16:48:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some post-mirror fixes

Browse Source
This commit is contained in:
Heroman3003
2023-02-07 16:55:49 -05:00
committed by Darlantan
parent e2ff2b55c2
commit d3bad85beb
6 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/emotes/definitions/audible.dm
+6 -3
View File
@@ -190,6 +190,8 @@
emote_sound = 'sound/effects/warble.ogg' // Copyright CC BY 3.0 alienistcog (freesound.org) for the sound.
emote_message_3p = "warbles."
<<<<<<< HEAD
=======
/decl/emote/audible/croon
key = "croon"
emote_message_3p = "croons..."
@@ -200,11 +202,12 @@
emote_message_3p = "lets out a low, throaty warble!"
emote_sound = 'sound/voice/lwarble.ogg'
/decl/emote/audible/croak
key = "croak"
/decl/emote/audible/croak_skrell
key = "scroak"
emote_message_3p = "croaks!"
emote_sound = 'sound/voice/croak.ogg'
emote_sound = 'sound/voice/croak_skrell.ogg'
>>>>>>> 7c14ead771... Merge pull request #14439 from Heroman3003/post-mirror-fixes
/decl/emote/audible/vox_shriek
key = "shriek"
emote_message_3p = "SHRIEKS!"