diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index ab5c4d47660..4c7a640fdf7 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -368,10 +368,6 @@ Command action procs to_chat(user, "Cannot establish a bluespace connection.") return 0 - if(deathsquad.deployed) - to_chat(user, "[current_map.boss_short] will not allow the shuttle to be called. Consider all contracts terminated.") - return 0 - if(emergency_shuttle.deny_shuttle) to_chat(user, "The emergency shuttle may not be sent at this time. Please try again later.") return 0 @@ -416,10 +412,6 @@ Command action procs to_chat(user, "[current_map.boss_short] does not currently have a shuttle available in your sector. Please try again later.") return - if(deathsquad.deployed == 1) - to_chat(user, "[current_map.boss_short] will not allow the shuttle to be called. Consider all contracts terminated.") - return - if(world.time < 54000) // 30 minute grace period to let the game get going to_chat(user, "The shuttle is refueling. Please wait another [round((54000-world.time)/60)] minutes before trying again.") return diff --git a/html/changelogs/johnwildkins-ertfix.yml b/html/changelogs/johnwildkins-ertfix.yml new file mode 100644 index 00000000000..e3938e2554b --- /dev/null +++ b/html/changelogs/johnwildkins-ertfix.yml @@ -0,0 +1,6 @@ +author: JohnWildkins + +delete-after: True + +changes: + - bugfix: "ERTs should no longer stop the emergency shuttle from being called."