cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-02-07 17:02:29 -05:00
committed by GitHub
parent 262ba3b8a4
commit a9b92fee76
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/emotes/definitions/audible.dm
View File

@@ -190,8 +190,6 @@
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."
<<<<<<< HEAD
=======
/decl/emote/audible/croon /decl/emote/audible/croon
key = "croon" key = "croon"
emote_message_3p = "croons..." emote_message_3p = "croons..."
@@ -207,7 +205,6 @@
emote_message_3p = "croaks!" emote_message_3p = "croaks!"
emote_sound = 'sound/voice/croak_skrell.ogg' emote_sound = 'sound/voice/croak_skrell.ogg'
>>>>>>> 7c14ead771... Merge pull request #14439 from Heroman3003/post-mirror-fixes
/decl/emote/audible/vox_shriek /decl/emote/audible/vox_shriek
key = "shriek" key = "shriek"
emote_message_3p = "SHRIEKS!" emote_message_3p = "SHRIEKS!"