Concrete Integration

code/game/objects/random/misc.dm

@@ -500,7 +500,8 @@
 				/obj/item/stack/rods{amount = 10},
 				/obj/item/stack/material/sandstone{amount = 10},
 				/obj/item/stack/material/marble{amount = 10},
-				/obj/item/stack/material/plasteel{amount = 10})
+				/obj/item/stack/material/plasteel{amount = 10},
+				/obj/item/stack/material/concrete{amount = 10})
 
 /obj/random/material/refined //Random materials for building stuff
 	name = "random refined material"
@@ -530,7 +531,9 @@
 				/obj/item/stack/material/osmium{amount = 3},
 				/obj/item/stack/material/titanium{amount = 5},
 				/obj/item/stack/material/tritium{amount = 3},
-				/obj/item/stack/material/verdantium{amount = 2})
+				/obj/item/stack/material/verdantium{amount = 2},
+				/obj/item/stack/material/concrete{amount =10},
+				/obj/item/stack/material/plasteel/rebar{amount = 5})
 
 /obj/random/material/precious //Precious metals, go figure
 	name = "random precious metal"
@@ -965,4 +968,4 @@
 				/obj/item/reagent_containers/food/drinks/glass2/coffeemug/green,
 				/obj/item/reagent_containers/food/drinks/glass2/coffeemug/green/dark,
 				/obj/item/reagent_containers/food/drinks/glass2/coffeemug/rainbow,
-				/obj/item/reagent_containers/food/drinks/glass2/coffeemug/metal)
+				/obj/item/reagent_containers/food/drinks/glass2/coffeemug/metal)

code/game/turfs/simulated/wall_icon.dm

@@ -126,6 +126,6 @@
 	wall_connections = dirs_to_corner_states(dirs)
 
 /turf/simulated/wall/proc/can_join_with(var/turf/simulated/wall/W)
-	if(istype(material) && istype(W.material) && material.icon_base == W.material.icon_base)
+	if (istype(material) && istype(W.material) && ((material.icon_base == W.material.icon_base) || (material.icon_base == "solid" && W.material.icon_base == "brick")))
 		return 1
 	return 0

code/game/turfs/simulated/wall_types.dm

@@ -103,8 +103,6 @@
 	desc = "A wall made out of concrete bricks"
 	material = MAT_CONCRETE
 	icon_state = "brick"
-
-
 /turf/simulated/wall/r_concrete
 	desc = "A sturdy wall made of concrete and reinforced with plasteel rebar"
 	material = MAT_CONCRETE

maps/cynosure/cynosure-7.dmm

@@ -137,7 +137,7 @@
 	icon_state = "wilderness2";
 	pixel_y = -6
 	},
-/turf/simulated/wall/sifwood,
+/turf/simulated/wall/concrete,
 /area/surface/outside/wilderness/normal)
 "tC" = (
 /obj/structure/simple_door/sifwood,