diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm
index e130c3ed606..ffcb2e06785 100644
--- a/code/game/objects/items/weapons/rpd.dm
+++ b/code/game/objects/items/weapons/rpd.dm
@@ -192,6 +192,10 @@ var/list/pipemenu = list(
return
if(world.time < lastused + spawndelay)
return
+ var/turf/T = get_turf(target)
+ for(var/obj/machinery/shieldwall/S in T)
+ to_chat(user, "[S] blocks access!")
+ return
target.rpd_act(user, src) //Handle RPD effects in separate procs
#undef RPD_COOLDOWN_TIME
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm
index 58eb8de7bde..be67d79272f 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/depot.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/depot.dm
@@ -41,6 +41,12 @@
return
return ..(M)
+/obj/structure/closet/secure_closet/syndicate/depot/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/rcs))
+ to_chat(user, "Bluespace interference prevents the [W] from locking onto [src]!")
+ return
+ return ..()
+
/obj/structure/closet/secure_closet/syndicate/depot/emp_act(severity)
return