cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 14:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update emote.dm

Browse Source
This commit is contained in:
Heroman3003
2023-03-14 18:00:22 +10:00
committed by GitHub
parent 3ad7cd8e8e
commit c2a88ee632
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/emote.dm
-3
View File
@@ -1,11 +1,8 @@
var/list/_silicon_default_emotes = list(
/decl/emote/audible/synth,
<<<<<<< HEAD
/decl/emote/audible/synth/beep,
=======
/decl/emote/audible/synth/ping,
/decl/emote/audible/synth/bing,
>>>>>>> ca0065ea05e... Merge pull request #9033 from Varlaisvea/goodbing
/decl/emote/audible/synth/buzz,
/decl/emote/audible/synth/confirm,
/decl/emote/audible/synth/deny,