Merge pull request #10248 from VOREStation/upstream-merge-8058

[MIRROR] Swaps emote(me) out for custom_emote().

code/modules/genetics/side_effects.dm

@@ -21,7 +21,7 @@
 	duration = 10*30
 
 	start(mob/living/carbon/human/H)
-		H.emote("me", 1, "starts turning very red..")
+		H.custom_emote(VISIBLE_MESSAGE, "starts turning very red..")
 
 	finish(mob/living/carbon/human/H)
 		if(!H.reagents.has_reagent("dexalin"))
@@ -37,7 +37,7 @@
 	duration = 10*60
 
 	start(mob/living/carbon/human/H)
-		H.emote("me", 1, "'s limbs start shivering uncontrollably.")
+		H.custom_emote(VISIBLE_MESSAGE, "'s limbs start shivering uncontrollably.")
 
 	finish(mob/living/carbon/human/H)
 		if(!H.reagents.has_reagent("bicaridine"))
@@ -54,7 +54,7 @@
 	duration = 10*90
 
 	start(mob/living/carbon/human/H)
-		H.emote("me", 1, "has drool running down from [H.gender == MALE ? "his" : H.gender == FEMALE ? "her" : "their"] mouth.")
+		H.custom_emote(VISIBLE_MESSAGE, "has drool running down from [H.gender == MALE ? "his" : H.gender == FEMALE ? "her" : "their"] mouth.")
 
 	finish(mob/living/carbon/human/H)
 		if(!H.reagents.has_reagent("anti_toxin"))
@@ -69,7 +69,7 @@
 
 	start(mob/living/carbon/human/H)
 		var/datum/gender/T = gender_datums[H.get_visible_gender()]
-		H.emote("me", 1, "has drool running down from [T.his] mouth.")
+		H.custom_emote(VISIBLE_MESSAGE, "has drool running down from [T.his] mouth.")
 
 	finish(mob/living/carbon/human/H)
 		if(!H.reagents.has_reagent("anti_toxin"))

code/modules/mob/living/carbon/human/MedicalSideEffects.dm

@@ -127,7 +127,7 @@
 		if(11 to 30)
 			H.custom_pain("The muscles in your body cramp up painfully.",0)
 		if(31 to INFINITY)
-			H.emote("me",1,"flinches as all the muscles in their body cramp up.")
+			H.custom_emote(VISIBLE_MESSAGE, "flinches as all the muscles in their body cramp up.")
 			H.custom_pain("There's pain all over your body.",1)
 
 // ITCH
@@ -145,5 +145,5 @@
 		if(11 to 30)
 			H.custom_pain("You want to scratch your itch badly.",0)
 		if(31 to INFINITY)
-			H.emote("me",1,"shivers slightly.")
+			H.custom_emote(VISIBLE_MESSAGE, "shivers slightly.")
 			H.custom_pain("This itch makes it really hard to concentrate.",1)

code/modules/mob/living/carbon/human/chem_side_effects.dm

@@ -127,7 +127,7 @@
 		if(11 to 30)
 			H.custom_pain("The muscles in your body cramp up painfully.",0)
 		if(31 to INFINITY)
-			H.emote("me",1,"flinches as all the muscles in their body cramp up.")
+			H.custom_emote(VISIBLE_MESSAGE, "flinches as all the muscles in their body cramp up.")
 			H.custom_pain("There's pain all over your body.",1)
 
 // ITCH
@@ -145,5 +145,5 @@
 		if(11 to 30)
 			H.custom_pain("You want to scratch your itch badly.",0)
 		if(31 to INFINITY)
-			H.emote("me",1,"shivers slightly.")
+			H.custom_emote(VISIBLE_MESSAGE, "shivers slightly.")
 			H.custom_pain("This itch makes it really hard to concentrate.",1)

code/modules/mob/living/carbon/human/human_defense.dm

@@ -69,10 +69,10 @@ emp_act
 
 				drop_from_inventory(c_hand)
 				if (affected.robotic >= ORGAN_ROBOT)
-					emote("me", 1, "drops what they were holding, their [affected.name] malfunctioning!")
+					custom_emote(VISIBLE_MESSAGE, "drops what they were holding, their [affected.name] malfunctioning!")
 				else
 					var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
-					emote("me", 1, "[affected.organ_can_feel_pain() ? "" : emote_scream] drops what they were holding in their [affected.name]!")
+					custom_emote(VISIBLE_MESSAGE, "[affected.organ_can_feel_pain() ? "" : emote_scream] drops what they were holding in their [affected.name]!")
 
 	..(stun_amount, agony_amount, def_zone)
 

code/modules/mob/living/carbon/human/human_organs.dm

