Runtime Fixes

2020-06-18 11:24:08 +03:00
parent da704db97d
commit 17c38efbb0
2 changed files with 5 additions and 2 deletions
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -363,6 +363,9 @@ SUBSYSTEM_DEF(shuttle)
 			hostileEnvironments -= d
 	emergencyNoEscape = hostileEnvironments.len

+	if((!emergency) || !istype(emergency))
+		return
+
 	if(emergencyNoEscape && (emergency.mode == SHUTTLE_IGNITING))
 		emergency.mode = SHUTTLE_STRANDED
 		emergency.timer = null