From d30087d0ee18913ee8d0c92ce05240877a84e864 Mon Sep 17 00:00:00 2001 From: Maxim Nikitin Date: Thu, 14 May 2020 17:02:55 -0400 Subject: [PATCH 1/2] runechat fixes --- code/datums/chatmessage.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index 3a733444e244..d3ec8931ecad 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -35,7 +35,7 @@ * * extra_classes - Extra classes to apply to the span that holds the text * * lifespan - The lifespan of the message in deciseconds */ -/datum/chatmessage/New(text, atom/target, mob/owner, list/extra_classes = null, lifespan = CHAT_MESSAGE_LIFESPAN) +/datum/chatmessage/New(text, atom/target, mob/owner, list/extra_classes = list(), lifespan = CHAT_MESSAGE_LIFESPAN) . = ..() if (!istype(target)) CRASH("Invalid target given for chatmessage") @@ -111,7 +111,7 @@ // BYOND Bug #2563917 // Construct text var/static/regex/html_metachars = new(@"&[A-Za-z]{1,7};", "g") - var/complete_text = "[text]" + var/complete_text = "[text]" var/mheight = WXH_TO_HEIGHT(owned_by.MeasureText(replacetext(complete_text, html_metachars, "m"), null, CHAT_MESSAGE_WIDTH)) approx_lines = max(1, mheight / CHAT_MESSAGE_APPROX_LHEIGHT) @@ -173,7 +173,7 @@ */ /mob/proc/create_chat_message(atom/movable/speaker, datum/language/message_language, raw_message, list/spans, message_mode) // Ensure the list we are using, if present, is a copy so we don't modify the list provided to us - spans = spans?.Copy() + spans = spans ? spans.Copy() : list() // Check for virtual speakers (aka hearing a message through a radio) var/atom/movable/originalSpeaker = speaker From 1cc397b43db03a4a5228f9ed9c8007d5032061ec Mon Sep 17 00:00:00 2001 From: Maxim Nikitin Date: Thu, 14 May 2020 17:07:24 -0400 Subject: [PATCH 2/2] there --- code/datums/chatmessage.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index d3ec8931ecad..5a74223028f2 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -70,9 +70,6 @@ owned_by = owner.client RegisterSignal(owned_by, COMSIG_PARENT_QDELETING, .proc/on_ownedby_deleting) - if(!islist(extra_classes)) - extra_classes = list() - // Clip message var/maxlen = owned_by.prefs.max_chat_length if (length_char(text) > maxlen)