runechat_msg_location UID (#16444)

This commit is contained in:
SteelSlayer
2021-08-31 13:28:22 +01:00
committed by GitHub
parent 9d9c592de7
commit a3c6beb28b
8 changed files with 19 additions and 18 deletions
+2 -2
View File
@@ -106,8 +106,8 @@
to_chat(src, "<span class='game say'><span class='name'>[speaker_name]</span>[speaker.GetAltName()] [track][verb], \"[message]\"</span>")
// Create map text message
if (client?.prefs.toggles2 & PREFTOGGLE_2_RUNECHAT) // can_hear is checked up there on L99
create_chat_message(speaker.runechat_msg_location, message_clean, italics)
if(client?.prefs.toggles2 & PREFTOGGLE_2_RUNECHAT) // can_hear is checked up there on L99
create_chat_message(locateUID(speaker.runechat_msg_location), message_clean, italics)
if(speech_sound && (get_dist(speaker, src) <= world.view && src.z == speaker.z))
var/turf/source = speaker? get_turf(speaker) : get_turf(src)
@@ -111,8 +111,8 @@ I'm using this for Stat to give it a more nifty interface to work with
/mob/living/carbon/brain/update_runechat_msg_location()
if(ismecha(loc))
runechat_msg_location = loc
runechat_msg_location = loc.UID()
else if(container)
runechat_msg_location = container
runechat_msg_location = container.UID()
else
runechat_msg_location = src
return ..()
@@ -1939,9 +1939,9 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
/mob/living/carbon/human/update_runechat_msg_location()
if(ismecha(loc))
runechat_msg_location = loc
runechat_msg_location = loc.UID()
else
runechat_msg_location = src
return ..()
/mob/living/carbon/human/verb/Examine_OOC()
set name = "Examine Meta-Info (OOC)"
+3 -3
View File
@@ -1251,7 +1251,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
var/rendered = "<i><span class='game say'>Relayed Speech: <span class='name'>[name_used]</span> [message]</span></i>"
if(client?.prefs.toggles2 & PREFTOGGLE_2_RUNECHAT)
var/message_clean = combine_message(message_pieces, null, M)
create_chat_message(M.runechat_msg_location, message_clean)
create_chat_message(locateUID(M.runechat_msg_location), message_clean)
show_message(rendered, 2)
/mob/living/silicon/ai/proc/malfhacked(obj/machinery/power/apc/apc)
@@ -1371,8 +1371,8 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
/mob/living/silicon/ai/update_runechat_msg_location()
if(istype(loc, /obj/item/aicard) || ismecha(loc))
runechat_msg_location = loc
runechat_msg_location = loc.UID()
else
runechat_msg_location = src
return ..()
#undef TEXT_ANNOUNCEMENT_COOLDOWN
+2 -2
View File
@@ -520,6 +520,6 @@
/mob/living/silicon/pai/update_runechat_msg_location()
if(istype(loc, /obj/item/paicard))
runechat_msg_location = loc
runechat_msg_location = loc.UID()
else
runechat_msg_location = src
return ..()
@@ -65,6 +65,6 @@
/mob/living/simple_animal/shade/update_runechat_msg_location()
if(istype(loc, /obj/item/soulstone))
runechat_msg_location = loc
runechat_msg_location = loc.UID()
else
runechat_msg_location = src
return ..()
+3 -2
View File
@@ -32,7 +32,6 @@
GLOB.alive_mob_list += src
set_focus(src)
prepare_huds()
runechat_msg_location = src
update_runechat_msg_location()
. = ..()
@@ -1455,9 +1454,11 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
/**
* Updates the mob's runechat maptext display location.
*
* By default, we set this to the src mob's `UID()`.
*/
/mob/proc/update_runechat_msg_location()
return
runechat_msg_location = UID()
/**
+2 -2
View File
@@ -201,5 +201,5 @@
/// Overrides the health HUD element state if set.
var/health_hud_override = HEALTH_HUD_OVERRIDE_NONE
/// The location our runechat message should appear. Should be src by default.
var/atom/runechat_msg_location
/// A soft reference to the location where this mob's runechat message will appear. Uses `UID()`.
var/runechat_msg_location