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

Fix conflict with master

Browse Source
This commit is contained in:
Raeschen
2021-08-17 08:01:06 +02:00
parent c7f19ecde1
commit 42eba2a9dc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
+2 -1
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,6 +260,7 @@ 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,