diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index aaeaccf2783..93920be8481 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -25,6 +25,11 @@ spark_system.set_up(4,1,src) spark_system.attach(src) + var/static/list/loc_connections = list( + COMSIG_ATOM_ENTERED = .proc/on_entered + ) + AddElement(/datum/element/connect_loc, src, loc_connections) + if(!ignore_typecache) ignore_typecache = typecacheof(list( /obj/effect, @@ -108,10 +113,6 @@ . = ..() time_between_triggers = 10 flare_message = "[src] snaps shut!" - var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, - ) - AddElement(/datum/element/connect_loc, src, loc_connections) /obj/structure/trap/stun/hunter/on_entered(datum/source, atom/movable/AM) if(isliving(AM)) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_structures.dm b/code/modules/antagonists/eldritch_cult/eldritch_structures.dm index 5a5331cfc3e..2b5055366e5 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_structures.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_structures.dm @@ -112,13 +112,6 @@ /// Reference to trap owner mob var/mob/owner -/obj/structure/trap/eldritch/Initialize(mapload) - . = ..() - var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, - ) - AddElement(/datum/element/connect_loc, src, loc_connections) - /obj/structure/trap/eldritch/on_entered(datum/source, atom/movable/AM) if(!isliving(AM)) return ..() diff --git a/code/modules/swarmers/swarmer_objs.dm b/code/modules/swarmers/swarmer_objs.dm index b3e40362c8e..7413f5efabb 100644 --- a/code/modules/swarmers/swarmer_objs.dm +++ b/code/modules/swarmers/swarmer_objs.dm @@ -130,13 +130,6 @@ max_integrity = 10 density = FALSE -/obj/structure/swarmer/trap/Initialize(mapload) - . = ..() - var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, - ) - AddElement(/datum/element/connect_loc, src, loc_connections) - /obj/structure/swarmer/trap/proc/on_entered(datum/source, atom/movable/AM) SIGNAL_HANDLER if(isliving(AM))