Merge pull request #11016 from Core0verload/mmi

MMI ID lock removed
This commit is contained in:
Jordie
2015-08-07 19:38:27 +10:00
3 changed files with 1 additions and 20 deletions
+1 -18
View File
@@ -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 << "<span class='notice'>You [locked ? "lock" : "unlock"] the brain holder.</span>"
else
user << "<span class='danger'>Access denied.</span>"
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 << "<span class='warning'>You upend the MMI, but there's nothing in it!</span>"
else if(locked)
user << "<span class='warning'>You upend the MMI, but the brain is clamped into place!</span>"
else
user << "<span class='notice'>You upend the MMI, spilling the brain onto the floor.</span>"
user << "<span class='notice'>You unlock and upend the MMI, spilling the brain onto the floor.</span>"
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
@@ -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"
@@ -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)