From 8182453c4e2a3b8d23fe5158fc6d9d5443eeea71 Mon Sep 17 00:00:00 2001
From: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Date: Tue, 10 Sep 2024 17:29:58 +0300
Subject: [PATCH] Fixes locker shoving closing and opening the locker thrice,
 sending its victim to the backrooms (#86572)

## About The Pull Request

Closes #86456 and fixes this

![dreamseeker_bPI7dM78rV](https://github.com/user-attachments/assets/b9939d24-347e-49e2-b3b4-cec1185d2dfc)

## Changelog
:cl:
fix: Fixed locker shoving closing and opening the locker thrice, sending
its victim to the backrooms
/:cl:
---
 code/game/objects/structures/crates_lockers/closets.dm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index f407dcd82c0..ffbbca66afb 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -1191,15 +1191,13 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
 		return
 	if(!opened && ((shove_flags & SHOVE_KNOCKDOWN_BLOCKED) || !(shove_flags & SHOVE_BLOCKED)))
 		return
-	var/was_opened = opened
-	if(!toggle())
-		return
-	if(was_opened)
-		if (!target.Move(get_turf(src), get_dir(target, src)))
+	if(opened)
+		if (target.loc != loc)
 			return
 		target.forceMove(src)
 	else
 		target.Knockdown(SHOVE_KNOCKDOWN_SOLID)
+	toggle()
 	update_icon()
 	target.visible_message(span_danger("[shover.name] shoves [target.name] into [src]!"),
 		span_userdanger("You're shoved into [src] by [shover.name]!"),