From ba3d180db6c167d284d215314a6cd172925bda6a Mon Sep 17 00:00:00 2001 From: Ravensdale Date: Fri, 26 Jun 2015 11:45:11 -0700 Subject: [PATCH] Remove posi-mmi-mechs fix actual removal --- code/game/mecha/combat/combat.dm | 9 ----- code/game/mecha/mecha.dm | 67 -------------------------------- 2 files changed, 76 deletions(-) diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index f75bd01ac49..e9cf59be6d2 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -244,15 +244,6 @@ else return 0 -/obj/mecha/combat/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) - if(..()) - if(occupant.client) - occupant.client.mouse_pointer_icon = file("icons/mecha/mecha_mouse.dmi") - return 1 - else - return 0 - - /obj/mecha/combat/go_out() if(src.occupant && src.occupant.client) src.occupant.client.mouse_pointer_icon = initial(src.occupant.client.mouse_pointer_icon) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index b2bdadfdbeb..25a28aa5326 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -687,14 +687,6 @@ /obj/mecha/attackby(obj/item/weapon/W as obj, mob/user as mob) - - if(istype(W, /obj/item/device/mmi)) - if(mmi_move_inside(W,user)) - user << "[src]-MMI interface initialized successfuly" - else - user << "[src]-MMI interface initialization failed." - return - if(istype(W, /obj/item/mecha_parts/mecha_equipment)) var/obj/item/mecha_parts/mecha_equipment/E = W spawn() @@ -1086,65 +1078,6 @@ else return 0 -/obj/mecha/proc/mmi_move_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) - if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - user << "Consciousness matrix not detected." - return 0 - else if(mmi_as_oc.brainmob.stat) - user << "Beta-rhythm below acceptable level." - return 0 - else if(occupant) - user << "Occupant detected." - return 0 - else if(dna && dna!=mmi_as_oc.brainmob.dna.unique_enzymes) - user << "Stop it!" - return 0 - //Added a message here since people assume their first click failed or something./N -// user << "Installing MMI, please stand by." - - visible_message("\blue [usr] starts to insert an MMI into [src.name]") - - if(enter_after(40,user)) - if(!occupant) - return mmi_moved_inside(mmi_as_oc,user) - else - user << "Occupant detected." - else - user << "You stop inserting the MMI." - return 0 - -/obj/mecha/proc/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) - if(mmi_as_oc && user in range(1)) - if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - user << "Consciousness matrix not detected." - return 0 - else if(mmi_as_oc.brainmob.stat) - user << "Beta-rhythm below acceptable level." - return 0 - user.drop_from_inventory(mmi_as_oc) - var/mob/brainmob = mmi_as_oc.brainmob - brainmob.reset_view(src) - /* - brainmob.client.eye = src - brainmob.client.perspective = EYE_PERSPECTIVE - */ - occupant = brainmob - brainmob.loc = src //should allow relaymove - brainmob.canmove = 1 - mmi_as_oc.loc = src - mmi_as_oc.mecha = src - src.verbs -= /obj/mecha/verb/eject - src.Entered(mmi_as_oc) - src.Move(src.loc) - src.icon_state = src.reset_icon() - set_dir(dir_in) - src.log_message("[mmi_as_oc] moved in as pilot.") - if(!hasInternalDamage()) - src.occupant << sound('sound/mecha/nominal.ogg',volume=50) - return 1 - else - return 0 - /obj/mecha/verb/view_stats() set name = "View Stats" set category = "Exosuit Interface"