diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm
index 6af1a797e2e..df7af42f5c7 100644
--- a/code/datums/supplypacks/misc_vr.dm
+++ b/code/datums/supplypacks/misc_vr.dm
@@ -85,7 +85,7 @@
 /datum/supply_pack/misc/com_medical_rig
 	name = "commonwealth medical hardsuit (loaded)"
 	contains = list(
-			/obj/item/weapon/rig/baymed = 1
+			/obj/item/weapon/rig/baymed/equipped = 1
 			)
 	cost = 250
 	containertype = /obj/structure/closet/crate/secure/gear
@@ -95,7 +95,7 @@
 /datum/supply_pack/misc/com_engineering_rig
 	name = "commonwealth engineering hardsuit (loaded)"
 	contains = list(
-			/obj/item/weapon/rig/bayeng = 1
+			/obj/item/weapon/rig/bayeng/equipped = 1
 			)
 	cost = 250
 	containertype = /obj/structure/closet/crate/secure/gear
diff --git a/code/modules/clothing/spacesuits/rig/suits/station_vr.dm b/code/modules/clothing/spacesuits/rig/suits/station_vr.dm
index 46c02b9e757..af0351b37d8 100644
--- a/code/modules/clothing/spacesuits/rig/suits/station_vr.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/station_vr.dm
@@ -237,15 +237,24 @@
 
 	chest_type = /obj/item/clothing/suit/space/rig/baymed
 	helm_type = /obj/item/clothing/head/helmet/space/rig/baymed
-	boot_type = /obj/item/clothing/shoes/magboots/rig/baymed
+	boot_type = /obj/item/clothing/shoes/magboots/rig/ce/baymed
 	glove_type = /obj/item/clothing/gloves/gauntlets/rig/baymed
 
+	allowed = list(
+		/obj/item/device/flashlight,
+		/obj/item/weapon/tank,
+		/obj/item/device/suit_cooling_unit,
+		/obj/item/weapon/storage,
+		/obj/item/device/healthanalyzer,
+		/obj/item/stack/medical,
+		/obj/item/roller
+		)
+
 	// speedy paper
 	slowdown = -0.5
 	armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 25, "bio" = 100, "rad" = 20)
 
 /obj/item/weapon/rig/baymed/equipped
-	req_access = list(access_medical)
 	
 	initial_modules = list(
 		/obj/item/rig_module/maneuvering_jets,
@@ -261,6 +270,7 @@
 	item_state = null
 	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
 	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
+	camera_networks = list(NETWORK_MEDICAL)
 
 /obj/item/clothing/suit/space/rig/baymed
 	icon = 'icons/inventory/suit/item_vr.dmi'
@@ -270,7 +280,7 @@
 	sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB
 	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM
 
-/obj/item/clothing/shoes/magboots/rig/baymed
+/obj/item/clothing/shoes/magboots/rig/ce/baymed
 	icon = 'icons/inventory/feet/item_vr.dmi'
 	default_worn_icon = 'icons/inventory/feet/mob_vr.dmi'
 	icon_state = "medical_rig_bay"
@@ -300,14 +310,24 @@
 
 	chest_type = /obj/item/clothing/suit/space/rig/bayeng
 	helm_type = /obj/item/clothing/head/helmet/space/rig/bayeng
-	boot_type = /obj/item/clothing/shoes/magboots/rig/bayeng
+	boot_type = /obj/item/clothing/shoes/magboots/rig/ce/bayeng
 	glove_type = /obj/item/clothing/gloves/gauntlets/rig/bayeng
 
-	slowdown = 1
+	allowed = list(
+		/obj/item/device/flashlight,
+		/obj/item/weapon/tank,
+		/obj/item/device/suit_cooling_unit,
+		/obj/item/weapon/storage,
+		/obj/item/device/t_scanner,
+		/obj/item/weapon/pickaxe,
+		/obj/item/weapon/rcd
+		)
+
+	slowdown = 0
 	offline_slowdown = 5 // very bulky
 	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 50)
 
-/obj/item/weapon/rig/bayeng//equipped
+/obj/item/weapon/rig/bayeng/equipped
 	initial_modules = list(
 		/obj/item/rig_module/maneuvering_jets,
 		/obj/item/rig_module/device/rcd,
@@ -323,6 +343,7 @@
 	item_state = null
 	sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB
 	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM
+	camera_networks = list(NETWORK_ENGINEERING)
 
 /obj/item/clothing/suit/space/rig/bayeng
 	icon = 'icons/inventory/suit/item_vr.dmi'
@@ -332,7 +353,7 @@
 	sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB
 	sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM
 
-/obj/item/clothing/shoes/magboots/rig/bayeng
+/obj/item/clothing/shoes/magboots/rig/ce/bayeng
 	icon = 'icons/inventory/feet/item_vr.dmi'
 	default_worn_icon = 'icons/inventory/feet/mob_vr.dmi'
 	icon_state = "engineering_rig_bay"