From 0898ac4f9f279822cb421c5aabb5a06c051e7ed1 Mon Sep 17 00:00:00 2001
From: Heroman <alesha3000@list.ru>
Date: Sun, 9 May 2021 13:25:34 +1000
Subject: [PATCH] Refactors to be more specific to its purpose.

---
 code/datums/repositories/crew.dm                   | 2 +-
 code/game/objects/items/devices/radio/jammer.dm    | 5 -----
 code/game/objects/items/devices/radio/jammer_vr.dm | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/code/datums/repositories/crew.dm b/code/datums/repositories/crew.dm
index e9547694480..997a8357da4 100644
--- a/code/datums/repositories/crew.dm
+++ b/code/datums/repositories/crew.dm
@@ -25,7 +25,7 @@ var/global/datum/repository/crew/crew_repository = new()
 	for(var/obj/item/clothing/under/C in tracked)
 		var/turf/pos = get_turf(C)
 		var/area/B = pos?.loc //VOREStation Add: No sensor in Dorm
-		if((C.has_sensor) && (pos?.z == zLevel) && (C.sensor_mode != SUIT_SENSOR_OFF) && !(B.block_suit_sensors) && !(is_jammed(C))) //VOREStation Edit
+		if((C.has_sensor) && (pos?.z == zLevel) && (C.sensor_mode != SUIT_SENSOR_OFF) && !(B.block_suit_sensors) && !(is_jammed(C)) && !(is_vore_jammed(C))) //VOREStation Edit
 			if(istype(C.loc, /mob/living/carbon/human))
 				var/mob/living/carbon/human/H = C.loc
 				if(H.w_uniform != C)
diff --git a/code/game/objects/items/devices/radio/jammer.dm b/code/game/objects/items/devices/radio/jammer.dm
index eedb05197b0..b59101cc663 100644
--- a/code/game/objects/items/devices/radio/jammer.dm
+++ b/code/game/objects/items/devices/radio/jammer.dm
@@ -13,11 +13,6 @@ var/global/list/active_radio_jammers = list()
 			if(dist <= J.jam_range)
 				return list("jammer" = J, "distance" = dist)
 
-	//VOREStation Addition Start
-	if(is_vore_jammed(radio))
-		return TRUE
-	//VOREStation Addition End
-
 /obj/item/device/radio_jammer
 	name = "subspace jammer"
 	desc = "Primarily for blocking subspace communications, preventing the use of headsets, PDAs, and communicators. Also masks suit sensors."	// Added suit sensor jamming
diff --git a/code/game/objects/items/devices/radio/jammer_vr.dm b/code/game/objects/items/devices/radio/jammer_vr.dm
index e99952657fc..de195322a27 100644
--- a/code/game/objects/items/devices/radio/jammer_vr.dm
+++ b/code/game/objects/items/devices/radio/jammer_vr.dm
@@ -8,7 +8,7 @@
 	while(current.loc)
 		if(isbelly(current.loc))
 			var/obj/belly/B = current.loc
-			if((istype(current, /obj/item/clothing/under)) && (B.mode_flags & DM_FLAG_JAMSENSORS))
+			if(B.mode_flags & DM_FLAG_JAMSENSORS)
 				return TRUE
 		current = current.loc