cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-01-09 16:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[MIRROR] Fix catch all blackbox vv guard
This commit is contained in:
deathride58
2017-12-10 22:36:09 +00:00
committed by GitHub
parent 1680b380a9 981bc6558b
commit 2a481e69df
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/controllers/subsystem/blackbox.dm
View File

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