From 3578a57dadade9871ef2f0fdee3ac3093fa67cf3 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 9 Mar 2021 17:24:04 -0500
Subject: [PATCH] Update typing_indicator.dm

---
 code/modules/mob/typing_indicator.dm | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index a8b8a3d16dc..7f65e4e5107 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -1,5 +1,5 @@
 /proc/generate_speech_bubble(var/bubble_loc, var/speech_state, var/set_layer = FLOAT_LAYER)
-	var/image/I = image('icons/mob/talk.dmi', bubble_loc, speech_state, set_layer)
+	var/image/I = image('icons/mob/talk_vr.dmi', bubble_loc, speech_state, set_layer)  //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons
 	I.appearance_flags |= (KEEP_APART|RESET_COLOR|PIXEL_SCALE)
 	if(istype(bubble_loc, /atom/movable))
 		var/atom/movable/AM = bubble_loc
@@ -22,15 +22,7 @@
 		return
 
 	if(!typing_indicator)
-<<<<<<< HEAD
-		typing_indicator = new
-		//typing_indicator.icon = 'icons/mob/talk_vr.dmi' //VOREStation Edit - Looks better on the right with job icons.
-		//typing_indicator.icon_state = "typing"
-		typing_indicator.icon = 'icons/mob/talk_vr.dmi' //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons
-		typing_indicator.icon_state = "[speech_bubble_appearance()]_typing"
-=======
 		init_typing_indicator("[speech_bubble_appearance()]_typing")
->>>>>>> e67c35e... Removes transform from speech bubbles when speaker is scaled at less than 2x. (#7927)
 
 	if(state && !typing)
 		add_overlay(typing_indicator, TRUE)