From 88bfcb129f07f11d2fd2a563c999270cf82fbbdb Mon Sep 17 00:00:00 2001 From: Casey Date: Thu, 30 Jun 2022 04:18:20 -0400 Subject: [PATCH 01/67] Moved Weight/Nutrition Prefs --- code/modules/vore/eating/vorepanel_vr.dm | 14 ++-- tgui/packages/tgui/interfaces/VorePanel.js | 93 +++++++++++++++------- 2 files changed, 74 insertions(+), 33 deletions(-) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 830145562c..77c9148328 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -586,6 +586,14 @@ host.stumble_vore = !host.stumble_vore unsaved_changes = TRUE return TRUE + if("toggle_nutrition_ex") + host.nutrition_message_visible = !host.nutrition_message_visible + unsaved_changes = TRUE + return TRUE + if("toggle_weight_ex") + host.weight_message_visible = !host.weight_message_visible + unsaved_changes = TRUE + return TRUE /datum/vore_look/proc/pick_from_inside(mob/user, params) var/atom/movable/target = locate(params["pick"]) @@ -1247,12 +1255,6 @@ if("b_save_digest_mode") host.vore_selected.save_digest_mode = !host.vore_selected.save_digest_mode . = TRUE - if("toggle_nutrition_ex") - host.nutrition_message_visible = !host.nutrition_message_visible - . = TRUE - if("toggle_weight_ex") - host.weight_message_visible = !host.weight_message_visible - . = TRUE if("b_del") var/alert = tgui_alert(usr, "Are you sure you want to delete your [lowertext(host.vore_selected.name)]?","Confirmation",list("Cancel","Delete")) if(!(alert == "Delete")) diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js index 8b42308dcd..79816cad2e 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.js +++ b/tgui/packages/tgui/interfaces/VorePanel.js @@ -430,14 +430,6 @@ const VoreSelectedBellyDescriptions = (props, context) => {