From 8a349ee87c4823827970301a41cdde7cbfe6f55d Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Wed, 27 Dec 2017 02:38:13 -0500 Subject: [PATCH] Flips talking icons to the right side So they don't sit under the HUD icons half the time. Kind of annoying. This is how it used to be. --- code/modules/mob/living/say.dm | 4 ++-- code/modules/mob/living/voice/voice.dm | 2 +- code/modules/mob/typing_indicator.dm | 2 +- code/modules/multiz/zshadow.dm | 2 +- icons/mob/talk_vr.dmi | Bin 929 -> 3937 bytes 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index e8fc9893b5d..cb102318ca1 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -300,7 +300,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() - var/image/speech_bubble = image('icons/mob/talk.dmi',src,"[speech_type][speech_bubble_test]") + 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 spawn(30) qdel(speech_bubble) // Attempt Multi-Z Talking @@ -309,7 +309,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) - var/image/z_speech_bubble = image('icons/mob/talk.dmi', above, "h[speech_bubble_test]") + 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 spawn(30) qdel(z_speech_bubble) for(var/item in results["mobs"]) if(item != above && !(item in listening)) diff --git a/code/modules/mob/living/voice/voice.dm b/code/modules/mob/living/voice/voice.dm index 8eb35738836..b50ea4bb30c 100644 --- a/code/modules/mob/living/voice/voice.dm +++ b/code/modules/mob/living/voice/voice.dm @@ -113,7 +113,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() - var/image/speech_bubble = image('icons/mob/talk.dmi',comm,"[speech_type][speech_bubble_test]") + 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 spawn(30) qdel(speech_bubble) diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm index c1c6821a7d6..8faf86b5d80 100644 --- a/code/modules/mob/typing_indicator.dm +++ b/code/modules/mob/typing_indicator.dm @@ -13,7 +13,7 @@ mob/var/obj/effect/decal/typing_indicator 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.dmi' + 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" if(client && !stat) diff --git a/code/modules/multiz/zshadow.dm b/code/modules/multiz/zshadow.dm index 5874bd4d802..9419408c5a5 100644 --- a/code/modules/multiz/zshadow.dm +++ b/code/modules/multiz/zshadow.dm @@ -121,7 +121,7 @@ /mob/zshadow/set_typing_indicator(var/state) if(!typing_indicator) typing_indicator = new - typing_indicator.icon = 'icons/mob/talk.dmi' // Looks better on the right with job icons. + 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" if(state && !typing) overlays += typing_indicator diff --git a/icons/mob/talk_vr.dmi b/icons/mob/talk_vr.dmi index 3f310170c9169eef4ada584e32e6e44347443e60..0f192acf2d6fb935ea6846d53dea90f744e6beec 100644 GIT binary patch literal 3937 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 DA;+AG