From 6f7f19bf52db2d96e490a0707781ddb5d2dc8243 Mon Sep 17 00:00:00 2001 From: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com> Date: Thu, 4 Jul 2024 17:56:23 -0700 Subject: [PATCH] [Ready] Map Voting Occurs when the shuttle is called and cannot be recalled. (#1608) ## About The Pull Request Map Voting Occurs when the shuttle is called and cannot be recalled. This means that if you call the shuttle, and then the point of no return happens where you can't recall (either due to time or adminbus), then map voting will occur. This should be merged with https://github.com/Bubberstation/config/pull/59 ## Why It's Good For The Game People rarely vote when the shuttle launches considering there is a lot of chaos happening on the shuttle (especially for security) or people are busy wrapping up RP. This is the alternative solution to that where hopefully there is enough time for people to vote here. ## Proof Of Testing ![image](https://github.com/Bubberstation/Bubberstation/assets/8602857/ee58e6a9-52f0-4861-9c52-5f2acbbee786) ## Changelog :cl: BurgerBB qol: Map Voting Occurs when the shuttle is called and cannot be recalled. /:cl: --- modular_zubbers/code/modules/shuttle/emergency.dm | 4 ++++ tgstation.dme | 1 + 2 files changed, 5 insertions(+) create mode 100644 modular_zubbers/code/modules/shuttle/emergency.dm diff --git a/modular_zubbers/code/modules/shuttle/emergency.dm b/modular_zubbers/code/modules/shuttle/emergency.dm new file mode 100644 index 00000000000..4caebfd52a5 --- /dev/null +++ b/modular_zubbers/code/modules/shuttle/emergency.dm @@ -0,0 +1,4 @@ +/obj/docking_port/mobile/emergency/check() + . = ..() + if(mode == SHUTTLE_CALL && !SSshuttle.canRecall()) + SSmapping.mapvote() //Do a map vote if we're at the point of no return. diff --git a/tgstation.dme b/tgstation.dme index 3d28d1e24b6..596952be78d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8951,6 +8951,7 @@ #include "modular_zubbers\code\modules\security\security_glock\research.dm" #include "modular_zubbers\code\modules\security_levels\security_level_datums.dm" #include "modular_zubbers\code\modules\shelves\shelf.dm" +#include "modular_zubbers\code\modules\shuttle\emergency.dm" #include "modular_zubbers\code\modules\skub\skub.dm" #include "modular_zubbers\code\modules\space_background\parallax.dm" #include "modular_zubbers\code\modules\space_background\turf_space.dm"