cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-15 01:54:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Block two people cuffing to one item (#96050)

Browse Source 
## About The Pull Request

Fixes #96042
Fixes #96041

Simply stops two people from cuffing to the same item
We could add support for this behavior later, but we'd need to sort out
how that behavior should work

## Changelog

🆑 Melbert
fix: Blocks two people cuffing to one item
/🆑
This commit is contained in:
MrMelbert
2026-05-12 01:28:36 -05:00
committed by GitHub
parent 22d4bd8832
commit e8d87d2578
3 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/dcs/signals/signals_object.dm
+5
View File
@@ -685,3 +685,8 @@
/// Sent from /datum/component/reflection when the reflection is updated to the mob reflecting: (atom/movable/reflecting_in, obj/effect/abstract/reflection)
#define COMSIG_REFLECTION_UPDATED "reflection_updated"
/// Send from /datum/element/cuffable_item(): (mob/cuffer, obj/item/cuffs)
#define COMSIG_ITEM_PRE_CUFFED_TO_MOB "item_cuffed_to_mob"
/// Return to stop the cuffing from happening.
#define BLOCK_ITEM_CUFF (1<<0)
code/datums/elements/cuffable_item.dm
+3
View File
@@ -62,6 +62,9 @@
if(cuffs.handcuffs_clumsiness_check(user))
return
if(SEND_SIGNAL(source, COMSIG_ITEM_PRE_CUFFED_TO_MOB, user, cuffs) & BLOCK_ITEM_CUFF)
return
source.balloon_alert(user, "cuffing item...")
playsound(source, cuffs.cuffsound, 30, TRUE, -2)
if(!do_after(user, cuffs.get_handcuff_time(user), source))
code/datums/status_effects/cuffed_item.dm
+34 -4
View File
@@ -43,6 +43,7 @@
RegisterSignal(cuffed, COMSIG_ITEM_GET_STRIPPABLE_ALT_ACTIONS, PROC_REF(get_strippable_action))
RegisterSignal(cuffed, COMSIG_ITEM_STRIPPABLE_ALT_ACTION, PROC_REF(do_strippable_action))
RegisterSignal(cuffed, COMSIG_ITEM_PRE_STORAGE_INSERTION, PROC_REF(block_storage_insert))
RegisterSignal(cuffed, COMSIG_ITEM_PRE_CUFFED_TO_MOB, PROC_REF(block_item_cuff))
RegisterSignals(cuffs, list(COMSIG_ITEM_EQUIPPED, COMSIG_QDELETING, COMSIG_MOVABLE_MOVED), PROC_REF(cleanup_effect))
RegisterSignal(cuffs, COMSIG_ATOM_UPDATE_APPEARANCE, PROC_REF(on_item_update_appearance))
@@ -59,10 +60,33 @@
/datum/status_effect/cuffed_item/on_remove()
//Prevent possible recursions from these signals
UnregisterSignal(cuffed, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_ITEM_PRE_STORAGE_INSERTION))
UnregisterSignal(cuffs, list(COMSIG_ITEM_EQUIPPED, COMSIG_MOVABLE_MOVED, COMSIG_QDELETING))
UnregisterSignal(cuffed_to, list(COMSIG_BODYPART_REMOVED, COMSIG_QDELETING))
UnregisterSignal(owner, list(COMSIG_ATOM_EXAMINE_MORE, COMSIG_CARBON_POST_ATTACH_LIMB))
UnregisterSignal(cuffed, list(
COMSIG_ATOM_EXAMINE,
COMSIG_ATOM_UPDATE_APPEARANCE,
COMSIG_ITEM_PRE_CUFFED_TO_MOB,
COMSIG_ITEM_DROPPED,
COMSIG_ITEM_EQUIPPED,
COMSIG_ITEM_GET_STRIPPABLE_ALT_ACTIONS,
COMSIG_ITEM_PRE_STORAGE_INSERTION,
COMSIG_ITEM_STRIPPABLE_ALT_ACTION,
COMSIG_MOVABLE_MOVED,
COMSIG_QDELETING,
COMSIG_TOPIC,
))
UnregisterSignal(cuffs, list(
COMSIG_ATOM_UPDATE_APPEARANCE,
COMSIG_ITEM_EQUIPPED,
COMSIG_MOVABLE_MOVED,
COMSIG_QDELETING,
))
UnregisterSignal(cuffed_to, list(
COMSIG_BODYPART_REMOVED,
COMSIG_QDELETING,
))
UnregisterSignal(owner, list(
COMSIG_ATOM_EXAMINE_MORE,
COMSIG_CARBON_POST_ATTACH_LIMB,
))
cuffed = null
if(!QDELETED(cuffs))
@@ -162,6 +186,12 @@
target_storage.balloon_alert(user, "can't store [source.name] while cuffed!")
return BLOCK_STORAGE_INSERT
/// Stops double cuff
/datum/status_effect/cuffed_item/proc/block_item_cuff(obj/item/source, mob/cuffer, obj/item/cuffs)
SIGNAL_HANDLER
source.balloon_alert(cuffer, "cuffed to someone else!")
return BLOCK_ITEM_CUFF
///What happens if one of the items is moved away from the mob
/datum/status_effect/cuffed_item/proc/cleanup_effect(datum/source)
SIGNAL_HANDLER