From d1055414ceb949367669e31b5b0b30bb7fa6845c Mon Sep 17 00:00:00 2001 From: Singul0 <127663818+Singul0@users.noreply.github.com> Date: Mon, 12 Feb 2024 07:53:15 +0700 Subject: [PATCH] Fixes bluespace launchpads from not working in shuttles (#81421) ## About The Pull Request Fixes #81314 does what it says on the tin, I made the check more discriminatory by checking supply and ferry areas instead (the two ways the crew can get to centcom). ## Why It's Good For The Game it is what it is ## Changelog :cl: fix: You can now use bluespace launchpads from shuttles (except cargo and ferry shuttles) /:cl: --- code/game/machinery/launch_pad.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index 910f3802bfd..a950750f4d8 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -152,7 +152,7 @@ return "ERROR: Launchpad busy." var/area/surrounding = get_area(src) - if(is_centcom_level(z) || istype(surrounding, /area/shuttle)) + if(is_centcom_level(z) || istype(surrounding, /area/shuttle/supply) ||istype(surrounding, /area/shuttle/transport)) return "ERROR: Launchpad not operative. Heavy area shielding makes teleporting impossible." return null