From 8769e7b6f4ab59463206d232a984b6b9d3210a6e Mon Sep 17 00:00:00 2001 From: c0 Date: Tue, 4 Aug 2015 16:33:42 +0300 Subject: [PATCH] MMI ID lock removed --- code/modules/mob/living/carbon/brain/MMI.dm | 19 +------------------ .../mob/living/carbon/brain/posibrain.dm | 1 - .../modules/mob/living/silicon/robot/robot.dm | 1 - 3 files changed, 1 insertion(+), 20 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index ec1fd6b67fb..1303a8ee03b 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -9,11 +9,6 @@ origin_tech = "biotech=3" var/braintype = "Cyborg" - req_access = list(access_robotics) - - //Revised. Brainmob is now contained directly within object of transfer. MMI in this case. - - var/locked = 0 var/syndiemmi = 0 //Whether or not this is a Syndicate MMI var/mob/living/carbon/brain/brainmob = null //The current occupant. var/mob/living/silicon/robot = null //Appears unused. @@ -63,19 +58,10 @@ name = "Man-Machine Interface: [brainmob.real_name]" update_icon() - locked = 1 - feedback_inc("cyborg_mmis_filled",1) return - if((istype(O,/obj/item/weapon/card/id)||istype(O,/obj/item/device/pda)) && brainmob) - if(allowed(user)) - locked = !locked - user << "You [locked ? "lock" : "unlock"] the brain holder." - else - user << "Access denied." - return if(brainmob) O.attack(brainmob, user) //Oh noooeeeee return @@ -84,10 +70,8 @@ /obj/item/device/mmi/attack_self(mob/user) if(!brain) user << "You upend the MMI, but there's nothing in it!" - else if(locked) - user << "You upend the MMI, but the brain is clamped into place!" else - user << "You upend the MMI, spilling the brain onto the floor." + user << "You unlock and upend the MMI, spilling the brain onto the floor." brainmob.container = null //Reset brainmob mmi var. brainmob.loc = brain //Throw mob into brain. @@ -116,7 +100,6 @@ name = "Man-Machine Interface: [brainmob.real_name]" update_icon() - locked = 1 return /obj/item/device/mmi/radio_enabled diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index 79817af275c..7f8445b95fc 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -11,7 +11,6 @@ var/global/posibrain_notif_cooldown = 0 var/askDelay = 10 * 60 * 1 brainmob = null req_access = list(access_robotics) - locked = 0 mecha = null//This does not appear to be used outside of reference in mecha.dm. braintype = "Android" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index e37ec22d115..e978c6c37a6 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -108,7 +108,6 @@ mmi = new(src) mmi.brain = new /obj/item/organ/brain(mmi) mmi.brain.name = "[real_name]'s brain" - mmi.locked = 1 mmi.icon_state = "mmi_full" mmi.name = "Man-Machine Interface: [real_name]" mmi.brainmob = new(src)