From 86804597d90d4992f80b19be9daea09e3bd30fb1 Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Thu, 24 Aug 2023 20:53:33 +0200 Subject: [PATCH 1/2] Fix add a check when trying to regain control of locked DS to avoid waste of time. (#4209) # About the pull request fixes: https://github.com/cmss13-devs/cmss13/issues/4188 add a check before they start the long process of unlock the DS after queen lock it to avoid people wasting time. # Explain why it's good for the game just a little fix or qol or both... # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags. ![image](https://github.com/cmss13-devs/cmss13/assets/117036822/424aadaa-536c-4fd1-9ffc-e54c92e2c05d)
# Changelog :cl: fix: add a check before people start the long process of unlock the DS so that people don't waste time. /:cl: --------- Co-authored-by: Julien Co-authored-by: harryob --- code/modules/shuttle/computers/dropship_computer.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm index 5ad84e17f159..16f96ce3017c 100644 --- a/code/modules/shuttle/computers/dropship_computer.dm +++ b/code/modules/shuttle/computers/dropship_computer.dm @@ -147,6 +147,10 @@ return 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)) to_chat(user, SPAN_WARNING("You fail to remove the Queens override")) From 6d6b93f01bf0f84b50bfe8d75b927db0d66d9b77 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Thu, 24 Aug 2023 20:04:14 +0100 Subject: [PATCH 2/2] reception offset --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 9ab055d0c904..1bff705013a5 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -34357,7 +34357,7 @@ }, /obj/structure/machinery/computer/working_joe{ dir = 8; - pixel_x = 17 + pixel_x = 29 }, /turf/open/floor/almayer/no_build{ icon_state = "ai_floors"