mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-20 19:49:39 +01:00
Protean Stripping fixes (#5432)
Requires #5420 to be merged. ## About The Pull Request See changelog ## Why It's Good For The Game Bug fixes are good. Especially fixing bugs that brick you. ## Proof Of Testing  ## Changelog 🆑 fix: Click dragging a protean modsuit onto yourself no longer unequips it, bricking you. del: Removed the Control Click Stripping functionality from Protean modsuits. It's now only click dragging. /🆑
This commit is contained in:
@@ -333,11 +333,14 @@
|
||||
|
||||
/// A lazy list of user mobs to a list of strip menu keys that they're interacting with
|
||||
var/list/interactions
|
||||
/// Bubber variable - Primarily for Proteans.
|
||||
var/needs_view = TRUE
|
||||
|
||||
/datum/strip_menu/New(atom/movable/owner, datum/element/strippable/strippable)
|
||||
/datum/strip_menu/New(atom/movable/owner, datum/element/strippable/strippable, needs_view) // Bubber edit: needs_view arg
|
||||
. = ..()
|
||||
src.owner = owner
|
||||
src.strippable = strippable
|
||||
src.needs_view = needs_view // Bubber edit
|
||||
|
||||
/datum/strip_menu/Destroy()
|
||||
owner = null
|
||||
@@ -520,7 +523,7 @@
|
||||
return min(
|
||||
ui_status_only_living(user, owner),
|
||||
ui_status_user_has_free_hands(user, owner),
|
||||
ui_status_user_is_adjacent(user, owner, allow_tk = FALSE),
|
||||
ui_status_user_is_adjacent(user, owner, allow_tk = FALSE, viewcheck = needs_view), // Bubber edit: Needs_view arg
|
||||
HAS_TRAIT(user, TRAIT_CAN_STRIP) ? UI_INTERACTIVE : UI_UPDATE,
|
||||
max(
|
||||
ui_status_user_is_conscious_and_lying_down(user),
|
||||
|
||||
Reference in New Issue
Block a user