Merge pull request #12234 from Incoming5643/flapping_intensifies

Modifies plastic flaps to defeat the secret box technique.

code/game/objects/structures/crates_lockers/closets/cardboardbox.dm

@@ -17,9 +17,11 @@
 /obj/structure/closet/cardboard/relaymove(mob/user, direction)
 	if(opened || move_delay || user.stat || user.stunned || user.weakened || user.paralysis || !isturf(loc) || !has_gravity(loc))
 		return
-	step(src, direction)
 	move_delay = 1
-	spawn(config.walk_speed)
+	if(step(src, direction))
+		spawn(config.walk_speed)
+			move_delay = 0
+	else
 		move_delay = 0
 
 /obj/structure/closet/cardboard/open()

code/game/objects/structures/plasticflaps.dm

@@ -1,4 +1,3 @@
-
 /obj/structure/plasticflaps	//HOW DO YOU CALL THOSE THINGS ANYWAY
 	name = "plastic flaps"
 	desc = "Definitely can't get past those. No way."
@@ -16,6 +15,11 @@
 	if (istype(A, /obj/structure/bed) && (B.buckled_mob || B.density))//if it's a bed/chair and is dense or someone is buckled, it will not pass
 		return 0
 
+	if (istype(A, /obj/structure/closet/cardboard))
+		var/obj/structure/closet/cardboard/C = A
+		if(C.move_delay)
+			return 0
+
 	else if(istype(A, /mob/living)) // You Shall Not Pass!
 		var/mob/living/M = A
 		if(M.buckled && istype(M.buckled, /obj/machinery/bot/mulebot)) // mulebot passenger gets a free pass.
@@ -55,4 +59,4 @@
 	if(T)
 		if(istype(T, /turf/simulated/floor))
 			T.blocks_air = 0
-	return ..()
+	return ..()