From b976d35489f1453571823095119d43120f7f653c Mon Sep 17 00:00:00 2001 From: Julien Date: Sat, 19 Aug 2023 17:06:49 +0200 Subject: [PATCH 1/5] add a check to avoid people wasting time when they can't do the action --- code/modules/shuttle/computers/dropship_computer.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 5ad84e17f159..87c876717924 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -147,6 +147,8 @@ return if(dropship_control_lost && skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) + if(remaining_time > 60) + to_chat(user, SPAN_WARNING("The shuttle is not responding, try again in [remaining_time] [units].")) to_chat(user, SPAN_NOTICE("You start to remove the Queens override.")) if(!do_after(user, 3 MINUTES, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) to_chat(user, SPAN_WARNING("You fail to remove the Queens override")) From d2359e323c0802b6bd9b6294252f5f3f09ec352b Mon Sep 17 00:00:00 2001 From: Julien Date: Sat, 19 Aug 2023 17:09:22 +0200 Subject: [PATCH 2/5] tsgdgqg --- code/modules/shuttle/computers/dropship_computer.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 87c876717924..781fe407b0db 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -147,6 +147,8 @@ return if(dropship_control_lost && skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) + var/remaining_time = timeleft(door_control_cooldown) / 10 + var/units = "seconds" if(remaining_time > 60) to_chat(user, SPAN_WARNING("The shuttle is not responding, try again in [remaining_time] [units].")) to_chat(user, SPAN_NOTICE("You start to remove the Queens override.")) From c2d0e2aef436888ad02810fa21787903aa515080 Mon Sep 17 00:00:00 2001 From: Julien Date: Sat, 19 Aug 2023 17:19:10 +0200 Subject: [PATCH 3/5] small mistake --- code/modules/shuttle/computers/dropship_computer.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 781fe407b0db..77e102b85096 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -151,6 +151,7 @@ var/units = "seconds" if(remaining_time > 60) to_chat(user, SPAN_WARNING("The shuttle is not responding, try again in [remaining_time] [units].")) + return to_chat(user, SPAN_NOTICE("You start to remove the Queens override.")) if(!do_after(user, 3 MINUTES, INTERRUPT_ALL, BUSY_ICON_HOSTILE)) to_chat(user, SPAN_WARNING("You fail to remove the Queens override")) From e75f653464f781ce506a5f8b63a3b910fd508f25 Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Thu, 24 Aug 2023 10:15:40 +0200 Subject: [PATCH 4/5] Update code/modules/shuttle/computers/dropship_computer.dm harry is the best Co-authored-by: harryob --- 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 77e102b85096..28d14e2286ed 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -150,7 +150,7 @@ var/remaining_time = timeleft(door_control_cooldown) / 10 var/units = "seconds" if(remaining_time > 60) - to_chat(user, SPAN_WARNING("The shuttle is not responding, try again in [remaining_time] [units].")) + 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)) From cb92e9ec4be264d9932048d81f7d3898bd518800 Mon Sep 17 00:00:00 2001 From: Julien Date: Thu, 24 Aug 2023 10:49:22 +0200 Subject: [PATCH 5/5] remove redondant var like harry suggested. --- code/modules/shuttle/computers/dropship_computer.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 28d14e2286ed..16f96ce3017c 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -148,7 +148,6 @@ if(dropship_control_lost && skillcheck(user, SKILL_PILOT, SKILL_PILOT_EXPERT)) var/remaining_time = timeleft(door_control_cooldown) / 10 - var/units = "seconds" if(remaining_time > 60) to_chat(user, SPAN_WARNING("The shuttle is not responding, try again in [remaining_time] seconds.")) return