Hotfix for windoor bumping (#8351)

* j * h * part 2 * e * fix errors & warnings * Update signaler.dm * aaa * clean up attackby * fixes + rest of it * Update blast_door.dm * bruh * fix everything * Update door_control.dm * s * Update code/datums/autolathe/parts.dm Co-authored-by: hyperioo <[email protected]> * Update code/game/machinery/doors/blast_door.dm Co-authored-by: hyperioo <[email protected]> * Update code/modules/assembly/signaler.dm * Update code/game/machinery/doors/blast_door.dm * Update code/game/machinery/doors/blast_door.dm Co-authored-by: hyperioo <[email protected]> * Update code/game/machinery/doors/blast_door.dm Co-authored-by: hyperioo <[email protected]> * Update code/game/machinery/doors/blast_door.dm Co-authored-by: hyperioo <[email protected]> * Update code/modules/assembly/signaler.dm Co-authored-by: hyperioo <[email protected]> * Update code/modules/assembly/signaler.dm Co-authored-by: hyperioo <[email protected]> * Update code/modules/assembly/signaler.dm Co-authored-by: hyperioo <[email protected]> * aa --------- Co-authored-by: hyperioo <[email protected]>
discordia-space · Nov 3, 2023 · 25a3ffe · 25a3ffe
1 parent a664e34
commit 25a3ffe
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
@@ -78,7 +78,7 @@
 	var/mob/M = AM // we've returned by here if M is not a mob
 	if (src.operating)
 		return
-	if (src.density && (!issmall(M) || ishuman(M)) && src.allowed(AM))
+	if (src.density && (!issmall(M) || ishuman(M)) && src.allowed(AM) && can_open())
 		open()
 		addtimer(CALLBACK(src, PROC_REF(close)), 5 SECONDS)
 		/*
@@ -109,10 +109,11 @@
 /obj/machinery/door/window/open()
 	if (src.operating == TRUE) //doors can still open when emag-disabled
 		return FALSE
-	if(!src.operating) //in case of emag
-		src.operating = TRUE
 	if(!can_open())
 		return FALSE
+	if(!src.operating) //in case of emag
+		src.operating = TRUE
+
 	flick(text("[]opening", src.base_state), src)
 	playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
 	src.icon_state = text("[]open", src.base_state)