diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 4a44b867f53..64c028d8037 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -96,15 +96,21 @@
if(!M)
param = null
- if(param)
- message = "[src] pings at [param]."
- else
- message = "[src] pings."
+ message = "[src] pings[param ? " at [param]" : ""]."
playsound(loc, 'sound/machines/ping.ogg', 50, 0)
m_type = 2
if("buzz2")
- message = "[src] emits an irritated buzzing sound."
+ var/M = null
+ if(param)
+ for(var/mob/A in view(null, null))
+ if(param == A.name)
+ M = A
+ break
+ if(!M)
+ param = null
+
+ message = "[src] emits an irritated buzzing sound[param ? " at [param]" : ""]."
playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
m_type = 2
@@ -118,10 +124,7 @@
if(!M)
param = null
- if(param)
- message = "[src] buzzes at [param]."
- else
- message = "[src] buzzes."
+ message = "[src] buzzes[param ? " at [param]" : ""]."
playsound(loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
m_type = 2
@@ -135,10 +138,7 @@
if(!M)
param = null
- if(param)
- message = "[src] beeps at [param]."
- else
- message = "[src] beeps."
+ message = "[src] beeps[param ? " at [param]" : ""]."
playsound(loc, 'sound/machines/twobeep.ogg', 50, 0)
m_type = 2
@@ -152,10 +152,7 @@
if(!M)
param = null
- if(param)
- message = "[src] drones at [param]."
- else
- message = "[src] rumbles."
+ message = "[src] [param ? "drones at [param]" : "rumbles"]."
playsound(loc, 'sound/voice/DraskTalk.ogg', 50, 0)
m_type = 2
@@ -169,10 +166,7 @@
if(!M)
param = null
- if(param)
- message = "[src] squishes at [param]."
- else
- message = "[src] squishes."
+ message = "[src] squishes[param ? " at [param]" : ""]."
playsound(loc, 'sound/effects/slime_squish.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound.
m_type = 2
@@ -186,10 +180,7 @@
if(!M)
param = null
- if(param)
- message = "[src] clacks their mandibles at [param]."
- else
- message = "[src] clacks their mandibles."
+ message = "[src] clacks their mandibles[param ? " at [param]" : ""]."
playsound(loc, 'sound/effects/Kidanclack.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound.
m_type = 2
@@ -203,10 +194,7 @@
if(!M)
param = null
- if(param)
- message = "[src] clicks their mandibles at [param]."
- else
- message = "[src] clicks their mandibles."
+ message = "[src] clicks their mandibles[param ? " at [param]" : ""]."
playsound(loc, 'sound/effects/Kidanclack2.ogg', 50, 0) //Credit to DrMinky (freesound.org) for the sound.
m_type = 2
@@ -220,10 +208,7 @@
if(!M)
param = null
- if(param)
- message = "[src] emits an affirmative blip at [param]."
- else
- message = "[src] emits an affirmative blip."
+ message = "[src] emits an affirmative blip[param ? " at [param]" : ""]."
playsound(loc, 'sound/machines/synth_yes.ogg', 50, 0)
m_type = 2
@@ -237,10 +222,7 @@
if(!M)
param = null
- if(param)
- message = "[src] emits a negative blip at [param]."
- else
- message = "[src] emits a negative blip."
+ message = "[src] emits a negative blip[param ? " at [param]" : ""]."
playsound(loc, 'sound/machines/synth_no.ogg', 50, 0)
m_type = 2
@@ -302,10 +284,7 @@
if(!M)
param = null
- if(param)
- message = "[src] bows to [param]."
- else
- message = "[src] bows."
+ message = "[src] bows[param ? " to [param]" : ""]."
m_type = 1
if("salute", "salutes")
@@ -319,10 +298,7 @@
if(!M)
param = null
- if(param)
- message = "[src] salutes to [param]."
- else
- message = "[src] salutes."
+ message = "[src] salutes[param ? " to [param]" : ""]."
m_type = 1
if("choke", "chokes")
@@ -465,7 +441,16 @@
m_type = 1
if("nod", "nods")
- message = "[src] nods."
+ var/M = null
+ if(param)
+ for(var/mob/A in view(null, null))
+ if(param == A.name)
+ M = A
+ break
+ if(!M)
+ param = null
+
+ message = "[src] nods[param ? " at [param]" : ""]."
m_type = 1
if("blush", "blushes")
@@ -473,7 +458,16 @@
m_type = 1
if("wave", "waves")
- message = "[src] waves."
+ var/M = null
+ if(param)
+ for(var/mob/A in view(null, null))
+ if(param == A.name)
+ M = A
+ break
+ if(!M)
+ param = null
+
+ message = "[src] waves[param ? " at [param]" : ""]."
m_type = 1
if("quiver", "quivers")
@@ -518,10 +512,7 @@
if(!M)
param = null
- if(param)
- message = "[src] glares at [param]."
- else
- message = "[src] glares."
+ message = "[src] glares[param ? " at [param]" : ""]."
m_type = 1
if("stare", "stares")
@@ -534,10 +525,7 @@
if(!M)
param = null
- if(param)
- message = "[src] stares at [param]."
- else
- message = "[src] stares."
+ message = "[src] stares[param ? " at [param]" : ""]."
m_type = 1
if("look", "looks")
@@ -551,10 +539,7 @@
if(!M)
param = null
- if(param)
- message = "[src] looks at [param]."
- else
- message = "[src] looks."
+ message = "[src] looks[param ? " at [param]" : ""]."
m_type = 1
if("grin", "grins")
@@ -669,7 +654,16 @@
m_type = 1
if("shake", "shakes")
- message = "[src] shakes \his head."
+ var/mob/M = null
+ if(param)
+ for(var/mob/A in view(1, null))
+ if(param == A.name)
+ M = A
+ break
+ if(M == src)
+ M = null
+
+ message = "[src] shakes \his head[param ? " at [param]" : ""]."
m_type = 1
if("shrug", "shrugs")
@@ -687,7 +681,16 @@
m_type = 1
if("smile", "smiles")
- message = "[src] smiles."
+ var/mob/M = null
+ if(param)
+ for(var/mob/A in view(1, null))
+ if(param == A.name)
+ M = A
+ break
+ if(M == src)
+ M = null
+
+ message = "[src] smiles[param ? " at [param]" : ""]."
m_type = 1
if("shiver", "shivers")
@@ -751,7 +754,16 @@
m_type = 2
if("wink", "winks")
- message = "[src] winks."
+ var/mob/M = null
+ if(param)
+ for(var/mob/A in view(1, null))
+ if(param == A.name)
+ M = A
+ break
+ if(M == src)
+ M = null
+
+ message = "[src] winks[param ? " at [param]" : ""]."
m_type = 1
if("yawn", "yawns")
@@ -828,19 +840,27 @@
break
if(M)
message = "[src] slaps [M] across the face. Ouch!"
- playsound(loc, 'sound/effects/snap.ogg', 50, 1)
else
message = "[src] slaps \himself!"
- playsound(loc, 'sound/effects/snap.ogg', 50, 1)
adjustFireLoss(4)
+ playsound(loc, 'sound/effects/snap.ogg', 50, 1)
if("scream", "screams")
if(miming)
message = "[src] acts out a scream!"
m_type = 1
else
+ var/M = null
+ if(param)
+ for(var/mob/A in view(null, null))
+ if(param == A.name)
+ M = A
+ break
+ if(!M)
+ param = null
+
if(!muzzled)
- message = "[src] [species.scream_verb]!"
+ message = "[src] [species.scream_verb][param ? " at [param]" : ""]!"
m_type = 2
if(gender == FEMALE)
playsound(loc, "[species.female_scream_sound]", 80, 1, 0, pitch = get_age_pitch())
@@ -848,7 +868,7 @@
playsound(loc, "[species.male_scream_sound]", 80, 1, 0, pitch = get_age_pitch()) //default to male screams if no gender is present.
else
- message = "[src] makes a very loud noise."
+ message = "[src] makes a very loud noise[param ? " at [param]" : ""]."
m_type = 2
@@ -869,7 +889,16 @@
to_chat(usr, "You need at least one hand in good working order to snap your fingers.")
return
- message = "[src] snaps \his fingers."
+ var/M = null
+ if(param)
+ for(var/mob/A in view(null, null))
+ if(param == A.name)
+ M = A
+ break
+ if(!M)
+ param = null
+
+ message = "[src] snaps \his fingers[param ? " at [param]" : ""]."
playsound(loc, 'sound/effects/fingersnap.ogg', 50, 1, -3)
else
message = "[src] snaps \his fingers right off!"
@@ -930,7 +959,7 @@
- if(message) //Humans are special fucking snowflakes and have 735 lines of emotes, they get to handle their own emotes, not call the parent
+ if(message) //Humans are special fucking snowflakes and have 1000 lines of emotes, they get to handle their own emotes, not call the parent
log_emote("[name]/[key] : [message]")
//Hearing gasp and such every five seconds is not good emotes were not global for a reason.
diff --git a/code/modules/mob/living/silicon/emote.dm b/code/modules/mob/living/silicon/emote.dm
index 9e95b9cefaa..5904f0d5ffb 100644
--- a/code/modules/mob/living/silicon/emote.dm
+++ b/code/modules/mob/living/silicon/emote.dm
@@ -35,10 +35,7 @@
if(!M)
param = null
- if(param)
- message = "[src] pings at [param]."
- else
- message = "[src] pings."
+ message = "[src] pings[param ? " at [param]" : ""]."
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
m_type = 2
@@ -52,10 +49,7 @@
if(!M)
param = null
- if(param)
- message = "[src] buzzes at [param]."
- else
- message = "[src] buzzes."
+ message = "[src] buzzes[param ? " at [param]" : ""]."
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
m_type = 2
@@ -69,10 +63,7 @@
if(!M)
param = null
- if(param)
- message = "[src] beeps at [param]."
- else
- message = "[src] beeps."
+ message = "[src] beeps[param ? " at [param]" : ""]."
playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
m_type = 2
@@ -86,10 +77,7 @@
if(!M)
param = null
- if(param)
- message = "[src] emits an affirmative blip at [param]."
- else
- message = "[src] emits an affirmative blip."
+ message = "[src] emits an affirmative blip[param ? " at [param]" : ""]."
playsound(src.loc, 'sound/machines/synth_yes.ogg', 50, 0)
m_type = 2
@@ -103,20 +91,35 @@
if(!M)
param = null
- if(param)
- message = "[src] emits a negative blip at [param]."
- else
- message = "[src] emits a negative blip."
+ message = "[src] emits a negative blip[param ? " at [param]" : ""]."
playsound(src.loc, 'sound/machines/synth_no.ogg', 50, 0)
m_type = 2
if("scream", "screams")
- message = "[src] screams!"
+ var/M = null
+ if(param)
+ for(var/mob/A in view(null, null))
+ if(param == A.name)
+ M = A
+ break
+ if(!M)
+ param = null
+
+ message = "[src] screams[param ? " at [param]" : ""]!"
playsound(src.loc, 'sound/goonstation/voice/robot_scream.ogg', 80, 0)
m_type = 2
if("buzz2")
- message = "[src] emits an irritated buzzing sound."
+ var/M = null
+ if(param)
+ for(var/mob/A in view(null, null))
+ if(param == A.name)
+ M = A
+ break
+ if(!M)
+ param = null
+
+ message = "[src] emits an irritated buzzing sound[param ? " at [param]" : ""]."
playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
m_type = 2
diff --git a/code/modules/mob/living/simple_animal/bot/emote.dm b/code/modules/mob/living/simple_animal/bot/emote.dm
index 1bf29d14178..8cf07664738 100644
--- a/code/modules/mob/living/simple_animal/bot/emote.dm
+++ b/code/modules/mob/living/simple_animal/bot/emote.dm
@@ -37,10 +37,7 @@
if(!M)
param = null
- if(param)
- message = "[src] pings at [param]."
- else
- message = "[src] pings."
+ message = "[src] pings[param ? " at [param]" : ""]."
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
m_type = 2
@@ -88,10 +85,7 @@
if(!M)
param = null
- if(param)
- message = "[src] emits an affirmative blip at [param]."
- else
- message = "[src] emits an affirmative blip."
+ message = "[src] emits an affirmative blip[param ? " at [param]" : ""]."
playsound(src.loc, 'sound/machines/synth_yes.ogg', 50, 0)
m_type = 2
@@ -105,15 +99,21 @@
if(!M)
param = null
- if(param)
- message = "[src] emits a negative blip at [param]."
- else
- message = "[src] emits a negative blip."
+ message = "[src] emits an negative blip[param ? " at [param]" : ""]."
playsound(src.loc, 'sound/machines/synth_no.ogg', 50, 0)
m_type = 2
if("scream", "screams")
- message = "[src] screams!"
+ var/M = null
+ if(param)
+ for(var/mob/A in view(null, null))
+ if(param == A.name)
+ M = A
+ break
+ if(!M)
+ param = null
+
+ message = "[src] screams[param ? " at [param]" : ""]!"
playsound(src.loc, 'sound/goonstation/voice/robot_scream.ogg', 80, 0)
m_type = 2