cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fix infinite recursive loop in cyborg beaker icon updates (#4150)

Browse Source 
* Fix infinite recursive loop in cyborg beaker icon updates (#57681)

* Fix infinite recursive loop in cyborg beaker icon updates

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
This commit is contained in:
SkyratBot
2021-03-14 14:05:16 +00:00
committed by GitHub
co-authored by Timberpoes
parent 1f16f515fa
commit ae56b91594
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/robot/robot_items.dm
+13 -7
View File
@@ -812,7 +812,7 @@
/obj/item/borg/apparatus/Exited(atom/A)
if(A == stored) //sanity check
UnregisterSignal(stored, COMSIG_ATOM_UPDATE_ICON)
UnregisterSignal(stored, COMSIG_ATOM_UPDATED_ICON)
stored = null
update_appearance()
. = ..()
@@ -846,7 +846,7 @@
var/obj/item/O = A
O.forceMove(src)
stored = O
RegisterSignal(stored, COMSIG_ATOM_UPDATE_ICON, .proc/on_update_icon)
RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, .proc/on_stored_updated_icon)
update_appearance()
return
else
@@ -854,10 +854,16 @@
return
. = ..()
/// Exists to eat signal args
/obj/item/borg/apparatus/proc/on_update_icon(datum/source, updates)
/**
* Updates the appearance of the apparatus when the stored object's icon gets updated.
*
* Returns NONE as we have not done anything to the stored object itself,
* which is where this signal that this handler intercepts is sent from.
*/
/obj/item/borg/apparatus/proc/on_stored_updated_icon(datum/source, updates)
SIGNAL_HANDLER
return on_update_icon(updates)
update_appearance()
return NONE
/obj/item/borg/apparatus/attackby(obj/item/W, mob/user, params)
if(stored)
@@ -879,7 +885,7 @@
/obj/item/borg/apparatus/beaker/Initialize()
. = ..()
stored = new /obj/item/reagent_containers/glass/beaker/large(src)
RegisterSignal(stored, COMSIG_ATOM_UPDATE_ICON, .proc/on_update_icon)
RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, .proc/on_stored_updated_icon)
update_appearance()
/obj/item/borg/apparatus/beaker/Destroy()
@@ -939,7 +945,7 @@
/obj/item/borg/apparatus/beaker/service/Initialize()
. = ..()
stored = new /obj/item/reagent_containers/food/drinks/drinkingglass(src)
RegisterSignal(stored, COMSIG_ATOM_UPDATE_ICON, .proc/on_update_icon)
RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, .proc/on_stored_updated_icon)
update_appearance()
/////////////////////