Merge pull request #11824 from Ghommie/Ghommie-cit673

Fixes occasional tunnel hole in the space hermit ruin.

_maps/RandomRuins/SpaceRuins/spacehermit.dmm

@@ -145,9 +145,6 @@
 "aE" = (
 /turf/open/floor/plating/asteroid/airless,
 /area/ruin/powered)
-"aF" = (
-/turf/open/floor/plating/asteroid,
-/area/ruin/powered)
 "aG" = (
 /obj/structure/sink/puddle,
 /turf/open/floor/plating/asteroid,
@@ -241,7 +238,7 @@
 /turf/closed/mineral/random/low_chance/earth_like,
 /area/ruin/powered)
 "bb" = (
-/turf/closed/mineral/random/earth_like,
+/turf/closed/mineral/random/no_caves/earth_like,
 /area/ruin/powered)
 "bc" = (
 /obj/item/circuitboard/machine/circuit_imprinter,
@@ -1137,7 +1134,7 @@ ao
 ao
 ak
 af
-aF
+am
 bb
 bb
 bb
@@ -1189,7 +1186,7 @@ an
 an
 ae
 ae
-aF
+am
 bb
 bb
 bb
@@ -1223,8 +1220,8 @@ bb
 bb
 bb
 ba
-aF
-aF
+am
+am
 ba
 ba
 ba
@@ -1241,7 +1238,7 @@ ar
 af
 at
 at
-aF
+am
 bb
 fp
 bb
@@ -1275,10 +1272,10 @@ bb
 bb
 bb
 ad
-aF
-aF
-aF
-aF
+am
+am
+am
+am
 ba
 aH
 aJ
@@ -1286,13 +1283,13 @@ aL
 bb
 bb
 aT
-aF
-aF
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
+am
+am
 aR
 bb
 bb
@@ -1328,23 +1325,23 @@ bb
 bb
 ad
 au
-aF
+am
 aB
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
 ba
 bb
-aF
-aF
-aF
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
+am
+am
+am
 bg
 bb
 fp
@@ -1384,19 +1381,19 @@ bs
 aC
 bC
 WH
-aF
-aF
-aF
+am
+am
+am
 ba
 bb
 bb
-aF
-aF
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
+am
+am
 bb
 bb
 bb
@@ -1432,23 +1429,23 @@ bb
 bb
 ad
 ax
-aF
+am
 aD
-aF
-aF
-aF
-aF
+am
+am
+am
+am
 bb
 bb
 bb
 aU
 bd
-aF
-aF
+am
+am
 bl
 bm
-aF
-aF
+am
+am
 bb
 bb
 bb
@@ -1484,20 +1481,20 @@ bb
 bb
 ad
 ay
-aF
-aF
-aF
+am
+am
+am
 aG
-aF
-aF
+am
+am
 bb
 bb
 ba
 av
 be
-aF
-aF
-aF
+am
+am
+am
 bn
 bo
 bo
@@ -1535,24 +1532,24 @@ bb
 bb
 bb
 ba
-aF
-aF
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
+am
+am
 bb
 bb
 bb
 bc
 bf
-aF
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
+am
 br
 bb
 bb
@@ -1590,22 +1587,22 @@ bb
 bb
 bb
 bb
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
 bb
 bb
-aF
-aF
-aF
-aF
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
+am
+am
+am
+am
 bb
 bb
 bb
@@ -1642,21 +1639,21 @@ bb
 bb
 bb
 bb
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
 aN
-aF
-aF
-aF
-aF
+am
+am
+am
+am
 aR
-aF
-aF
-aF
-aF
+am
+am
+am
+am
 bb
 bb
 fp
@@ -1695,22 +1692,22 @@ bb
 bb
 bb
 ba
-aF
-aF
-aF
+am
+am
+am
 ba
 ba
-aF
-aF
-aF
-aF
-aF
-aF
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
+am
+am
+am
+am
+am
+am
 ba
 ba
 ba
@@ -1752,16 +1749,16 @@ ba
 aK
 ba
 ba
-aF
-aF
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
+am
+am
 bp
-aF
-aF
+am
+am
 aR
 ba
 ba
@@ -1805,15 +1802,15 @@ ba
 fp
 ba
 aP
-aF
-aF
-aF
-aF
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
+am
+am
+am
+am
 aR
 ba
 ba
@@ -1858,15 +1855,15 @@ ba
 ba
 aQ
 aP
-aF
-aF
+am
+am
 aR
-aF
-aF
-aF
-aF
+am
+am
+am
+am
 bb
-aF
+am
 ba
 ba
 aZ
@@ -1910,12 +1907,12 @@ ba
 ba
 ba
 ba
-aF
-aF
-aF
-aF
+am
+am
+am
+am
 aP
-aF
+am
 bg
 bb
 bb
@@ -1962,12 +1959,12 @@ bb
 bb
 ba
 ba
-aF
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
+am
 aS
 bb
 fp
@@ -2015,11 +2012,11 @@ bb
 bb
 ba
 bg
-aF
-aF
-aF
-aF
-aF
+am
+am
+am
+am
+am
 aS
 bb
 fp
@@ -2066,12 +2063,12 @@ bb
 bb
 fp
 ba
-aF
-aF
+am
+am
 bj
-aF
-aF
-aF
+am
+am
+am
 aS
 fp
 bb
@@ -2120,9 +2117,9 @@ ba
 ba
 aS
 bi
-aF
-aF
-aF
+am
+am
+am
 aS
 aS
 bb
@@ -2171,10 +2168,10 @@ ba
 aZ
 ba
 aS
-aF
-aF
-aF
-aF
+am
+am
+am
+am
 aS
 aS
 ba

code/game/turfs/simulated/minerals.dm

@@ -173,6 +173,16 @@
 		/turf/closed/mineral/silver = 12, /turf/closed/mineral/plasma = 20, /turf/closed/mineral/iron = 40, /turf/closed/mineral/titanium = 11,
 		/turf/closed/mineral/gibtonite = 4, /turf/closed/mineral/bscrystal = 1)
 
