diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 15a510f7099..c5c900c1638 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -646,7 +646,7 @@ var/datum/controller/subsystem/ticker/ticker /datum/controller/subsystem/ticker/proc/check_maprotate() if (!config.maprotation) return - if (SSshuttle.emergency.mode != SHUTTLE_ESCAPE || SSshuttle.canRecall()) + if (SShuttle.emergency && SSshuttle.emergency.mode != SHUTTLE_ESCAPE || SSshuttle.canRecall()) return if (maprotatechecked) return