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

Revert "Fix conflict with master"

Browse Source 
This reverts commit 42eba2a9dc.
This commit is contained in:
Raeschen
2021-08-17 08:12:43 +02:00
parent 42eba2a9dc
commit cb879c31aa
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/mob/living/carbon/human/emote.dm
View File

@@ -127,7 +127,7 @@ var/list/_human_default_emotes = list(
/decl/emote/audible/squish,
/decl/emote/audible/spiderchitter,
/decl/emote/audible/spiderpurr,
/decl/emote/visible/squeaky,
/decl/emote/visible/mlem,
/decl/emote/visible/blep,
@@ -260,7 +260,6 @@ var/list/_simple_mob_default_emotes = list(
/decl/emote/audible/squish,
/decl/emote/audible/spiderchitter,
/decl/emote/audible/spiderpurr,
/decl/emote/visible/squeaky,
/decl/emote/visible/mlem,
/decl/emote/visible/blep,