From d4c93490ec4f6c1925a54316d3ed1f613b948b1b Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 18 Aug 2022 22:11:29 -0400 Subject: [PATCH] Fixes login() runtime when players connect before SSsecurity_level finishes initializing (#69152) Fixes login() runtime when players connect before SSsecurity_level finished initializing --- code/controllers/subsystem/security_level.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/security_level.dm b/code/controllers/subsystem/security_level.dm index 96d0cc5340a..3ca0b02deb9 100644 --- a/code/controllers/subsystem/security_level.dm +++ b/code/controllers/subsystem/security_level.dm @@ -76,13 +76,13 @@ SUBSYSTEM_DEF(security_level) * Returns the current security level as a number */ /datum/controller/subsystem/security_level/proc/get_current_level_as_number() - return current_security_level ? current_security_level.number_level : SEC_LEVEL_GREEN //Send a response in case the subsystem hasn't finished setting up yet + return ((!initialized || !current_security_level) ? SEC_LEVEL_GREEN : current_security_level.number_level) //Send the default security level in case the subsystem hasn't finished initializing yet /** * Returns the current security level as text */ /datum/controller/subsystem/security_level/proc/get_current_level_as_text() - return current_security_level ? current_security_level.name : "green" + return ((!initialized || !current_security_level) ? "green" : current_security_level.name) /** * Converts a text security level to a number