Merge pull request #4307 from Citadel-Station-13/upstream-merge-33400

[MIRROR] Fix catch all blackbox vv guard
This commit is contained in:
deathride58
2017-12-10 22:36:09 +00:00
committed by GitHub

View File

@@ -45,7 +45,14 @@ SUBSYSTEM_DEF(blackbox)
return ..()
/datum/controller/subsystem/blackbox/vv_edit_var(var_name, var_value)
return FALSE
switch(var_name)
if("feedback")
return FALSE
if("sealed")
if(var_value)
return Seal()
return FALSE
return ..()
/datum/controller/subsystem/blackbox/Shutdown()
sealed = FALSE
@@ -76,11 +83,12 @@ SUBSYSTEM_DEF(blackbox)
/datum/controller/subsystem/blackbox/proc/Seal()
if(sealed)
return
return FALSE
if(IsAdminAdvancedProcCall())
message_admins("[key_name_admin(usr)] sealed the blackbox!")
log_game("Blackbox sealed[IsAdminAdvancedProcCall() ? " by [key_name(usr)]" : ""].")
sealed = TRUE
return TRUE
/datum/controller/subsystem/blackbox/proc/log_research(tech, level)
if(!(tech in research_levels) || research_levels[tech] < level)