Merge pull request #1772 from Citadel-Station-13/upstream-merge-28749

[MIRROR] Exporting mechs!

code/game/mecha/mecha.dm

@@ -56,7 +56,7 @@
 	var/datum/gas_mixture/cabin_air
 	var/obj/machinery/atmospherics/components/unary/portables_connector/connected_port = null
 
-	var/obj/item/device/radio/radio = null
+	var/obj/item/device/radio/mech/radio
 	var/list/trackers = list()
 
 	var/max_temperature = 25000
@@ -117,6 +117,7 @@
 
 	hud_possible = list (DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_TRACK_HUD)
 
+/obj/item/device/radio/mech //this has to go somewhere
 
 /obj/mecha/Initialize()
 	. = ..()
@@ -155,11 +156,9 @@
 			AI = M //AIs are loaded into the mech computer itself. When the mech dies, so does the AI. They can be recovered with an AI card from the wreck.
 		else
 			M.forceMove(loc)
-
-	if(prob(30))
-		explosion(get_turf(loc), 0, 0, 1, 3)
-
 	if(wreckage)
+		if(prob(30))
+			explosion(get_turf(src), 0, 0, 1, 3)
 		var/obj/structure/mecha_wreckage/WR = new wreckage(loc, AI)
 		for(var/obj/item/mecha_parts/mecha_equipment/E in equipment)
 			if(E.salvageable && prob(30))

code/game/mecha/mecha.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm	(rejected hunks)
+@@ -146,7 +146,7 @@
+ /obj/mecha/get_cell()
+ 	return cell
+ 
+-/obj/mecha/deconstruct(disassembled = TRUE)
++/obj/mecha/Destroy()
+ 	go_out()
+ 	var/mob/living/silicon/ai/AI
+ 	for(var/mob/M in src) //Let's just be ultra sure