Compat fixes

code/modules/client/preference_setup/traits/trait_defines.dm

@@ -23,12 +23,8 @@
 
 // Physical traits are what they sound like, and involve the character's physical body, as opposed to their mental state.
 /datum/trait/modifier/physical
-<<<<<<< HEAD
-	category = "Physical Quirks" //VOREStation Edit
-=======
 	name = "Physical"
 	category = "Physical"
->>>>>>> b22a056... Sideports a couple of init unit tests from Neb. (#7893)
 
 
 /datum/trait/modifier/physical/flimsy

code/modules/mob/living/say.dm

@@ -320,11 +320,7 @@ proc/get_radio_key_from_channel(var/channel)
 	var/speech_bubble_test = say_test(message)
 	//var/image/speech_bubble = image('icons/mob/talk_vr.dmi',src,"h[speech_bubble_test]") //VOREStation Edit. Commented this out in case we need to reenable.
 	var/speech_type = speech_bubble_appearance()
-<<<<<<< HEAD
-	var/image/speech_bubble = image('icons/mob/talk_vr.dmi',src,"[speech_type][speech_bubble_test]") //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons
-=======
 	var/image/speech_bubble = generate_speech_bubble(src, "[speech_type][speech_bubble_test]")
->>>>>>> e67c35e... Removes transform from speech bubbles when speaker is scaled at less than 2x. (#7927)
 	var/sb_alpha = 255
 	var/atom/loc_before_turf = src
 	//VOREStation Add
@@ -346,11 +342,7 @@ proc/get_radio_key_from_channel(var/channel)
 		var/turf/ST = get_turf(above)
 		if(ST)
 			var/list/results = get_mobs_and_objs_in_view_fast(ST, world.view)
-<<<<<<< HEAD
-			var/image/z_speech_bubble = image('icons/mob/talk_vr.dmi', above, "h[speech_bubble_test]") //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons
-=======
 			var/image/z_speech_bubble = generate_speech_bubble(above, "h[speech_bubble_test]")
->>>>>>> e67c35e... Removes transform from speech bubbles when speaker is scaled at less than 2x. (#7927)
 			images_to_clients[z_speech_bubble] = list()
 			for(var/item in results["mobs"])
 				if(item != above && !(item in listening))

code/modules/mob/living/voice/voice.dm

@@ -110,11 +110,7 @@
 		var/speech_bubble_test = say_test(message)
 		//var/image/speech_bubble = image('icons/mob/talk_vr.dmi',comm,"h[speech_bubble_test]") //VOREStation Edit - Commented out in case of needed reenable.
 		var/speech_type = speech_bubble_appearance()
-<<<<<<< HEAD
-		var/image/speech_bubble = image('icons/mob/talk_vr.dmi',comm,"[speech_type][speech_bubble_test]") //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons
-=======
 		var/image/speech_bubble = generate_speech_bubble(comm, "[speech_type][speech_bubble_test]")
->>>>>>> e67c35e... Removes transform from speech bubbles when speaker is scaled at less than 2x. (#7927)
 		spawn(30)
 			qdel(speech_bubble)
 

code/modules/multiz/zshadow.dm

@@ -121,13 +121,7 @@
 
 /mob/zshadow/set_typing_indicator(var/state)
 	if(!typing_indicator)
-<<<<<<< HEAD
-		typing_indicator = new
-		typing_indicator.icon = 'icons/mob/talk_vr.dmi' // Looks better on the right with job icons. //VOREStation Edit - talk_vr.dmi instead of talk.dmi for right-side icons
-		typing_indicator.icon_state = "typing"
-=======
 		init_typing_indicator("typing")
->>>>>>> e67c35e... Removes transform from speech bubbles when speaker is scaled at less than 2x. (#7927)
 	if(state && !typing)
 		overlays += typing_indicator
 		typing = 1