Merge master into map-development

code/modules/materials/materials.dm

@@ -429,8 +429,9 @@ var/list/name_to_material
 				if(!is_reinforced())
 					user << "<span class='warning'>This material is not reinforced enough to use for a door.</span>"
 					return
-				if((locate(/obj/structure/windoor_assembly) in T.contents) || (locate(/obj/machinery/door/window) in T.contents))
-					failed_to_build = 1
+				for(var/obj/obstacle in T)
+					if((obstacle.flags & ON_BORDER) && obstacle.dir == user.dir)
+						failed_to_build = 1
 	if(failed_to_build)
 		user << "<span class='warning'>There is no room in this location.</span>"
 		return 1
@@ -466,7 +467,7 @@ var/list/name_to_material
 	tableslam_noise = 'sound/effects/Glasshit.ogg'
 	hardness = 40
 	weight = 30
-	stack_origin_tech = "materials=2"
+	stack_origin_tech = list(TECH_MATERIAL = 2)
 	composite_material = list(DEFAULT_WALL_MATERIAL = 1875,"glass" = 3750)
 	window_options = list("One Direction" = 1, "Full Window" = 4, "Windoor" = 5)
 	created_window = /obj/structure/window/reinforced
@@ -768,7 +769,7 @@ var/list/name_to_material
 	flags = MATERIAL_PADDING
 	hardness = 1
 	weight = 1
-		
+
 /material/hide/corgi
 	name = "corgi hide"
 	stack_type = /obj/item/stack/material/animalhide/corgi
@@ -778,17 +779,17 @@ var/list/name_to_material
 	name = "cat hide"
 	stack_type = /obj/item/stack/material/animalhide/cat
 	icon_colour = "#444444"
-	
+
 /material/hide/monkey
 	name = "monkey hide"
 	stack_type = /obj/item/stack/material/animalhide/monkey
 	icon_colour = "#914800"
-	
+
 /material/hide/lizard
 	name = "lizard hide"
 	stack_type = /obj/item/stack/material/animalhide/lizard
 	icon_colour = "#34AF10"
-	
+
 /material/hide/xeno
 	name = "alien hide"
 	stack_type = /obj/item/stack/material/animalhide/xeno
@@ -811,7 +812,7 @@ var/list/name_to_material
 	integrity = 70
 	stack_origin_tech = list(TECH_MATERIAL = 2)
 	door_icon_base = "stone"
-	
+
 /material/bone/necromancer
 	name = "cursed bone"
 	weight = 20