cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +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/datums/ai/_ai_controller.dm
+1 -1
View File
@@ -80,7 +80,7 @@ have ways of interacting with a specific atom and control it. They posses a blac
///Proc for deinitializing the pawn to the old controller
/datum/ai_controller/proc/UnpossessPawn(destroy)
UnregisterSignal(pawn, COMSIG_MOB_LOGIN, COMSIG_MOB_LOGOUT)
UnregisterSignal(pawn, list(COMSIG_MOB_LOGIN, COMSIG_MOB_LOGOUT))
pawn.ai_controller = null
pawn = null
if(destroy)
code/game/objects/buckling.dm
+1 -1
View File
@@ -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(.)
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)
code/modules/clothing/suits/cloaks.dm
+2 -2
View File
@@ -175,11 +175,11 @@
if(slot & ITEM_SLOT_OCLOTHING)
RegisterSignal(user, COMSIG_MOB_STATCHANGE, .proc/resurrect)
return
UnregisterSignal(user, COMSIG_MOB_STATCHANGE, .proc/resurrect)
UnregisterSignal(user, COMSIG_MOB_STATCHANGE)
/obj/item/clothing/suit/hooded/cloak/godslayer/dropped(mob/user)
..()
UnregisterSignal(user, COMSIG_MOB_STATCHANGE, .proc/resurrect)
UnregisterSignal(user, COMSIG_MOB_STATCHANGE)
/obj/item/clothing/suit/hooded/cloak/godslayer/proc/resurrect(mob/living/carbon/user, new_stat)
SIGNAL_HANDLER
code/modules/food_and_drinks/kitchen_machinery/grill.dm
+1 -1
View File
@@ -150,7 +150,7 @@
grilled_item.desc = "A [grilled_item.name]. Reminds you of your wife, wait, no, it's prettier!"
grilled_item.foodtype |= FRIED
grill_time = 0
UnregisterSignal(grilled_item, COMSIG_GRILL_COMPLETED, .proc/GrillCompleted)
UnregisterSignal(grilled_item, COMSIG_GRILL_COMPLETED)
grill_loop.stop()
///Called when a food is transformed by the grillable component
code/modules/mob/living/simple_animal/bot/mulebot.dm
+1 -1
View File
@@ -113,7 +113,7 @@
/mob/living/simple_animal/bot/mulebot/Destroy()
UnregisterSignal(src, COMSIG_MOB_BOT_PRE_STEP, COMSIG_MOB_CLIENT_PRE_MOVE, COMSIG_MOB_BOT_STEP, COMSIG_MOB_CLIENT_MOVED)
UnregisterSignal(src, list(COMSIG_MOB_BOT_PRE_STEP, COMSIG_MOB_CLIENT_PRE_MOVE, COMSIG_MOB_BOT_STEP, COMSIG_MOB_CLIENT_MOVED))
unload(0)
QDEL_NULL(wires)
QDEL_NULL(cell)
code/modules/research/nanites/nanite_programs/sensor.dm
+1 -1
View File
@@ -247,7 +247,7 @@
RegisterSignal(host_mob, COMSIG_MOVABLE_HEAR, .proc/on_hear)
/datum/nanite_program/sensor/voice/on_mob_remove()
UnregisterSignal(host_mob, COMSIG_MOVABLE_HEAR, .proc/on_hear)
UnregisterSignal(host_mob, COMSIG_MOVABLE_HEAR)
/datum/nanite_program/sensor/voice/proc/on_hear(datum/source, list/hearing_args)
SIGNAL_HANDLER
code/modules/surgery/organs/tongue.dm
+1 -1
View File
@@ -69,7 +69,7 @@
..()
if(say_mod && tongue_owner.dna && tongue_owner.dna.species)
tongue_owner.dna.species.say_mod = initial(tongue_owner.dna.species.say_mod)
UnregisterSignal(tongue_owner, COMSIG_MOB_SAY, .proc/handle_speech)
UnregisterSignal(tongue_owner, COMSIG_MOB_SAY)
tongue_owner.RegisterSignal(tongue_owner, COMSIG_MOB_SAY, /mob/living/carbon/.proc/handle_tongueless_speech)
REMOVE_TRAIT(tongue_owner, TRAIT_AGEUSIA, ORGAN_TRAIT)
// Carbons by default start with NO_TONGUE_TRAIT caused TRAIT_AGEUSIA