Merge pull request #10194 from VOREStation/upstream-merge-8043

[MIRROR] Corrected erroneous emote flag.

code/modules/emotes/definitions/audible.dm

@@ -35,7 +35,7 @@
 
 /decl/emote/audible/gnarl
 	key = "gnarl"
-	emote_message_3p = "gnarls and shows USER_HIS teeth."
+	emote_message_3p = "gnarls and shows USER_THEIR teeth."
 
 /decl/emote/audible/multichirp
 	key = "mchirp"
@@ -176,7 +176,7 @@
 
 /decl/emote/audible/crack
 	key = "crack"
-	emote_message_3p = "cracks USER_HIS knuckles."
+	emote_message_3p = "cracks USER_THEIR knuckles."
 	emote_sound = 'sound/voice/knuckles.ogg'
 
 /decl/emote/audible/squish

code/modules/emotes/definitions/audible_snap.dm

@@ -1,9 +1,9 @@
 /decl/emote/audible/snap
 	key = "snap"
 	emote_message_1p = "You snap your fingers."
-	emote_message_3p = "snaps USER_HIS fingers."
+	emote_message_3p = "snaps USER_THEIR fingers."
 	emote_message_1p_target = "You snap your fingers at TARGET."
-	emote_message_3p_target = "snaps USER_HIS fingers at TARGET."
+	emote_message_3p_target = "snaps USER_THEIR fingers at TARGET."
 	emote_sound = 'sound/effects/fingersnap.ogg'
 
 /decl/emote/audible/snap/proc/can_snap(var/atom/user)

code/modules/emotes/definitions/synthetics.dm

@@ -30,7 +30,7 @@
 
 /decl/emote/audible/synth/security
 	key = "law"
-	emote_message_3p = "shows USER_HIS legal authorization barcode."
+	emote_message_3p = "shows USER_THEIR legal authorization barcode."
 	emote_message_3p_target = "shows TARGET USER_THEIR legal authorization barcode."
 	emote_sound = 'sound/voice/biamthelaw.ogg'
 

code/modules/emotes/definitions/visible.dm

@@ -60,7 +60,7 @@
 
 /decl/emote/visible/flash
 	key = "flash"
-	emote_message_3p = "flash USER_HIS lights quickly."
+	emote_message_3p = "flash USER_THEIR lights quickly."
 
 /decl/emote/visible/blink
 	key = "blink"