+/turf/closed/mineral/random/no_caves/earth_like
+	icon_state = "rock_oxy"
+	turf_type = /turf/open/floor/plating/asteroid
+	baseturfs = /turf/open/floor/plating/asteroid
+	mineralSpawnChanceList = list(/turf/closed/mineral/uranium/earth_like = 5, /turf/closed/mineral/diamond/earth_like = 1, /turf/closed/mineral/gold/earth_like = 10,
+		/turf/closed/mineral/silver/earth_like = 12, /turf/closed/mineral/plasma/earth_like = 20, /turf/closed/mineral/iron/earth_like = 40,
+		/turf/closed/mineral/titanium/earth_like = 11, /turf/closed/mineral/gibtonite/earth_like = 4, /turf/closed/mineral/bscrystal/earth_like = 1)
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+	defer_change = TRUE
+
 /turf/closed/mineral/random/high_chance
 	icon_state = "rock_highchance"
 	mineralChance = 25
@@ -194,6 +204,10 @@
 	icon_state = "rock_highchance_oxy"
 	turf_type = /turf/open/floor/plating/asteroid
 	baseturfs = /turf/open/floor/plating/asteroid
+	mineralSpawnChanceList = list(
+		/turf/closed/mineral/uranium/earth_like = 35, /turf/closed/mineral/diamond/earth_like = 30, /turf/closed/mineral/gold/earth_like = 45,
+		/turf/closed/mineral/titanium/earth_like = 45, /turf/closed/mineral/silver/earth_like = 50, /turf/closed/mineral/plasma/earth_like = 50,
+		/turf/closed/mineral/bscrystal/earth_like = 20)
 	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
 	defer_change = TRUE
 
@@ -211,6 +225,10 @@
 	turf_type = /turf/open/floor/plating/asteroid
 	baseturfs = /turf/open/floor/plating/asteroid
 	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+	mineralSpawnChanceList = list(
+		/turf/closed/mineral/uranium/earth_like = 2, /turf/closed/mineral/diamond/earth_like = 1, /turf/closed/mineral/gold/earth_like = 4,
+		/turf/closed/mineral/titanium/earth_like = 4, /turf/closed/mineral/silver/earth_like = 6, /turf/closed/mineral/plasma/earth_like = 15,
+		/turf/closed/mineral/iron/earth_like = 40, /turf/closed/mineral/gibtonite/earth_like = 2, /turf/closed/mineral/bscrystal/earth_like = 1)
 	defer_change = TRUE
 
 /turf/closed/mineral/random/volcanic
@@ -246,13 +264,6 @@
 		/turf/closed/mineral/silver/volcanic = 20, /turf/closed/mineral/plasma/volcanic = 30, /turf/closed/mineral/bscrystal/volcanic = 1, /turf/closed/mineral/gibtonite/volcanic = 2,
 		/turf/closed/mineral/iron/volcanic = 95)
 
-/turf/closed/mineral/random/earth_like
-	icon_state = "rock_oxy"
-	turf_type = /turf/open/floor/plating/asteroid
-	baseturfs = /turf/open/floor/plating/asteroid
-	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
-	defer_change = TRUE
-
 
 /turf/closed/mineral/iron
 	mineralType = /obj/item/stack/ore/iron
@@ -624,3 +635,10 @@
 	baseturfs = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
 	initial_gas_mix = LAVALAND_DEFAULT_ATMOS
 	defer_change = 1
+
+/turf/closed/mineral/gibtonite/earth_like
+	icon_state = "rock_oxy"
+	turf_type = /turf/open/floor/plating/asteroid
+	baseturfs = /turf/open/floor/plating/asteroid
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+	defer_change = TRUE