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

[MIRROR] Fix incorrect uses of UnregisterSignal (#6035)

Browse Source 
* 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:
SkyratBot
2021-05-30 22:53:47 +01:00
committed by GitHub
co-authored by Gamer025
parent 3c7364764d
commit 7657dd420f
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/cards_ids.dm
+4 -4
View File
@@ -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)