Resolved conflicts

code/game/objects/items/devices/PDA/radio.dm

@@ -13,6 +13,10 @@
 	if (istype(loc.loc, /obj/item/device/pda))
 		hostpda = loc.loc
 
+/obj/item/radio/integrated/Destroy()
+	hostpda = null
+	return ..()
+
 /*
  *	Radio Cartridge, essentially a signaler.
  */
@@ -32,6 +36,7 @@
 /obj/item/radio/integrated/signal/Destroy()
 	if(SSradio)
 		SSradio.remove_object(src, frequency)
+	radio_connection = null
 	return ..()
 
 /obj/item/radio/integrated/signal/initialize()

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

@@ -68,6 +68,9 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 /obj/item/stack/sheet/metal/fifty
 	amount = 50
 
+/obj/item/stack/sheet/metal/five
+	amount = 5
+
 /obj/item/stack/sheet/metal/cyborg
 	materials = list()
 	is_cyborg = 1