diff --git a/aurorastation.dme b/aurorastation.dme index cec7ed4d39d..5198bd63ba7 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -2379,6 +2379,7 @@ #include "code\modules\maps\planet_types\lore\konyang.dm" #include "code\modules\maps\planet_types\lore\srandmarr.dm" #include "code\modules\maps\planet_types\lore\tauceti.dm" +#include "code\modules\maps\planet_types\lore\uueoaesa.dm" #include "code\modules\martial_arts\gunkata.dm" #include "code\modules\martial_arts\martial.dm" #include "code\modules\martial_arts\plasma_fist.dm" diff --git a/code/__DEFINES/space_sectors.dm b/code/__DEFINES/space_sectors.dm index da14b675858..ea646bf42b8 100644 --- a/code/__DEFINES/space_sectors.dm +++ b/code/__DEFINES/space_sectors.dm @@ -44,4 +44,7 @@ //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 non-generic, named and specific sectors, where generic planets or the like should not spawn +#define ALL_SPECIFIC_SECTORS list(SECTOR_TAU_CETI, SECTOR_SRANDMARR, SECTOR_HANEUNIM, SECTOR_BURZSIA, SECTOR_UUEOAESA, SECTOR_NEW_ANKARA, SECTOR_AEMAQ, SECTOR_NRRAHRAHUL, SECTOR_GAKAL) + #define ALL_POSSIBLE_SECTORS list(ALL_TAU_CETI_SECTORS, ALL_BADLAND_SECTORS, ALL_COALITION_SECTORS, ALL_VOID_SECTORS, ALL_GENERIC_SECTORS, ALL_CORPORATE_SECTORS) diff --git a/code/game/ambience.dm b/code/game/ambience.dm index ee309953fe1..a8851c6997a 100644 --- a/code/game/ambience.dm +++ b/code/game/ambience.dm @@ -214,3 +214,21 @@ #define AMBIENCE_KONYANG_WATER list(\ 'sound/ambience/konyang/konyang-water.ogg'\ ) + +#define AMBIENCE_DESERT list(\ + 'sound/effects/wind/desert0.ogg',\ + 'sound/effects/wind/desert1.ogg',\ + 'sound/effects/wind/desert2.ogg',\ + 'sound/effects/wind/desert3.ogg',\ + 'sound/effects/wind/desert4.ogg',\ + 'sound/effects/wind/desert5.ogg'\ + ) + +#define AMBIENCE_JUNGLE list(\ + 'sound/effects/wind/wind_2_1.ogg',\ + 'sound/effects/wind/wind_2_2.ogg',\ + 'sound/effects/wind/wind_3_1.ogg',\ + 'sound/effects/wind/wind_4_1.ogg',\ + 'sound/ambience/eeriejungle2.ogg',\ + 'sound/ambience/eeriejungle1.ogg'\ +) diff --git a/code/modules/asset_cache/asset_cache.dm b/code/modules/asset_cache/asset_cache.dm index ee9485cdb8b..689e4dc7ed4 100644 --- a/code/modules/asset_cache/asset_cache.dm +++ b/code/modules/asset_cache/asset_cache.dm @@ -576,6 +576,8 @@ var/list/asset_datums = list() "konyang.png" = 'html/images/scans/exoplanets/konyang.png', "konyang_point_verdant.png" = 'html/images/scans/exoplanets/konyang_point_verdant.png', "biesel.png" = 'html/images/scans/exoplanets/biesel.png', + "moghes.png" = 'html/images/scans/exoplanets/moghes.png', + "chanterel.png" = 'html/images/scans/exoplanets/chanterel.png', //end scan images "bluebird.woff" = 'html/fonts/OFL/Bluebird.woff', "grandhotel.woff" = 'html/fonts/OFL/GrandHotel.woff', diff --git a/code/modules/background/space_sectors/badlands.dm b/code/modules/background/space_sectors/badlands.dm index 68847d768f4..dbfec680b75 100644 --- a/code/modules/background/space_sectors/badlands.dm +++ b/code/modules/background/space_sectors/badlands.dm @@ -109,7 +109,29 @@ name = SECTOR_UUEOAESA description = "The home of the Unathi race, Uueoa-Esa is a solar system with 4 rocky planets and 1 gas giant. Moghes is the homeworld of the Unathi species and third from its mother star. \ It is similar in density and composition to Earth and held host to varied and complex environments and local fauna and flora. It's surface area of salt water is much lower than most other habitable planets. \ - Moghes is currently experiencing immense environmental degradation following a global nuclear war in the 2430's." - starlight_color = COLOR_WHITE - starlight_power = 5 - starlight_range = 1 + Moghes is currently experiencing immense environmental degradation following a global nuclear war in the 2430s." + skybox_icon = "uueoaesa" + starlight_color = "#f8711e" + starlight_power = 2 + starlight_range = 4 + cargo_price_coef = list("nt" = 1.5, "hpi" = 0.5, "zhu" = 1.5, "een" = 1.5, "get" = 1.2, "arz" = 0.5, "blm" = 1.2, "iac" = 1.0, "zsc" = 0.9, "vfc" = 1.2, "bis" = 1.5, "xmg" = 0.6, "npi" = 1.5) + sector_welcome_message = 'sound/AI/welcome_hegemony.ogg' + scheduled_port_visits = list("Thursday", "Sunday") + ports_of_call = list("the city of Skalamar") + + possible_exoplanets = list( + /obj/effect/overmap/visitable/sector/exoplanet/barren/omzoli, + /obj/effect/overmap/visitable/sector/exoplanet/barren/pid, + /obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/chanterel, + /obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/ytizi, + /obj/effect/overmap/visitable/sector/exoplanet/ouerea, + /obj/effect/overmap/visitable/sector/exoplanet/moghes + + ) + + lore_radio_stations = list( + "72.4 Radio Free Ouerea" = "config/lore_radio/uueoaesa/72.4_Radio_Free_Ouerea.txt", + "83.3 Canyon City Radio" = "config/lore_radio/uueoaesa/83.3_Canyon_City_Radio.txt", + "132.6 SkaldFM" = "config/lore_radio/uueoaesa/132.6_Skald_FM.txt", + "166.8 Discontinued Emergency Broadcast" = "config/lore_radio/uueoaesa/166.8_Azarak_Emergency_Broadcast.txt" + ) diff --git a/code/modules/maps/planet_types/lore/uueoaesa.dm b/code/modules/maps/planet_types/lore/uueoaesa.dm new file mode 100644 index 00000000000..599182e6e4c --- /dev/null +++ b/code/modules/maps/planet_types/lore/uueoaesa.dm @@ -0,0 +1,269 @@ +//Omzoli +/obj/effect/overmap/visitable/sector/exoplanet/barren/omzoli + name = "Omzoli" + desc = "A small and barren planet, bereft of anything other than scientific value and some small mineral deposits" + color = "#a39f9e" + icon_state = "globe" + rock_colors = list(COLOR_GRAY80) + possible_themes = list(/datum/exoplanet_theme/barren) + features_budget = 1 + surface_color = "#6b6464" + generated_name = FALSE + charted = "Unathi core world. Charted 2403CE, Sol Alliance Department of Colonization" + geology = "Low mineral levels. No active geothermal signatures detected. " + ring_chance = 0 + ruin_planet_type = PLANET_LORE + ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/izweski_probe, /datum/map_template/ruin/exoplanet/heph_survey_post, /datum/map_template/ruin/exoplanet/kazhkz_crash) + +/obj/effect/overmap/visitable/sector/exoplanet/barren/omzoli/get_surface_color() + return "#6b6464" + +/obj/effect/overmap/visitable/sector/exoplanet/barren/omzoli/update_icon() + return + +/obj/effect/overmap/visitable/sector/exoplanet/barren/omzoli/generate_ground_survey_result() + ..() + ground_survey_result += "
Trace mineral deposits detected in regolith" + ground_survey_result += "
Planetary rotation counter to spin of local star and other planets in system" + ground_survey_result += "
Carbon-dating indicates planetary age of at least 6.32 billion years" + ground_survey_result += "
Lack of atmosphere and unusual rotation can cause extremely wild temperature fluctuations" + ground_survey_result += "
High chance of meteor impact indicated through analysis of local surface craters" + +//Pid +/obj/effect/overmap/visitable/sector/exoplanet/barren/pid + name = "Pid" + desc = "Tret's moon, now home to a majority of K'laxan k'ois farming efforts." + icon_state = "asteroid" + color = "#ddff61" + rock_colors = list("#93948f") + features_budget = 1 + surface_color = "#83857f" + charted = "Natural satellite of Tret, Unathi core world. Charted 2403CE, Sol Alliance Department of Colonization" + generated_name = FALSE + small_flora_types = list(/datum/seed/koisspore) + possible_themes = list(/datum/exoplanet_theme/barren/pid) + ring_chance = 0 + ruin_planet_type = PLANET_LORE + planetary_area = /area/exoplanet/barren/pid + ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/pid_crashed_shuttle, /datum/map_template/ruin/exoplanet/pid_kois_farm, /datum/map_template/ruin/exoplanet/izweski_probe, /datum/map_template/ruin/exoplanet/heph_survey_post, /datum/map_template/ruin/exoplanet/kazhkz_crash) + +/obj/effect/overmap/visitable/sector/exoplanet/barren/pid/generate_atmosphere() + ..() + if(atmosphere) + atmosphere.remove_ratio(1) + atmosphere.adjust_gas(GAS_NITROGEN, MOLES_N2STANDARD) + atmosphere.temperature = T0C + 20 + atmosphere.update_values() + +/obj/effect/overmap/visitable/sector/exoplanet/barren/pid/generate_ground_survey_result() + ..() + ground_survey_result += "
Trace elements of phoron and biological matter detected in local atmosphere" + ground_survey_result += "
Small mineral deposits detected, largely untapped" + ground_survey_result += "
Evidence of lava tubes being present in the subsurface" + ground_survey_result += "
K'ois spores detected in local soil. Sample destruction recommended" + ground_survey_result += "
Surface soil may provide adequate radiation shielding" + + +//Ytizi Belt Asteroid. This exists solely for unique away site spawns, and is otherwise indistinguishable from a regular asteroid +/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/ytizi + name = "Ytizi Belt asteroid" + desc = "One of the many mineral-rich asteroids found in the Uueoa-Esa system's asteroid belt" + icon_state = "asteroid2" + possible_themes = list(/datum/exoplanet_theme/barren/asteroid, /datum/exoplanet_theme/barren/asteroid/ice) + ruin_planet_type = PLANET_LORE + features_budget = 3 + ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/heph_mining_station, /datum/map_template/ruin/exoplanet/miners_guild_outpost, /datum/map_template/ruin/exoplanet/sol_listening_post, /datum/map_template/ruin/exoplanet/crashed_sol_shuttle_01, /datum/map_template/ruin/exoplanet/crashed_skrell_shuttle_01, /datum/map_template/ruin/exoplanet/digsite, /datum/map_template/ruin/exoplanet/abandoned_outpost, /datum/map_template/ruin/exoplanet/izweski_probe, /datum/map_template/ruin/exoplanet/heph_survey_post, /datum/map_template/ruin/exoplanet/kazhkz_crash) + +/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/ytizi/pre_ruin_preparation() + if(istype(theme, /datum/exoplanet_theme/barren/asteroid/ice)) + surface_color = COLOR_BLUE_GRAY + else + surface_color = COLOR_GRAY + +//Chanterel +/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/chanterel + name = "Chanterel" + desc = "Moghes' only moon. Rich in minerals, it is home to several mining operations." + icon_state = "asteroid" + color = "#dddedc" + possible_themes = list(/datum/exoplanet_theme/barren/asteroid/chanterel) + rock_colors = list("#c9c9c7") + features_budget = 3 + surface_color = "#a3a3a3" + charted = "Natural satellite of Moghes, Unathi homeworld. Charted 2403CE, Sol Alliance Department of Colonization" + geology = "Large mineral deposits. No sign of geothermal activity." + generated_name = FALSE + ring_chance = 0 + ruin_planet_type = PLANET_LORE + place_near_main = list(2,2) + ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/heph_mining_station, /datum/map_template/ruin/exoplanet/miners_guild_outpost, /datum/map_template/ruin/exoplanet/digsite, /datum/map_template/ruin/exoplanet/abandoned_outpost, /datum/map_template/ruin/exoplanet/crashed_sol_shuttle_01, /datum/map_template/ruin/exoplanet/crashed_skrell_shuttle_01, /datum/map_template/ruin/exoplanet/izweski_probe, /datum/map_template/ruin/exoplanet/heph_survey_post, /datum/map_template/ruin/exoplanet/kazhkz_crash) + scanimage = "chanterel.png" + +/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/chanterel/generate_planet_image() + skybox_image = image('icons/skybox/lore_planets.dmi', "chanterel") + skybox_image.pixel_x = rand(0,64) + skybox_image.pixel_y = rand(128,256) + +/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/chanterel/generate_ground_survey_result() + ..() + ground_survey_result += "
No geothermal activity observed in the planetary core" + ground_survey_result += "
Silicon carbides found deep in the crust" + ground_survey_result += "
Oxygen found in locally stable metal oxides" + ground_survey_result += "
Regolith rich in heavy silicate alloys" + ground_survey_result += "
Traces of fusile material" + +//Moghes +/obj/effect/overmap/visitable/sector/exoplanet/moghes + name = "Moghes" + desc = "The hot and arid homeworld of the Unathi race, and capital world of the Izweski Hegemony. Moghes is currently suffering from an ongoing ecological collapse due to recent nuclear war." + icon_state = "globe2" + color = "#dfe08d" + planetary_area = /area/exoplanet/moghes + massvolume = "0.97/1.03" + surfacegravity = "0.93" + charted = "Unathi homeworld. Charted 2403CE, Sol Alliance Department of Colonization" + geology = "High tectonic heat. Significant geothermal activity detected." + weather = "Global full-atmosphere hydrological weather system. Substantial meteorological activity, violent storms unpredictable. Heavy radioactive contamination detected in atmosphere." + surfacewater = "34% surface water. Weak tidal forces from natural satellite." + scanimage = "moghes.png" + ring_chance = 0 + rock_colors = list(COLOR_BEIGE, COLOR_PALE_YELLOW, COLOR_GRAY80, COLOR_BROWN) + plant_colors = null + possible_themes = list(/datum/exoplanet_theme/grass/moghes) //default to untouched lands in case pre_ruin_preparation fucks up + features_budget = 8 + flora_diversity = 0 + has_trees = FALSE + small_flora_types = list(/datum/seed/xuizi, /datum/seed/gukhe, /datum/seed/sarezhi, /datum/seed/flower/serkiflower, /datum/seed/sthberry) + surface_color = "#e8faff" + generated_name = FALSE + ruin_planet_type = PLANET_LORE + //ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/moghes_village) //defaults to village bc for some reason nothing spawns if this is empty + place_near_main = list(2,2) + actors = list("reptilian humanoid", "three-faced reptilian humanoid", "a statue", "a sword", "an unidentifiable object", "an Unathi skull", "a staff", "a fishing spear", "reptilian humanoids", "unusual devices", "a pyramid") + var/landing_region + +/obj/effect/overmap/visitable/sector/exoplanet/moghes/pre_ruin_preparation() + if(prob(30)) + landing_region = "Untouched Lands" + else + landing_region = "Wasteland" + switch(landing_region) + if("Untouched Lands") + possible_themes = list(/datum/exoplanet_theme/grass/moghes) //non-nuked theme + surface_color = "#164a14" + //Untouched Lands ruins + //ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/moghes_village, /datum/map_template/ruin/exoplanet/moghes_heph_mining, /datum/map_template/ruin/exoplanet/moghes_bar, /datum/map_template/ruin/exoplanet/moghes_hegemony_base, /datum/map_template/ruin/exoplanet/moghes_skakh, /datum/map_template/ruin/exoplanet/moghes_thakh, /datum/map_template/ruin/exoplanet/moghes_kung_fu, /datum/map_template/ruin/exoplanet/moghes_fishing_spot, /datum/map_template/ruin/exoplanet/moghes_memorial, /datum/map_template/ruin/exoplanet/moghes_guild_mining, /datum/map_template/ruin/exoplanet/moghes_threshbeast_herd, /datum/map_template/ruin/exoplanet/moghes_diona_traders, /datum/map_template/ruin/exoplanet/moghes_untouched_tyrant) + + if("Wasteland") + possible_themes = list(/datum/exoplanet_theme/desert/wasteland) //nuked theme + surface_color = "#faeac5" + //Wasteland ruins + //ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/moghes_guwandi, /datum/map_template/ruin/exoplanet/moghes_gawgaryn_bikers, /datum/map_template/ruin/exoplanet/moghes_kataphract_wasteland, /datum/map_template/ruin/exoplanet/moghes_wasteland_dorviza, /datum/map_template/ruin/exoplanet/moghes_wasteland_ozeuoi, /datum/map_template/ruin/exoplanet/moghes_wasteland_vihnmes, /datum/map_template/ruin/exoplanet/moghes_wasteland_village, /datum/map_template/ruin/exoplanet/moghes_wasteland_izweski, /datum/map_template/ruin/exoplanet/moghes_siakh, /datum/map_template/ruin/exoplanet/moghes_queendom, /datum/map_template/ruin/exoplanet/moghes_wasteland_klax, /datum/map_template/ruin/exoplanet/moghes_wasteland_reclaimer, /datum/map_template/ruin/exoplanet/moghes_wasteland_mikuetz, /datum/map_template/ruin/exoplanet/moghes_wasteland_crater, /datum/map_template/ruin/exoplanet/moghes_wasteland_oasis, /datum/map_template/ruin/exoplanet/moghes_wasteland_battlefield, /datum/map_template/ruin/exoplanet/moghes_ruined_base, /datum/map_template/ruin/exoplanet/moghes_wasteland_tomb, /datum/map_template/ruin/exoplanet/moghes_wasteland_bomb, /datum/map_template/ruin/exoplanet/moghes_wasteland_crash, /datum/map_template/ruin/exoplanet/moghes_wasteland_priests, /datum/map_template/ruin/exoplanet/moghes_dead_guwandi, /datum/map_template/ruin/exoplanet/moghes_gawgaryn_riders, /datum/map_template/ruin/exoplanet/moghes_wasteland_tyrant) + + desc += " The landing sites are located in the [landing_region]." + +/obj/effect/overmap/visitable/sector/exoplanet/moghes/generate_habitability() + return HABITABILITY_IDEAL + +/obj/effect/overmap/visitable/sector/exoplanet/moghes/generate_map() + if(prob(75)) + lightlevel = rand(5,10)/10 + ..() + +/obj/effect/overmap/visitable/sector/exoplanet/moghes/generate_atmosphere() + ..() + if(atmosphere) + atmosphere.remove_ratio(1) + atmosphere.adjust_gas(GAS_OXYGEN, MOLES_O2STANDARD, 1) + atmosphere.adjust_gas(GAS_NITROGEN, MOLES_N2STANDARD, 1) + if(landing_region == "Wasteland") + atmosphere.temperature = T0C + rand(40, 50) + else + atmosphere.temperature = T0C + rand(30, 40) + atmosphere.update_values() + +/obj/effect/overmap/visitable/sector/exoplanet/moghes/update_icon() + return + +/obj/effect/overmap/visitable/sector/exoplanet/moghes/generate_planet_image() + skybox_image = image('icons/skybox/lore_planets.dmi', "moghes") + skybox_image.pixel_x = rand(0,64) + skybox_image.pixel_y = rand(128,256) + +/obj/effect/overmap/visitable/sector/exoplanet/moghes/generate_ground_survey_result() + ..() + switch(landing_region) + if("Untouched Lands") + ground_survey_result += "
Low levels of radioactive material detected in the soil" + ground_survey_result += "
Signs indicate soil is undergoing signs of early nutrient depletion" + ground_survey_result += "
Stratigraphy indicates low risk of tectonic activity in this region" + ground_survey_result += "
Fossilized organic material found settled in sedimentary rock" + ground_survey_result += "
Soft clays detected, composed of quartz and calcites" + ground_survey_result += "
Trace signs of radioactive contamination present in local surface water deposits" + + if("Wasteland") + ground_survey_result += "
Extremely high levels of radioactive material detected in the soil" + ground_survey_result += "
Soil near-completely depleted of nutrients." + ground_survey_result += "
High concentration of decayed organic matter detected in soil samples" + ground_survey_result += "
Fragmented concrete detected within local soil. High levels of radiation indicated" + ground_survey_result += "
Geological analysis suggests there were once large bodies of water in this region" + ground_survey_result += "
Fossilized organic material found settled in sedimentary rock" + if(prob(10)) + ground_survey_result += "
Signs of a large subterranean aquifer in this region" + + +//Ouerea +/obj/effect/overmap/visitable/sector/exoplanet/ouerea + name = "Ouerea" + desc = "The fourth planet from the Uueoa-Esa star, Ouerea was the first planet colonized by the Unathi. It is now home to most of the Hegemony's food production, as ecological collapse devastated Moghes" + icon_state = "globe1" + color = "#0b9e68" + planetary_area = /area/exoplanet/ouerea + massvolume = "0.94/1.0" + surfacegravity = "0.98" + charted = "Unathi core world. Charted 2403CE, Sol Alliance Department of Colonization" + geology = "High-energy geothermal signature, tectonic activity non-obstructive to surface environment" + weather = "Global full-atmosphere hydrological weather system. Dangerous meteorological activity not present" + surfacewater = "67% surface water. Four major surface seas detected." + rock_colors = null + plant_colors = null + possible_themes = list(/datum/exoplanet_theme/grass/ouerea) + features_budget = 6 + ring_chance = 0 + flora_diversity = 0 + has_trees = FALSE + small_flora_types = list(/datum/seed/xuizi, /datum/seed/gukhe, /datum/seed/aghrassh) + generated_name = FALSE + ruin_planet_type = PLANET_LORE + //ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/ouerea_heph_mining, /datum/map_template/ruin/exoplanet/ouerea_village, /datum/map_template/ruin/exoplanet/ouerea_bar, /datum/map_template/ruin/exoplanet/ouerea_autakh, /datum/map_template/ruin/exoplanet/ouerea_hegemony_base, /datum/map_template/ruin/exoplanet/ouerea_farm, /datum/map_template/ruin/exoplanet/ouerea_fishing_spot, /datum/map_template/ruin/exoplanet/ouerea_sol_base, /datum/map_template/ruin/exoplanet/ouerea_skrell_base, /datum/map_template/ruin/exoplanet/ouerea_guild_mining, /datum/map_template/ruin/exoplanet/ouerea_nt_ruin, /datum/map_template/ruin/exoplanet/ouerea_freewater, /datum/map_template/ruin/exoplanet/ouerea_battlefield, /datum/map_template/ruin/exoplanet/ouerea_threshbeast_herd) + place_near_main = list(2,2) + +/obj/effect/overmap/visitable/sector/exoplanet/ouerea/generate_habitability() + return HABITABILITY_IDEAL + +/obj/effect/overmap/visitable/sector/exoplanet/ouerea/generate_map() + if(prob(75)) + lightlevel = rand(5,10)/10 + ..() + +/obj/effect/overmap/visitable/sector/exoplanet/ouerea/generate_atmosphere() + ..() + if(atmosphere) + atmosphere.remove_ratio(1) + atmosphere.adjust_gas(GAS_OXYGEN, MOLES_O2STANDARD, 1) + atmosphere.adjust_gas(GAS_NITROGEN, MOLES_N2STANDARD, 1) + atmosphere.temperature = T0C + rand(25, 30) + atmosphere.update_values() + +/obj/effect/overmap/visitable/sector/exoplanet/ouerea/update_icon() + return + +/obj/effect/overmap/visitable/sector/exoplanet/ouerea/generate_ground_survey_result() + ..() + ground_survey_result += "
High quality natural fertilizer found in subterranean pockets" + ground_survey_result += "
Chemical extraction indicates soil is rich in major and secondary nutrients for agriculture" + ground_survey_result += "
Extensive subterranean water deposits detected" + ground_survey_result += "
Stratigraphy indicates moderate risk of tectonic activity in this region" + ground_survey_result += "
Muddy dirt rich in organic material" + ground_survey_result += "
Fossilized organic material found settled in sedimentary rock" + ground_survey_result += "
High nitrogen and phosphorus contents of the soil" diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm index 269d501c785..62c87a52225 100644 --- a/code/modules/mob/living/carbon/human/human_species.dm +++ b/code/modules/mob/living/carbon/human/human_species.dm @@ -64,6 +64,9 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy/mannequin) /mob/living/carbon/human/stok/Initialize(mapload) . = ..(mapload, SPECIES_MONKEY_UNATHI) +/mob/living/carbon/human/stok/moghes + faction = "Moghes" + /mob/living/carbon/human/bug/Initialize(mapload) . = ..(mapload, SPECIES_MONKEY_VAURCA) src.gender = FEMALE diff --git a/code/modules/mob/living/simple_animal/friendly/moghes.dm b/code/modules/mob/living/simple_animal/friendly/moghes.dm index 4a58fa5688b..594344315c2 100644 --- a/code/modules/mob/living/simple_animal/friendly/moghes.dm +++ b/code/modules/mob/living/simple_animal/friendly/moghes.dm @@ -16,6 +16,7 @@ response_disarm = "gently pushes aside" response_harm = "kicks" attacktext = "kicked" + faction = "Moghes" maxHealth = 100 health = 100 @@ -59,6 +60,7 @@ response_disarm = "gently pushes aside" response_harm = "kicks" attacktext = "kicked" + faction = "Moghes" maxHealth = 200 health = 200 @@ -94,6 +96,7 @@ /mob/living/simple_animal/aquatic/fish/moghes name = "orszi fish" desc = "A small fish native to the rivers and seas of the planet Moghes, the orzsi or 'swarm fish' is a common food source for noble and common Unathi alike." + faction = "Moghes" /mob/living/simple_animal/otzek name = "otzek" @@ -110,6 +113,7 @@ emote_see = list("flicks its tongue", "shakes its head") speak_chance = 1 turns_per_move = 5 + faction = "Moghes" organ_names = list("head", "chest", "right fore leg", "left fore leg", "right rear leg", "left rear leg", "tail") response_help = "pets" @@ -138,6 +142,7 @@ emote_see = list("pecks at the ground","flaps its wings","flicks out its tongue") speak_chance = 1 turns_per_move = 5 + faction = "Moghes" organ_names = list("head", "chest", "left leg", "right leg", "left wing", "right wing") response_help = "pets" diff --git a/code/modules/overmap/exoplanets/biomes/barren.dm b/code/modules/overmap/exoplanets/biomes/barren.dm index 0908b7d59f0..dbfd7b6e3c5 100644 --- a/code/modules/overmap/exoplanets/biomes/barren.dm +++ b/code/modules/overmap/exoplanets/biomes/barren.dm @@ -23,3 +23,12 @@ /singleton/biome/barren/asteroid/ice turf_type = /turf/simulated/floor/exoplanet/ice + +/singleton/biome/barren/pid + turf_type = /turf/simulated/floor/exoplanet/barren + generators = list(SMALL_FLORA = list(POISSON_SAMPLE, 7)) + spawn_types = list( + SMALL_FLORA = list( + /obj/effect/landmark/exoplanet_spawn/plant = 2 + ) + ) diff --git a/code/modules/overmap/exoplanets/biomes/desert.dm b/code/modules/overmap/exoplanets/biomes/desert.dm index 812e682ae6d..af45c5c6646 100644 --- a/code/modules/overmap/exoplanets/biomes/desert.dm +++ b/code/modules/overmap/exoplanets/biomes/desert.dm @@ -75,3 +75,29 @@ /mob/living/simple_animal/tindalos = 1 ) ) + +/singleton/biome/desert/wasteland //TODO: Add cool wrecked shit for the wasteland + generators = list( + GRASSES = list(BATCHED_NOISE, -0.1, 360, 4), + SMALL_FLORA = list(POISSON_SAMPLE, 7), + LARGE_FLORA = list(POISSON_SAMPLE, 7), + WILDLIFE = list(POISSON_SAMPLE, 45) + ) + spawn_types = list( + GRASSES = list( + /obj/structure/flora/grass/desert/bush = 1, + /obj/structure/flora/grass/desert = 3 + ), + SMALL_FLORA = list( + /obj/structure/flora/rock/desert = 1, + /obj/structure/flora/rock/desert/scrub = 3, + ), + LARGE_FLORA = list( + /obj/structure/flora/tree/desert/tiny = 1 + ), + WILDLIFE = list( + /mob/living/simple_animal/hostile/shrieker = 1, + /mob/living/carbon/human/stok/moghes = 1, + /mob/living/simple_animal/threshbeast = 1 + ) + ) diff --git a/code/modules/overmap/exoplanets/biomes/grass.dm b/code/modules/overmap/exoplanets/biomes/grass.dm index f700c55f7e4..704569b3a72 100644 --- a/code/modules/overmap/exoplanets/biomes/grass.dm +++ b/code/modules/overmap/exoplanets/biomes/grass.dm @@ -193,3 +193,265 @@ /mob/living/simple_animal/cosmozoan = 1, ) ) + +//Moghes Biomes +//TODO - add Moghes flora and fauna here when they're implemented, as well as generic structure/flora for the planet. + +/singleton/biome/grass/moghes + turf_type = /turf/simulated/floor/exoplanet/grass/moghes + generators = list( + SMALL_FLORA = list(POISSON_SAMPLE, 4), + GRASSES = list(BATCHED_NOISE, -0.1, 360, 4), + WILDLIFE = list(POISSON_SAMPLE, 10) + ) + spawn_types = list( + SMALL_FLORA = list( + /obj/structure/flora/bush/jungle/random = 3, + /obj/structure/flora/bush/jungle/b/random = 3, + /obj/structure/flora/bush/jungle/c/random = 3, + /obj/effect/landmark/exoplanet_spawn/plant = 3 + ), + + GRASSES = list( + /obj/structure/flora/grass/junglegrass/random = 4, + /obj/structure/flora/grass/junglegrass/dense/random = 2, + /obj/structure/flora/grass/junglegrass/rocky/random = 1 + ), + + WILDLIFE = list( + /mob/living/carbon/human/stok/moghes = 1, + /mob/living/simple_animal/threshbeast = 1, + /mob/living/simple_animal/hostile/retaliate/hegeranzi = 1, + /mob/living/simple_animal/hostile/shrieker = 1, + /mob/living/simple_animal/otzek = 1 + //other mobs when added + ) + ) + +/singleton/biome/grass/forest/moghes + turf_type = /turf/simulated/floor/exoplanet/grass/moghes + generators = list( + LARGE_FLORA = list(POISSON_SAMPLE, 5), + SMALL_FLORA = list(POISSON_SAMPLE, 1), + GRASSES = list(BATCHED_NOISE, 0.1, 360, 4), + WILDLIFE = list(POISSON_SAMPLE, 15) + ) + exclusive_generators = list(LARGE_FLORA, SMALL_FLORA) + spawn_types = list( + LARGE_FLORA = list( + /obj/structure/flora/tree/jungle/small/random = 5, + /obj/structure/flora/tree/jungle/random = 1 + ), + SMALL_FLORA = list( + /obj/structure/flora/bush/jungle/large/random = 1, + /obj/structure/flora/bush/jungle/random = 3, + /obj/structure/flora/bush/jungle/b/random = 3, + /obj/structure/flora/bush/jungle/c/random = 3, + /obj/effect/landmark/exoplanet_spawn/plant = 3 + ), + GRASSES = list( + /obj/structure/flora/grass/junglegrass/random = 4, + /obj/structure/flora/grass/junglegrass/dense/random = 2, + /obj/structure/flora/grass/junglegrass/rocky/random = 1 + ), + WILDLIFE = list( + /mob/living/carbon/human/stok/moghes = 1, + /mob/living/simple_animal/threshbeast = 1, + /mob/living/simple_animal/hostile/retaliate/hegeranzi = 1, + /mob/living/simple_animal/hostile/shrieker = 1, + /mob/living/simple_animal/otzek = 1 + //other mobs when added + ) + ) + +/singleton/biome/grass/riverside/moghes + turf_type = /turf/simulated/floor/exoplanet/grass/moghes + generators = list( + PLANET_TURF = list(HEIGHT_MOD, 0.95), + SMALL_FLORA = list(POISSON_SAMPLE, 1), + WILDLIFE = list(POISSON_SAMPLE, 15) + ) + exclusive_generators = list(PLANET_TURF) + spawn_types = list( + PLANET_TURF = list( + /turf/simulated/floor/exoplanet/water/shallow/moghes = 1 + ), + SMALL_FLORA = list( + /obj/structure/flora/ausbushes/reedbush = 1, + /obj/structure/flora/ausbushes/stalkybush = 1, + /obj/effect/landmark/exoplanet_spawn/plant = 1 + ), + WILDLIFE = list( + /mob/living/carbon/human/stok/moghes = 1, + /mob/living/simple_animal/threshbeast = 1, + /mob/living/simple_animal/hostile/retaliate/hegeranzi = 1, + /mob/living/simple_animal/hostile/shrieker = 1, + /mob/living/simple_animal/aquatic/fish/moghes = 1, + /mob/living/simple_animal/otzek = 1 + //other mobs when added + ) + ) + +/singleton/biome/grass/chaparral/moghes + generators = list( + GRASS_1 = list(BATCHED_NOISE, -0.4, 360, 4), + GRASS_2 = list(BATCHED_NOISE, -0.4, 360, 4), + GRASS_3 = list(BATCHED_NOISE, -0.4, 360, 4), + SMALL_FLORA = list(POISSON_SAMPLE, 3), + WILDLIFE = list(POISSON_SAMPLE, 15) + ) + exclusive_generators = list(GRASS_1, GRASS_2, GRASS_3) + spawn_types = list( + GRASS_1 = list( + /obj/structure/flora/ausbushes/ywflowers = 1 + ), + GRASS_2 = list( + /obj/structure/flora/ausbushes/brflowers = 1 + ), + GRASS_3 = list( + /obj/structure/flora/ausbushes/ppflowers = 1 + ), + SMALL_FLORA = list( + /obj/structure/flora/ausbushes/grassybush = 1, + /obj/structure/flora/ausbushes/palebush = 1, + /obj/structure/flora/ausbushes = 1, + /obj/structure/flora/ausbushes/fernybush = 1, + /obj/effect/landmark/exoplanet_spawn/plant = 1 + ), + WILDLIFE = list( + /mob/living/carbon/human/stok/moghes = 1, + /mob/living/simple_animal/threshbeast = 1, + /mob/living/simple_animal/hostile/retaliate/hegeranzi = 1, + /mob/living/simple_animal/hostile/shrieker = 1, + /mob/living/simple_animal/otzek = 1 + //other mobs when added + ) + ) + + +//Ouerea Biomes +//TODO: Ouerea flora and fauna +/singleton/biome/grass/ouerea + turf_type = /turf/simulated/floor/exoplanet/grass + generators = list( + GRASS_1 = list(BATCHED_NOISE, -0.3, 360, 4), + GRASS_2 = list(BATCHED_NOISE, -0.3, 360, 4), + GRASS_3 = list(BATCHED_NOISE, -0.3, 360, 4), + SMALL_FLORA = list(POISSON_SAMPLE, 6), + WILDLIFE = list(POISSON_SAMPLE, 15) + ) + exclusive_generators = list(GRASS_1, GRASS_2, GRASS_3) + spawn_types = list( + GRASS_1 = list( + /obj/structure/flora/ausbushes/ywflowers = 1 + ), + GRASS_2 = list( + /obj/structure/flora/ausbushes/brflowers = 1 + ), + GRASS_3 = list( + /obj/structure/flora/ausbushes/ppflowers = 1 + ), + SMALL_FLORA = list( + /obj/structure/flora/ausbushes/ywflowers = 1, + /obj/structure/flora/ausbushes/brflowers = 1, + /obj/structure/flora/ausbushes/ppflowers = 1, + /obj/structure/flora/ausbushes/grassybush = 1, + /obj/structure/flora/ausbushes/palebush = 1, + /obj/structure/flora/ausbushes = 1, + /obj/structure/flora/ausbushes/fernybush = 1, + /obj/effect/landmark/exoplanet_spawn/plant = 1 + ), + WILDLIFE = list( + /mob/living/simple_animal/threshbeast = 1, + /mob/living/simple_animal/otzek = 1, + /mob/living/simple_animal/miervesh = 1 + ) + ) + +/singleton/biome/grass/forest/ouerea + turf_type = /turf/simulated/floor/exoplanet/grass + generators = list( + LARGE_FLORA = list(POISSON_SAMPLE, 5), + SMALL_FLORA = list(POISSON_SAMPLE, 1), + WILDLIFE = list(POISSON_SAMPLE, 15) + ) + exclusive_generators = list(LARGE_FLORA) + spawn_types = list( + LARGE_FLORA = list( + /obj/structure/flora/tree/grove = 1 + ), + SMALL_FLORA = list( + /obj/structure/flora/ausbushes/ywflowers = 1, + /obj/structure/flora/ausbushes/brflowers = 1, + /obj/structure/flora/ausbushes/ppflowers = 1, + /obj/structure/flora/ausbushes/grassybush = 1, + /obj/structure/flora/ausbushes/palebush = 1, + /obj/structure/flora/ausbushes = 1, + /obj/structure/flora/ausbushes/fernybush = 1, + /obj/effect/landmark/exoplanet_spawn/plant = 1 + ), + WILDLIFE = list( + /mob/living/simple_animal/threshbeast = 1, + /mob/living/simple_animal/otzek = 1, + /mob/living/simple_animal/miervesh = 1 + ) + ) + +/singleton/biome/grass/riverside/ouerea + turf_type = /turf/simulated/floor/exoplanet/grass + generators = list( + PLANET_TURF = list(HEIGHT_MOD, 0.95), + SMALL_FLORA = list(POISSON_SAMPLE, 1), + WILDLIFE = list(POISSON_SAMPLE, 15) + ) + exclusive_generators = list(PLANET_TURF) + spawn_types = list( + PLANET_TURF = list( + /turf/simulated/floor/exoplanet/water/shallow = 1 + ), + SMALL_FLORA = list( + /obj/structure/flora/ausbushes/reedbush = 1, + /obj/structure/flora/ausbushes/stalkybush = 1, + /obj/effect/landmark/exoplanet_spawn/plant = 1 + ), + WILDLIFE = list( + /mob/living/simple_animal/threshbeast = 1, + /mob/living/simple_animal/aquatic/fish/moghes = 1, + /mob/living/simple_animal/otzek = 1, + /mob/living/simple_animal/miervesh = 1 + ) + ) + +/singleton/biome/grass/chaparral/ouerea + turf_type = /turf/simulated/floor/exoplanet/grass + generators = list( + GRASS_1 = list(BATCHED_NOISE, -0.4, 360, 4), + GRASS_2 = list(BATCHED_NOISE, -0.4, 360, 4), + GRASS_3 = list(BATCHED_NOISE, -0.4, 360, 4), + SMALL_FLORA = list(POISSON_SAMPLE, 3), + WILDLIFE = list(POISSON_SAMPLE, 15) + ) + exclusive_generators = list(GRASS_1, GRASS_2, GRASS_3) + spawn_types = list( + GRASS_1 = list( + /obj/structure/flora/ausbushes/ywflowers = 1 + ), + GRASS_2 = list( + /obj/structure/flora/ausbushes/brflowers = 1 + ), + GRASS_3 = list( + /obj/structure/flora/ausbushes/ppflowers = 1 + ), + SMALL_FLORA = list( + /obj/structure/flora/ausbushes/grassybush = 1, + /obj/structure/flora/ausbushes/palebush = 1, + /obj/structure/flora/ausbushes = 1, + /obj/structure/flora/ausbushes/fernybush = 1, + /obj/effect/landmark/exoplanet_spawn/plant = 1 + ), + WILDLIFE = list( + /mob/living/simple_animal/threshbeast = 1, + /mob/living/simple_animal/otzek = 1, + /mob/living/simple_animal/miervesh = 1 + ) + ) diff --git a/code/modules/overmap/exoplanets/decor/_areas.dm b/code/modules/overmap/exoplanets/decor/_areas.dm index 42f1da05855..c568b791b95 100644 --- a/code/modules/overmap/exoplanets/decor/_areas.dm +++ b/code/modules/overmap/exoplanets/decor/_areas.dm @@ -29,11 +29,25 @@ /area/exoplanet/barren/burzsia name = "Burzsia Surface" +/area/exoplanet/barren/pid + name = "Pid Surface" + area_blurb = "The surface of this moon is lifeless and rocky - almost. A faint yellow light suffuses the ground, the dim glow of spores in bloom." + /area/exoplanet/crystal name = "\improper Planetary surface" ambience = AMBIENCE_SPACE base_turf = /turf/simulated/floor/exoplanet/crystal +/area/exoplanet/moghes //ambience and area_blurb are set on init + name = "Moghes Wilderness" + base_turf = /turf/simulated/floor/exoplanet/grass/moghes/dirt + +/area/exoplanet/ouerea + name = "Ouerea Wilderness" + ambience = AMBIENCE_JUNGLE + base_turf = /turf/simulated/floor/exoplanet/barren + area_blurb = "Strange grasses beneath your feet, and a warm breeze in the air. The shapes of strange flying reptiles dart between the trees, their bright and clear calls drifting on the wind." + /area/exoplanet/desert ambience = list('sound/effects/wind/desert0.ogg','sound/effects/wind/desert1.ogg','sound/effects/wind/desert2.ogg','sound/effects/wind/desert3.ogg','sound/effects/wind/desert4.ogg','sound/effects/wind/desert5.ogg') base_turf = /turf/simulated/floor/exoplanet/desert diff --git a/code/modules/overmap/exoplanets/decor/turfs/grass.dm b/code/modules/overmap/exoplanets/decor/turfs/grass.dm index af7f35c7046..615ed137140 100644 --- a/code/modules/overmap/exoplanets/decor/turfs/grass.dm +++ b/code/modules/overmap/exoplanets/decor/turfs/grass.dm @@ -45,3 +45,16 @@ /turf/simulated/floor/exoplanet/grass/marsh/Initialize() . = ..() icon_state = "marsh[rand(1,8)]" + +/turf/simulated/floor/exoplanet/grass/moghes + icon = 'icons/turf/flooring/exoplanet/moghes.dmi' + icon_state = "grass" + color = null + +/turf/simulated/floor/exoplanet/grass/moghes/dirt + icon_state = "dirt" + color = null + does_footprint = TRUE + +/turf/simulated/floor/exoplanet/grass/moghes/dirt/beach + icon_state = "beach" diff --git a/code/modules/overmap/exoplanets/decor/turfs/water.dm b/code/modules/overmap/exoplanets/decor/turfs/water.dm index 927e3752ccc..87ac2c0c784 100644 --- a/code/modules/overmap/exoplanets/decor/turfs/water.dm +++ b/code/modules/overmap/exoplanets/decor/turfs/water.dm @@ -171,6 +171,10 @@ W.germ_level = INFECTION_LEVEL_ONE W.germ_level += rand(10, 50) +/turf/simulated/floor/exoplanet/water/shallow/moghes + icon = 'icons/turf/flooring/exoplanet/moghes.dmi' + icon_state = "water" + /turf/simulated/floor/exoplanet/water/proc/wash(atom/movable/O) var/obj/effect/effect/water/W = new(O) diff --git a/code/modules/overmap/exoplanets/exoplanet.dm b/code/modules/overmap/exoplanets/exoplanet.dm index 96696b091c1..6cfaac9268d 100644 --- a/code/modules/overmap/exoplanets/exoplanet.dm +++ b/code/modules/overmap/exoplanets/exoplanet.dm @@ -205,6 +205,7 @@ generate_flora() generate_map() generate_features() + theme.after_map_generation(src) generate_landing(2) update_biome() generate_planet_image() diff --git a/code/modules/overmap/exoplanets/themes/_theme.dm b/code/modules/overmap/exoplanets/themes/_theme.dm index 72e5bbf2c05..c8f68b38d81 100644 --- a/code/modules/overmap/exoplanets/themes/_theme.dm +++ b/code/modules/overmap/exoplanets/themes/_theme.dm @@ -356,3 +356,5 @@ M.UpdateMineral() // It's already a mineral turf, so we can avoid changeturf here /datum/exoplanet_theme/proc/get_planet_image_extra() + +/datum/exoplanet_theme/proc/after_map_generation(obj/effect/overmap/visitable/sector/exoplanet/E) //after the map is generated and ruins exist diff --git a/code/modules/overmap/exoplanets/themes/barren.dm b/code/modules/overmap/exoplanets/themes/barren.dm index 702a8f207c5..0b163d0baa4 100644 --- a/code/modules/overmap/exoplanets/themes/barren.dm +++ b/code/modules/overmap/exoplanets/themes/barren.dm @@ -94,3 +94,55 @@ ORE_PHORON = list(0, 2) ) ) + +/datum/exoplanet_theme/barren/pid + name = "Pid" + possible_biomes = list( + BIOME_POLAR = list( + BIOME_ARID = /singleton/biome/barren/pid + ) + ) + +/datum/exoplanet_theme/barren/asteroid/chanterel + name = "Chanterel" + surface_turfs = list( + /turf/simulated/mineral/planet, + /turf/simulated/floor/exoplanet/barren + ) + + possible_biomes = list( + BIOME_POLAR = list( + BIOME_ARID = /singleton/biome/barren + ) + ) + + wall_ore_levels = list( + ORE_PLATINUM = 0.6, + ORE_DIAMOND = 0.6, + ORE_URANIUM = 0.7, + ORE_GOLD = 0.68, + ORE_SILVER = 0.7, + ORE_COAL = 0.9, + ORE_IRON = 0.92, + ) + ground_ore_levels = list( + SURFACE_ORES = list( + ORE_IRON = list(2, 4), + ORE_GOLD = list(0, 2), + ORE_SILVER = list(0, 2), + ORE_URANIUM = list(0, 2) + ), + RARE_ORES = list( + ORE_GOLD = list(1, 3), + ORE_SILVER = list(1, 3), + ORE_URANIUM = list(1, 3), + ORE_PLATINUM = list(1, 3), + ), + DEEP_ORES = list( + ORE_URANIUM = list(0, 2), + ORE_DIAMOND = list(0, 2), + ORE_PLATINUM = list(2, 4), + ORE_HYDROGEN = list(1, 3), + ) + ) + diff --git a/code/modules/overmap/exoplanets/themes/desert.dm b/code/modules/overmap/exoplanets/themes/desert.dm index cdf233fabb0..7396c57f2e6 100644 --- a/code/modules/overmap/exoplanets/themes/desert.dm +++ b/code/modules/overmap/exoplanets/themes/desert.dm @@ -53,3 +53,34 @@ BIOME_SUBHUMID = 0.8, BIOME_HUMID = 1.0 ) + +/datum/exoplanet_theme/desert/wasteland //nuked Moghes theme + name = "Wasteland" + possible_biomes = list( + BIOME_EQUATOR = list( + BIOME_ARID = /singleton/biome/desert/wasteland //ecological diversity? in this economy? + ) + ) + mountain_threshold = 0.6 + + heat_levels = list( + BIOME_EQUATOR = 1.0 + ) + + humidity_levels = list( + BIOME_ARID = 1.0 + ) + +/datum/exoplanet_theme/desert/wasteland/after_map_generation(obj/effect/overmap/visitable/sector/exoplanet/E) //irradiate to shit + var/area/A = E.planetary_area + LAZYDISTINCTADD(A.ambience, AMBIENCE_DESERT) + A.area_blurb = "The sweltering heat presses down on you from every direction. Clouds of sand swirl around your feet. In the distance, the jagged shapes of broken skyscrapers loom on the horizon. This is the Wasteland of Moghes, a bleeding scar of a war that had no victors." + var/radiation_power = rand(10, 37.5) + var/num_craters = round(min(0.04, rand()) * 0.02 * E.maxx, E.maxy) + for(var/i = 1 to num_craters) + var/turf/simulated/T = pick_area_turf(E.planetary_area, list(/proc/not_turf_contains_dense_objects)) + if(!T) + return + var/datum/radiation_source/S = new(T, radiation_power, FALSE) + S.range = 4 + SSradiation.add_source(S) diff --git a/code/modules/overmap/exoplanets/themes/grass.dm b/code/modules/overmap/exoplanets/themes/grass.dm index 3074589d32b..5cac895fd02 100644 --- a/code/modules/overmap/exoplanets/themes/grass.dm +++ b/code/modules/overmap/exoplanets/themes/grass.dm @@ -84,3 +84,77 @@ BIOME_SUBHUMID = /singleton/biome/grass/riverside/biesel ) ) + +/datum/exoplanet_theme/grass/moghes //un-nuked Moghes theme + name = "Untouched Lands" + mountain_threshold = 0.9 + possible_biomes = list( + BIOME_COOL = list( + BIOME_ARID = /singleton/biome/grass/chaparral/moghes, + BIOME_SEMIARID = /singleton/biome/grass/forest/moghes, + BIOME_SUBHUMID = /singleton/biome/grass/forest/moghes + ), + BIOME_WARM = list( + BIOME_ARID = /singleton/biome/grass/chaparral/moghes, + BIOME_SEMIARID = /singleton/biome/grass/moghes, + BIOME_SUBHUMID = /singleton/biome/grass/riverside/moghes + ), + BIOME_EQUATOR = list( + BIOME_ARID = /singleton/biome/grass/moghes, + BIOME_SEMIARID = /singleton/biome/grass/riverside/moghes, + BIOME_SUBHUMID = /singleton/biome/grass/riverside/moghes + ) + ) + + heat_levels = list( + BIOME_COOL = 0.4, + BIOME_WARM = 0.8, + BIOME_EQUATOR = 1.0 + ) + + humidity_levels = list( + BIOME_ARID = 0.2, + BIOME_SEMIARID = 0.5, + BIOME_SUBHUMID = 1.0 + ) + +/datum/exoplanet_theme/grass/moghes/after_map_generation(obj/effect/overmap/visitable/sector/exoplanet/E) + var/area/A = E.planetary_area + LAZYDISTINCTADD(A.ambience, AMBIENCE_JUNGLE) + A.area_blurb = "The air is hot and humid, clinging to your skin. An occasional cool breeze offers some small respite. Beneath your feet lies lush grass, and the sounds of strange animals fill the air." + +/datum/exoplanet_theme/grass/ouerea //Ouerea theme. + name = "Ouerea" + surface_turfs = list( + /turf/simulated/mineral + ) + mountain_threshold = 0.9 + possible_biomes = list( + BIOME_COOL = list( + BIOME_ARID = /singleton/biome/grass/chaparral/ouerea, + BIOME_SEMIARID = /singleton/biome/grass/forest/ouerea, + BIOME_SUBHUMID = /singleton/biome/grass/forest/ouerea + ), + BIOME_WARM = list( + BIOME_ARID = /singleton/biome/grass/chaparral/ouerea, + BIOME_SEMIARID = /singleton/biome/grass/ouerea, + BIOME_SUBHUMID = /singleton/biome/grass/riverside/ouerea + ), + BIOME_EQUATOR = list( + BIOME_ARID = /singleton/biome/grass/ouerea, + BIOME_SEMIARID = /singleton/biome/grass/riverside/ouerea, + BIOME_SUBHUMID = /singleton/biome/grass/riverside/ouerea + ) + ) + + heat_levels = list( + BIOME_COOL = 0.4, + BIOME_WARM = 0.8, + BIOME_EQUATOR = 1.0 + ) + + humidity_levels = list( + BIOME_ARID = 0.2, + BIOME_SEMIARID = 0.5, + BIOME_SUBHUMID = 1.0 + ) diff --git a/config/example/lore_radio/uueoaesa/132.6_Skald_FM.txt b/config/example/lore_radio/uueoaesa/132.6_Skald_FM.txt new file mode 100644 index 00000000000..b8a91392e55 --- /dev/null +++ b/config/example/lore_radio/uueoaesa/132.6_Skald_FM.txt @@ -0,0 +1,98 @@ +This is 132.6 Skald FM, the number one rated music station in the Hegemony! +[RANDOMNOTE] Skald FM - brought to you by the Keepers of Heirlooms! [RANDOMNOTE] +Greetings to our listeners, from here in Skalamar to the furthest colonies - you're listening to 132.6 Skald FM! +[RANDOMNOTE] Fire in hearts and blades in claws, they soar to bring down death, [RANDOMNOTE] +[RANDOMNOTE] In honor and in fury, cold wind upon their breath. [RANDOMNOTE] +[RANDOMNOTE] Warriors of S'rand'marr, though you may die alone, [RANDOMNOTE] +[RANDOMNOTE] Upon cold winds of Adhomai, your spirits they shall roam! [RANDOMNOTE] +[RANDOMNOTE] Warriors of S'rand'marr, in fire on alien shores, [RANDOMNOTE] +[RANDOMNOTE] The lands that you defend stand proud, an end to bitter war! [RANDOMNOTE] +That was Wall Breachers - Warriors of S'rand'marr. And now, a word from our sponsors. +/Kzzht-.../ +132.6 Skald FM is brought to you by Hephaestus Industries. +Hephaestus Industries - the anvil on which the world is shaped. +[RANDOMNOTE] Masked in iron, secret words [RANDOMNOTE] +[RANDOMNOTE] A threefold god's demand [RANDOMNOTE] +[RANDOMNOTE] A blade, a prayer, but neither heard [RANDOMNOTE] +[RANDOMNOTE] In fire across the land [RANDOMNOTE] +[RANDOMNOTE] You, masked in iron, tell me what was it worth? [RANDOMNOTE] +[RANDOMNOTE] O, masked in iron tell me true. [RANDOMNOTE] +[RANDOMNOTE] Trial by fire, [RANDOMNOTE] +[RANDOMNOTE] Iron turned to rust [RANDOMNOTE] +[RANDOMNOTE] When Hegemon's ire pulled all you were to dust [RANDOMNOTE] +[RANDOMNOTE] You, masked in irons, tell me what have you done? [RANDOMNOTE] +[RANDOMNOTE] Do you think think Sk'akh led you true? [RANDOMNOTE] +That was Uhszi Ski - Masked in Iron. +/Bzzzht-.../ +The Hegemon's rule extends to the stars - and he needs YOUR help! Sign on with a colony vessel today! +Tired of the same daily labors? Dagamuir Freewater Private Forces are hiring warriors of all sorts! No guild certification needed! +See the finest programs of the Spur - subscribe to the Keepers of Heirlooms' online platform! +[RANDOMNOTE] Come gather me lads, I'll weave ye a tale, [RANDOMNOTE] +[RANDOMNOTE] Of a captain unrivalled, who men called Smokescale. [RANDOMNOTE] +[RANDOMNOTE] The first and the greatest, ol' Smokescale flew, [RANDOMNOTE] +[RANDOMNOTE] In a ship called Glorywright, e'er strong and true. [RANDOMNOTE] +[RANDOMNOTE] Ouerea to Xanu, Biesel to Sol, [RANDOMNOTE] +[RANDOMNOTE] There weren't a place Glorywright didn't know. [RANDOMNOTE] +[RANDOMNOTE] When men saw her coming, they bared blades and cried, [RANDOMNOTE] +[RANDOMNOTE] For when Glorywright came, each one of them died. [RANDOMNOTE] +/Krzzzh-/ +132.6 Skald FM. Don't touch that dial. This is The Rezlik Crew - Gold of the Glorywright. +[RANDOMNOTE] But even ol' Smokescale, he were but a man, [RANDOMNOTE] +[RANDOMNOTE] When he wagered it all on a perilous plan. [RANDOMNOTE] +[RANDOMNOTE] He flew far to Sol, in the old Middle Ring, [RANDOMNOTE] +[RANDOMNOTE] To take enough phoron for the richest of kings. [RANDOMNOTE] +[RANDOMNOTE] The corporates chased him, but none could prevail, [RANDOMNOTE] +[RANDOMNOTE] For no man could best the rogue called Smokescale. [RANDOMNOTE] +[RANDOMNOTE] Now some say he died there, by the Crimson Moon, [RANDOMNOTE] +[RANDOMNOTE] That he grasped for too much and did seal his doom, [RANDOMNOTE] +[RANDOMNOTE] But listen, me lad, for I tell ye no lies, [RANDOMNOTE] +[RANDOMNOTE] For they ne'er found the treasure, out in empty skies. [RANDOMNOTE] +[RANDOMNOTE] So come now me hearties, the tale is done, [RANDOMNOTE] +[RANDOMNOTE] Of the man who struck out to seek glory and won. [RANDOMNOTE] +[RANDOMNOTE] But that treasure's still out there, out in the deep black [RANDOMNOTE] +[RANDOMNOTE] Many men have gone searching, and not one did come back. [RANDOMNOTE] +/Zzzzht-../ +Junzi Electric - keeping your lights on since 1934. +Zo'kaa Yiaa sets foot on the mean streets of Mendell City this Travakh - Venom Hearts season six! +Up next is Wall Breachers - Burn Thy Fear! +[RANDOMNOTE] Honor, fire, bu-urn thy fear! [RANDOMNOTE] +[RANDOMNOTE] Today is not the day to die! [RANDOMNOTE] +[RANDOMNOTE] Honor, fire, bu-urn thy fear! [RANDOMNOTE] +[RANDOMNOTE] Set our sights on alien skies! [RANDOMNOTE] +[RANDOMNOTE] In the skies of Youthstone, our battle begun, [RANDOMNOTE] +[RANDOMNOTE] The roaring of fire, the flash of the guns, [RANDOMNOTE] +[RANDOMNOTE] Two empires came down with that fire in their eyes, [RANDOMNOTE] +[RANDOMNOTE] To win from those raiders a perilous prize! [RANDOMNOTE] +[RANDOMNOTE] Honor, fire, bu-urn thy fear! [RANDOMNOTE] +[RANDOMNOTE] Thundering down to rend the earth! [RANDOMNOTE] +[RANDOMNOTE] Honor, fire, bu-urn thy fear! [RANDOMNOTE] +[RANDOMNOTE] Screaming death with bloody curse! [RANDOMNOTE] +/Krzzzh-/ +Hephaestus Industries offering new positions offworlds - see exotic alien locales! Enquire today if Hephaestus is right for YOU! +I would never wed a man who would not fight for his Hegemon - don't let them say that about you, brother! Enlist today! +Dagamuir Freewater Private Forces - keeping an eye on you. +[RANDOMNOTE] Empire's fall, rage of the dying, [RANDOMNOTE] +[RANDOMNOTE] A mad admiral drove his men to their deaths, [RANDOMNOTE] +[RANDOMNOTE] Empire's fall, the Legion kept trying, [RANDOMNOTE] +[RANDOMNOTE] To hold back the foe until their final breaths! [RANDOMNOTE] +[RANDOMNOTE] But when the call for help went out, it would not go unheard, [RANDOMNOTE] +[RANDOMNOTE] Adhomai to Moghes to Xanu, the Spur would hear their words, [RANDOMNOTE] +[RANDOMNOTE] A dozen worlds as one would go, protecting liberty, [RANDOMNOTE] +[RANDOMNOTE] To send that admiral running, so Biesel could live free! [RANDOMNOTE] +[RANDOMNOTE] Empire's fall, a fury inspired, [RANDOMNOTE] +[RANDOMNOTE] In Reade's crushing depths he would gamble it all, [RANDOMNOTE] +[RANDOMNOTE] Empire's fall, the voice of the choir, [RANDOMNOTE] +[RANDOMNOTE] Would set skies alight as his flagship would fall! [RANDOMNOTE] +That was Wall Breachers - Empire's Fall! Stirring tribute to the battle of Tau Ceti, four years ago now! +/Zzzzht-../ +132.6 Skald FM. +Visit beautiful Ouerea today at low, low prices! +Zandiziite 2466 is coming up - who will you be rooting for! Call in to let us know, here at Skald FM! +Scientists have proven that Sinta drinking Three Towns Cider are twice as likely to find a good marriage! Don't be left out! +Hephaestus Corporate Scholarship - learn a valued trade in today's fast-paced economy! +Hephaestus guild members are eligible for free treatment from the House of Medicine! Hephaestus - looking after our people since 2137! +If you or a clan member has been diagnosed with radiation-induced cancer, do not delay. Visit a K'laxan genetic therapy clinic, available in all major cities. This message has been broadcast on behalf of the Hive K'lax, in the name of the High Queen, may She reign forever. +In a bind? Need cash now? The Imas'hi Banking Guild is your friend, offering the lowest interest rates on Moghes! +I don't have time to season this fish with all the work I'm doing - better use some Fishing League-certified Gukhe sauce! +Rezoek Fish Bucket - home of the best xuizi-marinaded fish in Skalamar! +When a villainous raider threatens the Hegemony, only one warrior stands in his way. The Waste Hunter 2: Xsain Fury, in cinemas this Travakh! \ No newline at end of file diff --git a/config/example/lore_radio/uueoaesa/166.8_Azarak_Emergency_Broadcast.txt b/config/example/lore_radio/uueoaesa/166.8_Azarak_Emergency_Broadcast.txt new file mode 100644 index 00000000000..7b8f3515168 --- /dev/null +++ b/config/example/lore_radio/uueoaesa/166.8_Azarak_Emergency_Broadcast.txt @@ -0,0 +1,55 @@ +/...bzzbbt.../ +/Khhkhhhkh...khhh#t.../ +/...gh#hhk....kt.../ +/Khhkhhht.../ +This message will automatically repeat +/..hkk#ht../ +/...bzzbbt.../ +/Khhkhhhkh...khhh#t.../ +/...gh#hhk....kt.../ +/Khhkhhht.../ +/..khkbzzzzz-t.../ +/Bzzzt-bzzt.../ +/...khhbzzztdistresskzzzh.../ +/....khk#khhh.../ +/...khh..Azarak../ +/...khhbeware..khhht.../ +/..khhk#hhemergencykhhh-ht../ +/..Zzzhkenduring../ +Honor of /zzzht../ emerges resplendent +/..khhhksignal has been/zzh../ +/..hkkkht../ +/...bzzbbt.../ +/Khhkhhht.../ +/..khkbzzzzz-t.../ +/..khhEndures and holds despite/..zzzht-../ +Confirmed reports of /..kzzzzh../ detonations in /bzzt-../, Guzari, and /krzzzh-/ +/...bzzt-../do not believe the words that echo. +/...khh../is broken. We cannot /..kzzzzh../ +This message will automatically repeat. +/..hkkkht../ +/...bzzbbt.../ +/Khhkhhht.../ +/..khkbzzzzz-t.../ +/Khhkhhhkh...khhh#t.../ +/Khhkhhhkh.../Fort Azarak/..khhhht.../ +/..zzzht-.../among resilient honor of/...krzzzh-/ +Is anyone /..kzzzh##.../ us? +/...khhbzzzzztrappedkzzzzh.../ +/..Zzzzzhktheenemyiswithinandwithinandkzzzz-/ +/...hkkkht../Wheel within a wheel within a wheel within a/..Zzzzht-../ +This message will automatically repeat. Are you listening? +/..hkkkht../ +/...bzzbbt.../ +/Khhkhhht.../ +/..khkbzzzzz-t.../ +/..zzzzzzh../listening/kzzzzh/ +We are /...khhbzzzt./ here +/Khhkhht.../The signal/..zzzzt-/ +/..hkk#ht../ +/...bzzbbt.../ +/Khhkhhhkh...khhh#t.../ +/...gh#hhk....kt.../ +/Khhkhhht.../ +/..khkbzzzzz-t.../ +This message will automatically repeat. \ No newline at end of file diff --git a/config/example/lore_radio/uueoaesa/72.4_Radio_Free_Ouerea.txt b/config/example/lore_radio/uueoaesa/72.4_Radio_Free_Ouerea.txt new file mode 100644 index 00000000000..baa79e1d619 --- /dev/null +++ b/config/example/lore_radio/uueoaesa/72.4_Radio_Free_Ouerea.txt @@ -0,0 +1,93 @@ +This is 72.4 - Radio Free Ouerea, the voice of the Confederation. +/An energetic jingle/ +Your number one Ouerean source for Ouerean news. +Reports are coming in of a massive robbery in Kr'ath - over ten thousand credits' worth of Hephaestus industrial equipment stolen. +Culprits are suspected to have been Aut'akh, but law enforcement has found no concrete leads yet. +Dagamuir mercenaries have been deployed to Hephaestus sites around the planet, citing fear of industrial sabotage. +/Kzzht-../ +Radio Free Ouerea - don't touch that dial. +Skrell citizens are concerned about the Nralakk Federation's return to Ouerea, with many believing that 'subversive' Skrell are at risk of abduction or interrogation from Nralakk agents. +The Synod has issued a statement that all Ouereans, regardless of species, are under the protection of the Confederation, and acts of aggression against our citizens will not be tolerated. +The Nralakk delegation has declined to comment. +/Bzzzt-../ +Archpriest Azente has declared his support for the humanitarian effort on Moghes, and has called for the Church to do all that it can to help the desperate state of the Wasteland. +Hephaestus stock prices rise .3% today, as the humanitarian programme inspires Spur-wide confidence in the guild's investment. +Synod of Scales votes to outlaw synthetic labor on Ouerea by 2468, Overlord Zik'san in talks with Hegemon Not'zar and Yukal T'zakal on implementation. +/Krrzh-../ +Warriors of Liberty projected to win Tr'ha'rem in upcoming election, historically a Revolution's Heirs stronghold. Overlord Zik'san declined to comment. +Sahat divers missing for fourth day, specialist Skrell rescue team deployed into the cavern network. +Reports have come in of a bombing at a Hephaestus factory near Isoz, with the Champions of Moghes claiming responsibility. Law enforcement has yet to apprehend the terrorists. +Venom Hearts Season Six is reportedly a fresh new direction for the series, having premiered to exceptional audience ratings in the Hegemony and Republic of Biesel. +The Third Fleet recently engaged a pirate force near Gekhi, driving them off with minimal casualties. Lord-Admiral Xitac recommended for medal from the Hegemon. +/Zzzzht-../ +Radio Free Ouerea - Ouerean news, 24/7. +'Ouerean Defense Force' proposed in Synod, debate continues. Overlord Zik'san expresses skepticism on whether the Hegemony will allow the bill to pass. +Xrem-Lixoq Q'ull unveils new art exhibition in New Skalamar, visited by several Nralakk diplomats. +Stellar Corporate Conglomerate corporations pushing for greater presence in the Hegemony, reportedly blocked by Hephaestus Industries. +High Priest Azandar blesses humanitarian efforts, claims Sk'akh is with 'friends from across the stars'. +Wall Breachers announce new album, coming 2467. +/Bzzh-../ +Radio Free Ouerea - giving you the truth since 2409. +Human communities protesting over lack of Synod representation, demand observer positions. Synod yet to comment. +Si'akh demonstration in New Skalamar results in watch deployment to prevent outbreak of religious violence. +Corporate vessels sighted landing on Ouerea, Synod assures public that all activities are monitored and sanctioned. +Fishing League publishes new guidebook to Ouerean fish preparation - rated a must-read by Sinta Articles. +Sarak Ranza and Angeline Beaufort announce new documentary series 'Revolutionary Lives', an 8-part limited series covering the history of the Revolution. +Ouerean fish exports up 13% this past week as Hephaestus opens new aquaculture center in Trizakael. +Ouerean Independence Movement holds rally in New Skalamar, attendance widespread. +/Rrrrkzh-../ +Art of the Hunt crew reportedly filming in Riztizkzi Sea, hunting some of the larger aquatic fauna of the region. +Restorationists celebrate arrival of Nralakk delegation, who have so far refused to meet with them. +Revolution's Heirs remain locked in leadership debate, Ozesh Zuruziir calls for unity. +Kr'ath police seal off roads due to discovery of unexploded ordinance. +Polar research vessel 'Merry Wanderer' discovered drifting off northern Azareazi coast - no signs of crew aboard. Investigators remain baffled. +Keepers of Heirlooms announce Last Days of Kres'hanor will end after four seasons. +/Zzzht-../ +Radio Free Ouerea - the voice of liberty. +Hephaestus Industries rolls out new hiring campaign for Hegeranzi Starworks, targeting Ouerean engineers. +New Skalamar police seize smuggler vessel, carrying over twenty thousand credits' worth of illegal weaponry. +Sahat dive team remains missing, experts say chances of survival slim. +Phoron shortage remains critical, with civilian use now restricted solely to industries of national importance. +Z'ek tourist vessel rescued by local Skrell fishers after three weeks lost at sea. +Overlord Zik'san honors veterans of Revolution at Pioneer's Plaza. +Over fifty Th'akh shamans congregate in Yiz to try and calm recent storms in Trizkizkzi Sea. +/Krrzhkz-../ +Radio Free Ouerea - don't touch that dial. +[RANDOMNOTE] She came to me one morning, [RANDOMNOTE] +[RANDOMNOTE] One lonely Travakh morning, [RANDOMNOTE] +[RANDOMNOTE] She sang to me a song of loss, and bleeding stones so cold. [RANDOMNOTE] +[RANDOMNOTE] I asked her where she came from, [RANDOMNOTE] +[RANDOMNOTE] She told me it was long long lost, [RANDOMNOTE] +[RANDOMNOTE] I knew not who she was and yet I felt something so strange. [RANDOMNOTE] +[RANDOMNOTE] The lady clad in red she smiled, and offered me her hand, [RANDOMNOTE] +[RANDOMNOTE] She said that she could show me to a new and better land, [RANDOMNOTE] +[RANDOMNOTE] And there beneath Chanterel's light, my heart was gripped with dread, [RANDOMNOTE] +[RANDOMNOTE] But yet I longed to walk with her, my sweet lady in red. [RANDOMNOTE] +That was Uhszi Ski - Lady in Red. +/Zzzht-../ +Aut'akh stronghold raided by Freewater mercenaries under suspicion for Kr'ath heist. +Law enforcement has detained several individuals for questioning. +Synod pledges to maintain order, bill to raise taxes on non-Ouerean guilds enters third day of debate. +Delegation of K'lax gynes reportedly meets with Synod of Scales, no further comment available at this time. +Restorationist rally canceled due to lack of attendance. +House of Medicine scheduled to open new hospital in Um'a'yid. +New Skalamar observatory dome defaced with anti-Nralakk graffiti, local Starkeeper decries it as "slanderous rabblerousing". +Archpriest Azente calls for cross-species conclave to discuss spiritual matters, invites leading human and Skrell religious figures. +Grand Ouerean Cloister announces Sqai'Laaq tournament for next year, invites Skrell from across the stars to participate. +/Krrrzh-../ +Radio Free Ouerea - voice of the Confederation +Dagamuir Freewater Private Forces issues official apology for aggressive behavior from security staff at Wall Breachers concert, assures public that those responsible have been reprimanded. +Seamaster developers announce new expansion for the popular video game, thank players for the waves of support recieved. +Hephaestus executive found guilty of multiple counts of corporate embezzlement, sentenced to 20 years in New Skalamar Penitentiary. Yukal T'zakal announces that all stolen assets will be recovered. +/Hrrrrkt./ +The Fishing League - hiring new apprentices now! Be a part of the time-honored guild, with competitive pay and Hephaestus-provided benefits! +You're listening to 72.4 - Radio Free Ouerea. +Dagamuir Freewater Private Forces - keeping an eye on you since 2076. +Don't let opportunists ruin the freedom that our people fought for - vote WARRIORS OF LIBERTY! This message paid for by the Warriors of Liberty. +/Zzzt-../ +Radical and violent extremists will drag our world to ruin! Vote Revolution's Heirs! This message paid for by Revolution's Heirs. +New Skalamar police arrest several tourists for drunken and disorderly behavior in Pioneer's Plaza. +Emergency services deployed to Trizakael in preparation for approaching storms. +Stellar Corporate Conglomerate vessels reportedly deployed in humanitarian effort to Moghes, concentrated in Wasteland-bordering regions. +Champions of Moghes safehouse raided by New Skalamar police, one suspected terrorist reported in custody. +/Krrrzh-../ \ No newline at end of file diff --git a/config/example/lore_radio/uueoaesa/83.3_Canyon_City_Radio.txt b/config/example/lore_radio/uueoaesa/83.3_Canyon_City_Radio.txt new file mode 100644 index 00000000000..8f6a698b372 --- /dev/null +++ b/config/example/lore_radio/uueoaesa/83.3_Canyon_City_Radio.txt @@ -0,0 +1,100 @@ +Hello once again, my lovely listeners. +This is Canyon City Radio, here on 83.3 MHz. +We're looking at another hot day our here in the Wasteland, with temperatures reaching the low fifties. +So if yoou're still alive out there, wear a hat. No sense in getting MORE cancer, right? +/Bzzzt-.../ +I'm Azkohi Vihnmes, here in lovely Canyon City. For those just tuning in, this is Canyon City Radio, the best and only news source in the Wasteland. +No sense in playing around with it - let's have some news. +The Gawgaryn bands west of old Kopesk seem to be gathering, so if you're headed out in that direction I suggest some new travel plans. +A little siro told me they're planning a pretty major operation. Who knows? Maybe they'll get lucky. +Izweski forces have been marshalling near Camp Integrity lately - hey, if you're listening, go take care of those Gawgaryn I just mentioned. +/Hzzt-...brr../ +Here's something that sounds like a conspiracy. There are Skrell out in the Wasteland, in pretty high numbers. +Now I know some of you might be thinking hey, bet they have some good stuff, right? But get this, I'm hearing they're here to help. +I know, right? Crazy. Word's going out about Skrell handing out food, medicine - so if you se a weird alien out there, maybe talk first, shoot later. Just a heads-up. +I know we've all heard 'humanitarian' promises before - the Izweski, the humans, Hephaestus - pretty much everyone wants to talk, pretty much no one wants to help. +Maybe this time's different? Word of advice, though - I know a guy from Ouerea, familiar with some of those Skrell guns, and they hit hard. Don't go picking any fights you can't win - except my Guwandi friends out there. You're gonna do that anyway. +/Kzzt...hkk-/ +This one goes out to my good friend Vhariz Vihnmes, now three years gone. I know I said he was bound for Guzari, didn't expect the fool to go wandering off there. If you're out there, Vhariz - we all miss you. +[RANDOMNOTE] Strange is the night where flowers bloom [RANDOMNOTE] +[RANDOMNOTE] Strange a city, turned a tomb [RANDOMNOTE] +[RANDOMNOTE] Strange that song, which brings our doom [RANDOMNOTE] +[RANDOMNOTE] The song of lost Guzari [RANDOMNOTE] +[RANDOMNOTE] E'er north where sun does never shine [RANDOMNOTE] +[RANDOMNOTE] Travakh's cold grasp untouched by time [RANDOMNOTE] +[RANDOMNOTE] Is where it lies, but heed this rhyme [RANDOMNOTE] +[RANDOMNOTE] Stay far from cold Guzari [RANDOMNOTE] +[RANDOMNOTE] For ancient lords did speak a curse [RANDOMNOTE] +[RANDOMNOTE] Of rage before the dying earth [RANDOMNOTE] +[RANDOMNOTE] As fire came down, the whispers birthed [RANDOMNOTE] +[RANDOMNOTE] Horrors of old Guzari [RANDOMNOTE] +[RANDOMNOTE] The city sleeps, beneath the snows [RANDOMNOTE] +[RANDOMNOTE] Where mortal feet may never go [RANDOMNOTE] +[RANDOMNOTE] But still it calls now, even so [RANDOMNOTE] +[RANDOMNOTE] The lure of sweet Guzari [RANDOMNOTE] +[RANDOMNOTE] So hear me friend, and hear me well [RANDOMNOTE] +[RANDOMNOTE] Not just a song, this tale I tell [RANDOMNOTE] +[RANDOMNOTE] Many ignored, and many fell [RANDOMNOTE] +[RANDOMNOTE] Now lost to Dead Guzari [RANDOMNOTE] +That was 'The Ballad of Dead Guzari', by a lovely bard here in Canyon City. +/Hrrrkt.../ +Welcome back, listeners to 83.3 - Canyon City Radio! +As always this is Azkohi Vihnmes, keeping you in the loop no matter how bad the news is. +Don't like it? Turn it off. +News from way out near the Queendom this time - shout out to all you lovely ladies. If you're ever in Canyon City, come say hi. First drink's on me. +Who likes fire? If you raised your hand, jumped up, or started chanting - then odds are pretty good you're one of that Si'akh crowd. +Hear you guys have been getting some real coverage lately - just so long as you don't set the station on fire, all good with me. +This new flame church business? Let me tell you, the Church down in Skalamar is far from happy. Now, knowing them, it'll take five years to make a decision, so you're probably fine. +Still, if you're out at this temple, or in the Queendom, might want to keep your claws sharp. Never know when some bounty hunter type might try his luck. +Speaking of bounty hunters, old Izaku's been offering more and more money for someone to bring him Si'akh's head - though if you're thinking about taking it, word of advice. Notorious cheapskate, not to mention mad as a fish in the desert. Find a better employer. +/Kzzt-.../ +You folks out there ever seen a xsain? Some of you might have, round Integrity way - but I mean one of the big ones. The ones they use for war. +Course you haven't, you're still breathing! +But rumor has been going round that some Klex- Kuhla- you know who I mean, the xsain. +Some project of theirs got hit by Gawgaryn out north of Thos'kar. And the big bugs were far from happy. +Reclaimer friend of mine from out that way says that they dropped in a xsain as tall as three Sinta, that breathed fire all over them! +Now, he likes to hit the koko. But still, we know those Gawgaryn have been real quiet lately. So perhaps there's a lesson to be learned here. +Xsain business is weird, and messing with it might get you killed. No disrespect to my Mi'kuetz friends out there. You lot are all right. +Speaking of Mi'kuetz, I got one of them in to fix my radio the other day - so our signal is stronger than ever! +We all know life in the Wasteland is hard, folks, believe me - so why not keep listening? Make our radioactive desert into a little more of a radioactive home. +/Zzht-.../ +Folks, no jokes for today. You heard of Kseok Gawgaryn? Big-shot raider, down near the Zazalais. +Apparently this guy was getting hungry, decided to torch a Vihnmes inn to make of with its food. Most of my clanmates there got away. Most. +So congratulations, Kseok Gawgaryn, you've won the Canyon City Radio grand prize - a ten-gallon bounty on your miserable hide. +That's right. Ten gallons of clean, fresh, water, to whoever delivers this coward dead or alive to my establishment here in Canyon City. +Last I heard he was riding up towards Mudki - so load those guns and sharpen those blades, listeners. Payment on delivery. +Oh, and for any other Gawgaryn listening? Take this to heart if you're thinking about messing with the Vihnmes. +That's all for today, listeners - remember, a little common sense goes a long way out here. +/Kzzzh-.../ +Hello again listeners, and welcome back to Canyon City Radio. +I'm your host, Azkohi Vihnmes, here with the weather - hot, radioactive, sandy. Same as ever. +A band of mercenaries set out from Canyon City the other day - Freewater types, you know the kind. +Apparently, some Hegemony lordling wants to find out what's in Fallen Mountain, and put together an expedition. +If you're in the area, they should have made it by now, and those guys had some quality gear. Feel free to help yourselves to the corpses. +Remember, when everyone in the Wasteland's left a place unsalvaged? Probably a good reason. +In other words, it seems this humanitarian thing's not just all talk. +The other day, listeners, and by mine and your spirits I'm not spinning a tale here - a Skrell spaceship touched down, right here in Canyon City! +I know, I know! Thought I needed to lay off the xuizi, but there they were, must have been ten of the ghazkii warbling like no one's business. +Had some weird-looking xsain with them, too - blue, not green or yellow like the usual crowd. I ddn't know they came in different colors like that. +Naturally, we were all rattled - but then one of them comes out jabbering in some human language, and the militia had to spend nearly an hour finding someone who spoke Tau Ceti Basic - yours truly, by the way. +Turns out, they were there to help - with a load of Hephaestus aquaponics equipment that I'd have bet the Hegemon's head was a mirage. +They're still here, getting the stuff set up - all right sorts, even if I can't stop worrying they're gonna try read my mind. +Still, apparently we should be able to have a good fishery set up with all these machines - so consider this a shout out to the ghazkii. +Anyone who helps out the Canyon is a friend of the Vihnmes, and the clan-mothers are fully with me on that one. Any Skrell out there in the Wasteland, congratulations - you drink free at Vihnmes establishments. Food still costs, though. We're not a charity. +/Zzzzt-.../ +Hello again, all my lovely Wasteland friends. +It's me, Azkohi Vihnmes, broadcasting from sunny Canyon City. +Got a little news here, if that's something you lot would be interested in. Let's see... +Now, I know when I talk about Hephaestus you all start molting, but bear with me here. +Apparently, old Yukal T'zakal's having his guild work with the Skrell on this 'help out the wasteland' project. +So, maybe they're not all bad. None of them have bought drinks from me yet, though, so I'm still putting them below the Skrell. +Today's broadcast is sponsored by - nah, I'm just quoting a limerick at you. Who'd want to sponsor this dump? +Well, aside from the proud and ancient Clan Vihnmes, anyway. Our inns are some of the safest places in the Wasteland - if you die, your money back! +/Krrzh-.../ +Now, some more surprising news - heard there are all sorts of aliens wandering round the Wasteland. +Mining operations or something, shutles coming down from orbit. Apparently, there's this S.C.C ship here, part of the whole humanitarian thing. +Surprised Hephaestus - put the knives down, folks - let them in. Guess this is a big project. +That's all for now, friends - but keep those radios tuned to 83.3, Canyon City Radio! +The best, the fastest and most importantly, the only news outlet in the Wasteland! +As always, take care out there, people - this is Azkohi Vihnmes, signing off. +/Zzzzt-.../ \ No newline at end of file diff --git a/html/changelogs/RustingWithYou - uueoabase.yml b/html/changelogs/RustingWithYou - uueoabase.yml new file mode 100644 index 00000000000..add040c3d63 --- /dev/null +++ b/html/changelogs/RustingWithYou - uueoabase.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: RustingWithYou + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds the Uueoa-Esa sector, along with its lore planets." diff --git a/html/images/scans/exoplanets/chanterel.png b/html/images/scans/exoplanets/chanterel.png new file mode 100644 index 00000000000..cea5759f8ce Binary files /dev/null and b/html/images/scans/exoplanets/chanterel.png differ diff --git a/html/images/scans/exoplanets/moghes.png b/html/images/scans/exoplanets/moghes.png new file mode 100644 index 00000000000..e4a1f046199 Binary files /dev/null and b/html/images/scans/exoplanets/moghes.png differ diff --git a/icons/obj/machinery/stargazer.dmi b/icons/obj/machinery/stargazer.dmi index be5319267a9..9ab7c487ebc 100644 Binary files a/icons/obj/machinery/stargazer.dmi and b/icons/obj/machinery/stargazer.dmi differ diff --git a/icons/skybox/lore_planets.dmi b/icons/skybox/lore_planets.dmi index 88bd344c7c4..2780ba01a38 100644 Binary files a/icons/skybox/lore_planets.dmi and b/icons/skybox/lore_planets.dmi differ diff --git a/icons/skybox/skybox.dmi b/icons/skybox/skybox.dmi index 7c3ce6f3bce..169d67f90f8 100644 Binary files a/icons/skybox/skybox.dmi and b/icons/skybox/skybox.dmi differ diff --git a/maps/away/away_site/abandoned_diner/abandoned_diner.dm b/maps/away/away_site/abandoned_diner/abandoned_diner.dm index db9e8a38a84..e45e2c8eb31 100644 --- a/maps/away/away_site/abandoned_diner/abandoned_diner.dm +++ b/maps/away/away_site/abandoned_diner/abandoned_diner.dm @@ -10,7 +10,7 @@ suffixes = list("abandoned_diner.dmm") sectors = list(ALL_CORPORATE_SECTORS) - sectors_blacklist = list(SECTOR_TAU_CETI, SECTOR_HANEUNIM) + sectors_blacklist = list(SECTOR_TAU_CETI, SECTOR_HANEUNIM, SECTOR_UUEOAESA) /singleton/submap_archetype/abandoned_diner//Arbitrary duplicates of the above name/desc map = "abandoned diner" diff --git a/maps/away/away_site/abandoned_mining/cursed.dm b/maps/away/away_site/abandoned_mining/cursed.dm index 21d4a56fe52..e56ca926d0f 100644 --- a/maps/away/away_site/abandoned_mining/cursed.dm +++ b/maps/away/away_site/abandoned_mining/cursed.dm @@ -6,7 +6,7 @@ suffixes = list("cursed.dmm") sectors = list(ALL_TAU_CETI_SECTORS, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) - sectors_blacklist = list(SECTOR_HANEUNIM, SECTOR_BURZSIA, SECTOR_TAU_CETI) //you're not gonna have a station left alone for 2 years in the middle of inhabited space + sectors_blacklist = list(SECTOR_HANEUNIM, SECTOR_BURZSIA, SECTOR_TAU_CETI, SECTOR_UUEOAESA) //you're not gonna have a station left alone for 2 years in the middle of inhabited space spawn_weight = 1 spawn_cost = 1 id = "cursed" diff --git a/maps/away/away_site/blueriver/blueriver.dm b/maps/away/away_site/blueriver/blueriver.dm index cccdeaa6df0..cd0e5076cc7 100644 --- a/maps/away/away_site/blueriver/blueriver.dm +++ b/maps/away/away_site/blueriver/blueriver.dm @@ -10,7 +10,7 @@ generate_mining_by_z = 2 sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, ALL_COALITION_SECTORS) - sectors_blacklist = list(SECTOR_BURZSIA, SECTOR_HANEUNIM, SECTOR_TAU_CETI, SECTOR_SRANDMARR) //it's a whole ass planet, shouldn't have it in predefined sectors + sectors_blacklist = list(ALL_SPECIFIC_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/crystal_planet_outpost/crystal_planet_outpost_.dm b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dm index 84b38fd61a9..23a5c6b4821 100644 --- a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dm +++ b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dm @@ -9,7 +9,7 @@ suffixes = list("crystal_planet_outpost.dmm") sectors = list(ALL_POSSIBLE_SECTORS) - sectors_blacklist = list(SECTOR_BURZSIA, SECTOR_HANEUNIM, SECTOR_SRANDMARR, SECTOR_TAU_CETI) //it's a whole planet, shouldn't have it in predefined sectors + sectors_blacklist = list(ALL_SPECIFIC_SECTORS) //it's a whole planet, shouldn't have it in predefined sectors unit_test_groups = list(1) /singleton/submap_archetype/crystal_planet_outpost diff --git a/maps/away/ships/freebooter/freebooter_ship.dm b/maps/away/ships/freebooter/freebooter_ship.dm index 16446ee8777..a941a32346d 100644 --- a/maps/away/ships/freebooter/freebooter_ship.dm +++ b/maps/away/ships/freebooter/freebooter_ship.dm @@ -5,7 +5,7 @@ prefix = "ships/freebooter/" suffixes = list("freebooter_ship.dmm") - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ, SECTOR_SRANDMARR, ALL_COALITION_SECTORS) + sectors = list(ALL_POSSIBLE_SECTORS) spawn_weight = 1 ship_cost = 1 id = "freebooter_ship" diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dm index 1755061cb0e..e9e237c88c6 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dm @@ -6,6 +6,7 @@ suffixes = list("hegemony_corvette.dmm") sectors = list(SECTOR_BADLANDS, SECTOR_UUEOAESA) + spawn_weight_sector_dependent = list(SECTOR_UUEOAESA = 1.5) spawn_weight = 1 ship_cost = 1 id = "hegemony_corvette" diff --git a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dm b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dm index e76734a884b..46c652c1922 100644 --- a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dm +++ b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dm @@ -8,6 +8,7 @@ spawn_weight = 1 ship_cost = 1 sectors = list(SECTOR_BADLANDS, SECTOR_UUEOAESA) + spawn_weight_sector_dependent = list(SECTOR_UUEOAESA = 1.5) id = "miners_guild_station" shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/miners_guild) diff --git a/maps/away/ships/iac/iac_rescue_ship.dm b/maps/away/ships/iac/iac_rescue_ship.dm index e67aafe8a51..93c939da193 100644 --- a/maps/away/ships/iac/iac_rescue_ship.dm +++ b/maps/away/ships/iac/iac_rescue_ship.dm @@ -5,7 +5,7 @@ prefix = "ships/iac/" suffixes = list("iac_rescue_ship.dmm") - sectors = list(SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, ALL_COALITION_SECTORS) + sectors = list(SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, ALL_COALITION_SECTORS, SECTOR_UUEOAESA) spawn_weight = 1 ship_cost = 1 id = "iac_rescue_ship" diff --git a/maps/away/ships/kataphracts/kataphract_ship.dm b/maps/away/ships/kataphracts/kataphract_ship.dm index e51533a080b..3bcf156cbbf 100644 --- a/maps/away/ships/kataphracts/kataphract_ship.dm +++ b/maps/away/ships/kataphracts/kataphract_ship.dm @@ -8,7 +8,7 @@ ship_cost = 1 spawn_weight = 1 - spawn_weight_sector_dependent = list(SECTOR_UUEOAESA=3) + spawn_weight_sector_dependent = list(SECTOR_UUEOAESA = 1.5) sectors = list(SECTOR_ROMANOVICH, SECTOR_TAU_CETI, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_UUEOAESA, SECTOR_WEEPING_STARS) shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/kataphract_transport) unit_test_groups = list(3) diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm index ce707ab5f85..138ac86d774 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm @@ -5,7 +5,7 @@ prefix = "ships/tajara/taj_smuggler/" suffixes = list("tajaran_smuggler.dmm") - sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_SRANDMARR, SECTOR_NRRAHRAHUL, SECTOR_GAKAL, SECTOR_WEEPING_STARS) + sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, ALL_BADLAND_SECTORS, SECTOR_WEEPING_STARS) spawn_weight = 1 ship_cost = 1 id = "tajaran_smuggler" diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dm b/maps/away/ships/tramp_freighter/tramp_freighter.dm index acfb2da4c15..1b30f82323f 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter.dm +++ b/maps/away/ships/tramp_freighter/tramp_freighter.dm @@ -5,7 +5,7 @@ prefix = "ships/tramp_freighter/" suffixes = list("tramp_freighter.dmm") - sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ, SECTOR_SRANDMARR, ALL_COALITION_SECTORS) + sectors = list(ALL_POSSIBLE_SECTORS) spawn_weight = 1 ship_cost = 1 id = "tramp_freighter" diff --git a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dm b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dm index 98055a0b4ce..f5e28a041c8 100644 --- a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dm +++ b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dm @@ -10,6 +10,7 @@ ship_cost = 1 shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/unathi_pirate_izharshan) sectors = list(SECTOR_NRRAHRAHUL, SECTOR_BADLANDS, SECTOR_GAKAL, SECTOR_UUEOAESA) + spawn_weight_sector_dependent = list(SECTOR_UUEOAESA = 0.5, SECTOR_NRRAHRAHUL = 0.5) //Rarer due to actual government/military presence unit_test_groups = list(1) template_flags = TEMPLATE_FLAG_SPAWN_GUARANTEED diff --git a/maps/random_ruins/exoplanets/uueoaesa/izweski_probe.dm b/maps/random_ruins/exoplanets/uueoaesa/izweski_probe.dm index d1c1278f880..23ec0a0da36 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/izweski_probe.dm +++ b/maps/random_ruins/exoplanets/uueoaesa/izweski_probe.dm @@ -11,10 +11,7 @@ name = "\improper Hegemony space probe" desc = "An unmanned probe, clearly a very old and unsophisticated design. The flag of the Izweski Hegemony is displayed on the side, and a fading screen displays a readout in Sinta'Unathi" desc_extended = "This model of survey probe seems to be very old. A plaque on the side bears some words in Sinta'Unathi beneath the seal of the Izweski Hegemony." - anchored = TRUE - density = TRUE - icon = 'icons/obj/xenoarchaeology.dmi' - icon_state = "surveying_probe_deployed" + start_deployed = TRUE /obj/structure/survey_probe/hegemony/old/examine(mob/user) . = ..() diff --git a/sound/AI/welcome_hegemony.ogg b/sound/AI/welcome_hegemony.ogg new file mode 100644 index 00000000000..2cb2faa83da Binary files /dev/null and b/sound/AI/welcome_hegemony.ogg differ