From 1b69cfc402e8d8461d4a2e5a8b2edd401ec2df38 Mon Sep 17 00:00:00 2001 From: Helg2 Date: Tue, 2 Jul 2024 14:32:53 +0300 Subject: [PATCH] Update transit.dm --- code/game/turfs/space/transit.dm | 2 +- modular_RUtgmc/code/game/turfs/transit.dm | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm index 1c50db1e9e243..ba6575826571a 100644 --- a/code/game/turfs/space/transit.dm +++ b/code/game/turfs/space/transit.dm @@ -39,7 +39,6 @@ ..() if(!locate(/obj/structure/lattice) in src) //todo wtf is this even throw_atom(arrived) -*/ /turf/open/space/transit/proc/throw_atom(atom/movable/AM) set waitfor = FALSE @@ -85,6 +84,7 @@ update_icon() for(var/atom/movable/AM in src) throw_atom(AM) +*/ /turf/open/space/transit/update_icon() . = ..() diff --git a/modular_RUtgmc/code/game/turfs/transit.dm b/modular_RUtgmc/code/game/turfs/transit.dm index fd05dcf039e38..eefab56515a79 100644 --- a/modular_RUtgmc/code/game/turfs/transit.dm +++ b/modular_RUtgmc/code/game/turfs/transit.dm @@ -12,6 +12,20 @@ INVOKE_ASYNC(crosser, TYPE_PROC_REF(/atom/movable, throw_at), projected, 50, 2, null, TRUE, targetted_throw = TRUE) addtimer(CALLBACK(src, PROC_REF(handle_crosser), crosser), 0.5 SECONDS) +/turf/open/space/transit/Initialize(mapload) + . = ..() + update_icon() + if(isobserver(crosser) || crosser.anchored) + return + + if(!isobj(crosser) && !isliving(crosser)) + return + + if(!isspaceturf(old_loc)) + var/turf/projected = get_ranged_target_turf(crosser.loc, dir, 10) + INVOKE_ASYNC(crosser, TYPE_PROC_REF(/atom/movable, throw_at), projected, 50, 2, null, TRUE, targetted_throw = TRUE) + addtimer(CALLBACK(src, PROC_REF(handle_crosser), crosser), 0.5 SECONDS) + /turf/open/space/transit/proc/handle_crosser(atom/movable/crosser) if(QDELETED(crosser)) return