cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 13:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes world status runtiming during initialize [MDB IGNORE] (#14939)

Browse Source 
* Fixes world status runtiming during initialize

* Update world.dm

resolve a code conflict

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-07-17 20:34:57 +02:00
committed by GitHub
parent 3a0fe981fd
commit ea83b1444c
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/security_level.dm
+3 -3
View File
@@ -78,13 +78,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.number_level
return current_security_level?.number_level
/**
* Returns the current security level as text
*/
/datum/controller/subsystem/security_level/proc/get_current_level_as_text()
return current_security_level.name
return current_security_level?.name
/**
* Converts a text security level to a number
@@ -94,7 +94,7 @@ SUBSYSTEM_DEF(security_level)
*/
/datum/controller/subsystem/security_level/proc/text_level_to_number(text_level)
var/datum/security_level/selected_level = available_levels[text_level]
return selected_level.number_level
return selected_level?.number_level
/**
* Converts a number security level to a text