diff --git a/code/datums/elements/dusts_on_leaving_area.dm b/code/datums/elements/dusts_on_leaving_area.dm index 9527e1fd3a..7b1807a15c 100644 --- a/code/datums/elements/dusts_on_leaving_area.dm +++ b/code/datums/elements/dusts_on_leaving_area.dm @@ -1,28 +1,20 @@ /datum/element/dusts_on_leaving_area element_flags = ELEMENT_DETACH | ELEMENT_BESPOKE id_arg_index = 2 - var/list/attached_mobs = list() var/list/area_types = list() /datum/element/dusts_on_leaving_area/Attach(datum/target,types) . = ..() if(!ismob(target)) return ELEMENT_INCOMPATIBLE - attached_mobs += target area_types = types - START_PROCESSING(SSprocessing,src) + RegisterSignal(target,COMSIG_ENTER_AREA,.proc/check_dust) /datum/element/dusts_on_leaving_area/Detach(mob/M) . = ..() - if(M in attached_mobs) - attached_mobs -= M - if(!attached_mobs.len) - STOP_PROCESSING(SSprocessing,src) + UnregisterSignal(M,COMSIG_ENTER_AREA) -/datum/element/dusts_on_leaving_area/process() - for(var/m in attached_mobs) - var/mob/M = m - var/area/A = get_area(M) - if(!(A.type in area_types)) - M.dust(force = TRUE) - Detach(M) +/datum/element/dusts_on_leaving_area/proc/check_dust(datum/source, area/A) + var/mob/M = source + if(istype(M) && !(A.type in area_types)) + M.dust(force = TRUE)