From 7b89ef11f4dfaad6ebaefe90c01e1ce97d77e1dc Mon Sep 17 00:00:00 2001 From: Tenebrosity Date: Mon, 13 Jan 2014 12:35:30 +1300 Subject: [PATCH] Fixes a bug that prevents killing AIs before roundstart --- code/controllers/shuttle_controller.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index 2d6af5d0c45..0ee9264a211 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -105,8 +105,8 @@ datum/shuttle_controller callshuttle = 0 //if there's an alive AI or a communication console on the station z level, we don't call the shuttle break - if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction") - callshuttle = 0 + if(ticker && ticker.mode && (ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction")) + callshuttle = 0 if(callshuttle) if(!online && direction == 1) //we don't call the shuttle if it's already coming