mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-22 05:25:15 +01:00
[MIRROR] Fix incorrect uses of UnregisterSignal (#6035)
* Fix incorrect uses of UnregisterSignal (#59379) Correctly unregister multiple signal types / removes uneeded proc parameters in calls to UnregisterSignal * Fix incorrect uses of UnregisterSignal Co-authored-by: Gamer025 <33846895+Gamer025@users.noreply.github.com>
This commit is contained in:
@@ -156,7 +156,7 @@
|
||||
if(anchored)
|
||||
REMOVE_TRAIT(buckled_mob, TRAIT_NO_FLOATING_ANIM, BUCKLED_TRAIT)
|
||||
if(!length(buckled_mobs))
|
||||
UnregisterSignal(src, COMSIG_MOVABLE_SET_ANCHORED, .proc/on_set_anchored)
|
||||
UnregisterSignal(src, COMSIG_MOVABLE_SET_ANCHORED)
|
||||
SEND_SIGNAL(src, COMSIG_MOVABLE_UNBUCKLE, buckled_mob, force)
|
||||
|
||||
post_unbuckle_mob(.)
|
||||
|
||||
@@ -747,7 +747,7 @@
|
||||
RegisterSignal(src, COMSIG_ITEM_DROPPED, .proc/remove_intern_status)
|
||||
|
||||
/obj/item/card/id/advanced/Destroy()
|
||||
UnregisterSignal(src, COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)
|
||||
UnregisterSignal(src, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
|
||||
|
||||
return ..()
|
||||
|
||||
@@ -789,7 +789,7 @@
|
||||
/obj/item/card/id/advanced/proc/on_holding_card_slot_moved(obj/item/computer_hardware/card_slot/source, atom/old_loc, dir, forced)
|
||||
SIGNAL_HANDLER
|
||||
if(istype(old_loc, /obj/item/modular_computer/tablet))
|
||||
UnregisterSignal(old_loc, COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)
|
||||
UnregisterSignal(old_loc, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
|
||||
|
||||
if(istype(source.loc, /obj/item/modular_computer/tablet))
|
||||
RegisterSignal(source.loc, COMSIG_ITEM_EQUIPPED, .proc/update_intern_status)
|
||||
@@ -799,7 +799,7 @@
|
||||
. = ..()
|
||||
|
||||
if(istype(OldLoc, /obj/item/pda) || istype(OldLoc, /obj/item/storage/wallet))
|
||||
UnregisterSignal(OldLoc, COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)
|
||||
UnregisterSignal(OldLoc, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
|
||||
|
||||
if(istype(OldLoc, /obj/item/computer_hardware/card_slot))
|
||||
var/obj/item/computer_hardware/card_slot/slot = OldLoc
|
||||
@@ -808,7 +808,7 @@
|
||||
|
||||
if(istype(slot.holder, /obj/item/modular_computer/tablet))
|
||||
var/obj/item/modular_computer/tablet/slot_holder = slot.holder
|
||||
UnregisterSignal(slot_holder, COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)
|
||||
UnregisterSignal(slot_holder, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
|
||||
|
||||
if(istype(loc, /obj/item/pda) || istype(OldLoc, /obj/item/storage/wallet))
|
||||
RegisterSignal(loc, COMSIG_ITEM_EQUIPPED, .proc/update_intern_status)
|
||||
|
||||
Reference in New Issue
Block a user