From aaf07170b6aaf63b527a9a321cff4d1569e03ed7 Mon Sep 17 00:00:00 2001 From: Crazylemon Date: Mon, 21 Dec 2015 19:59:39 -0800 Subject: [PATCH] RIP rd console locking, you were completely obsolete by rdconsole checks --- code/modules/research/rdconsole.dm | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index b26b275a836..4ce213730ab 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -169,8 +169,6 @@ proc/CallMaterialName(ID) return D.loc = src user << "You add the disk to the machine!" - if(istype(D, /obj/item/weapon/screwdriver) && islocked() && !(stat & BROKEN)) - user << "This console is locked; Unlock it first" else ..() src.updateUsrDialog() @@ -326,12 +324,6 @@ proc/CallMaterialName(ID) use_power(250) updateUsrDialog() - else if(href_list["lock"]) //Lock the console from use by anyone without access. - if(src.allowed(usr)) - screen = text2num(href_list["lock"]) - else - usr << "Unauthorized Access." - else if(href_list["sync"]) //Sync the research holder with all the R&D consoles in the game that aren't sync protected. screen = 0.0 if(!sync) @@ -658,10 +650,6 @@ proc/CallMaterialName(ID) if(0.1) dat += "
Processing and Updating Database...
" - if(0.2) - dat += "
SYSTEM LOCKED
" - dat += "Unlock" - if(0.3) dat += "
Constructing Prototype. Please Wait...
" @@ -774,7 +762,6 @@ proc/CallMaterialName(ID) dat += "Connect to Research Network
" dat += "Disconnect from Research Network
" dat += "Device Linkage Menu
" - dat += "Lock Console
" if(check_rights(R_ADMIN,0)) dat += "\[ADMIN\] Maximize Research Levels
" dat += "Reset R&D Database" @@ -1156,11 +1143,6 @@ proc/CallMaterialName(ID) dat += "" return dat -// This check here is silly but the reason I made it a proc is so that if a better criterion is made -// you can just change it here and you'll be good to go -/obj/machinery/computer/rdconsole/proc/islocked() - return screen == 0.2 - /obj/machinery/computer/rdconsole/core name = "core R&D console" desc = "A console used to interface with R&D tools."