(code bounty) refactors all uses of Crossed() and Uncrossed() into signals sent to loc, tracked by connect_loc (#58340)

Co-authored-by: Jared-Fogle <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
This commit is contained in:
Kylerace
2021-05-07 03:54:03 -07:00
committed by GitHub
co-authored by Jared-Fogle Emmett Gaines
parent 3cabee50b6
commit 08df8798ce
104 changed files with 702 additions and 358 deletions
+7 -3
View File
@@ -77,6 +77,10 @@
recipes += temp
update_weight()
update_appearance()
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = .proc/on_entered,
)
AddElement(/datum/element/connect_loc, src, loc_connections)
/** Sets the amount of materials per unit for this stack.
*
@@ -437,10 +441,10 @@
S.add(transfer)
return transfer
/obj/item/stack/Crossed(atom/movable/crossing)
/obj/item/stack/proc/on_entered(datum/source, atom/movable/crossing)
SIGNAL_HANDLER
if(!crossing.throwing && can_merge(crossing))
merge(crossing)
. = ..()
INVOKE_ASYNC(src, .proc/merge, crossing)
/obj/item/stack/hitby(atom/movable/hitting, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
if(can_merge(hitting))