Modern Modular Computers

code/modules/modular_computers/hardware/_hardware.dm

@@ -48,11 +48,6 @@
 
 /obj/item/weapon/computer_hardware/New(var/obj/L)
 	w_class = hardware_size
-	if(istype(L, /obj/machinery/modular_computer))
-		var/obj/machinery/modular_computer/C = L
-		if(C.cpu)
-			holder2 = C.cpu
-			return
 	if(istype(L, /obj/item/modular_computer))
 		holder2 = L
 		return

code/modules/modular_computers/hardware/battery_module.dm

@@ -70,6 +70,10 @@
 	battery.charge = 0
 	..()
 
+/obj/item/weapon/computer_hardware/battery_module/Destroy()
+	qdel_null(battery)
+	return ..()
+
 /obj/item/weapon/computer_hardware/battery_module/proc/charge_to_full()
 	if(battery)
 		battery.charge = battery.maxcharge

code/modules/modular_computers/hardware/card_slot.dm

@@ -15,4 +15,4 @@
 	if(stored_card)
 		stored_card.forceMove(get_turf(holder2))
 	holder2 = null
-	..() 
+	return ..()

code/modules/modular_computers/hardware/hard_drive.dm

@@ -160,7 +160,7 @@
 	if(holder2 && (holder2.hard_drive == src))
 		holder2.hard_drive = null
 	stored_files = null
-	..()
+	return ..()
 
 /obj/item/weapon/computer_hardware/hard_drive/New()
 	install_default_programs()

code/modules/modular_computers/hardware/nano_printer.dm

@@ -43,4 +43,4 @@
 	if(holder2 && (holder2.nano_printer == src))
 		holder2.nano_printer = null
 	holder2 = null
-	..()
+	return ..()

code/modules/modular_computers/hardware/network_card.dm

@@ -32,7 +32,7 @@ var/global/ntnet_card_uid = 1
 
 /obj/item/weapon/computer_hardware/network_card/advanced
 	name = "advanced NTNet network card"
-	desc = "An advanced network card for usage with standard NTNet frequencies. It's transmitter is strong enough to connect even off-station."
+	desc = "An advanced network card for usage with standard NTNet frequencies. It's transmitter is strong enough to connect even when far away."
 	long_range = 1
 	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 2)
 	power_usage = 100 // Better range but higher power usage.
@@ -52,7 +52,7 @@ var/global/ntnet_card_uid = 1
 	if(holder2 && (holder2.network_card == src))
 		holder2.network_card = null
 	holder2 = null
-	..()
+	return ..()
 
 // Returns a string identifier of this network card
 /obj/item/weapon/computer_hardware/network_card/proc/get_network_tag()
@@ -77,19 +77,21 @@ var/global/ntnet_card_uid = 1
 
 	if(holder2)
 		var/turf/T = get_turf(holder2)
-		if((T && istype(T)) && T.z in using_map.station_levels)
+		if(!istype(T)) //no reception in nullspace
+			return 0
+		if(T.z in using_map.station_levels)
 			// Computer is on station. Low/High signal depending on what type of network card you have
 			if(long_range)
 				return 2
 			else
 				return 1
-
-	if(long_range) // Computer is not on station, but it has upgraded network card. Low signal.
-		return 1
+		if(T.z in using_map.contact_levels) //not on station, but close enough for radio signal to travel
+			if(long_range) // Computer is not on station, but it has upgraded network card. Low signal.
+				return 1
 
 	return 0 // Computer is not on station and does not have upgraded network card. No signal.
 
 /obj/item/weapon/computer_hardware/network_card/Destroy()
 	if(holder2 && (holder2.network_card == src))
 		holder2.network_card = null
-	..()
+	..()

code/modules/modular_computers/hardware/portable_hard_drive.dm

@@ -29,4 +29,9 @@
 /obj/item/weapon/computer_hardware/hard_drive/portable/New()
 	..()
 	stored_files = list()
-	recalculate_size()
+	recalculate_size()
+
+/obj/item/weapon/computer_hardware/hard_drive/portable/Destroy()
+	if(holder2 && (holder2.portable_drive == src))
+		holder2.portable_drive = null
+	return ..()

code/modules/modular_computers/hardware/processor_unit.dm

@@ -38,4 +38,9 @@
 	hardware_size = 1
 	power_usage = 75
 	max_idle_programs = 2
-	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3)
+	origin_tech = list(TECH_DATA = 4, TECH_ENGINEERING = 3)
+
+/obj/item/weapon/computer_hardware/processor_unit/Destroy()
+	if(holder2 && (holder2.processor_unit == src))
+		holder2.processor_unit = null
+	return ..()

code/modules/modular_computers/hardware/tesla_link.dm

@@ -6,16 +6,9 @@
 	icon_state = "teslalink"
 	hardware_size = 1
 	origin_tech = list(TECH_DATA = 2, TECH_POWER = 3, TECH_ENGINEERING = 2)
-	var/obj/machinery/modular_computer/holder
 	var/passive_charging_rate = 250			// W
 
-/obj/item/weapon/computer_hardware/tesla_link/New(var/obj/L)
-	if(istype(L, /obj/machinery/modular_computer))
-		holder = L
-		return
-	..(L)
-
 /obj/item/weapon/computer_hardware/tesla_link/Destroy()
 	if(holder2 && (holder2.tesla_link == src))
 		holder2.tesla_link = null
-	..()
+	return ..()