From 43744d9db84df6410db5597c4b70c0054c87b776 Mon Sep 17 00:00:00 2001 From: Drulikar Date: Sun, 10 Mar 2024 09:00:37 -0700 Subject: [PATCH 1/2] Fix queen only prying when locked --- code/game/machinery/doors/multi_tile.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index 9e734a0152e7..f841695cfc89 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -291,9 +291,6 @@ if(!queen_pryable) return ..() - if(!locked) - return ..() - if(xeno.action_busy) return From 14ef17a5a9aa147b1177b942f8b3d4eae5af314c Mon Sep 17 00:00:00 2001 From: Drulikar Date: Sun, 10 Mar 2024 09:00:47 -0700 Subject: [PATCH 2/2] Refactoring --- code/game/machinery/doors/airlock_control.dm | 10 ++++++---- code/game/machinery/doors/door.dm | 2 +- code/game/machinery/doors/multi_tile.dm | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index 57e27cc60d91..b656250dabeb 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -123,14 +123,16 @@ radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK) -/obj/structure/machinery/door/airlock/open(surpress_send) +/obj/structure/machinery/door/airlock/open(forced) . = ..() - if(!surpress_send) send_status() + if(!forced) + send_status() -/obj/structure/machinery/door/airlock/close(surpress_send) +/obj/structure/machinery/door/airlock/close(forced) . = ..() - if(!surpress_send) send_status() + if(!forced) + send_status() /obj/structure/machinery/door/airlock/proc/set_frequency(new_frequency) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 021cb60769f9..27bb58397956 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -214,7 +214,7 @@ flick("door_deny", src) return -/obj/structure/machinery/door/proc/open(forced=0) +/obj/structure/machinery/door/proc/open(forced) if(!density) return TRUE if(operating || !loc) diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index f841695cfc89..693e7284210e 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -297,7 +297,7 @@ to_chat(xeno, SPAN_NOTICE("You try and force the doors open")) if(do_after(xeno, 3 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) unlock(TRUE) - open(1) + open(TRUE) lock(TRUE) var/direction switch(id)