From b4e5e3f505e28aecfbe1b49f81206aa1839ff7d0 Mon Sep 17 00:00:00 2001 From: Burzah <116982774+Burzah@users.noreply.github.com> Date: Wed, 16 Aug 2023 12:44:14 -0700 Subject: [PATCH] Radio Jammer can no longer jam across z-levels (#21954) * jammer fix attempt * oversight fix --- code/game/objects/items/devices/radio/radio_objects.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/radio/radio_objects.dm b/code/game/objects/items/devices/radio/radio_objects.dm index 5dff77d0704..07094ea3c7b 100644 --- a/code/game/objects/items/devices/radio/radio_objects.dm +++ b/code/game/objects/items/devices/radio/radio_objects.dm @@ -376,7 +376,10 @@ GLOBAL_LIST_INIT(default_medbay_channels, list( var/turf/position = get_turf(src) for(var/J in GLOB.active_jammers) var/obj/item/jammer/jammer = J - if(get_dist(position, get_turf(jammer)) < jammer.range) + var/position_jammer = get_turf(jammer) + if(!atoms_share_level(position, position_jammer)) + continue + if(get_dist(position, position_jammer) < jammer.range) jammed = TRUE break