diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index d4b79a0163..431768500e 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -1,142 +1,9 @@
-/obj/machinery/computer/mecha
- name = "exosuit control console"
- desc = "Used to remotely locate or lockdown exosuits."
- icon_screen = "mecha"
- icon_keyboard = "tech_key"
+/obj/machinery/computer/mecha
+ name = "exosuit control console"
+ desc = "Used to remotely locate or lockdown exosuits."
+ icon_screen = "mecha"
+ icon_keyboard = "tech_key"
req_access = list(ACCESS_ROBOTICS)
-<<<<<<< HEAD
- circuit = /obj/item/circuitboard/computer/mecha_control
- var/list/located = list()
- var/screen = 0
- var/stored_data
-
-/obj/machinery/computer/mecha/attack_hand(mob/user)
- if(..())
- return
- user.set_machine(src)
- var/dat = "
[src.name]"
- if(screen == 0)
- dat += "Tracking beacons data
"
- var/list/trackerlist = list()
- for(var/obj/mecha/MC in GLOB.mechas_list)
- trackerlist += MC.trackers
- for(var/obj/item/mecha_parts/mecha_tracking/TR in trackerlist)
- var/answer = TR.get_mecha_info()
- if(answer)
- dat += {"
[answer]
- Send message
- Show exosuit log | (EMP pulse)
"}
-
- if(screen==1)
- dat += "Log contents
"
- dat += "Return
"
- dat += "[stored_data]"
-
- dat += "(Refresh)
"
- dat += ""
-
- user << browse(dat, "window=computer;size=400x500")
- onclose(user, "computer")
- return
-
-/obj/machinery/computer/mecha/Topic(href, href_list)
- if(..())
- return
- var/datum/topic_input/filter = new /datum/topic_input(href,href_list)
- if(href_list["send_message"])
- var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("send_message")
- var/message = stripped_input(usr,"Input message","Transmit message")
- var/obj/mecha/M = MT.in_mecha()
- if(trim(message) && M)
- M.occupant_message(message)
- return
- if(href_list["shock"])
- var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("shock")
- MT.shock()
- if(href_list["get_log"])
- var/obj/item/mecha_parts/mecha_tracking/MT = filter.getObj("get_log")
- stored_data = MT.get_mecha_log()
- screen = 1
- if(href_list["return"])
- screen = 0
- updateUsrDialog()
- return
-
-/obj/item/mecha_parts/mecha_tracking
- name = "exosuit tracking beacon"
- desc = "Device used to transmit exosuit data."
- icon = 'icons/obj/device.dmi'
- icon_state = "motion2"
- w_class = WEIGHT_CLASS_SMALL
- origin_tech = "programming=2;magnets=2"
- var/ai_beacon = FALSE //If this beacon allows for AI control. Exists to avoid using istype() on checking.
-
-/obj/item/mecha_parts/mecha_tracking/proc/get_mecha_info()
- if(!in_mecha())
- return 0
- var/obj/mecha/M = src.loc
- var/cell_charge = M.get_charge()
- var/answer = {"Name: [M.name]
-Integrity: [M.obj_integrity/M.max_integrity*100]%
-Cell charge: [isnull(cell_charge)?"Not found":"[M.cell.percent()]%"]
-Airtank: [M.return_pressure()]kPa
-Pilot: [M.occupant||"None"]
-Location: [get_area(M)||"Unknown"]
-Active equipment: [M.selected||"None"] "}
- if(istype(M, /obj/mecha/working/ripley))
- var/obj/mecha/working/ripley/RM = M
- answer += "Used cargo space: [RM.cargo.len/RM.cargo_capacity*100]%
"
-
- return answer
-
-/obj/item/mecha_parts/mecha_tracking/emp_act()
- qdel(src)
-
-/obj/item/mecha_parts/mecha_tracking/Destroy()
- if(istype(loc, /obj/mecha))
- var/obj/mecha/M = loc
- if(src in M.trackers)
- M.trackers -= src
- return ..()
-
-/obj/item/mecha_parts/mecha_tracking/proc/in_mecha()
- if(istype(src.loc, /obj/mecha))
- return src.loc
- return 0
-
-/obj/item/mecha_parts/mecha_tracking/proc/shock()
- var/obj/mecha/M = in_mecha()
- if(M)
- M.emp_act(EMP_LIGHT)
- qdel(src)
-
-/obj/item/mecha_parts/mecha_tracking/proc/get_mecha_log()
- if(!istype(loc, /obj/mecha))
- return 0
- var/obj/mecha/M = src.loc
- return M.get_log_html()
-
-
-/obj/item/mecha_parts/mecha_tracking/ai_control
- name = "exosuit AI control beacon"
- desc = "A device used to transmit exosuit data. Also allows active AI units to take control of said exosuit."
- origin_tech = "programming=3;magnets=2;engineering=2"
- ai_beacon = TRUE
-
-
-/obj/item/storage/box/mechabeacons
- name = "exosuit tracking beacons"
-
-/obj/item/storage/box/mechabeacons/New()
- ..()
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
- new /obj/item/mecha_parts/mecha_tracking(src)
-=======
circuit = /obj/item/circuitboard/computer/mecha_control
var/list/located = list()
var/screen = 0
@@ -268,4 +135,3 @@
new /obj/item/mecha_parts/mecha_tracking(src)
new /obj/item/mecha_parts/mecha_tracking(src)
new /obj/item/mecha_parts/mecha_tracking(src)
->>>>>>> cc30923... ismecha define (#31192)