diff --git a/code/__DEFINES/space_sectors.dm b/code/__DEFINES/space_sectors.dm index 67e3f2e968e..f7332f7f38a 100644 --- a/code/__DEFINES/space_sectors.dm +++ b/code/__DEFINES/space_sectors.dm @@ -34,6 +34,7 @@ #define SECTOR_LIGHTS_EDGE "Light's Edge" // For the area of Light's Edge that is somewhat inhabited. NOTE- this also lives in ALL_COALITION_SECTORS, per lore. #define SECTOR_LEMURIAN_SEA "Lemurian Sea (Outer)" // For the fringes of the Lemurian Sea. #define SECTOR_LEMURIAN_SEA_FAR "Lemurian Sea (Inner)" // For the actual Lemurian Sea. Adminbus town. +#define LEMURIAN_SEA_SECTORS list(SECTOR_LEMURIAN_SEA, SECTOR_LEMURIAN_SEA_FAR) // Sanity #define ALL_VOID_SECTORS list(SECTOR_LIGHTS_EDGE, SECTOR_LEMURIAN_SEA, SECTOR_LEMURIAN_SEA_FAR) //Crescent Expanse & Beyond @@ -51,7 +52,7 @@ #define ALL_CORPORATE_SECTORS list(ALL_TAU_CETI_SECTORS, SECTOR_SRANDMARR, SECTOR_UUEOAESA, ALL_COALITION_SECTORS, ALL_GENERIC_SECTORS, SECTOR_NRRAHRAHUL, SECTOR_BADLANDS)//Currently excludes Elyran sectors and Light's Edge /// For remote/uncharted regions distant from the civilised Spur. Some surveyors/independents only. -#define ALL_UNCHARTED_SECTORS list(SECTOR_CRESCENT_EXPANSE_FAR, SECTOR_LEMURIAN_SEA_FAR) +#define ALL_UNCHARTED_SECTORS list(SECTOR_CRESCENT_EXPANSE_FAR, SECTOR_LEMURIAN_SEA, SECTOR_LEMURIAN_SEA_FAR) //For highly dangerous sectors with high piracy. Civilian and leisure ships should be less common or not found here. #define ALL_DANGEROUS_SECTORS list(SECTOR_BADLANDS, ALL_VOID_SECTORS, ALL_CRESCENT_EXPANSE_SECTORS, ALL_UNCHARTED_SECTORS) diff --git a/code/controllers/subsystems/hallucinations.dm b/code/controllers/subsystems/hallucinations.dm index 2ed54e2ec99..9bc3f7686aa 100644 --- a/code/controllers/subsystems/hallucinations.dm +++ b/code/controllers/subsystems/hallucinations.dm @@ -176,7 +176,7 @@ SUBSYSTEM_DEF(hallucinations) /datum/controller/subsystem/hallucinations/proc/is_adpi_excluded(var/mob/living/target) if(!target) return TRUE - if(isvaurca(target) || isipc(target) || issilicon(target)) + if(isvaurca(target) || isipc(target) || issilicon(target) || target.is_diona()) return TRUE return FALSE @@ -403,7 +403,7 @@ SUBSYSTEM_DEF(hallucinations) message = pick("The water is dripping dripping dripping all around you.","Water flowing over stone, but there is no stone.","The waterfall roars o'er the cliff's edge.","Water, water, water. You are drowning.","Water, water, water. You will be awake for it.","Drums, drums, drums, unrelenting.","The drumbeat draws e'er closer.","Tap, ta-tap, ta-tap, tap, ta-tap, ta-tap.","Tap, tap tap, ta-tap, tap-tap, ta-tap.","Ta-ta-tap, tap, ta-tap, tap, tap ta-tap.") target.play_screen_text("[message]", /atom/movable/screen/text/screen_text/adpi_message, COLOR_PURPLE) to_chat(target, SPAN_CULT(FONT_LARGE("[message]"))) - + log_admin("ADPI message sent to [target]: [message]") if(prob(33)) sound_to(target, pick(adpi_sounds)) diff --git a/code/modules/background/space_sectors/void.dm b/code/modules/background/space_sectors/void.dm index 619a1dc4cd4..999d3236260 100644 --- a/code/modules/background/space_sectors/void.dm +++ b/code/modules/background/space_sectors/void.dm @@ -43,7 +43,7 @@ starlight_color = "#000000" starlight_power = 0 starlight_range = 0 - overmap_hazards_multiplier = 2.0 + overmap_hazards_multiplier = 1.3 cargo_price_coef = list( "nanotrasen" = 6.0, "orion" = 6.0, @@ -68,6 +68,9 @@ ) sector_welcome_message = 'sound/AI/welcome_lemurian_sea_outer.ogg' + sector_lobby_art = list('icons/misc/titlescreens/sccv_horizon/sccv_horizon_dark.dmi') + sector_lobby_transitions = 0 + sector_hud_menu = 'icons/misc/hudmenu/lemurian_hud.dmi' hivenet_echoes = FALSE ghostroles_enabled = FALSE away_sites_enabled = FALSE diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index 16b5528a7aa..4d98e80fe4f 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -385,7 +385,7 @@ GLOBAL_LIST_INIT(severity_to_string, alist(EVENT_LEVEL_MUNDANE = "Mundane", EVEN 20, list(ASSIGNMENT_ENGINEER = 15, ASSIGNMENT_JANITOR = 20)), new /datum/event_meta(EVENT_LEVEL_MAJOR, "Dark Matter Influx", /datum/event/gravity_anomaly, - 5, list(ASSIGNMENT_ENGINEER = 20), is_one_shot = TRUE, + 35, list(ASSIGNMENT_ENGINEER = 20), is_one_shot = TRUE, pop_needed = 12), ) diff --git a/code/modules/events/gravity_anomaly.dm b/code/modules/events/gravity_anomaly.dm index ac85fbfa8d0..e992b1a9308 100644 --- a/code/modules/events/gravity_anomaly.dm +++ b/code/modules/events/gravity_anomaly.dm @@ -137,6 +137,11 @@ // Is there gravity where they are? IE. is the grav generator on/off OR are they on the holodeck w/ zero gravity, OR are they EVA? Skip if no artificial gravity for whatever reason. if(!potential_victim.has_gravity()) return FALSE + // Are they in one of the shuttles? Bandaid case, whatever. + var/turf/potential_victim_turf = potential_victim.loc + var/area/potential_victim_area = potential_victim_turf?.loc + if(istype(potential_victim_area, /area/horizon/shuttle)) + return FALSE return TRUE /datum/event/gravity_anomaly/proc/apply_effect(var/mob/living/carbon/human/victim, var/current_effect) @@ -161,14 +166,14 @@ shake_camera(victim, rand(3 SECONDS, 10 SECONDS), 0.1, TRUE) /datum/event/gravity_anomaly/proc/apply_nausea_minor(var/mob/living/carbon/human/victim) - victim.dizziness += rand(2, 4) - victim.confused += 1 + victim.dizziness += rand(4, 8) + victim.confused += 10 if(prob(10)) to_chat(victim, SPAN_WARNING(pick(nausea_minor))) /datum/event/gravity_anomaly/proc/apply_nausea_mild(var/mob/living/carbon/human/victim) - victim.dizziness += rand(3, 6) - victim.confused += rand(0, 1) + victim.dizziness += rand(5, 8) + victim.confused += rand(10, 15) if(isipc(victim)) if(prob(20)) to_chat(victim, SPAN_MACHINE_WARNING(pick(nausea_mild_ipc))) @@ -180,7 +185,7 @@ /datum/event/gravity_anomaly/proc/apply_nausea_strong(var/mob/living/carbon/human/victim) victim.dizziness += rand(8, 15) - victim.confused += rand(1, 3) + victim.confused += rand(15, 20) if(prob(50)) if(isipc(victim)) to_chat(victim, SPAN_MACHINE_WARNING(pick(nausea_strong_ipc))) @@ -189,8 +194,8 @@ victim.vomit() /datum/event/gravity_anomaly/proc/apply_surge_default(var/mob/living/carbon/human/victim) - victim.dizziness += rand(4, 10) - victim.confused += rand(1, 5) + victim.dizziness += rand(10, 20) + victim.confused += rand(20, 25) if(prob(50)) if(isipc(victim)) to_chat(victim, SPAN_MACHINE_WARNING(pick(nausea_strong_ipc))) @@ -214,13 +219,13 @@ victim.Weaken(3) /datum/event/gravity_anomaly/proc/apply_surge_hilarious(var/mob/living/carbon/human/victim) - victim.dizziness += rand(8, 15) - victim.confused += rand(1, 10) + victim.dizziness += rand(20, 80) + victim.confused += rand(20, 80) if(isipc(victim)) to_chat(victim, SPAN_MACHINE_WARNING(pick(nausea_strong_ipc))) else to_chat(victim, SPAN_WARNING(pick(nausea_strong_organic))) - if(prob(33)) + if(prob(80)) victim.vomit() if(prob(60)) if(victim.buckled_to) diff --git a/code/modules/overmap/events/event.dm b/code/modules/overmap/events/event.dm index a671c194d4d..c951befacc6 100644 --- a/code/modules/overmap/events/event.dm +++ b/code/modules/overmap/events/event.dm @@ -357,7 +357,7 @@ /datum/overmap_event/meteor name = "asteroid field" - count = 15 + count = 10 radius = 4 opacity = 1 continuous = FALSE @@ -365,26 +365,26 @@ /datum/overmap_event/electric name = "electrical storm" - count = 6 + count = 4 radius = 2 hazards = /obj/effect/overmap/event/electric /datum/overmap_event/dust name = "dust cloud" - count = 13 + count = 9 radius = 3 opacity = 1 hazards = /obj/effect/overmap/event/dust /datum/overmap_event/ion name = "ion cloud" - count = 5 + count = 4 radius = 2 hazards = /obj/effect/overmap/event/ion /datum/overmap_event/carp name = "carp shoal" - count = 8 + count = 6 radius = 2 continuous = FALSE hazards = /obj/effect/overmap/event/carp @@ -398,7 +398,7 @@ /datum/overmap_event/gravity name = "dark matter influx" - count = 15 - radius = 8 + count = 19 + radius = 12 hazards = /obj/effect/overmap/event/gravity_anomaly sectors = list(SECTOR_LEMURIAN_SEA, SECTOR_LEMURIAN_SEA_FAR) diff --git a/icons/misc/hudmenu/lemurian_hud.dmi b/icons/misc/hudmenu/lemurian_hud.dmi new file mode 100644 index 00000000000..d5f4ebc107c Binary files /dev/null and b/icons/misc/hudmenu/lemurian_hud.dmi differ diff --git a/icons/misc/titlescreens/sccv_horizon/sccv_horizon_dark.dmi b/icons/misc/titlescreens/sccv_horizon/sccv_horizon_dark.dmi new file mode 100644 index 00000000000..a495a7c5b7b Binary files /dev/null and b/icons/misc/titlescreens/sccv_horizon/sccv_horizon_dark.dmi differ diff --git a/maps/away/away_site/blueriver/blueriver.dm b/maps/away/away_site/blueriver/blueriver.dm index 6ccd3e0951e..4856fff8513 100644 --- a/maps/away/away_site/blueriver/blueriver.dm +++ b/maps/away/away_site/blueriver/blueriver.dm @@ -16,7 +16,7 @@ suffix = "blueriver.dmm" sectors = list(ALL_POSSIBLE_SECTORS) - sectors_blacklist = list(ALL_SPECIFIC_SECTORS) //it's a whole ass planet, shouldn't have it in predefined sectors + sectors_blacklist = list(ALL_SPECIFIC_SECTORS, LEMURIAN_SEA_SECTORS) //it's a whole ass planet, shouldn't have it in predefined sectors unit_test_groups = list(1) diff --git a/maps/away/away_site/cult_base/cult_base_.dm b/maps/away/away_site/cult_base/cult_base_.dm index 2ec318d114f..ee2e2501c5d 100644 --- a/maps/away/away_site/cult_base/cult_base_.dm +++ b/maps/away/away_site/cult_base/cult_base_.dm @@ -10,6 +10,7 @@ spawn_cost = 1 spawn_weight = 1 sectors = list(ALL_POSSIBLE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/cult_base_shuttle) unit_test_groups = list(3) diff --git a/maps/away/away_site/pirate_base/pirate_base.dm b/maps/away/away_site/pirate_base/pirate_base.dm index 41327e5b6cd..086a2433bf5 100644 --- a/maps/away/away_site/pirate_base/pirate_base.dm +++ b/maps/away/away_site/pirate_base/pirate_base.dm @@ -6,6 +6,7 @@ suffix = "pirate_base.dmm" sectors = list(ALL_POSSIBLE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) spawn_weight = 1 ship_cost = 1 id = "pirate" diff --git a/maps/away/away_site/sensor_relay/solarian_prewar/sensor_relay.dm b/maps/away/away_site/sensor_relay/solarian_prewar/sensor_relay.dm index 13b569a89b3..8d5b0a3383d 100644 --- a/maps/away/away_site/sensor_relay/solarian_prewar/sensor_relay.dm +++ b/maps/away/away_site/sensor_relay/solarian_prewar/sensor_relay.dm @@ -13,7 +13,7 @@ sectors_blacklist = list( ALL_UNCHARTED_SECTORS, // Because finding a sensor relay in hell would be weird - SECTOR_UUEOAESA // Because there is a specific relay variant in Uueoa-Esa + SECTOR_UUEOAESA, // Because there is a specific relay variant in Uueoa-Esa ) unit_test_groups = list(1) diff --git a/maps/away/away_site/treasure_trove/treasure_trove.dm b/maps/away/away_site/treasure_trove/treasure_trove.dm index 957c7539b99..7cc111228b5 100644 --- a/maps/away/away_site/treasure_trove/treasure_trove.dm +++ b/maps/away/away_site/treasure_trove/treasure_trove.dm @@ -6,6 +6,7 @@ suffix = "treasure_trove.dmm" sectors = list(ALL_POSSIBLE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) spawn_weight = 1 spawn_cost = 1 id = "trove" diff --git a/maps/away/scenarios/cryo_outpost/cryo_outpost_.dm b/maps/away/scenarios/cryo_outpost/cryo_outpost_.dm index ceff7969ae9..cb1dacdeb68 100644 --- a/maps/away/scenarios/cryo_outpost/cryo_outpost_.dm +++ b/maps/away/scenarios/cryo_outpost/cryo_outpost_.dm @@ -22,6 +22,7 @@ spawn_weight = 0 // so it does not spawn as ordinary away site spawn_cost = 1 sectors = list(ALL_POSSIBLE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) template_flags = TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED unit_test_groups = list(3) diff --git a/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dm b/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dm index 4c8b48a6880..a9f0c53e55f 100644 --- a/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dm +++ b/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dm @@ -16,6 +16,7 @@ shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/freebooter_salvager, /datum/shuttle/autodock/multi/lift/freebooter_salvager) sectors = list(ALL_POSSIBLE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) ban_ruins = list(/datum/map_template/ruin/away_site/freebooter_ship) unit_test_groups = list(1) diff --git a/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_.dm b/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_.dm index de447bce7f3..4a0d6e9c201 100644 --- a/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_.dm +++ b/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_.dm @@ -9,6 +9,7 @@ suffix = "freebooter_ship_.dmm" sectors = list(ALL_POSSIBLE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) spawn_weight = 1 template_flags = TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED // Disabled for debloating. Feel free to enable again if reworked or relevant. ship_cost = 1 diff --git a/maps/away/ships/lone_spacer/lone_spacer.dm b/maps/away/ships/lone_spacer/lone_spacer.dm index 82808de0e45..bc77357d562 100644 --- a/maps/away/ships/lone_spacer/lone_spacer.dm +++ b/maps/away/ships/lone_spacer/lone_spacer.dm @@ -10,6 +10,7 @@ ship_cost = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/lone_spacer) sectors = list(ALL_POSSIBLE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) unit_test_groups = list(1) diff --git a/maps/away/ships/scc/scc_scout_ship.dm b/maps/away/ships/scc/scc_scout_ship.dm index ceeecff3f69..8d207fa93f1 100644 --- a/maps/away/ships/scc/scc_scout_ship.dm +++ b/maps/away/ships/scc/scc_scout_ship.dm @@ -6,6 +6,7 @@ suffix = "scc_scout_ship.dmm" sectors = list(ALL_POSSIBLE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) spawn_weight = 1 ship_cost = 1 id = "scc_scout_ship" diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dm b/maps/away/ships/tramp_freighter/tramp_freighter.dm index 66a97ffdcd3..230630837a6 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter.dm +++ b/maps/away/ships/tramp_freighter/tramp_freighter.dm @@ -6,6 +6,7 @@ suffix = "tramp_freighter.dmm" sectors = list(ALL_POSSIBLE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) spawn_weight = 1 ship_cost = 1 id = "tramp_freighter" diff --git a/maps/random_ruins/exoplanets/asteroid/asteroid.dm b/maps/random_ruins/exoplanets/asteroid/asteroid.dm index 1eb7ba58bbc..94a0cedae06 100644 --- a/maps/random_ruins/exoplanets/asteroid/asteroid.dm +++ b/maps/random_ruins/exoplanets/asteroid/asteroid.dm @@ -4,6 +4,7 @@ description = "An abandoned mining site. Some tools and materials were left behind." sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "asteroid/mining_base/" suffix = "mining_base.dmm" @@ -19,6 +20,7 @@ description = "A nest of deadly space carps." sectors = list(ALL_POSSIBLE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "asteroid/carp_nest/" suffix = "carp_nest.dmm" @@ -36,6 +38,7 @@ spawn_weight = 0.5 spawn_cost = 2 sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS, ALL_CRESCENT_EXPANSE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "asteroid/hideout/" suffix = "hideout.dmm" @@ -51,6 +54,7 @@ description = "A crashed shuttle, with some gear left behind." sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS, ALL_CRESCENT_EXPANSE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "asteroid/crashed_shuttle/" suffix = "crashed_shuttle_01.dmm" @@ -71,6 +75,7 @@ spawn_weight = 0.5 spawn_cost = 2 sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_WEEPING_STARS, SECTOR_UUEOAESA, SECTOR_CRESCENT_EXPANSE_WEST, SECTOR_CRESCENT_EXPANSE_EAST) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "asteroid/sol_ship/" suffix = "sol_ship_unique.dmm" @@ -88,6 +93,7 @@ spawn_weight = 0.5 spawn_cost = 3 sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_UUEOAESA, SECTOR_CRESCENT_EXPANSE_WEST) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "asteroid/skrell_ship/" suffix = "skrell_crash_unique.dmm" @@ -105,6 +111,7 @@ spawn_weight = 0.5 spawn_cost = 3 sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS, ALL_CRESCENT_EXPANSE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "asteroid/mystery_ship/" suffix = "mystery_ship_unique.dmm" @@ -120,6 +127,7 @@ description = "A crashed satelite." sectors = list(ALL_TAU_CETI_SECTORS, ALL_BADLAND_SECTORS, ALL_COALITION_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "asteroid/satellite_crash/" suffix = "satellite_crash_unique.dmm" @@ -137,6 +145,7 @@ spawn_weight = 0.5 spawn_cost = 1 sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_TABITI, SECTOR_AEMAQ, ALL_COALITION_SECTORS, ALL_CRESCENT_EXPANSE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "asteroid/escape_pod/" suffix = "escape_pod_unique.dmm" @@ -154,6 +163,7 @@ spawn_weight = 1 spawn_cost = 1 sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_TABITI, SECTOR_AEMAQ, ALL_COALITION_SECTORS, SECTOR_UUEOAESA, ALL_CRESCENT_EXPANSE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "asteroid/digsite/" suffix = "digsite_unique.dmm" @@ -171,6 +181,7 @@ spawn_weight = 1 spawn_cost = 0.5 sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_TABITI, SECTOR_AEMAQ, ALL_COALITION_SECTORS, ALL_CRESCENT_EXPANSE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "asteroid/crashed_pod/" suffix = "crashed_pod_unique.dmm" @@ -188,6 +199,7 @@ spawn_weight = 0.5 spawn_cost = 3 sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS, SECTOR_CRESCENT_EXPANSE_EAST) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "asteroid/coc_ship/" suffix = "coc_ship_unique.dmm" diff --git a/maps/random_ruins/exoplanets/grove/grove.dm b/maps/random_ruins/exoplanets/grove/grove.dm index 03feb4f5d6f..450e06e408a 100644 --- a/maps/random_ruins/exoplanets/grove/grove.dm +++ b/maps/random_ruins/exoplanets/grove/grove.dm @@ -9,6 +9,7 @@ spawn_weight = 1 spawn_cost = 0.5 sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS, ALL_CRESCENT_EXPANSE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) planet_types = PLANET_DESERT|PLANET_GRASS|PLANET_GROVE|PLANET_SNOW ruin_tags = RUIN_LOWPOP|RUIN_SCIENCE @@ -23,6 +24,7 @@ spawn_weight = 3 spawn_cost = 0.5 sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS, ALL_CRESCENT_EXPANSE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "grove/crashsurvivors/" suffix = "crashsurvivors.dmm" @@ -40,6 +42,7 @@ spawn_weight = 3 spawn_cost = 0.5 sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "grove/sdf_outpost/" suffix = "sdf_outpost.dmm" @@ -64,6 +67,7 @@ spawn_weight = 1 spawn_cost = 0.5 sectors = list(ALL_POSSIBLE_SECTORS) + sectors_blacklist = list(LEMURIAN_SEA_SECTORS) prefix = "grove/batcave/" suffix = "batcave.dmm"