Merge pull request #194 from Azarak/holofan2

ATMOS holofans and forcefield generator icon update, temperature block for holofans and force gens going into toolbelts

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

@@ -2,7 +2,7 @@
 	name = "forcefield projector"
 	desc = "An experimental device that can create several forcefields at a distance."
 	icon = 'icons/obj/device.dmi'
-	icon_state = "signmaker_engi"
+	icon_state = "signmaker_forcefield"
 	slot_flags = ITEM_SLOT_BELT
 	w_class = WEIGHT_CLASS_SMALL
 	item_flags = NOBLUDGEON

code/game/objects/items/holosign_creator.dm

@@ -78,8 +78,8 @@
 
 /obj/item/holosign_creator/atmos
 	name = "ATMOS holofan projector"
-	desc = "A holographic projector that creates holographic barriers that prevent changes in atmosphere conditions."
-	icon_state = "signmaker_engi"
+	desc = "A holographic projector that creates holographic fans that prevent changes in atmosphere conditions."
+	icon_state = "signmaker_atmos"
 	holosign_type = /obj/structure/holosign/barrier/atmos
 	creation_time = 0
 	max_signs = 3

code/game/objects/items/storage/belt.dm

@@ -60,6 +60,7 @@
 		/obj/item/radio,
 		/obj/item/clothing/gloves,
 		/obj/item/holosign_creator,
+		/obj/item/forcefield_projector,
 		/obj/item/assembly/signaler
 		))
 	STR.can_hold = can_hold

code/game/objects/structures/holosign.dm

@@ -69,7 +69,7 @@
 /obj/structure/holosign/barrier/atmos
 	name = "holo firelock"
 	desc = "A holographic barrier resembling a firelock. Though it does not prevent solid objects from passing through, gas is kept out."
-	icon_state = "holo_firelock"
+	icon_state = "holo_fan"
 	density = FALSE
 	layer = ABOVE_MOB_LAYER
 	anchored = TRUE
@@ -81,6 +81,9 @@
 	. = ..()
 	air_update_turf(TRUE)
 
+/obj/structure/holosign/barrier/atmos/blocksTemperature()
+	return TRUE
+
 /obj/structure/holosign/barrier/cyborg
 	name = "Energy Field"
 	desc = "A fragile energy field that blocks movement. Excels at blocking lethal projectiles."

code/modules/atmospherics/environmental/LINDA_turf_tile.dm

@@ -357,6 +357,9 @@
 	SSair.excited_groups -= src
 
 ////////////////////////SUPERCONDUCTIVITY/////////////////////////////
+/atom/movable/proc/blocksTemperature()
+	return FALSE
+
 /turf/proc/conductivity_directions()
 	if(archived_cycle < SSair.times_fired)
 		archive()
@@ -371,6 +374,9 @@
 			. |= direction
 
 /turf/proc/neighbor_conduct_with_src(turf/open/other)
+	for (var/atom/movable/G in src)
+		if (G.blocksTemperature())
+			return
 	if(!other.blocks_air) //Open but neighbor is solid
 		other.temperature_share_open_to_solid(src)
 	else //Both tiles are solid
@@ -382,6 +388,10 @@
 		..()
 		return
 
+	
+	for (var/atom/movable/G in src)
+		if (G.blocksTemperature())
+			return
 	if(!other.blocks_air) //Both tiles are open
 		var/turf/open/T = other
 		T.air.temperature_share(air, WINDOW_HEAT_TRANSFER_COEFFICIENT)