Merge pull request #4886 from Citadel-Station-13/upstream-merge-34427

[MIRROR] Reebe rifts no longer instantly teleport you on collision, and servant blockers also block airflow

code/game/gamemodes/clock_cult/clock_effects/city_of_cogs_rift.dm

@@ -10,7 +10,6 @@
 	light_power = 3
 	light_color = "#6A4D2F"
 
-
 /obj/effect/clockwork/city_of_cogs_rift/singularity_act()
 	return
 
@@ -42,6 +41,13 @@
 
 /obj/effect/clockwork/city_of_cogs_rift/CollidedWith(atom/movable/AM)
 	if(!QDELETED(AM))
+		if(isliving(AM))
+			var/mob/living/L = AM
+			if(L.client && !L.incapacitated())
+				L.visible_message("<span class='notice'>[L] starts climbing through [src]...</span>", \
+				"<span class='notice'>You begin climbing through [src]...</span>")
+				if(!do_after(L, 30, target = L))
+					return
 		beckon(AM)
 
 /obj/effect/clockwork/city_of_cogs_rift/proc/beckon(atom/movable/AM)

code/game/gamemodes/clock_cult/clock_effects/servant_blocker.dm

@@ -4,12 +4,20 @@
 	desc = "A faintly glowing image of an arrow on the ground. Convenient!"
 	icon_state = "servant_blocker"
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	anchored = TRUE
 	density = TRUE
+	CanAtmosPass = ATMOS_PASS_NO
+
+/obj/effect/clockwork/servant_blocker/Initialize()
+	. = ..()
+	air_update_turf(TRUE)
 
 /obj/effect/clockwork/servant_blocker/Destroy(force)
 	if(!force)
 		return
+	var/turf/T = get_turf(src)
 	. = ..()
+	T.air_update_turf(TRUE)
 
 /obj/effect/clockwork/servant_blocker/CanPass(atom/movable/M, turf/target)
 	var/list/target_contents = M.GetAllContents() + M
@@ -17,6 +25,13 @@
 		if(is_servant_of_ratvar(L) && get_dir(M, src) != dir && L.stat != DEAD) //Unless we're on the side the arrow is pointing directly away from, no-go
 			to_chat(L, "<span class='danger'>The space beyond here can't be accessed by you or other servants.</span>")
 			return
+	if(isitem(M))
+		var/obj/item/I = M
+		if(is_servant_of_ratvar(I.thrownby)) //nice try!
+			return
+	return TRUE
+
+/obj/effect/clockwork/servant_blocker/BlockSuperconductivity()
 	return TRUE
 
 /obj/effect/clockwork/servant_blocker/singularity_act()