Ports https://github.com/tgstation/tgstation/pull/44525, and

And fixes to make stuff work

code/game/machinery/computer/communications.dm

@@ -164,21 +164,16 @@
 						to_chat(usr, "You have not met the requirements for purchasing this shuttle.")
 					else
 						if(SSshuttle.points >= S.credit_cost)
-							var/obj/machinery/shuttle_manipulator/M = locate() in GLOB.machines
-							if(M)
-								SSshuttle.shuttle_purchased = TRUE
-								SSshuttle.points -= S.credit_cost
-								minor_announce("[usr.real_name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase")
-								message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [S.name].")
-								SSblackbox.record_feedback("text", "shuttle_purchase", 1, "[S.name]")
-								M.unload_preview()
-								M.load_template(S)
-								M.existing_shuttle = SSshuttle.emergency
-								M.action_load(S)
-								log_shuttle("[key_name(usr)] has purchased [S.name].")
-								message_admins("[S.name] loaded, purchased by [usr]")
-							else
-								to_chat(usr, "Something went wrong! The shuttle exchange system seems to be down.")
+							SSshuttle.shuttle_purchased = TRUE
+							SSshuttle.unload_preview()
+							SSshuttle.load_template(S)
+							SSshuttle.existing_shuttle = SSshuttle.emergency
+							SSshuttle.action_load(S)
+							SSshuttle.points -= S.credit_cost
+							minor_announce("[usr.real_name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase")
+							message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [S.name].")
+							log_shuttle("[key_name(usr)] has purchased [S.name].")
+							SSblackbox.record_feedback("text", "shuttle_purchase", 1, "[S.name]")
 						else
 							to_chat(usr, "Not enough credits.")
 

code/game/machinery/computer/dna_console.dm

@@ -1210,7 +1210,7 @@
 			var/len = length_char(scanner_occupant.dna.uni_identity)
 			rad_pulse_timer = world.time + (radduration*10)
 			rad_pulse_index = WRAP(text2num(params["index"]), 1, len+1)
-			begin_processing()
+			START_PROCESSING(SSobj, src)
 			return
 
 		// Cancels the delayed action - In this context it is not the radiation
@@ -1503,7 +1503,7 @@
 		//	   this DNA can not be bad
 		//   is done via radiation bursts, so radiation immune carbons are not viable
 		// And the DNA Scanner itself must have a valid scan level
-	if(scanner_occupant.has_dna() && !HAS_TRAIT(scanner_occupant, TRAIT_RADIMMUNE) && !HAS_TRAIT(scanner_occupant, TRAIT_BADDNA) || (connected_scanner.scan_level == 3))
+	if(scanner_occupant.has_dna() && !HAS_TRAIT(scanner_occupant, TRAIT_RADIMMUNE) && !HAS_TRAIT(scanner_occupant, TRAIT_NOCLONE) || (connected_scanner.scan_level == 3))
 		return TRUE
 
 	return FALSE
@@ -1575,7 +1575,7 @@
 	// Imagine it being like a microwave stopping when you open the door.
 	rad_pulse_index = 0
 	rad_pulse_timer = 0
