From 3df1a53d99be6f6b774c72289d04b3a7306faaf0 Mon Sep 17 00:00:00 2001 From: Lucy Date: Sat, 10 Feb 2024 16:50:24 -0500 Subject: [PATCH 1/2] Fix last words being double-encoded when done from the alert popup (#81386) ## About The Pull Request Fixes succumb last words, when typed in the tgui input popup, being double-encoded/sanitized, resulting in things like this: Upstream port of https://github.com/Monkestation/Monkestation2.0/pull/1182 ## Why It's Good For The Game This bug is annoying and makes text uglier and less readable. Also, bugs are bad. Do I even need to fill this part out for a blatant bugfix? --- code/_onclick/hud/alert.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index e73cebf14c0..1f5f7588162 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -464,7 +464,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." var/mob/living/living_owner = owner var/last_whisper if(!HAS_TRAIT(living_owner, TRAIT_SUCCUMB_OVERRIDE)) - last_whisper = tgui_input_text(usr, "Do you have any last words?", "Goodnight, Sweet Prince") + last_whisper = tgui_input_text(usr, "Do you have any last words?", "Goodnight, Sweet Prince", encode = FALSE) // saycode already handles sanitization if(isnull(last_whisper)) if(!HAS_TRAIT(living_owner, TRAIT_SUCCUMB_OVERRIDE)) return From c58a698cb2355344d805f5fa149ef5719689cefd Mon Sep 17 00:00:00 2001 From: NaakaKo Date: Sat, 10 Feb 2024 21:50:36 +0000 Subject: [PATCH 2/2] (upstream PR 81386)