From 8895bc672b0d5e26db2b2b369aaf5f2080853314 Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Wed, 6 Dec 2023 16:03:09 +0300 Subject: [PATCH 01/12] init --- .../shuttle/computers/dropship_computer.dm | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 6774d81e590d..1b9ed4badbac 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -142,16 +142,22 @@ if(shuttle.mode == SHUTTLE_CRASHED) to_chat(user, SPAN_NOTICE("\The [src] is not responsive")) return - + var/remaining_time = timeleft(door_control_cooldown) / 10 + if(remaining_time > 60) + to_chat(user, SPAN_WARNING("The shuttle is not responding, try again in [remaining_time] seconds.")) if(dropship_control_lost && skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) - var/remaining_time = timeleft(door_control_cooldown) / 10 - if(remaining_time > 60) - to_chat(user, SPAN_WARNING("The shuttle is not responding, try again in [remaining_time] seconds.")) - return to_chat(user, SPAN_NOTICE("You start to remove the Queens override.")) - if(!do_after(user, 3 MINUTES, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) + if(do_after(user, 20 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) + remaining_time = timeleft(door_control_cooldown) / 10 - 20 + if(remaining_time > 0) + to_chat(user, SPAN_WARNING("You partly remove the Queens override, only [remaining_time] seconds left.")) + door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), remaining_time SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_DELETE_ME|TIMER_OVERRIDE) + return + else to_chat(user, SPAN_WARNING("You fail to remove the Queens override")) return + if(dropship_control_lost) + remove_door_lock() playsound(loc, 'sound/machines/terminal_success.ogg', KEYBOARD_SOUND_VOLUME, 1) if(!shuttle.is_hijacked) @@ -216,7 +222,7 @@ if(!dropship_control_lost) dropship.control_doors("unlock", "all", TRUE) dropship_control_lost = TRUE - door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), SHUTTLE_LOCK_COOLDOWN, TIMER_STOPPABLE) + door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), SHUTTLE_LOCK_COOLDOWN, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_DELETE_ME|TIMER_OVERRIDE) if(GLOB.almayer_orbital_cannon) GLOB.almayer_orbital_cannon.is_disabled = TRUE addtimer(CALLBACK(GLOB.almayer_orbital_cannon, TYPE_PROC_REF(/obj/structure/orbital_cannon, enable)), 10 MINUTES, TIMER_UNIQUE) From 13abeaf878ba4814e100971b1af623e728a92d8e Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Wed, 6 Dec 2023 16:57:25 +0300 Subject: [PATCH 02/12] test --- code/modules/shuttle/computers/dropship_computer.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 1b9ed4badbac..cd554dafc882 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -143,21 +143,21 @@ to_chat(user, SPAN_NOTICE("\The [src] is not responsive")) return var/remaining_time = timeleft(door_control_cooldown) / 10 - if(remaining_time > 60) - to_chat(user, SPAN_WARNING("The shuttle is not responding, try again in [remaining_time] seconds.")) + to_chat(user, SPAN_WARNING("The shuttle is not responding, try again in [remaining_time] seconds.")) if(dropship_control_lost && skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) to_chat(user, SPAN_NOTICE("You start to remove the Queens override.")) if(do_after(user, 20 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) remaining_time = timeleft(door_control_cooldown) / 10 - 20 if(remaining_time > 0) - to_chat(user, SPAN_WARNING("You partly remove the Queens override, only [remaining_time] seconds left.")) - door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), remaining_time SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_DELETE_ME|TIMER_OVERRIDE) + to_chat(user, SPAN_NOTICE("You partly remove the Queens override, only [remaining_time] seconds left.")) + door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), remaining_time SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT) return else - to_chat(user, SPAN_WARNING("You fail to remove the Queens override")) + to_chat(user, SPAN_WARNING("You fail to remove the Queens override!")) return if(dropship_control_lost) remove_door_lock() + to_chat(user, SPAN_NOTICE("You succesfully removed the Queens override!")) playsound(loc, 'sound/machines/terminal_success.ogg', KEYBOARD_SOUND_VOLUME, 1) if(!shuttle.is_hijacked) @@ -222,7 +222,7 @@ if(!dropship_control_lost) dropship.control_doors("unlock", "all", TRUE) dropship_control_lost = TRUE - door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), SHUTTLE_LOCK_COOLDOWN, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_DELETE_ME|TIMER_OVERRIDE) + door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), SHUTTLE_LOCK_COOLDOWN, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT) if(GLOB.almayer_orbital_cannon) GLOB.almayer_orbital_cannon.is_disabled = TRUE addtimer(CALLBACK(GLOB.almayer_orbital_cannon, TYPE_PROC_REF(/obj/structure/orbital_cannon, enable)), 10 MINUTES, TIMER_UNIQUE) @@ -305,6 +305,7 @@ playsound(loc, 'sound/machines/terminal_success.ogg', KEYBOARD_SOUND_VOLUME, 1) dropship_control_lost = FALSE if(door_control_cooldown) + deltimer(door_control_cooldown) door_control_cooldown = null /obj/structure/machinery/computer/shuttle/dropship/flight/ui_data(mob/user) From 5ebe27b57416cc6aa2fcab2b5f0918f6044ecc53 Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Thu, 7 Dec 2023 08:39:29 +0300 Subject: [PATCH 03/12] epic --- .../shuttle/computers/dropship_computer.dm | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index cd554dafc882..6da8f463f834 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -142,22 +142,32 @@ if(shuttle.mode == SHUTTLE_CRASHED) to_chat(user, SPAN_NOTICE("\The [src] is not responsive")) return - var/remaining_time = timeleft(door_control_cooldown) / 10 - to_chat(user, SPAN_WARNING("The shuttle is not responding, try again in [remaining_time] seconds.")) - if(dropship_control_lost && skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) - to_chat(user, SPAN_NOTICE("You start to remove the Queens override.")) - if(do_after(user, 20 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) + + if(dropship_control_lost) + var/remaining_time = timeleft(door_control_cooldown) / 10 + to_chat(user, SPAN_WARNING("The shuttle is not responding due to the Queen's override, the system will automatically remove the override in about [remaining_time] seconds.")) + if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) + return + if(user.action_busy) + return + to_chat(user, SPAN_NOTICE("You start to remove the Queen's override.")) + for(var/i in 1 to n_ceil(remaining_time/40)) + if(!do_after(user, 20 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) + to_chat(user, SPAN_WARNING("You fail to remove the Queen's override!")) + return + if(!dropship_control_lost) + to_chat(user, SPAN_NOTICE("The Queen's override is already removed.")) + break remaining_time = timeleft(door_control_cooldown) / 10 - 20 if(remaining_time > 0) - to_chat(user, SPAN_NOTICE("You partly remove the Queens override, only [remaining_time] seconds left.")) + to_chat(user, SPAN_NOTICE("You partly remove the Queen's override, about [remaining_time] seconds left.")) door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), remaining_time SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT) - return - else - to_chat(user, SPAN_WARNING("You fail to remove the Queens override!")) - return - if(dropship_control_lost) - remove_door_lock() - to_chat(user, SPAN_NOTICE("You succesfully removed the Queens override!")) + else + break + + if(dropship_control_lost) + remove_door_lock() + to_chat(user, SPAN_NOTICE("You succesfully removed the Queen's override!")) playsound(loc, 'sound/machines/terminal_success.ogg', KEYBOARD_SOUND_VOLUME, 1) if(!shuttle.is_hijacked) From 9d3c178dfeeb8d679037c2131ab316246a20db91 Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Thu, 7 Dec 2023 09:13:01 +0300 Subject: [PATCH 04/12] snowflake check --- code/modules/shuttle/computers/dropship_computer.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 6da8f463f834..a1d23ac9032c 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -7,6 +7,7 @@ unacidable = TRUE exproof = TRUE needs_power = FALSE + var/override_being_removed = FALSE // Admin disabled var/disabled = FALSE @@ -148,12 +149,14 @@ to_chat(user, SPAN_WARNING("The shuttle is not responding due to the Queen's override, the system will automatically remove the override in about [remaining_time] seconds.")) if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) return - if(user.action_busy) + if(user.action_busy || override_being_removed) return to_chat(user, SPAN_NOTICE("You start to remove the Queen's override.")) + override_being_removed = TRUE for(var/i in 1 to n_ceil(remaining_time/40)) if(!do_after(user, 20 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) to_chat(user, SPAN_WARNING("You fail to remove the Queen's override!")) + override_being_removed = FALSE return if(!dropship_control_lost) to_chat(user, SPAN_NOTICE("The Queen's override is already removed.")) @@ -164,7 +167,7 @@ door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), remaining_time SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT) else break - + override_being_removed = FALSE if(dropship_control_lost) remove_door_lock() to_chat(user, SPAN_NOTICE("You succesfully removed the Queen's override!")) From 691f48401e4cb4c7f5a0fdde0fc9119396f1a343 Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Thu, 7 Dec 2023 11:57:14 +0300 Subject: [PATCH 05/12] Update code/modules/shuttle/computers/dropship_computer.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/modules/shuttle/computers/dropship_computer.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index a1d23ac9032c..ccee94664bfd 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -153,7 +153,7 @@ return to_chat(user, SPAN_NOTICE("You start to remove the Queen's override.")) override_being_removed = TRUE - for(var/i in 1 to n_ceil(remaining_time/40)) + while(remaining_time > 0) if(!do_after(user, 20 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) to_chat(user, SPAN_WARNING("You fail to remove the Queen's override!")) override_being_removed = FALSE @@ -165,8 +165,6 @@ if(remaining_time > 0) to_chat(user, SPAN_NOTICE("You partly remove the Queen's override, about [remaining_time] seconds left.")) door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), remaining_time SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT) - else - break override_being_removed = FALSE if(dropship_control_lost) remove_door_lock() From 8967b517b73eab19ec2545fcf33e22a582388191 Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Thu, 7 Dec 2023 12:00:53 +0300 Subject: [PATCH 06/12] 20 --- code/modules/shuttle/computers/dropship_computer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index ccee94664bfd..7d008e6f9fe4 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -153,7 +153,7 @@ return to_chat(user, SPAN_NOTICE("You start to remove the Queen's override.")) override_being_removed = TRUE - while(remaining_time > 0) + while(remaining_time > 20) if(!do_after(user, 20 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) to_chat(user, SPAN_WARNING("You fail to remove the Queen's override!")) override_being_removed = FALSE From be6bee15f19b24b265c0e20d5e98f329aef5a56c Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Thu, 7 Dec 2023 12:05:59 +0300 Subject: [PATCH 07/12] point lockout --- code/modules/shuttle/computers/dropship_computer.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 7d008e6f9fe4..7a9237f1997d 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -146,29 +146,29 @@ if(dropship_control_lost) var/remaining_time = timeleft(door_control_cooldown) / 10 - to_chat(user, SPAN_WARNING("The shuttle is not responding due to the Queen's override, the system will automatically remove the override in about [remaining_time] seconds.")) + to_chat(user, SPAN_WARNING("The shuttle is not responding due to an unauthorazed access attempt, the system will automatically remove the lockout in about [remaining_time] seconds.")) if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) return if(user.action_busy || override_being_removed) return - to_chat(user, SPAN_NOTICE("You start to remove the Queen's override.")) + to_chat(user, SPAN_NOTICE("You start to remove the lockout.")) override_being_removed = TRUE while(remaining_time > 20) if(!do_after(user, 20 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) - to_chat(user, SPAN_WARNING("You fail to remove the Queen's override!")) + to_chat(user, SPAN_WARNING("You fail to remove the lockout!")) override_being_removed = FALSE return if(!dropship_control_lost) - to_chat(user, SPAN_NOTICE("The Queen's override is already removed.")) + to_chat(user, SPAN_NOTICE("The lockout is already removed.")) break remaining_time = timeleft(door_control_cooldown) / 10 - 20 if(remaining_time > 0) - to_chat(user, SPAN_NOTICE("You partly remove the Queen's override, about [remaining_time] seconds left.")) + to_chat(user, SPAN_NOTICE("You partly remove the lockout, about [remaining_time] seconds left.")) door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), remaining_time SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT) override_being_removed = FALSE if(dropship_control_lost) remove_door_lock() - to_chat(user, SPAN_NOTICE("You succesfully removed the Queen's override!")) + to_chat(user, SPAN_NOTICE("You succesfully removed the lockout!")) playsound(loc, 'sound/machines/terminal_success.ogg', KEYBOARD_SOUND_VOLUME, 1) if(!shuttle.is_hijacked) From 69b875775009eba1fc3d35ea1f98915209bc5c33 Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Thu, 7 Dec 2023 12:08:35 +0300 Subject: [PATCH 08/12] eh --- code/modules/shuttle/computers/dropship_computer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 7a9237f1997d..bbf30ed51859 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -146,7 +146,7 @@ if(dropship_control_lost) var/remaining_time = timeleft(door_control_cooldown) / 10 - to_chat(user, SPAN_WARNING("The shuttle is not responding due to an unauthorazed access attempt, the system will automatically remove the lockout in about [remaining_time] seconds.")) + to_chat(user, SPAN_WARNING("The shuttle is not responding due to an unauthorazed access attempt, a large lockout timers reads that the lockout will be automatically removed in [remaining_time] seconds.")) if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) return if(user.action_busy || override_being_removed) @@ -163,7 +163,7 @@ break remaining_time = timeleft(door_control_cooldown) / 10 - 20 if(remaining_time > 0) - to_chat(user, SPAN_NOTICE("You partly remove the lockout, about [remaining_time] seconds left.")) + to_chat(user, SPAN_NOTICE("You partly remove the lockout, only [remaining_time] seconds left.")) door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), remaining_time SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT) override_being_removed = FALSE if(dropship_control_lost) From 8eb514390f1f1d09cf0475aab88f370e34d54686 Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:17:31 +0300 Subject: [PATCH 09/12] Update code/modules/shuttle/computers/dropship_computer.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/modules/shuttle/computers/dropship_computer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index bbf30ed51859..73ee49196976 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -146,7 +146,7 @@ if(dropship_control_lost) var/remaining_time = timeleft(door_control_cooldown) / 10 - to_chat(user, SPAN_WARNING("The shuttle is not responding due to an unauthorazed access attempt, a large lockout timers reads that the lockout will be automatically removed in [remaining_time] seconds.")) + to_chat(user, SPAN_WARNING("The shuttle is not responding due to an unauthorized access attempt. In large text it says the lockout will be automatically removed in [remaining_time] seconds.")) if(!skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) return if(user.action_busy || override_being_removed) From 4b268af37217319042879f76dfb0277fa7d55f38 Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:17:39 +0300 Subject: [PATCH 10/12] Update code/modules/shuttle/computers/dropship_computer.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/modules/shuttle/computers/dropship_computer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 73ee49196976..3b999abd6bd8 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -163,7 +163,7 @@ break remaining_time = timeleft(door_control_cooldown) / 10 - 20 if(remaining_time > 0) - to_chat(user, SPAN_NOTICE("You partly remove the lockout, only [remaining_time] seconds left.")) + to_chat(user, SPAN_NOTICE("You partially bypass the lockout, only [remaining_time] seconds left.")) door_control_cooldown = addtimer(CALLBACK(src, PROC_REF(remove_door_lock)), remaining_time SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT) override_being_removed = FALSE if(dropship_control_lost) From 1a819518985c5d6430a876f93d75a13605c31958 Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Thu, 7 Dec 2023 13:18:32 +0300 Subject: [PATCH 11/12] small fix --- code/modules/shuttle/computers/dropship_computer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 3b999abd6bd8..6432e00a5a43 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -154,7 +154,7 @@ to_chat(user, SPAN_NOTICE("You start to remove the lockout.")) override_being_removed = TRUE while(remaining_time > 20) - if(!do_after(user, 20 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) + if(!do_after(user, 20 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, numticks = 20)) to_chat(user, SPAN_WARNING("You fail to remove the lockout!")) override_being_removed = FALSE return From 6ba1531366c77ee39ddb963f64655b04a4e333fd Mon Sep 17 00:00:00 2001 From: ihatethisengine <115417687+ihatethisengine@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:01:01 +0300 Subject: [PATCH 12/12] Update dropship_computer.dm --- code/modules/shuttle/computers/dropship_computer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 6432e00a5a43..67d3a20d969e 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -154,7 +154,7 @@ to_chat(user, SPAN_NOTICE("You start to remove the lockout.")) override_being_removed = TRUE while(remaining_time > 20) - if(!do_after(user, 20 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE, numticks = 20)) + if(!do_after(user, 20 SECONDS, INTERRUPT_ALL|INTERRUPT_CHANGED_LYING, BUSY_ICON_HOSTILE, numticks = 20)) to_chat(user, SPAN_WARNING("You fail to remove the lockout!")) override_being_removed = FALSE return