@@ -164,7 +164,7 @@
 					drop_from_inventory(r_hand)
 
 			var/emote_scream = pick("screams in pain and ", "lets out a sharp cry and ", "cries out and ")
-			emote("me", 1, "[(can_feel_pain()) ? "" : emote_scream ]drops what they were holding in their [E.name]!")
+			custom_emote(VISIBLE_MESSAGE, "[(can_feel_pain()) ? "" : emote_scream ]drops what they were holding in their [E.name]!")
 
 		else if(E.is_malfunctioning())
 			switch(E.body_part)
@@ -177,7 +177,7 @@
 						continue
 					drop_from_inventory(r_hand)
 
-			emote("me", 1, "drops what they were holding, their [E.name] malfunctioning!")
+			custom_emote(VISIBLE_MESSAGE, "drops what they were holding, their [E.name] malfunctioning!")
 
 			var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 			spark_system.set_up(5, 0, src)

code/modules/mob/living/carbon/human/life.dm

@@ -1571,7 +1571,7 @@
 
 	if(shock_stage >= 30)
 		if(shock_stage == 30 && !isbelly(loc)) //VOREStation Edit
-			emote("me",1,"is having trouble keeping their eyes open.")
+			custom_emote(VISIBLE_MESSAGE, "is having trouble keeping their eyes open.")
 		eye_blurry = max(2, eye_blurry)
 		stuttering = max(stuttering, 5)
 
@@ -1580,7 +1580,7 @@
 
 	if (shock_stage >= 60)
 		if(shock_stage == 60 && !isbelly(loc)) //VOREStation Edit
-			emote("me",1,"'s body becomes limp.")
+			custom_emote(VISIBLE_MESSAGE, "'s body becomes limp.")
 		if (prob(2))
 			to_chat(src, "<span class='danger'>[pick("The pain is excruciating", "Please&#44; just end the pain", "Your whole body is going numb")]!</span>")
 			Weaken(20)
@@ -1597,7 +1597,7 @@
 
 	if(shock_stage == 150)
 		if(!isbelly(loc)) //VOREStation Edit
-			emote("me",1,"can no longer stand, collapsing!")
+			custom_emote(VISIBLE_MESSAGE, "can no longer stand, collapsing!")
 		Weaken(20)
 
 	if(shock_stage >= 150)

code/modules/organs/internal/appendix.dm

@@ -30,11 +30,11 @@
 	if(inflamed == 1)
 		if(prob(5))
 			to_chat(owner, "<span class='warning'>You feel a stinging pain in your abdomen!</span>")
-			owner.emote("me", 1, "winces slightly.")
+			owner.custom_emote(VISIBLE_MESSAGE, "winces slightly.")
 	if(inflamed > 1)
 		if(prob(3))
 			to_chat(owner, "<span class='warning'>You feel a stabbing pain in your abdomen!</span>")
-			owner.emote("me", 1, "winces painfully.")
+			owner.custom_emote(VISIBLE_MESSAGE, "winces painfully.")
 			owner.adjustToxLoss(1)
 	if(inflamed > 2)
 		if(prob(1))

code/modules/organs/internal/lungs.dm

@@ -15,17 +15,17 @@
 
 	if(is_bruised())
 		if(prob(4))
-			spawn owner?.emote("me", 1, "coughs up blood!")
+			spawn owner?.custom_emote(VISIBLE_MESSAGE, "coughs up blood!")
 			owner.drip(10)
 		if(prob(8))
-			spawn owner?.emote("me", 1, "gasps for air!")
+			spawn owner?.custom_emote(VISIBLE_MESSAGE, "gasps for air!")
 			owner.AdjustLosebreath(15)
 
 	if(owner.internal_organs_by_name[O_BRAIN]) // As the brain starts having Trouble, the lungs start malfunctioning.
 		var/obj/item/organ/internal/brain/Brain = owner.internal_organs_by_name[O_BRAIN]
 		if(Brain.get_control_efficiency() <= 0.8)
 			if(prob(4 / max(0.1,Brain.get_control_efficiency())))
-				spawn owner?.emote("me", 1, "gasps for air!")
+				spawn owner?.custom_emote(VISIBLE_MESSAGE, "gasps for air!")
 				owner.AdjustLosebreath(round(3 / max(0.1,Brain.get_control_efficiency())))
 
 /obj/item/organ/internal/lungs/proc/rupture()

code/modules/spells/spell_code.dm

@@ -267,7 +267,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
 			else
 				user.whisper(replacetext(invocation," ","`"))
 		if(SpI_EMOTE)
-			user.emote("me", 1, invocation) //the 1 means it's for everyone in view, the me makes it an emote, and the invocation is written accordingly.
+			user.custom_emote(VISIBLE_MESSAGE, invocation) 
 
 /////////////////////
 ///UPGRADING PROCS///