cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-21 20:27:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-11-13 16:54:44 -05:00
committed by GitHub
parent 0feb73835c
commit e68bf8d494
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
+1 -5
View File
@@ -158,8 +158,6 @@ var/list/_human_default_emotes = list(
/decl/emote/audible/mothscream,
/decl/emote/audible/mothchitter,
/decl/emote/audible/mothlaugh,
<<<<<<< HEAD
=======
/decl/emote/audible/multichirp,
/decl/emote/audible/gnarl,
/decl/emote/audible/teshsqueak,
@@ -168,9 +166,7 @@ var/list/_human_default_emotes = list(
/decl/emote/visible/bounce,
/decl/emote/visible/jiggle,
/decl/emote/visible/lightup,
/decl/emote/visible/vibrate
>>>>>>> 0f7edb4589... Merge pull request #14077 from TankTheBirb/lemme-chirp
/decl/emote/visible/vibrate,
//VOREStation Add End
//CHOMP Add start
/decl/emote/audible/prbt2