diff --git a/code/game/turfs/simulated/dungeon/wall.dm b/code/game/turfs/simulated/dungeon/wall.dm
index 6c39e01798..be26ab2393 100644
--- a/code/game/turfs/simulated/dungeon/wall.dm
+++ b/code/game/turfs/simulated/dungeon/wall.dm
@@ -16,26 +16,55 @@
 	return
 
 /turf/simulated/wall/solidrock //for more stylish anti-cheese.
-	name = "solid rock"
-	desc = "This rock seems dense, impossible to drill."
 	description_info = "Probably not going to be able to drill or bomb your way through this, best to try and find a way around."
-	icon_state = "bedrock"
-	var/base_state = "bedrock"
+	var/rock_side = "rock_side"
 	block_tele = TRUE
 
-/turf/simulated/wall/solidrock/update_icon()
-	for(var/direction in cardinal)
-		var/turf/T = get_step(src,direction)
-		if(istype(T) && !T.density)
-			var/place_dir = turn(direction, 180)
-			if(!mining_overlay_cache["rock_side_[place_dir]"])
-				mining_overlay_cache["rock_side_[place_dir]"] = image('icons/turf/walls.dmi', "rock_side", dir = place_dir)
-			T.add_overlay(mining_overlay_cache["rock_side_[place_dir]"])
+/turf/simulated/wall/solidrock/New(var/newloc)
+	..(newloc,"bedrock")
 
 /turf/simulated/wall/solidrock/Initialize()
-	icon_state = base_state
+	..()
 	update_icon(1)
 
+/turf/simulated/wall/solidrock/update_material()
+	name = "solid rock"
+	desc = "This rock seems dense, impossible to drill."
+
+/turf/simulated/wall/solidrock/proc/get_cached_border(var/cache_id, var/direction, var/icon_file, var/icon_state, var/offset = 32)
+	if(!mining_overlay_cache["[cache_id]_[direction]"])
+		var/image/new_cached_image = image(icon_state, dir = direction, layer = ABOVE_TURF_LAYER)
+		switch(direction)
+			if(NORTH)
+				new_cached_image.pixel_y = offset
+			if(SOUTH)
+				new_cached_image.pixel_y = -offset
+			if(EAST)
+				new_cached_image.pixel_x = offset
+			if(WEST)
+				new_cached_image.pixel_x = -offset
+		mining_overlay_cache["[cache_id]_[direction]"] = new_cached_image
+		return new_cached_image
+
+	return mining_overlay_cache["[cache_id]_[direction]"]
+
+/turf/simulated/wall/solidrock/update_icon(var/update_neighbors)
+	if(density)
+		var/image/I
+		for(var/i = 1 to 4)
+			I = image('icons/turf/wall_masks.dmi', "rock[wall_connections[i]]", dir = 1<<(i-1))
+			add_overlay(I)
+		for(var/direction in cardinal)
+			var/turf/T = get_step(src,direction)
+			if(istype(T) && !T.density)
+				add_overlay(get_cached_border(rock_side,direction,icon,rock_side))
+
+	else if(update_neighbors)
+		for(var/direction in alldirs)
+			if(istype(get_step(src, direction), /turf/simulated/wall/solidrock))
+				var/turf/simulated/wall/solidrock/M = get_step(src, direction)
+				M.update_icon()
+
 /turf/simulated/wall/solidrock/attackby()
 	return
 
@@ -43,4 +72,31 @@
 	return
 
 /turf/simulated/wall/solidrock/take_damage()	//These things are suppose to be unbreakable
-	return
\ No newline at end of file
+	return
+
+
+//Mossy rocks for POI. Unbreakable, no teleport.
+
+/turf/simulated/wall/solidrock/mossyrockpoi // Version for POI labyrinths. No teleporting, no breaking.
+	desc = "An old, yet impressively durably rock wall."
+	var/mossyrock_side = "mossyrock_side"
+
+/turf/simulated/wall/solidrock/New(var/newloc)
+	..(newloc,"mossyrock")
+
+/turf/simulated/wall/solidrock/mossyrockpoi/update_icon(var/update_neighbors)
+	if(density)
+		var/image/I
+		for(var/i = 1 to 4)
+			I = image('icons/turf/wall_masks.dmi', "mossyrock[wall_connections[i]]", dir = 1<<(i-1))
+			add_overlay(I)
+		for(var/direction in cardinal)
+			var/turf/T = get_step(src,direction)
+			if(istype(T) && !T.density)
+				add_overlay(get_cached_border(mossyrock_side,direction,icon,mossyrock_side))
+
+	else if(update_neighbors)
+		for(var/direction in alldirs)
+			if(istype(get_step(src, direction), /turf/simulated/wall/solidrock/mossyrockpoi))
+				var/turf/simulated/wall/solidrock/mossyrockpoi/M = get_step(src, direction)
+				M.update_icon()
\ No newline at end of file
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 012de7bf38..a86d99434f 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -212,6 +212,9 @@ turf/simulated/mineral/floor/light_corner
 				if(istype(get_step(src, direction), /turf/simulated/mineral))
 					var/turf/simulated/mineral/M = get_step(src, direction)
 					M.update_icon()
+				if(istype(get_step(src, direction), /turf/simulated/wall/solidrock))
+					var/turf/simulated/wall/solidrock/M = get_step(src, direction)
+					M.update_icon()
 
 /turf/simulated/mineral/ex_act(severity)
 
diff --git a/icons/turf/wall_masks.dmi b/icons/turf/wall_masks.dmi
index 916d230ffd..c8564ac407 100644
Binary files a/icons/turf/wall_masks.dmi and b/icons/turf/wall_masks.dmi differ