Merge remote-tracking branch 'upstream/dev-freeze' into dev

Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm

code/game/objects/effects/aliens.dm

@@ -254,7 +254,7 @@ Alien plants should do something if theres a lot of poison
 
 
 /obj/effect/alien/weeds/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	if(exposed_temperature > 300)
+	if(exposed_temperature > 300 + T0C)
 		health -= 5
 		healthcheck()
 
@@ -425,7 +425,7 @@ Alien plants should do something if theres a lot of poison
 		Burst()
 
 /obj/effect/alien/egg/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	if(exposed_temperature > 500)
+	if(exposed_temperature > 500 + T0C)
 		health -= 5
 		healthcheck()
 

code/game/objects/effects/spiders.dm

@@ -48,7 +48,7 @@
 		qdel(src)
 
 /obj/effect/spider/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-	if(exposed_temperature > 300)
+	if(exposed_temperature > 300 + T0C)
 		health -= 5
 		healthcheck()
 

code/game/objects/items/devices/floor_painter.dm

@@ -21,7 +21,7 @@
 	if(istype(A, /turf/simulated/floor))
 		var/turf/simulated/floor/F = A
 
-		if(F.is_plasteel_floor()) // only tiled floors
+		if(F.is_steel_floor()) // only tiled floors
 			if(tile_dir_mode)
 				var/D = get_dir(usr, F)
 				if(usr.loc == F)

code/game/objects/items/stacks/tiles/plasteel.dm

@@ -1,7 +1,7 @@
-/obj/item/stack/tile/plasteel
+/obj/item/stack/tile/steel
 	name = "floor tile"
 	singular_name = "floor tile"
-	desc = "Those could work as a pretty decent throwing weapon"
+	desc = "Those could work as a pretty decent throwing weapon" //why?
 	icon_state = "tile"
 	force = 6.0
 	matter = list(DEFAULT_WALL_MATERIAL = 937.5)
@@ -10,23 +10,23 @@
 	throw_range = 20
 	flags = CONDUCT
 
-/obj/item/stack/tile/plasteel/New(var/loc, var/amount=null)
+/obj/item/stack/tile/steel/New(var/loc, var/amount=null)
 	..()
 	src.pixel_x = rand(1, 14)
 	src.pixel_y = rand(1, 14)
 	return
 
-/obj/item/stack/tile/plasteel/cyborg
+/obj/item/stack/tile/steel/cyborg
 	name = "floor tile synthesizer"
 	desc = "A device that makes floor tiles."
 	gender = NEUTER
 	matter = null
 	uses_charge = 1
 	charge_costs = list(250)
-	stacktype = /obj/item/stack/tile/plasteel
-	build_type = /obj/item/stack/tile/plasteel
+	stacktype = /obj/item/stack/tile/steel
+	build_type = /obj/item/stack/tile/steel
 
-/obj/item/stack/tile/plasteel/proc/build(turf/S as turf)
+/obj/item/stack/tile/steel/proc/build(turf/S as turf)
 	if (istype(S,/turf/space))
 		S.ChangeTurf(/turf/simulated/floor/plating/airless)
 	else

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -26,7 +26,7 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	flags = CONDUCT
+	flags = 0
 	origin_tech = list(TECH_BIO = 1)
 
 /*
@@ -41,7 +41,7 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	flags = CONDUCT
+	flags = 0
 
 /obj/item/stack/tile/wood/cyborg
 	name = "wood floor tile synthesizer"
@@ -63,4 +63,4 @@
 	throwforce = 1.0
 	throw_speed = 5
 	throw_range = 20
-	flags = CONDUCT
+	flags = 0

code/game/objects/structures/lattice.dm

@@ -53,7 +53,7 @@
 
 /obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob)
 
-	if (istype(C, /obj/item/stack/tile/plasteel))
+	if (istype(C, /obj/item/stack/tile/steel))
 		var/turf/T = get_turf(src)
 		T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead
 		return