From f643d0fba2c3a46828a17f9f52cb67fa313cf957 Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Fri, 22 Mar 2024 23:13:49 -0400 Subject: [PATCH 1/2] Fixes music importing newlining (#82152) ## About The Pull Request Makes the instrument song importing tgui input text use multiline which means BPM is now on its own line instead of taking the first line of the song with it, getting it cut from the import. ## Why It's Good For The Game Closes https://github.com/tgstation/tgstation/issues/82148 ## Changelog :cl: fix: Importing songs into instruments no longer cuts the first line of the song. /:cl: --- code/modules/instruments/songs/editor.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/instruments/songs/editor.dm b/code/modules/instruments/songs/editor.dm index 927e03d055d..651b3d6f3b6 100644 --- a/code/modules/instruments/songs/editor.dm +++ b/code/modules/instruments/songs/editor.dm @@ -94,9 +94,10 @@ if("import_song") var/song_text = "" do - song_text = tgui_input_text(user, "Please paste the entire song, formatted:", name, max_length = (MUSIC_MAXLINES * MUSIC_MAXLINECHARS)) + song_text = tgui_input_text(user, "Please paste the entire song, formatted:", name, max_length = (MUSIC_MAXLINES * MUSIC_MAXLINECHARS), multiline = TRUE) if(!in_range(parent, user)) return + if(length_char(song_text) >= MUSIC_MAXLINES * MUSIC_MAXLINECHARS) var/should_continue = tgui_alert(user, "Your message is too long! Would you like to continue editing it?", "Warning", list("Yes", "No")) if(should_continue != "Yes") From 351e12d9a118cb8b70675dd35a8624802ce103a3 Mon Sep 17 00:00:00 2001 From: NaakaKo Date: Sat, 23 Mar 2024 03:14:20 +0000 Subject: [PATCH 2/2] (upstream PR 82152)