fixed some weird merge issues

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>

code/defines/obj/machinery.dm

@@ -113,6 +113,7 @@
 	idle_power_usage = 2
 	active_power_usage = 6
 	power_channel = ENVIRON
+	var/network
 
 	New()
 		if(z == 1)

code/defines/turf.dm

@@ -117,6 +117,15 @@
 
 	var/walltype = "wall"
 
+/turf/simulated/wall/heatshield
+	thermal_conductivity = 0
+	opacity = 0
+	name = "Heat Shielding"
+	icon = 'thermal.dmi'
+	icon_state = "thermal"
+	heat_capacity = 625000 //twice the cap of a normal wall
+	walltype = "heatshield"
+
 /turf/simulated/wall/cult
 	name = "wall"
 	desc = "The patterns engraved on the wall seem to shift as you try to focus on them. You feel sick"