diff --git a/code/modules/tgui/states/vorepanel_vr.dm b/code/modules/tgui/states/vorepanel_vr.dm new file mode 100644 index 0000000000..855c332c08 --- /dev/null +++ b/code/modules/tgui/states/vorepanel_vr.dm @@ -0,0 +1,18 @@ + /** + * tgui state: vorepanel_state + * + * Only checks that the user and src_object are the same. + **/ + +GLOBAL_DATUM_INIT(tgui_vorepanel_state, /datum/tgui_state/vorepanel_state, new) + +/datum/tgui_state/vorepanel_state/can_use_topic(src_object, mob/user) + if(src_object != user) + // Note, in order to allow others to look at others vore panels, change this to + // STATUS_UPDATE + return STATUS_CLOSE + if(!user.client) + return STATUS_CLOSE + if(user.stat == DEAD) + return STATUS_DISABLED + return STATUS_INTERACTIVE \ No newline at end of file diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index d6ea5a31a0..21807670c1 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -60,9 +60,32 @@ return host // Note, in order to allow others to look at others vore panels, this state would need +<<<<<<< HEAD // to be changed to tgui_always_state, and a custom tgui_status() implemented for true "rights" management. +||||||| parent of e236746acd... Merge pull request #9856 from ShadowLarkens/vorepanel_adjust +// 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. +======= +// to be modified. +>>>>>>> e236746acd... Merge pull request #9856 from ShadowLarkens/vorepanel_adjust /datum/vore_look/tgui_state(mob/user) +<<<<<<< HEAD return GLOB.tgui_self_state +||||||| parent of e236746acd... Merge pull request #9856 from ShadowLarkens/vorepanel_adjust + 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) +======= + return GLOB.tgui_vorepanel_state +>>>>>>> e236746acd... Merge pull request #9856 from ShadowLarkens/vorepanel_adjust /datum/vore_look/var/static/list/nom_icons /datum/vore_look/proc/cached_nom_icon(atom/target) diff --git a/vorestation.dme b/vorestation.dme index 65717ed22d..4ad5a39dd5 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -3914,6 +3914,7 @@ #include "code\modules\tgui\states\observer.dm" #include "code\modules\tgui\states\physical.dm" #include "code\modules\tgui\states\self.dm" +#include "code\modules\tgui\states\vorepanel_vr.dm" #include "code\modules\tgui\states\zlevel.dm" #include "code\modules\tooltip\tooltip.dm" #include "code\modules\turbolift\_turbolift.dm"