Fixes FTL pylons getting stuck in the shutdown state (#2586)

BeeStation · Dec 29, 2023 · dba4805 · dba4805
1 parent aa6128b
commit dba4805
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/nsv13/code/modules/overmap/FTL/components/drive.dm b/nsv13/code/modules/overmap/FTL/components/drive.dm
@@ -363,6 +363,8 @@ Preset classes of FTL drive with pre-programmed behaviours
 	jump_speed_pylon = initial(jump_speed_pylon)
 	if(shutdown_pylons)
 		for(var/obj/machinery/atmospherics/components/binary/drive_pylon/P as() in pylons)
+			if(P.pylon_state == PYLON_STATE_OFFLINE || P.pylon_state == PYLON_STATE_SHUTDOWN)
+				continue
 			P.set_state(PYLON_STATE_SHUTDOWN)
 	cooldown = TRUE
 	addtimer(CALLBACK(src, PROC_REF(post_cooldown), auto_spool_enabled), FTL_COOLDOWN)

diff --git a/nsv13/code/modules/overmap/FTL/components/drive_pylon.dm b/nsv13/code/modules/overmap/FTL/components/drive_pylon.dm
@@ -387,16 +387,9 @@
 	else
 		to_chat(user, "<span class='info'>You don't think it would be wise to touch this right now.</span>")
 
-
-#undef PYLON_STATE_OFFLINE
-#undef PYLON_STATE_STARTING
-#undef PYLON_STATE_WARMUP
-#undef PYLON_STATE_SPOOLING
-#undef PYLON_STATE_ACTIVE
-#undef PYLON_STATE_SHUTDOWN
-
 #undef MAX_WASTE_OUTPUT_PRESSURE
 #undef MAX_WASTE_STORAGE_PRESSURE
+#undef WASTE_GAS_HEAT
 
 #undef PYLON_ACTIVE_EXPONENT
 #undef POWER_FAIL_TOLERANCE