From 8ea5bc3f3574dd6cf680418d02e3e0f1288d0161 Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Fri, 31 Jan 2025 21:52:23 +0100 Subject: [PATCH] some more usr (#17013) --- code/modules/mob/living/living_vr.dm | 22 +++++++++---------- code/modules/reagents/machinery/distillery.dm | 1 - code/modules/vore/eating/living_vr.dm | 10 ++++----- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/code/modules/mob/living/living_vr.dm b/code/modules/mob/living/living_vr.dm index a196169dc8c..b4401cabf43 100644 --- a/code/modules/mob/living/living_vr.dm +++ b/code/modules/mob/living/living_vr.dm @@ -36,11 +36,11 @@ to_chat(src, span_filter_notice("OOC notes updated. Don't forget to save!")) log_admin("[key_name(src)] updated their OOC notes mid-round.") ooc_notes_window(src) - set_metainfo_likes(FALSE) - set_metainfo_dislikes(FALSE) + set_metainfo_likes(src, FALSE) + set_metainfo_dislikes(src, FALSE) -/mob/living/proc/set_metainfo_panel() - if(usr != src) +/mob/living/proc/set_metainfo_panel(mob/user) + if(user != src) return var/new_metadata = strip_html_simple(tgui_input_text(src, "Enter any information you'd like others to see, such as Roleplay-preferences. This will not be saved permanently unless you click save in the OOC notes panel!", "Game Preference" , html_decode(ooc_notes), multiline = TRUE, prevent_enter = TRUE)) if(new_metadata && CanUseTopic(src)) @@ -50,8 +50,8 @@ log_admin("[key_name(src)] updated their OOC notes mid-round.") ooc_notes_window(src) -/mob/living/proc/set_metainfo_likes(var/reopen = TRUE) - if(usr != src) +/mob/living/proc/set_metainfo_likes(mob/user, var/reopen = TRUE) + if(user != src) return var/new_metadata = strip_html_simple(tgui_input_text(src, "Enter any information you'd like others to see relating to your LIKED roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_likes), multiline = TRUE, prevent_enter = TRUE)) if(new_metadata && CanUseTopic(src)) @@ -64,8 +64,8 @@ if(reopen) ooc_notes_window(src) -/mob/living/proc/set_metainfo_dislikes(var/reopen = TRUE) - if(usr != src) +/mob/living/proc/set_metainfo_dislikes(mob/user, var/reopen = TRUE) + if(user != src) return var/new_metadata = strip_html_simple(tgui_input_text(src, "Enter any information you'd like others to see relating to your DISLIKED roleplay preferences. This will not be saved permanently unless you click save in the OOC notes panel! Type \"!clear\" to empty.", "Game Preference" , html_decode(ooc_notes_dislikes), multiline = TRUE, prevent_enter = TRUE)) if(new_metadata && CanUseTopic(src)) @@ -78,8 +78,8 @@ if(reopen) ooc_notes_window(src) -/mob/living/proc/save_ooc_panel() - if(usr != src) +/mob/living/proc/save_ooc_panel(mob/user) + if(user != src) return if(client.prefs.real_name != real_name) to_chat(src, span_danger("Your selected character slot name is not the same as your character's name. Aborting save. Please select [real_name]'s character slot in character setup before saving.")) @@ -87,7 +87,7 @@ if(client.prefs.save_character()) to_chat(src, span_filter_notice("Character preferences saved.")) -/mob/living/proc/print_ooc_notes_to_chat() +/mob/living/proc/print_ooc_notes_to_chat(mob/user) if(!ooc_notes) return var/msg = ooc_notes diff --git a/code/modules/reagents/machinery/distillery.dm b/code/modules/reagents/machinery/distillery.dm index d6d0af7e521..96ac6b6e10d 100644 --- a/code/modules/reagents/machinery/distillery.dm +++ b/code/modules/reagents/machinery/distillery.dm @@ -205,7 +205,6 @@ if("adjust temp") target_temp = tgui_input_number(user, "Choose a target temperature.", "Temperature.", T20C, max_temp, min_temp, round_value = FALSE) - target_temp = CLAMP(target_temp, min_temp, max_temp) update_icon() diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 6ff858e7938..38f766bf09d 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -1182,18 +1182,18 @@ Examine_OOC(usr) if(href_list["edit_ooc_notes"]) if(usr == src) - set_metainfo_panel() + set_metainfo_panel(usr) if(href_list["edit_ooc_note_likes"]) if(usr == src) - set_metainfo_likes() + set_metainfo_likes(usr) if(href_list["edit_ooc_note_dislikes"]) if(usr == src) - set_metainfo_dislikes() + set_metainfo_dislikes(usr) if(href_list["save_ooc_panel"]) if(usr == src) - save_ooc_panel() + save_ooc_panel(usr) if(href_list["print_ooc_notes_to_chat"]) - print_ooc_notes_to_chat() + print_ooc_notes_to_chat(usr) if(href_list["save_private_notes"]) if(usr == src) save_private_notes(usr)