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 "Merge branch 'master' into prbt"

Browse Source 
This reverts commit 6240ccc5fe, reversing
changes made to 2055234acf.
This commit is contained in:
Raeschen
2021-08-17 08:13:00 +02:00
parent d0b32346a6
commit 6deb4e071c
2 changed files with 352 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/emotes/definitions/audible_furry_vr.dm
View File

@@ -137,7 +137,3 @@
key = "spiderpurr"
emote_message_3p = "purrs."
emote_sound = 'sound/voice/spiderpurr.ogg'
/decl/emote/audible/squeaky
key = "squeaky"
emote_message_3p = "squeaks."
emote_sound = 'sound/items/drop/plushie.ogg'

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/audible/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/audible/squeaky,
/decl/emote/visible/mlem,
/decl/emote/visible/blep,