cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-06 07:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Emote fix and cleanup (#12036)

Browse Source
This commit is contained in:
Doxxmedearly
2021-06-21 16:49:15 -04:00
committed by GitHub
parent 80e96c7d89
commit cb2675a973
5 changed files with 14 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/emotes/definitions/_mob.dm
View File

@@ -112,7 +112,7 @@
/decl/emote/audible/grunt,
/decl/emote/audible/slap,
/decl/emote/audible/snap,
/decl/emote/human,
/decl/emote/human/vomit,
/decl/emote/human/deathgasp,
/decl/emote/audible/giggle,
/decl/emote/audible/scream,
@@ -120,8 +120,6 @@
/decl/emote/visible/blink_r,
/decl/emote/visible/bow,
/decl/emote/visible/salute,
/decl/emote/visible/flap,
/decl/emote/visible/aflap,
/decl/emote/visible/drool,
/decl/emote/visible/eyebrow,
/decl/emote/visible/twitch,
@@ -169,16 +167,8 @@
/mob/living/silicon/robot
default_emotes = list(
/decl/emote/audible/clap,
/decl/emote/visible/bow,
/decl/emote/visible/salute,
/decl/emote/visible/flap,
/decl/emote/visible/aflap,
/decl/emote/visible/twitch,
/decl/emote/visible/twitch_v,
/decl/emote/visible/nod,
/decl/emote/visible/shake,
/decl/emote/visible/glare,
/decl/emote/visible/look,
/decl/emote/visible/stare,
/decl/emote/visible/deathgasp_robot,

7
code/modules/emotes/definitions/human.dm
View File

@@ -1,14 +1,17 @@
/decl/emote/human
/decl/emote/human/vomit
key = "vomit"
/decl/emote/human/check_user(var/mob/living/carbon/human/user)
/decl/emote/human/vomit/check_user(var/mob/living/carbon/human/user)
return (istype(user) && user.check_has_mouth() && !user.isSynthetic())
/decl/emote/human/do_emote(var/mob/living/carbon/human/user)
/decl/emote/human/vomit/do_emote(var/mob/living/carbon/human/user)
user.vomit(deliberate = TRUE)
/decl/emote/human/deathgasp
key = "deathgasp"
emote_message_3p = "USER falls limp and stops moving..." //Fallback. Will be replaced with below proc but emotes won't show without a value in this variable
/decl/emote/human/deathgasp/get_emote_message_3p(var/mob/living/carbon/human/user)
return "USER [user.species.death_message]"

10
code/modules/emotes/definitions/visible.dm
View File

@@ -84,16 +84,6 @@
emote_message_3p_target = "USER salutes TARGET."
emote_message_3p = "USER salutes."
/decl/emote/visible/flap
key = "flap"
check_restraints = TRUE
emote_message_3p = "USER flaps USER_THEIR wings."
/decl/emote/visible/aflap
key = "aflap"
check_restraints = TRUE
emote_message_3p = "USER flaps USER_THEIR wings ANGRILY!"
/decl/emote/visible/eyebrow
key = "eyebrow"
emote_message_3p = "USER raises an eyebrow."