diff --git a/code/modules/random_map/automata/caves.dm b/code/modules/random_map/automata/caves.dm
index 58e61045b3..ee9d4ddf54 100644
--- a/code/modules/random_map/automata/caves.dm
+++ b/code/modules/random_map/automata/caves.dm
@@ -47,18 +47,19 @@
 	if(!current_cell)
 		return 0
 	var/turf/simulated/mineral/T = locate((origin_x-1)+x,(origin_y-1)+y,origin_z)
-	if(istype(T) && !T.ignore_mapgen && !T.ignore_cavegen)	//VOREStation Edit: ignore cavegen
-		if(map[current_cell] == FLOOR_CHAR)
-			T.make_floor() //VOREStation Edit - Don't make cracked sand on surface map, jerk.
-			//if(prob(90))
-				//T.make_floor()
-			//else
-				//T.ChangeTurf(/turf/space/cracked_asteroid)
-		else
-			T.make_wall()
+	//VOREStation Edit Start
+	if(istype(T) && !T.ignore_mapgen)
+		if(!T.ignore_cavegen)
+			if(map[current_cell] == FLOOR_CHAR)
+				T.make_floor()
+			else
+				T.make_wall()
+
+		if(T.density && !T.ignore_oregen)
 			if(map[current_cell] == DOOR_CHAR)
 				T.make_ore()
 			else if(map[current_cell] == EMPTY_CHAR)
 				T.make_ore(1)
 		get_additional_spawns(map[current_cell],T,get_spawn_dir(x, y))
+	//VOREStation Edit End
 	return T
\ No newline at end of file