Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap

Conflicts:
	code/game/turfs/simulated/floor_types.dm

code/modules/random_map/automata/caves.dm

@@ -2,7 +2,7 @@
 	iterations = 5
 	descriptor = "moon caves"
 	wall_type =  /turf/simulated/mineral
-	floor_type = /turf/simulated/floor/plating/airless/asteroid
+	floor_type = /turf/simulated/floor/asteroid
 	target_turf_type = /turf/unsimulated/mask
 	var/mineral_sparse =  /turf/simulated/mineral/random
 	var/mineral_rich = /turf/simulated/mineral/random/high_chance

code/modules/random_map/drop/droppod.dm

@@ -12,7 +12,7 @@
 	preserve_map = 0
 
 	wall_type = /turf/simulated/wall/titanium
-	floor_type = /turf/simulated/floor/engine
+	floor_type = /turf/simulated/floor/reinforced
 	var/list/supplied_drop_types = list()
 	var/door_type = /obj/structure/droppod_door
 	var/drop_type = /mob/living/simple_animal/parrot

code/modules/random_map/drop/droppod_doors.dm

@@ -46,10 +46,10 @@
 
 	// Overwrite turfs.
 	var/turf/origin = get_turf(src)
-	origin.ChangeTurf(/turf/simulated/floor/engine)
+	origin.ChangeTurf(/turf/simulated/floor/reinforced)
 	origin.set_light(0) // Forcing updates
 	var/turf/T = get_step(origin, src.dir)
-	T.ChangeTurf(/turf/simulated/floor/engine)
+	T.ChangeTurf(/turf/simulated/floor/reinforced)
 	T.set_light(0) // Forcing updates
 
 	// Destroy turf contents.

code/modules/random_map/noise/magma.dm

@@ -37,7 +37,7 @@
 
 /datum/random_map/noise/volcanism/get_additional_spawns(var/value, var/turf/T)
 	if(value>=178)
-		if(istype(T,/turf/simulated/floor/plating/airless/asteroid))
+		if(istype(T,/turf/simulated/floor/asteroid))
 			T.ChangeTurf(/turf/simulated/floor/airless/lava)
 		else if(istype(T,/turf/simulated/mineral))
 			var/turf/simulated/mineral/M = T