Skip to content

Commit

Permalink
Fixes lifepods still working after evac canceled (#4392)
Browse files Browse the repository at this point in the history
# About the pull request

This PR fixes lifepods still being operational after evac has been
canceled.

# Explain why it's good for the game

Lifepods should not work if evac is canceled.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog

:cl: Morrow
fix: Fixed lifepods still working after evac canceled
/:cl:
  • Loading branch information
morrowwolf authored Sep 13, 2023
1 parent a81f0d3 commit a4f8936
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
3 changes: 3 additions & 0 deletions code/modules/shuttle/computers/escape_pod_computer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@
var/obj/docking_port/mobile/crashable/escape_shuttle/shuttle = SSshuttle.getShuttle(shuttleId)
switch(action)
if("force_launch")
if(pod_state != STATE_READY && pod_state != STATE_DELAYED)
return

shuttle.evac_launch()
pod_state = STATE_LAUNCHING
. = TRUE
Expand Down
7 changes: 3 additions & 4 deletions tgui/packages/tgui/interfaces/EscapePodConsole.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,15 @@ export const EscapePodConsole = (_props, context) => {

switch (data.docking_status) {
case 4:
statusMessage = 'SYSTEMS OK';
buttonColor = 'good';
operable = 1;
statusMessage = 'NO EVACUATION';
buttonColor = 'neutral';
break;
case 5:
statusMessage = 'SYSTEMS DOWN';
break;
case 6:
statusMessage = 'STANDING BY';
buttonColor = 'neutral';
buttonColor = 'good';
operable = 1;
break;
case 7:
Expand Down

0 comments on commit a4f8936

Please sign in to comment.