From 420ea64e30f0a1d12038f9ea9464296f38b84d85 Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Fri, 5 Mar 2021 15:59:10 +0000 Subject: [PATCH 1/2] Fixes vorepanel accessibility requirements --- code/modules/vore/eating/vorepanel_vr.dm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index d6ea5a31a0..2bff8befee 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -61,8 +61,19 @@ // Note, in order to allow others to look at others vore panels, this state would need // to be changed to tgui_always_state, and a custom tgui_status() implemented for true "rights" management. +// Currently there is no way for others to look at others vore panels so the above concern can wait. /datum/vore_look/tgui_state(mob/user) - return GLOB.tgui_self_state + return GLOB.tgui_always_state + +/datum/vore_look/tgui_status(mob/user, datum/tgui_state/state) + . = STATUS_CLOSE + if(!state) + return + if(user.client) + if(user.stat) + . = max(., STATUS_UPDATE) + else + . = max(., STATUS_INTERACTIVE) /datum/vore_look/var/static/list/nom_icons /datum/vore_look/proc/cached_nom_icon(atom/target) @@ -954,6 +965,7 @@ . = TRUE if(.) +<<<<<<< HEAD unsaved_changes = TRUE //CHOMPedit start: liquid belly procs @@ -1128,3 +1140,8 @@ host.vore_selected.set_reagent_messages(new_message,"full5") . = TRUE //CHOMPedit end +||||||| parent of 013ff5ebd4... Merge pull request #9853 from Verkister/patch-37 + unsaved_changes = TRUE +======= + unsaved_changes = TRUE +>>>>>>> 013ff5ebd4... Merge pull request #9853 from Verkister/patch-37 From 971ac1ff4083bafba93a8d00922673d465091b8a Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 6 Mar 2021 05:32:31 -0500 Subject: [PATCH 2/2] Update vorepanel_vr.dm --- code/modules/vore/eating/vorepanel_vr.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 2bff8befee..4e20c61a55 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -965,7 +965,6 @@ . = TRUE if(.) -<<<<<<< HEAD unsaved_changes = TRUE //CHOMPedit start: liquid belly procs @@ -1140,8 +1139,3 @@ host.vore_selected.set_reagent_messages(new_message,"full5") . = TRUE //CHOMPedit end -||||||| parent of 013ff5ebd4... Merge pull request #9853 from Verkister/patch-37 - unsaved_changes = TRUE -======= - unsaved_changes = TRUE ->>>>>>> 013ff5ebd4... Merge pull request #9853 from Verkister/patch-37