Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port strapable fixes #856

Merged
merged 1 commit into from
Dec 21, 2024
Merged

Port strapable fixes #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion code/datums/elements/strappable.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@

/datum/element/strappable/Detach(datum/source, ...)
. = ..()
UnregisterSignal(source, COMSIG_CLICK_ALT)
UnregisterSignal(source, list(COMSIG_CLICK_ALT, COMSIG_ITEM_UNEQUIPPED))
REMOVE_TRAIT(source, TRAIT_STRAPPABLE, STRAPPABLE_ITEM_TRAIT)

///Toggles strap state
/datum/element/strappable/proc/on_alt_click(datum/source, mob/user)
SIGNAL_HANDLER
var/obj/item/item_source = source
Expand All @@ -19,8 +20,16 @@
return
var/strapped = HAS_TRAIT_FROM(item_source, TRAIT_NODROP, STRAPPABLE_ITEM_TRAIT)
if(!strapped)
RegisterSignal(item_source, COMSIG_ITEM_UNEQUIPPED, PROC_REF(on_unequip))
ADD_TRAIT(item_source, TRAIT_NODROP, STRAPPABLE_ITEM_TRAIT)
item_source.balloon_alert(user, "Tightened strap")
else
UnregisterSignal(item_source, COMSIG_ITEM_UNEQUIPPED)
REMOVE_TRAIT(item_source, TRAIT_NODROP, STRAPPABLE_ITEM_TRAIT)
item_source.balloon_alert(user, "Loosened strap")

///Unstraps if the target is somehow forcefully unequipped
/datum/element/strappable/proc/on_unequip(obj/item/item_source, mob/unequipper, slot)
SIGNAL_HANDLER
UnregisterSignal(item_source, COMSIG_ITEM_UNEQUIPPED)
REMOVE_TRAIT(item_source, TRAIT_NODROP, STRAPPABLE_ITEM_TRAIT)
20 changes: 7 additions & 13 deletions code/modules/mob/mob.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,19 +259,13 @@
if(!do_after(src, W.equip_delay_self, NONE, W, BUSY_ICON_FRIENDLY))
to_chat(src, "You stop putting on \the [W]")
return FALSE
if(!W.mob_can_equip(src, slot, warning, override_nodrop))
return FALSE
equip_to_slot(W, slot) //This proc should not ever fail.
//This will unwield items -without- triggering lights.
if(CHECK_BITFIELD(W.flags_item, TWOHANDED))
W.unwield(src)
return TRUE
else
equip_to_slot(W, slot) //This proc should not ever fail.
//This will unwield items -without- triggering lights.
if(CHECK_BITFIELD(W.flags_item, TWOHANDED))
W.unwield(src)
return TRUE
//calling the proc again with ignore_delay saves a boatload of copypaste
return equip_to_slot_if_possible(W, slot, TRUE, del_on_fail, warning, redraw_mob, override_nodrop)
equip_to_slot(W, slot) //This proc should not ever fail.
//This will unwield items -without- triggering lights.
if(CHECK_BITFIELD(W.flags_item, TWOHANDED))
W.unwield(src)
return TRUE

/**
*This is an UNSAFE proc. It merely handles the actual job of equipping. All the checks on whether you can or can't eqip need to be done before! Use mob_can_equip() for that task.
Expand Down
Loading