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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-04-25 20:34:32 -04:00
committed by GitHub
parent a6d5805068
commit 577085c73c
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_furry_vr.dm
View File

@@ -238,8 +238,6 @@
key = "coyawoo5"
emote_message_3p = "lets out a scraggly, whine-awoo."
emote_sound = 'sound/voice/coyoteawoo5.ogg'
<<<<<<< HEAD
=======
/decl/emote/audible/roarbark // Upstream port from CHOMP
key = "roarbark"
@@ -250,4 +248,3 @@
key = "dook"
emote_message_3p = "dooks."
emote_sound = 'sound/voice/FerretDook.ogg'
>>>>>>> 8d85ea8a88... Merge pull request #14800 from Wulfestwulf/ferretdooks