Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions code/datums/elements/strippable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -502,19 +502,8 @@
/datum/strip_menu/ui_host(mob/user)
return owner

/datum/strip_menu/ui_status(mob/user, datum/ui_state/state)
. = ..()

if (isliving(user))
var/mob/living/living_user = user

if (
. == UI_UPDATE \
&& user.stat == CONSCIOUS \
&& living_user.body_position == LYING_DOWN \
&& user.Adjacent(owner)
)
return UI_INTERACTIVE
/datum/strip_menu/ui_state(mob/user)
return GLOB.strip_state

/// Creates an assoc list of keys to /datum/strippable_item
/proc/create_strippable_list(types)
Expand Down
13 changes: 13 additions & 0 deletions code/modules/tgui/states/strip.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
GLOBAL_DATUM_INIT(strip_state, /datum/ui_state/strip_state, new)

/// Carbons and cyborgs can strip mobs, other living can view but not strip
/datum/ui_state/strip_state/can_use_topic(src_object, mob/user)
if(iscarbon(user) || iscyborg(user))
if(!user.Adjacent(src_object))
return UI_DISABLED
return UI_INTERACTIVE
if(isliving(user))
if(!user.Adjacent(src_object))
return UI_DISABLED
return UI_UPDATE
return UI_CLOSE
1 change: 1 addition & 0 deletions yogstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3926,6 +3926,7 @@
#include "code\modules\tgui\states\physical.dm"
#include "code\modules\tgui\states\pilot.dm"
#include "code\modules\tgui\states\self.dm"
#include "code\modules\tgui\states\strip.dm"
#include "code\modules\tgui\states\zlevel.dm"
#include "code\modules\tgui_input\alert.dm"
#include "code\modules\tgui_input\checkboxes.dm"
Expand Down
Loading