From 25a3ffe8c8c7a46b734673087b4bb87ea94b2e05 Mon Sep 17 00:00:00 2001 From: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com> Date: Sat, 4 Nov 2023 01:39:24 +0200 Subject: [PATCH] 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 <64754494+hyperioo@users.noreply.github.com> * Update code/game/machinery/doors/blast_door.dm Co-authored-by: hyperioo <64754494+hyperioo@users.noreply.github.com> * 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 <64754494+hyperioo@users.noreply.github.com> * Update code/game/machinery/doors/blast_door.dm Co-authored-by: hyperioo <64754494+hyperioo@users.noreply.github.com> * Update code/game/machinery/doors/blast_door.dm Co-authored-by: hyperioo <64754494+hyperioo@users.noreply.github.com> * Update code/modules/assembly/signaler.dm Co-authored-by: hyperioo <64754494+hyperioo@users.noreply.github.com> * Update code/modules/assembly/signaler.dm Co-authored-by: hyperioo <64754494+hyperioo@users.noreply.github.com> * Update code/modules/assembly/signaler.dm Co-authored-by: hyperioo <64754494+hyperioo@users.noreply.github.com> * aa --------- Co-authored-by: hyperioo <64754494+hyperioo@users.noreply.github.com> --- code/game/machinery/doors/windowdoor.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 4efe2657f21..d7539ab8846 100644 --- 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)