-	end_processing()
+	STOP_PROCESSING(SSobj, src)
 	scanner_occupant = null
 
 /**
@@ -1953,7 +1953,7 @@
 	// If we can't, abort the procedure.
 	if(!can_modify_occupant())
 		rad_pulse_index = 0
-		end_processing()
+		STOP_PROCESSING(SSobj, src)
 		return
 
 	var/len = length_char(scanner_occupant.dna.uni_identity)
@@ -1965,7 +1965,7 @@
 	scanner_occupant.updateappearance(mutations_overlay_update=1)
 
 	rad_pulse_index = 0
-	end_processing()
+	STOP_PROCESSING(SSobj, src)
 	return
 
 /**

code/game/machinery/computer/robot.dm

@@ -5,26 +5,22 @@
 	icon_keyboard = "rd_key"
 	req_access = list(ACCESS_ROBOTICS)
 	circuit = /obj/item/circuitboard/computer/robotics
-	var/temp = null
-
 	light_color = LIGHT_COLOR_PINK
 	ui_x = 500
 	ui_y = 460
 
 /obj/machinery/computer/robotics/proc/can_control(mob/user, mob/living/silicon/robot/R)
+	. = FALSE
 	if(!istype(R))
-		return FALSE
+		return
 	if(isAI(user))
-		if (R.connected_ai != user)
-			return FALSE
+		if(R.connected_ai != user)
+			return
 	if(iscyborg(user))
-		if (R != user)
-			return FALSE
+		if(R != user)
+			return
 	if(R.scrambledcodes)
-		return FALSE
-	if (hasSiliconAccessInArea(user) && !issilicon(user))
-		if (!Adjacent(user))
-			return FALSE
+		return
 	return TRUE
 
 /obj/machinery/computer/robotics/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
@@ -49,132 +45,83 @@
 	for(var/mob/living/silicon/robot/R in GLOB.silicon_mobs)
 		if(!can_control(user, R))
 			continue
-		robots++
-		dat += "[R.name] |"
-		if(R.stat)
-			dat += " Not Responding |"
-		else if(R.locked_down)
-			dat += " Locked Down |"
-		else
-			dat += " Operating Normally |"
-		if(R.cell)
-			dat += " Battery Installed ([R.cell.charge]/[R.cell.maxcharge]) |"
-		else
-			dat += " No Cell Installed |"
-		if(R.module)
-			dat += " Module Installed ([R.module.name]) |"
-		else
-			dat += " No Module Installed |"
-		if(R.connected_ai)
-			dat += " Slaved to [R.connected_ai.name] |"
-		else
-			dat += " Independent from AI |"
-		if(issilicon(user) && user != R)
-			var/mob/living/silicon/S = user
-			if(is_servant_of_ratvar(S))
-				dat += "<A href='?src=[REF(src)];convert=[REF(R)]'>(<font color=#BE8700><i>Convert</i></font>)</A> "
-			else if(S.hack_software && !R.emagged)
-				dat += "<A href='?src=[REF(src)];magbot=[REF(R)]'>(<font color=blue><i>Hack</i></font>)</A> "
-		else if(IsAdminGhost(user) && !R.emagged)
-			dat += "<A href='?src=[REF(src)];magbot=[REF(R)]'>(<font color=blue><i>Hack</i></font>)</A> "
-		dat += "<A href='?src=[REF(src)];stopbot=[REF(R)]'>(<font color=green><i>[R.locked_down? "Lockdown" : "Release"]</i></font>)</A> "
-		dat += "<A href='?src=[REF(src)];killbot=[REF(R)]'>(<font color=red><i>Destroy</i></font>)</A>"
-		dat += "<BR>"
+		if(z != (get_turf(R)).z)
+			continue
+		var/list/cyborg_data = list(
+			name = R.name,
+			locked_down = R.locked_down,
+			status = R.stat,
+			charge = R.cell ? round(R.cell.percent()) : null,
+			module = R.module ? "[R.module.name] Module" : "No Module Detected",
+			synchronization = R.connected_ai,
+			emagged =  R.emagged,
+			ref = REF(R)
+		)
+		data["cyborgs"] += list(cyborg_data)
 
-	if(!robots)
-		dat += "No Cyborg Units detected within access parameters."
-		dat += "<BR>"
-
-	var/drones = 0
+	data["drones"] = list()
 	for(var/mob/living/simple_animal/drone/D in GLOB.drones_list)
 		if(D.hacked)
 			continue
-		drones++
-		dat += "[D.name] |"
-		if(D.stat)
-			dat += " Not Responding |"
-		dat += "<A href='?src=[REF(src)];killdrone=[REF(D)]'>(<font color=red><i>Destroy</i></font>)</A>"
-		dat += "<BR>"
+		if(z != (get_turf(D)).z)
+			continue
+		var/list/drone_data = list(
+			name = D.name,
+			status = D.stat,
+			ref = REF(D)
+		)
+		data["drones"] += list(drone_data)
 
-	if(!drones)
-		dat += "No Drone Units detected within access parameters."
+	return data
 
-	var/datum/browser/popup = new(user, "computer", "Cyborg Control Console", 400, 500)
-	popup.set_content(dat)
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.open()
-	return
-
-/obj/machinery/computer/robotics/Topic(href, href_list)
+/obj/machinery/computer/robotics/ui_act(action, params)
 	if(..())
 		return
 
-	if (href_list["temp"])
-		src.temp = null
-
-	else if (href_list["killbot"])
-		if(src.allowed(usr))
-			var/mob/living/silicon/robot/R = locate(href_list["killbot"]) in GLOB.silicon_mobs
-			if(can_control(usr, R))
-				var/choice = input("Are you certain you wish to detonate [R.name]?") in list("Confirm", "Abort")
-				if(choice == "Confirm" && can_control(usr, R) && !..())
+	switch(action)
+		if("killbot")
+			if(allowed(usr))
+				var/mob/living/silicon/robot/R = locate(params["ref"]) in GLOB.silicon_mobs
+				if(can_control(usr, R) && !..())
 					var/turf/T = get_turf(R)
 					message_admins("<span class='notice'>[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(R, R.client)] at [ADMIN_VERBOSEJMP(T)]!</span>")
 					log_game("\<span class='notice'>[key_name(usr)] detonated [key_name(R)]!</span>")
 					if(R.connected_ai)
 						to_chat(R.connected_ai, "<br><br><span class='alert'>ALERT - Cyborg detonation detected: [R.name]</span><br>")
 					R.self_destruct()
-		else
-			to_chat(usr, "<span class='danger'>Access Denied.</span>")
-
-	else if (href_list["stopbot"])
-		if(src.allowed(usr))
-			var/mob/living/silicon/robot/R = locate(href_list["stopbot"]) in GLOB.silicon_mobs
-			if(can_control(usr, R))
-				var/choice = input("Are you certain you wish to [!R.locked_down ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort")
-				if(choice == "Confirm" && can_control(usr, R) && !..())
-					message_admins("<span class='notice'>[ADMIN_LOOKUPFLW(usr)] [!R.locked_down ? "locked down" : "released"] [key_name(R, R.client)][ADMIN_LOOKUPFLW(R)]!</span>")
+			else
+				to_chat(usr, "<span class='danger'>Access Denied.</span>")
+		if("stopbot")
+			if(allowed(usr))
+				var/mob/living/silicon/robot/R = locate(params["ref"]) in GLOB.silicon_mobs
+				if(can_control(usr, R) && !..())
+					message_admins("<span class='notice'>[ADMIN_LOOKUPFLW(usr)] [!R.locked_down ? "locked down" : "released"] [ADMIN_LOOKUPFLW(R)]!</span>")
 					log_game("[key_name(usr)] [!R.locked_down ? "locked down" : "released"] [key_name(R)]!")
 					R.SetLockdown(!R.locked_down)
 					to_chat(R, "[!R.locked_down ? "<span class='notice'>Your lockdown has been lifted!" : "<span class='alert'>You have been locked down!"]</span>")
 					if(R.connected_ai)
 						to_chat(R.connected_ai, "[!R.locked_down ? "<span class='notice'>NOTICE - Cyborg lockdown lifted" : "<span class='alert'>ALERT - Cyborg lockdown detected"]: <a href='?src=[REF(R.connected_ai)];track=[html_encode(R.name)]'>[R.name]</a></span><br>")
-
-		else
-			to_chat(usr, "<span class='danger'>Access Denied.</span>")
-
-	else if (href_list["magbot"])
-		var/mob/living/silicon/S = usr
-		if((istype(S) && S.hack_software) || IsAdminGhost(usr))
-			var/mob/living/silicon/robot/R = locate(href_list["magbot"]) in GLOB.silicon_mobs
-			if(istype(R) && !R.emagged && (R.connected_ai == usr || IsAdminGhost(usr)) && !R.scrambledcodes && can_control(usr, R))
-				log_game("[key_name(usr)] emagged [key_name(R)] using robotic console!")
-				message_admins("[ADMIN_LOOKUPFLW(usr)] emagged cyborg [key_name_admin(R)] using robotic console!")
-				R.SetEmagged(1)
-
-	else if(href_list["convert"])
-		if(isAI(usr) && is_servant_of_ratvar(usr))
-			var/mob/living/silicon/robot/R = locate(href_list["convert"]) in GLOB.silicon_mobs
-			if(istype(R) && !is_servant_of_ratvar(R) && R.connected_ai == usr)
-				log_game("[key_name(usr)] converted [key_name(R)] using robotic console!")
-				message_admins("[ADMIN_LOOKUPFLW(usr)] converted cyborg [key_name_admin(R)] using robotic console!")
-				add_servant_of_ratvar(R)
-
-	else if (href_list["killdrone"])
-		if(src.allowed(usr))
-			var/mob/living/simple_animal/drone/D = locate(href_list["killdrone"]) in GLOB.mob_list
-			if(D.hacked)
-				to_chat(usr, "<span class='danger'>ERROR: [D] is not responding to external commands.</span>")
 			else
-				var/turf/T = get_turf(D)
-				message_admins("[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(D)] at [ADMIN_VERBOSEJMP(T)]!")
-				log_game("[key_name(usr)] detonated [key_name(D)]!")
-				var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-				s.set_up(3, 1, D)
-				s.start()
-				D.visible_message("<span class='danger'>\the [D] self destructs!</span>")
-				D.gib()
-
-
-	src.updateUsrDialog()
-	return
+				to_chat(usr, "<span class='danger'>Access Denied.</span>")
+		if("magbot")
+			var/mob/living/silicon/S = usr
+			if((istype(S) && S.hack_software) || IsAdminGhost(usr))
+				var/mob/living/silicon/robot/R = locate(params["ref"]) in GLOB.silicon_mobs
+				if(istype(R) && !R.emagged && (R.connected_ai == usr || IsAdminGhost(usr)) && !R.scrambledcodes && can_control(usr, R))
+					log_game("[key_name(usr)] emagged [key_name(R)] using robotic console!")
+					message_admins("[ADMIN_LOOKUPFLW(usr)] emagged cyborg [key_name_admin(R)] using robotic console!")
+					R.SetEmagged(TRUE)
+		if("killdrone")
+			if(allowed(usr))
+				var/mob/living/simple_animal/drone/D = locate(params["ref"]) in GLOB.mob_list
+				if(D.hacked)
+					to_chat(usr, "<span class='danger'>ERROR: [D] is not responding to external commands.</span>")
+				else
+					var/turf/T = get_turf(D)
+					message_admins("[ADMIN_LOOKUPFLW(usr)] detonated [key_name_admin(D)] at [ADMIN_VERBOSEJMP(T)]!")
+					log_game("[key_name(usr)] detonated [key_name(D)]!")
+					var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
+					s.set_up(3, TRUE, D)
+					s.start()
+					D.visible_message("<span class='danger'>\the [D] self destructs!</span>")
+					D.gib()

code/game/machinery/dna_scanner.dm

@@ -8,7 +8,7 @@
 	idle_power_usage = 50
 	active_power_usage = 300
 	occupant_typecache = list(/mob/living, /obj/item/bodypart/head, /obj/item/organ/brain)
-	circuit = /obj/item/circuitboard/machine/dnascanner
+	circuit = /obj/item/circuitboard/machine/clonescanner
 	var/locked = FALSE
 	var/damage_coeff
 	var/scan_level

code/game/machinery/status_display.dm

@@ -289,7 +289,7 @@
 		if("shuttle_id")
 			update()
 
-/obj/machinery/status_display/shuttle/proc/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override)
+/obj/machinery/status_display/shuttle/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override)
 	if (port && (shuttle_id == initial(shuttle_id) || override))
 		shuttle_id = port.id
 	update()

code/game/mecha/mecha_control_console.dm

@@ -5,12 +5,9 @@
 	icon_keyboard = "tech_key"
 	req_access = list(ACCESS_ROBOTICS)
 	circuit = /obj/item/circuitboard/computer/mecha_control
-	var/list/located = list()
-	var/screen = 0
-	var/stored_data
 	ui_x = 500
 	ui_y = 500
-	
+
 /obj/machinery/computer/mecha/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
@@ -18,42 +15,64 @@
 		ui = new(user, src, ui_key, "ExosuitControlConsole", name, ui_x, ui_y, master_ui, state)
 		ui.open()
 
-	if(screen==1)
-		dat += "<h3>Log contents</h3>"
-		dat += "<a href='?src=[REF(src)];return=1'>Return</a><hr>"
-		dat += "[stored_data]"
+/obj/machinery/computer/mecha/ui_data(mob/user)
+	var/list/data = list()
 
-	dat += "<A href='?src=[REF(src)];refresh=1'>(Refresh)</A><BR>"
-	dat += "</body></html>"
+	var/list/trackerlist = list()
+	for(var/obj/mecha/MC in GLOB.mechas_list)
+		trackerlist += MC.trackers
 
-	user << browse(dat, "window=computer;size=400x500")
-	onclose(user, "computer")
+	data["mechs"] = list()
+	for(var/obj/item/mecha_parts/mecha_tracking/MT in trackerlist)
+		if(!MT.chassis)
+			continue
+		var/obj/mecha/M = MT.chassis
+		var/list/mech_data = list(
+			name = M.name,
+			integrity = round((M.obj_integrity / M.max_integrity) * 100),
+			charge = M.cell ? round(M.cell.percent()) : null,
+			airtank = M.internal_tank ? M.return_pressure() : null,
+			pilot = M.occupant,
+			location = get_area_name(M, TRUE),
+			active_equipment = M.selected,
+			emp_recharging = MT.recharging,
+			tracker_ref = REF(MT)
+		)
+		if(istype(M, /obj/mecha/working/ripley))
+			var/obj/mecha/working/ripley/RM = M
+			mech_data += list(
+				cargo_space = round((RM.cargo.len / RM.cargo_capacity) * 100)
+		)
 
-/obj/machinery/computer/mecha/Topic(href, href_list)
+		data["mechs"] += list(mech_data)
+
+	return data
+
+/obj/machinery/computer/mecha/ui_act(action, params)
 	if(..())
 		return
-	if(href_list["send_message"])
-		var/obj/item/mecha_parts/mecha_tracking/MT = locate(href_list["send_message"])
-		if (!istype(MT))
-			return
-		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 = locate(href_list["shock"])
-		if (istype(MT))
-			MT.shock()
-	if(href_list["get_log"])
-		var/obj/item/mecha_parts/mecha_tracking/MT = locate(href_list["get_log"])
-		if(istype(MT))
-			stored_data = MT.get_mecha_log()
-			screen = 1
-	if(href_list["return"])
-		screen = 0
-	updateUsrDialog()
-	return
+
+	switch(action)
+		if("send_message")
+			var/obj/item/mecha_parts/mecha_tracking/MT = locate(params["tracker_ref"])
+			if(!istype(MT))
+				return
+			var/message = stripped_input(usr, "Input message", "Transmit message")
+			var/obj/mecha/M = MT.chassis
+			if(trim(message) && M)
+				M.occupant_message(message)
+				to_chat(usr, "<span class='notice'>Message sent.</span>")
+				. = TRUE
+		if("shock")
+			var/obj/item/mecha_parts/mecha_tracking/MT = locate(params["tracker_ref"])
+			if(!istype(MT))
+				return
+			var/obj/mecha/M = MT.chassis
+			if(M)
+				MT.shock()
+				log_game("[key_name(usr)] has activated remote EMP on exosuit [M], located at [loc_name(M)], which is currently [M.occupant? "being piloted by [key_name(M.occupant)]." : "without a pilot."] ")
+				message_admins("[key_name_admin(usr)][ADMIN_FLW(usr)] has activated remote EMP on exosuit [M][ADMIN_JMP(M)], which is currently [M.occupant ? "being piloted by [key_name_admin(M.occupant)][ADMIN_FLW(M.occupant)]." : "without a pilot."] ")
+				. = TRUE
 
 /obj/item/mecha_parts/mecha_tracking
 	name = "exosuit tracking beacon"
@@ -61,24 +80,31 @@
 	icon = 'icons/obj/device.dmi'
 	icon_state = "motion2"
 	w_class = WEIGHT_CLASS_SMALL
-	var/ai_beacon = FALSE //If this beacon allows for AI control. Exists to avoid using istype() on checking.
-	var/recharging = 0
+	/// If this beacon allows for AI control. Exists to avoid using istype() on checking
+	var/ai_beacon = FALSE
+	/// Cooldown variable for EMP pulsing
+	var/recharging = FALSE
+	/// The Mecha that this tracking beacon is attached to
+	var/obj/mecha/chassis
 
+/**
+  * Returns a html formatted string describing attached mech status
+  */
 /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 = {"<b>Name:</b> [M.name]
-<b>Integrity:</b> [M.obj_integrity/M.max_integrity*100]%
-<b>Cell charge:</b> [isnull(cell_charge)?"Not found":"[M.cell.percent()]%"]
-<b>Airtank:</b> [M.return_pressure()]kPa
-<b>Pilot:</b> [M.occupant||"None"]
-<b>Location:</b> [get_area(M)||"Unknown"]
-<b>Active equipment:</b> [M.selected||"None"] "}
-	if(istype(M, /obj/mecha/working/ripley))
-		var/obj/mecha/working/ripley/RM = M
-		answer += "<b>Used cargo space:</b> [RM.cargo.len/RM.cargo_capacity*100]%<br>"
+	if(!chassis)
+		return FALSE
+
+	var/cell_charge = chassis.get_charge()
+	var/answer = {"<b>Name:</b> [chassis.name]<br>
+				<b>Integrity:</b> [round((chassis.obj_integrity/chassis.max_integrity * 100), 0.01)]%<br>
+				<b>Cell Charge:</b> [isnull(cell_charge) ? "Not Found":"[chassis.cell.percent()]%"]<br>
+				<b>Airtank:</b> [chassis.internal_tank ? "[round(chassis.return_pressure(), 0.01)]" : "Not Equipped"] kPa<br>
+				<b>Pilot:</b> [chassis.occupant || "None"]<br>
+				<b>Location:</b> [get_area_name(chassis, TRUE) || "Unknown"]<br>
+				<b>Active Equipment:</b> [chassis.selected || "None"]"}
+	if(istype(chassis, /obj/mecha/working/ripley))
+		var/obj/mecha/working/ripley/RM = chassis
+		answer += "<br><b>Used Cargo Space:</b> [round((RM.cargo.len / RM.cargo_capacity * 100), 0.01)]%"
 
 	return answer
 
@@ -88,42 +114,41 @@
 		qdel(src)
 
 /obj/item/mecha_parts/mecha_tracking/Destroy()
-	if(ismecha(loc))
-		var/obj/mecha/M = loc
-		if(src in M.trackers)
-			M.trackers -= src
+	if(chassis)
+		if(src in chassis.trackers)
+			chassis.trackers -= src
+	chassis = null
 	return ..()
 
-/obj/item/mecha_parts/mecha_tracking/proc/in_mecha()
-	if(ismecha(loc))
-		return loc
-	return 0
+/obj/item/mecha_parts/mecha_tracking/try_attach_part(mob/user, obj/mecha/M)
+	if(!..())
+		return
+	M.trackers += src
+	M.diag_hud_set_mechtracking()
+	chassis = M
 
+/**
+  * Attempts to EMP mech that the tracker is attached to, if there is one and tracker is not on cooldown
+  */
 /obj/item/mecha_parts/mecha_tracking/proc/shock()
 	if(recharging)
 		return
-	var/obj/mecha/M = in_mecha()
-	if(M)
-		M.emp_act(EMP_HEAVY)
-		addtimer(CALLBACK(src, /obj/item/mecha_parts/mecha_tracking/proc/recharge), 15 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
-		recharging = 1
+	if(chassis)
+		chassis.emp_act(EMP_HEAVY)
+		addtimer(CALLBACK(src, /obj/item/mecha_parts/mecha_tracking/proc/recharge), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
+		recharging = TRUE
 
+/**
+  * Resets recharge variable, allowing tracker to be EMP pulsed again
+  */
 /obj/item/mecha_parts/mecha_tracking/proc/recharge()
-	recharging = 0
-
-/obj/item/mecha_parts/mecha_tracking/proc/get_mecha_log()
-	if(!ismecha(loc))
-		return 0
-	var/obj/mecha/M = src.loc
-	return M.get_log_html()
-
+	recharging = FALSE
 
 /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."
 	ai_beacon = TRUE
 
-
 /obj/item/storage/box/mechabeacons
 	name = "exosuit tracking beacons"
 

code/game/mecha/mecha_parts.dm

@@ -9,6 +9,13 @@
 	w_class = WEIGHT_CLASS_GIGANTIC
 	flags_1 = CONDUCT_1
 
+/obj/item/mecha_parts/proc/try_attach_part(mob/user, obj/mecha/M) //For attaching parts to a finished mech
+	if(!user.transferItemToLoc(src, M))
+		to_chat(user, "<span class='warning'>\The [src] is stuck to your hand, you cannot put it in \the [M]!</span>")
+		return FALSE
+	user.visible_message("<span class='notice'>[user] attaches [src] to [M].</span>", "<span class='notice'>You attach [src] to [M].</span>")
+	return TRUE
+	
 /obj/item/mecha_parts/chassis
 	name = "Mecha Chassis"
 	icon_state = "backbone"

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -245,6 +245,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
 	new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
 	new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wood, 2, time = 30), \
+	new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\
 	new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
 	new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),\
 	null, \

code/game/objects/structures/artstuff.dm

@@ -177,7 +177,7 @@
 			if("red")
 				return "#ff0000"
 		return P.colour
-	else if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/glass/rag))
+	else if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/rag))
 		return canvas_color
 
 /obj/item/canvas/proc/try_rename(mob/user)
@@ -240,7 +240,6 @@
 /obj/structure/sign/painting/Initialize(mapload, dir, building)
 	. = ..()
 	SSpersistence.painting_frames += src
-	AddComponent(/datum/component/art, 20)
 	if(dir)
 		setDir(dir)
 	if(building)

code/game/world.dm

@@ -124,6 +124,7 @@ GLOBAL_LIST(topic_status_cache)
 	GLOB.subsystem_log = "[GLOB.log_directory]/subsystem.log"
 	GLOB.reagent_log = "[GLOB.log_directory]/reagents.log"
 	GLOB.world_crafting_log = "[GLOB.log_directory]/crafting.log"
+	GLOB.world_asset_log = "[GLOB.log_directory]/asset.log"
 
 
 #ifdef UNIT_TESTS