Made various fixes requested and made it so alarm stops when launch b…

…utton is pressed.
cmss13-devs · Nov 20, 2023 · c35cde6 · c35cde6
2 parents e1aa1ab + eabb463
commit c35cde6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/code/modules/shuttle/computers/dropship_computer.dm b/code/modules/shuttle/computers/dropship_computer.dm
@@ -384,6 +384,7 @@
 				msg_admin_niche(log)
 				log_interact(user, msg = "[log]")
 				shuttle.send_for_flyby()
+				stop_playing_launch_announcement_alarm()
 				return TRUE
 
 			update_equipment(is_optimised, FALSE)
@@ -413,6 +414,7 @@
 			var/log = "[key_name(user)] launched the dropship [src.shuttleId] on transport."
 			msg_admin_niche(log)
 			log_interact(user, msg = "[log]")
+			stop_playing_launch_announcement_alarm()
 			return TRUE
 		if("button-push")
 			playsound(loc, get_sfx("terminal_button"), KEYBOARD_SOUND_VOLUME, 1)
@@ -476,11 +478,17 @@
 			shuttle.alarm_sound_loop.start()
 			shuttle.playing_launch_announcement_alarm = TRUE
 			return
-		if ("stop_play_launch_announcement_alarm")
-			shuttle.alarm_sound_loop.stop()
-			shuttle.playing_launch_announcement_alarm = FALSE
+		if ("stop_playing_launch_announcement_alarm")
+			stop_playing_launch_announcement_alarm()
 			return
 
+/obj/structure/machinery/computer/shuttle/dropship/flight/proc/stop_playing_launch_announcement_alarm()
+	var/obj/docking_port/mobile/marine_dropship/shuttle = SSshuttle.getShuttle(shuttleId)
+
+	shuttle.alarm_sound_loop.stop()
+	shuttle.playing_launch_announcement_alarm = FALSE
+	return
+
 /obj/structure/machinery/computer/shuttle/dropship/flight/lz1
 	icon = 'icons/obj/structures/machinery/computer.dmi'
 	icon_state = "shuttle"

diff --git a/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx b/tgui/packages/tgui/interfaces/DropshipFlightControl.tsx
@@ -44,7 +44,10 @@ const DropshipDoorControl = (_, context) => {
               <Button
                 disabled={disable_door_controls}
                 onClick={() =>
-                  act('door-control', { interaction: 'lock', location: 'all' })
+                  act('door-control', {
+                    interaction: 'lock',
+                    location: 'all',
+                  })
                 }
                 icon="triangle-exclamation">
                 Lockdown
@@ -278,13 +281,13 @@ const AutopilotConfig = (props, context) => {
   );
 };
 
-const StopPlayLaunchAnnouncementAlarm = (_, context) => {
+const StopLaunchAnnouncementAlarm = (_, context) => {
   const { act } = useBackend<NavigationProps>(context);
   return (
     <Button
       icon="ban"
       onClick={() => {
-        act('stop_play_launch_announcement_alarm');
+        act('stop_playing_launch_announcement_alarm');
       }}>
       Stop Alarm
     </Button>
@@ -315,19 +318,11 @@ const LaunchAnnouncementAlarm = (_, context) => {
     <Section
       title="Launch Announcement Alarm"
       buttons={
-        <>
-          {!data.playing_launch_announcement_alarm && (
-            <PlayLaunchAnnouncementAlarm />
-          )}
-
-          {data.playing_launch_announcement_alarm && (
-            <Button
-              onClick={() => act('stop_play_launch_announcement_alarm')}
-              icon="triangle-exclamation">
-              Stop Launch Alarm
-            </Button>
-          )}
-        </>
+        !data.playing_launch_announcement_alarm ? (
+          <PlayLaunchAnnouncementAlarm />
+        ) : (
+          <StopLaunchAnnouncementAlarm />
+        )
       }
     />
   );