diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 3115c3216ad..5c4ee55f092 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -241,8 +241,8 @@
 	name = "lava"
 	baseturf = /turf/simulated/floor/plating/lava/smooth
 	icon = 'icons/turf/floors/lava.dmi'
-	icon_state = "smooth"
-	smooth = SMOOTH_BORDER | SMOOTH_TRUE
+	icon_state = "unsmooth"
+//	smooth = SMOOTH_BORDER | SMOOTH_TRUE
 	canSmoothWith = list(/turf/simulated/wall, /turf/simulated/mineral, /turf/simulated/floor/plating/lava/smooth, /turf/simulated/floor/plating/lava/smooth/lava_land_surface
 	)
 
diff --git a/code/game/turfs/simulated/river.dm b/code/game/turfs/simulated/river.dm
index a6031075b4f..a1f87a8f809 100644
--- a/code/game/turfs/simulated/river.dm
+++ b/code/game/turfs/simulated/river.dm
@@ -4,7 +4,7 @@
 #define RANDOM_LOWER_X 50
 #define RANDOM_LOWER_Y 50
 
-/proc/spawn_rivers(target_z = 5, nodes = 4, turf_type = /turf/simulated/floor/plating/lava/smooth/lava_land_surface)
+/proc/spawn_rivers(target_z = 5, nodes = 4, turf_type = /turf/simulated/floor/plating/lava/smooth/lava_land_surface, whitelist_area = /area/lavaland/surface/outdoors)
 	var/list/river_nodes = list()
 	var/num_spawned = 0
 	while(num_spawned < nodes)
@@ -42,8 +42,8 @@
 				cur_dir = get_dir(cur_turf, target_turf)
 
 			cur_turf = get_step(cur_turf, cur_dir)
-
-			if(!cur_turf.density || istype(cur_turf, /turf/simulated/mineral)) //Rivers will flow around walls
+			var/area/new_area = get_area(cur_turf)
+			if(!istype(new_area, whitelist_area)) //Rivers will skip ruins
 				detouring = 0
 				cur_dir = get_dir(cur_turf, target_turf)
 				cur_turf = get_step(cur_turf, cur_dir)