cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-05 23:11:52 +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."

191
code/modules/mob/living/silicon/robot/emote.dm
View File

@@ -1,194 +1,3 @@
/mob/living/silicon/robot/emote(var/act, var/m_type = 1, var/message)
var/param
if(findtext(act, "-", 1, null))
var/t1 = findtext(act, "-", 1, null)
param = copytext(act, t1 + 1, length(act) + 1)
act = copytext(act, 1, t1)
if(findtext(act,"s",-1) && !findtext(act,"_",-2))//Removes ending s's unless they are prefixed with a '_'
act = copytext(act,1,length(act))
switch(act)
if("me")
if(client?.prefs.muted & MUTE_IC)
to_chat(src, SPAN_WARNING("You cannot send IC messages (muted)."))
return
if(!message || stat)
return
else
return custom_emote(m_type, message)
if("custom")
return custom_emote(m_type, message)
if("salute")
if(!buckled_to)
var/M
if(param)
for(var/mob/A in view(null, null))
if(param == A.name)
M = A
break
if(!M)
param = null
if(param)
message = "salutes to [param]."
else
message = "salutes."
m_type = 1
if("bow")
if(!buckled_to)
var/M
if(param)
for(var/mob/A in view(null, null))
if(param == A.name)
M = A
break
if(!M)
param = null
if(param)
message = "bows to [param]."
else
message = "bows."
m_type = 1
if("clap")
if(!restrained())
message = "claps."
m_type = 2
if("flap")
if(!restrained())
message = "flaps its wings."
m_type = 2
if("aflap")
if(!restrained())
message = "flaps its wings ANGRILY!"
m_type = 2
if("twitch")
message = "twitches violently."
m_type = 1
if("twitch_s")
message = "twitches."
m_type = 1
if("nod")
message = "nods."
m_type = 1
if("deathgasp")
message = "shudders violently for a moment, then becomes motionless, its eyes slowly darkening."
m_type = 1
if("glare")
var/M
if(param)
for(var/mob/A in view(null, null))
if(param == A.name)
M = A
break
if(!M)
param = null
if(param)
message = "glares at [param]."
else
message = "glares."
if("stare")
var/M
if(param)
for(var/mob/A in view(null, null))
if(param == A.name)
M = A
break
if(!M)
param = null
if(param)
message = "stares at [param]."
else
message = "stares."
if("look")
var/M
if(param)
for(var/mob/A in view(null, null))
if (param == A.name)
M = A
break
if(!M)
param = null
if(param)
message = "looks at [param]."
else
message = "looks."
m_type = 1
if("beep")
var/M
if(param)
for(var/mob/A in view(null, null))
if(param == A.name)
M = A
break
if(!M)
param = null
if(param)
message = "beeps at [param]."
else
message = "beeps."
playsound(loc, 'sound/machines/twobeep.ogg', 50, 0)
m_type = 1
if("ping")
var/M
if(param)
for(var/mob/A in view(null, null))
if (param == A.name)
M = A
break
if(!M)
param = null
if(param)
message = "pings at [param]."
else
message = "pings."
playsound(loc, 'sound/machines/ping.ogg', 50, 0)
m_type = 1
if("buzz")
var/M
if(param)
for (var/mob/A in view(null, null))
if (param == A.name)
M = A
break
if(!M)
param = null
if(param)
message = "buzzes at [param]."
else
message = "buzzes."
playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
m_type = 1
if("help")
to_chat(src, "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt")
else
to_chat(src, SPAN_NOTICE("Unusable emote '[act]'. Say *help for a list."))
if(message && stat == CONSCIOUS)
custom_emote(m_type, message)
return
/mob/living/silicon/robot/verb/powerwarn()
set category = "Robot Commands"
set name = "Power Warning"