diff --git a/code/modules/maps/planet_types/barren.dm b/code/modules/maps/planet_types/barren.dm index d4fd495f688..b954cc02c67 100644 --- a/code/modules/maps/planet_types/barren.dm +++ b/code/modules/maps/planet_types/barren.dm @@ -10,6 +10,7 @@ features_budget = 6 surface_color = "#807d7a" water_color = null + possible_random_ruins = list(/datum/map_template/ruin/exoplanet/abandoned_mining, /datum/map_template/ruin/exoplanet/hideout, /datum/map_template/ruin/exoplanet/crashed_shuttle_01) /obj/effect/overmap/visitable/sector/exoplanet/barren/generate_habitability() return HABITABILITY_BAD @@ -62,7 +63,7 @@ map_generators = list(/datum/random_map/noise/exoplanet/barren/asteroid, /datum/random_map/noise/ore/rich) rock_colors = list(COLOR_ASTEROID_ROCK) planetary_area = /area/exoplanet/barren/asteroid - possible_features = list(/datum/map_template/ruin/exoplanet/abandoned_mining) + possible_random_ruins = list(/datum/map_template/ruin/exoplanet/abandoned_mining, /datum/map_template/ruin/exoplanet/carp_nest, /datum/map_template/ruin/exoplanet/hideout, /datum/map_template/ruin/exoplanet/crashed_shuttle_01) /obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/romanovich name = "romanovich cloud asteroid" diff --git a/code/modules/overmap/exoplanets/exoplanet.dm b/code/modules/overmap/exoplanets/exoplanet.dm index 48b38adc8ff..36aec3040dc 100644 --- a/code/modules/overmap/exoplanets/exoplanet.dm +++ b/code/modules/overmap/exoplanets/exoplanet.dm @@ -49,6 +49,8 @@ var/list/mobs_to_tolerate = list() + var/list/possible_random_ruins + /obj/effect/overmap/visitable/sector/exoplanet/proc/generate_habitability() var/roll = rand(1,100) switch(roll) @@ -75,14 +77,14 @@ if(LAZYLEN(possible_themes)) var/datum/exoplanet_theme/T = pick(possible_themes) theme = new T - - for(var/T in subtypesof(/datum/map_template/ruin/exoplanet)) - var/datum/map_template/ruin/exoplanet/ruin = T - if(ruin_tags_whitelist && !(ruin_tags_whitelist & initial(ruin.ruin_tags))) - continue - if(ruin_tags_blacklist & initial(ruin.ruin_tags)) - continue - possible_features += new ruin + if(possible_random_ruins) + for(var/T in possible_random_ruins) + var/datum/map_template/ruin/exoplanet/ruin = T + if(ruin_tags_whitelist && !(ruin_tags_whitelist & initial(ruin.ruin_tags))) + continue + if(ruin_tags_blacklist & initial(ruin.ruin_tags)) + continue + possible_features += new ruin ..() /obj/effect/overmap/visitable/sector/exoplanet/proc/build_level() diff --git a/maps/random_ruins/exoplanets/asteroid/asteroid.dm b/maps/random_ruins/exoplanets/asteroid/asteroid.dm index 84df89277a8..d6a575c6014 100644 --- a/maps/random_ruins/exoplanets/asteroid/asteroid.dm +++ b/maps/random_ruins/exoplanets/asteroid/asteroid.dm @@ -5,7 +5,7 @@ spawn_weight = 1 spawn_cost = 2 - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE) + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) suffix = "asteroid/mining_base.dmm" ruin_tags = RUIN_HUMAN|RUIN_VOID @@ -17,7 +17,7 @@ spawn_weight = 1 spawn_cost = 2 - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE) + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) suffix = "asteroid/carp_nest.dmm" ruin_tags = RUIN_ALIEN|RUIN_VOID @@ -29,7 +29,7 @@ spawn_weight = 0.5 spawn_cost = 4 - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE) + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) suffix = "asteroid/hideout.dmm" ruin_tags = RUIN_HUMAN|RUIN_WRECK|RUIN_VOID @@ -41,7 +41,7 @@ spawn_weight = 1 spawn_cost = 2 - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE) + sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS) suffix = "asteroid/crashed_shuttle_01.dmm" ruin_tags = RUIN_WRECK|RUIN_VOID