diff --git a/aurorastation.dme b/aurorastation.dme index c975178ce55..89eae6efde4 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -2502,6 +2502,7 @@ #include "code\modules\mapping\planet_types\lore\srandmarr.dm" #include "code\modules\mapping\planet_types\lore\tauceti.dm" #include "code\modules\mapping\planet_types\lore\uueoaesa.dm" +#include "code\modules\mapping\planet_types\lore\xanu.dm" #include "code\modules\mapping\space_management\space_level.dm" #include "code\modules\mapping\space_management\space_reservation.dm" #include "code\modules\mapping\space_management\space_transition.dm" diff --git a/code/__DEFINES/space_sectors.dm b/code/__DEFINES/space_sectors.dm index 729bc6baaca..260d6ac61c3 100644 --- a/code/__DEFINES/space_sectors.dm +++ b/code/__DEFINES/space_sectors.dm @@ -24,9 +24,10 @@ #define SECTOR_WEEPING_STARS "Weeping Stars" //Generic sector #define SECTOR_ARUSHA "Arusha" //Generic sector #define SECTOR_LIBERTYS_CRADLE "Liberty's Cradle" //Generic sector +#define SECTOR_XANU "Xanu" // Xanu Prime is here #define SECTOR_BURZSIA "Burzsia" //Burzsia I and II are here #define SECTOR_HANEUNIM "Haneunim" //Haneunim and its gravity well, Konyang is found here -#define ALL_COALITION_SECTORS list(SECTOR_COALITION, SECTOR_WEEPING_STARS, SECTOR_ARUSHA, SECTOR_LIBERTYS_CRADLE, SECTOR_BURZSIA, SECTOR_HANEUNIM) +#define ALL_COALITION_SECTORS list(SECTOR_COALITION, SECTOR_XANU, SECTOR_WEEPING_STARS, SECTOR_ARUSHA, SECTOR_LIBERTYS_CRADLE, SECTOR_BURZSIA, SECTOR_HANEUNIM) //Light's edge, which should have unique properties all around #define SECTOR_LIGHTS_EDGE "Light's Edge" //For the area of Light's Edge that is somewhat inhabited diff --git a/code/modules/background/space_sectors/coalition/coalition.dm b/code/modules/background/space_sectors/coalition/coalition.dm index 8fc526b0328..1bbb453b707 100644 --- a/code/modules/background/space_sectors/coalition/coalition.dm +++ b/code/modules/background/space_sectors/coalition/coalition.dm @@ -51,11 +51,9 @@ /datum/space_sector/libertys_cradle name = SECTOR_LIBERTYS_CRADLE description = "The beating heart of the modern Coalition of Colonies, Liberty’s Cradle is home to many of the Coalition’s most developed and influential worlds. In contrast to the Solarian stereotype of the frontier as a decivilized wasteland populated by roving bands of pirates and petty warlords, Liberty’s Cradle is a prosperous and safe region which has a higher standard of living than much of the former Middle and Outer Ring possessed prior to the Solarian Collapse of 2462. Post-Collapse the area has continued to prosper and, now that it dwells far behind the Coalition-controlled Weeping Stars, is more secure than it has ever been before." - skybox_icon = "the_clash"//placeholder + skybox_icon = "arusha"//placeholder // cargo_price_coef = TBD - starlight_color = "#962d96" - starlight_power = 2 - starlight_range = 4 + starlight_range = 2 /datum/space_sector/burzsia name = SECTOR_BURZSIA @@ -133,3 +131,19 @@ "77.7 SoulFM" = 'texts/lore_radio/konyang/77.7_SoulFM.txt', "78.1 RealFM" = 'texts/lore_radio/konyang/78.1_RealFM.txt' ) + +/datum/space_sector/xanu + name = SECTOR_XANU + description = "Located in the eastern Orion Spur. The Xanu system is home to the Xanu Prime, colonised in 2185, which has grown into the current capital of the Coalition of Colonies, a decentralised government that won its independence from the Solarian Alliance after the Interstellar War." + skybox_icon = "arusha" //placeholder + possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid, /obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid/ice) + guaranteed_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/xanu) + + ports_of_call = list("Pataliputra") + scheduled_port_visits = list("Saturday", "Sunday") + starlight_range = 2 + + lobby_tracks = list( + 'sound/music/regional/xanu/xanu_rock_1.ogg', + 'sound/music/regional/xanu/xanu_rock_2.ogg' + ) diff --git a/code/modules/mapping/planet_types/lore/xanu.dm b/code/modules/mapping/planet_types/lore/xanu.dm new file mode 100644 index 00000000000..29b7f9267ca --- /dev/null +++ b/code/modules/mapping/planet_types/lore/xanu.dm @@ -0,0 +1,109 @@ + +// Xanu Prime + +/obj/effect/overmap/visitable/sector/exoplanet/xanu + name = "Xanu Prime" + desc = "The capital of the Coalition of Colonies. Xanu Prime is a geographically diverse, Earth-like world with varied biomes, ranging from equatorial rainforests and tropical deserts to boreal forests and polar continents. Sieged during the Interstellar War, the planet is scarred by battles and orbital bombardments of the past." + icon_state = "globe2" + scanimage = "xanu_prime.png" + color = "#7c945c" + planetary_area = /area/exoplanet/grass/xanu + initial_weather_state = /singleton/state/weather/calm + has_water_weather = TRUE + massvolume = "~1.05" + surfacegravity = "1.07" + charted = "Charted 2156, Sol Alliance Department of Colonization." + alignment = "Coalition of Colonies" + geology = "4 major continents exhibiting typical seismic activty. Abundance of cratering detected on surface; flooded to form lakes." + weather = "Global full-atmosphere hydrological weather system." + surfacewater = "67% surface salt water" + surface_color = null//pre colored + water_color = null//pre colored + rock_colors = null//pre colored + plant_colors = null//pre colored + generated_name = FALSE + flora_diversity = 0 + has_trees = FALSE + ruin_planet_type = PLANET_LORE + place_near_main = list(1,0) + + // Defaults, later set under pre_ruin_preparation + ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/delivery_site, /datum/map_template/ruin/exoplanet/crashed_coc_skipjack) + possible_themes = list(/datum/exoplanet_theme/grass/xanu_nayakhyber) + surface_color = "#7c945c" + var/landing_region = "grasslands and mountains of Naya Khyber" + +/obj/effect/overmap/visitable/sector/exoplanet/xanu/generate_habitability() + return HABITABILITY_IDEAL + +/obj/effect/overmap/visitable/sector/exoplanet/xanu/generate_map() + lightlevel = rand(1,10) + ..() + +/obj/effect/overmap/visitable/sector/exoplanet/xanu/update_icon() + return + +/obj/effect/overmap/visitable/sector/exoplanet/xanu/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) + switch(landing_region) + if("grasslands and mountains of Naya Khyber") + atmosphere.temperature = T0C + rand(25,30) + if("valleys and cliffs of Himavatia") + atmosphere.temperature = T0C - rand(1,5) + + atmosphere.update_values() + +/obj/effect/overmap/visitable/sector/exoplanet/xanu/generate_ground_survey_result() + ground_survey_result = "
Notable Features:" + + switch(landing_region) + if("grasslands and mountains of Naya Khyber") + ground_survey_result += "
Clay-loam soil with a dense, sticky texture; excellent retention of nutrients and water for agricultural purposes." + ground_survey_result += "
Trace materials and signatures consistent with historical orbital bombardment: lead, uranium. Carbon-dated: ~220 years old." + switch(rand(1,3)) + if(1) + ground_survey_result += "
(!) Large mineral deposit of lithium in the form of spodumene. Inform local authority for reward." + if(2) + ground_survey_result += "
(!) Region displays above average retention of nutrients and water for agricultural purposes. Inform local authority for reward." + if(3) + ground_survey_result += "
(!) Region otherwise typical of Naya Khyber." + if("valleys and cliffs of Himavatia") + ground_survey_result += "
Permafrost with massive ice layer. Unable to sustain deep-rooted flora." + ground_survey_result += "
Ground form consistent with high, historical glacial activity." + switch(rand(1,2)) + if(1) + ground_survey_result += "
(!) Large oil trap detected, containing significant crude oil deposit. Inform local authority for reward." + if(2) + ground_survey_result += "
(!) Region otherwise typical of Himavatia." + +/obj/effect/overmap/visitable/sector/exoplanet/xanu/pre_ruin_preparation() + if(prob(66)) + landing_region = "grasslands and mountains of Naya Khyber" + else + landing_region = "valleys and cliffs of Himavatia" + + desc += " The landing sites are located in the [landing_region]." + + switch(landing_region) + if("grasslands and mountains of Naya Khyber") + possible_themes = list(/datum/exoplanet_theme/grass/xanu_nayakhyber) + surface_color = "#7c945c" + + ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/delivery_site, /datum/map_template/ruin/exoplanet/crashed_coc_skipjack) + + desc += " The local government only permits Scientific Sampling operations in this area; other operations are not permitted." + + if("valleys and cliffs of Himavatia") + possible_themes = list(/datum/exoplanet_theme/snow/tundra/xanu_himavatia) + surface_color = "#d0fac5" + initial_weather_state = /singleton/state/weather/calm/arctic_planet + + ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/delivery_site, /datum/map_template/ruin/exoplanet/crashed_coc_skipjack) + + desc += " The local government only permits Scientific Sampling operations in this area; other operations are not permitted." diff --git a/code/modules/overmap/exoplanets/biomes/grass.dm b/code/modules/overmap/exoplanets/biomes/grass.dm index 704569b3a72..ac9c8e11cac 100644 --- a/code/modules/overmap/exoplanets/biomes/grass.dm +++ b/code/modules/overmap/exoplanets/biomes/grass.dm @@ -455,3 +455,91 @@ /mob/living/simple_animal/miervesh = 1 ) ) + +//Xanu Biomes +//TODO: Xanu flora and fauna +/singleton/biome/grass/xanu + turf_type = /turf/simulated/floor/exoplanet/grass/stalk + 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() // No wildlife assets for xanu + ) + +/singleton/biome/grass/forest/xanu + turf_type = /turf/simulated/floor/exoplanet/grass/stalk + + 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() + ) + +/singleton/biome/grass/riverside/xanu + turf_type = /turf/simulated/floor/exoplanet/grass/stalk + + 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/aquatic/fish/cod = 1, + /mob/living/simple_animal/aquatic/fish/gupper = 1 + ) + ) + +/singleton/biome/grass/chaparral/xanu + turf_type = /turf/simulated/floor/exoplanet/dirt_konyang + + 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() + ) diff --git a/code/modules/overmap/exoplanets/biomes/snow.dm b/code/modules/overmap/exoplanets/biomes/snow.dm index e5adc6aa0a7..31bb0d6de03 100644 --- a/code/modules/overmap/exoplanets/biomes/snow.dm +++ b/code/modules/overmap/exoplanets/biomes/snow.dm @@ -254,3 +254,51 @@ /singleton/biome/water/ice/polar turf_type = /turf/simulated/floor/exoplanet/ice/dark + +// Xanu Biomes +// TODO: Xanan wildlife +/singleton/biome/snow/xanu + spawn_types = list( + PLANET_TURF = list(/turf/simulated/floor/exoplanet/permafrost = 1), + GRASSES = list( + /obj/structure/flora/grass/both = 2, + /obj/structure/flora/grass/green = 1, + /obj/structure/flora/grass/brown = 1 + ), + LARGE_FLORA = list( + /obj/effect/floor_decal/snowdrift/large/random = 4, + /obj/structure/flora/rock/snow = 4, + /obj/structure/flora/tree/dead = 2, + /obj/structure/flora/tree/pine = 1, + /obj/effect/landmark/exoplanet_spawn/large_plant = 1 + ), + SMALL_FLORA = list( + /obj/structure/flora/bush = 2, + /obj/effect/floor_decal/snowrocks = 1, + /obj/effect/floor_decal/snowdrift/random = 1, + /obj/effect/landmark/exoplanet_spawn/plant = 2 + ), + WILDLIFE = list() //No Xanu wildlife assets yet + ) + +/singleton/biome/snow/forest/xanu + spawn_types = list( + GRASSES = list( + /obj/structure/flora/grass/both = 1, + /obj/structure/flora/grass/green = 2, + /obj/structure/flora/grass/brown = 1 + ), + LARGE_FLORA = list( + /obj/structure/flora/rock/snow = 1, + /obj/structure/flora/tree/dead = 2, + /obj/structure/flora/tree/pine = 4, + /obj/effect/landmark/exoplanet_spawn/large_plant = 3 + ), + SMALL_FLORA = list( + /obj/structure/flora/bush = 3, + /obj/effect/floor_decal/snowrocks = 1, + /obj/effect/floor_decal/snowdrift/random = 1, + /obj/effect/landmark/exoplanet_spawn/plant = 3 + ), + WILDLIFE = list() //no xanu wildlife assets yet + ) diff --git a/code/modules/overmap/exoplanets/decor/_areas.dm b/code/modules/overmap/exoplanets/decor/_areas.dm index 98750c3ae99..29cb4f27bac 100644 --- a/code/modules/overmap/exoplanets/decor/_areas.dm +++ b/code/modules/overmap/exoplanets/decor/_areas.dm @@ -68,6 +68,10 @@ name = "Konyang Wilderness" base_turf = /turf/simulated/floor/exoplanet/konyang +/area/exoplanet/grass/xanu + name = "Xanu Prime Wilderness" + base_turf = /turf/simulated/floor/exoplanet/grass/stalk + /area/exoplanet/lava name = "\improper Planetary surface" ambience = AMBIENCE_LAVA diff --git a/code/modules/overmap/exoplanets/themes/grass.dm b/code/modules/overmap/exoplanets/themes/grass.dm index 5cac895fd02..379172a7bbd 100644 --- a/code/modules/overmap/exoplanets/themes/grass.dm +++ b/code/modules/overmap/exoplanets/themes/grass.dm @@ -158,3 +158,28 @@ BIOME_SEMIARID = 0.5, BIOME_SUBHUMID = 1.0 ) + +/datum/exoplanet_theme/grass/xanu_nayakhyber + name = "Naya Khyber" + surface_turfs = list( + /turf/simulated/floor/exoplanet/grass/stalk, + /turf/simulated/mineral/planet + ) + + possible_biomes = list( + BIOME_COOL = list( + BIOME_ARID = /singleton/biome/grass/xanu, + BIOME_SEMIARID = /singleton/biome/grass/chaparral/xanu, + BIOME_SUBHUMID = /singleton/biome/grass/forest/xanu + ), + BIOME_WARM = list( + BIOME_ARID = /singleton/biome/grass/chaparral/xanu, + BIOME_SEMIARID = /singleton/biome/grass/chaparral/xanu, + BIOME_SUBHUMID = /singleton/biome/grass/riverside/xanu + ), + BIOME_EQUATOR = list( + BIOME_ARID = /singleton/biome/grass/forest/xanu, + BIOME_SEMIARID = /singleton/biome/grass/forest/xanu, + BIOME_SUBHUMID = /singleton/biome/grass/chaparral/xanu + ) + ) diff --git a/code/modules/overmap/exoplanets/themes/snow.dm b/code/modules/overmap/exoplanets/themes/snow.dm index dd2e21d10fe..fa3d9fa4b74 100644 --- a/code/modules/overmap/exoplanets/themes/snow.dm +++ b/code/modules/overmap/exoplanets/themes/snow.dm @@ -89,3 +89,17 @@ BIOME_SEMIARID = /singleton/biome/snow/adhomai/polar/eclipse ) ) + +/datum/exoplanet_theme/snow/tundra/xanu_himavatia + name = "Himavatian Tundra" + + possible_biomes = list( + BIOME_POLAR = list( + BIOME_ARID = /singleton/biome/water/ice, + BIOME_SEMIARID = /singleton/biome/snow/xanu + ), + BIOME_COOL = list( + BIOME_ARID = /singleton/biome/snow/xanu, + BIOME_SEMIARID = /singleton/biome/snow/forest/xanu + ) + ) diff --git a/html/changelogs/kermit-xanu-system.yml b/html/changelogs/kermit-xanu-system.yml new file mode 100644 index 00000000000..023265f709c --- /dev/null +++ b/html/changelogs/kermit-xanu-system.yml @@ -0,0 +1,7 @@ +author: kermit + +delete-after: True + +changes: + - rscadd: "Implements the bare essentials of the Xanu system and the planet of Xanu Prime." + - soundadd: "Xanu lobby music from 'Indulgence' album by Swara Sutra @ Bandcamp." diff --git a/html/images/scans/exoplanets/xanu_prime.png b/html/images/scans/exoplanets/xanu_prime.png new file mode 100644 index 00000000000..be0024f59de Binary files /dev/null and b/html/images/scans/exoplanets/xanu_prime.png differ diff --git a/maps/away/away_site/abandoned_diner/abandoned_diner.dm b/maps/away/away_site/abandoned_diner/abandoned_diner.dm index 3f474783392..ef2f0cfc2b9 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 @@ suffix = "abandoned_diner.dmm" sectors = list(ALL_CORPORATE_SECTORS) - sectors_blacklist = list(SECTOR_TAU_CETI, SECTOR_HANEUNIM, SECTOR_UUEOAESA) + sectors_blacklist = list(SECTOR_TAU_CETI, SECTOR_HANEUNIM, SECTOR_UUEOAESA, SECTOR_XANU) /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 43e1c27c8ba..7c740628a63 100644 --- a/maps/away/away_site/abandoned_mining/cursed.dm +++ b/maps/away/away_site/abandoned_mining/cursed.dm @@ -6,7 +6,7 @@ suffix = "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, SECTOR_UUEOAESA) //you're not gonna have a station left alone for 2 years in the middle of inhabited space + sectors_blacklist = list(ALL_SPECIFIC_SECTORS) //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/big_derelict/bigderelict.dm b/maps/away/away_site/big_derelict/bigderelict.dm index 5298bac792b..654dc6ed0e2 100644 --- a/maps/away/away_site/big_derelict/bigderelict.dm +++ b/maps/away/away_site/big_derelict/bigderelict.dm @@ -6,7 +6,7 @@ suffix = "bigderelict.dmm" sectors = list(SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_TABITI, SECTOR_BADLANDS, SECTOR_AEMAQ, ALL_COALITION_SECTORS) - sectors_blacklist = list(SECTOR_HANEUNIM) + sectors_blacklist = list(ALL_SPECIFIC_SECTORS) spawn_weight = 1 spawn_cost = 2 id = "big_derelict" diff --git a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dm b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dm index 89cb2b2f21a..9b9807f6269 100644 --- a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dm +++ b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dm @@ -7,7 +7,7 @@ sectors = list(SECTOR_BADLANDS, ALL_COALITION_SECTORS, ALL_VOID_SECTORS) spawn_weight_sector_dependent = list(ALL_BADLAND_SECTORS = 0.3) - sectors_blacklist = list(SECTOR_HANEUNIM, SECTOR_BURZSIA) + sectors_blacklist = list(SECTOR_HANEUNIM, SECTOR_BURZSIA, SECTOR_XANU) spawn_weight = 1 ship_cost = 1 id = "coc_surveyor" diff --git a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dm b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dm index 1a5f25c9b48..53e9b8abdfb 100644 --- a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dm +++ b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dm @@ -5,7 +5,7 @@ prefix = "ships/konyang/ipc_refugee/" suffix = "ipc_refugee_ship.dmm" - sectors = list(SECTOR_HANEUNIM, SECTOR_LIBERTYS_CRADLE) + sectors = list(SECTOR_HANEUNIM, SECTOR_LIBERTYS_CRADLE, SECTOR_XANU) spawn_weight = 1 ship_cost = 1 id = "ipc_refugee_ship" diff --git a/maps/away/ships/sadar_scout/sadar_scout.dm b/maps/away/ships/sadar_scout/sadar_scout.dm index 339665d6d6a..aa0efb41d6a 100644 --- a/maps/away/ships/sadar_scout/sadar_scout.dm +++ b/maps/away/ships/sadar_scout/sadar_scout.dm @@ -6,7 +6,7 @@ suffix = "sadar_scout.dmm" sectors = list(ALL_COALITION_SECTORS) - sectors_blacklist = list(SECTOR_HANEUNIM, SECTOR_BURZSIA) + sectors_blacklist = list(SECTOR_HANEUNIM, SECTOR_BURZSIA, SECTOR_XANU) spawn_weight = 1 ship_cost = 1 id = "sadar_scout" diff --git a/maps/away/ships/xanu/xanu_frigate.dm b/maps/away/ships/xanu/xanu_frigate.dm index 7a658d09b7d..8d1bddb9937 100644 --- a/maps/away/ships/xanu/xanu_frigate.dm +++ b/maps/away/ships/xanu/xanu_frigate.dm @@ -8,7 +8,7 @@ suffix = "xanu_frigate.dmm" sectors = list(ALL_COALITION_SECTORS) - spawn_weight_sector_dependent = list(SECTOR_LIBERTYS_CRADLE = 3, SECTOR_BURZSIA = 0.5) + spawn_weight_sector_dependent = list(SECTOR_LIBERTYS_CRADLE = 3, SECTOR_XANU = 3, SECTOR_BURZSIA = 0.5) spawn_weight = 1 ship_cost = 1 id = "xanu_frigate" diff --git a/sound/attributions.txt b/sound/attributions.txt index c1cbf0759ad..f3c35070e07 100644 --- a/sound/attributions.txt +++ b/sound/attributions.txt @@ -137,3 +137,8 @@ sound/machines/steam_pipe2.ogg - "Steam Leaking" by PatrickLieberkind. Licensed sound/machines/steam_pipe3.ogg - "file0571_air_hiss_weak.wav" by beerbelly38. Licensed under CC-BY NC 4.0. Obtained from https://freesound.org/people/beerbelly38/sounds/277360/ sound/machines/steam_pipe4.ogg - "Steam Sewer Ambient" by Geoff-Bremner-Audio. Licensed under CC0. Obtained from https://freesound.org/people/Geoff-Bremner-Audio/sounds/724892/ ATTRIBUTIONS SECTION END + +ATTRIBUTIONS SECTOR START +sound/music/lobby/xanu/xanu_rock_1.ogg - "Rise" by Swara Sutra, licensed under CC BY-NC-SA 3.0. Obtained from https://swarasutra.bandcamp.com/track/rise +sound/music/lobby/xanu/xanu_rock_2.ogg - "Induldge" by Swara Sutra, licensed under CC BY-NC-SA 3.0. Obtained from https://swarasutra.bandcamp.com/track/indulgence +ATTRIBUTIONS SECTION END \ No newline at end of file diff --git a/sound/music/regional/xanu/xanu_rock_1.ogg b/sound/music/regional/xanu/xanu_rock_1.ogg new file mode 100644 index 00000000000..ae29bb8ea1d Binary files /dev/null and b/sound/music/regional/xanu/xanu_rock_1.ogg differ diff --git a/sound/music/regional/xanu/xanu_rock_2.ogg b/sound/music/regional/xanu/xanu_rock_2.ogg new file mode 100644 index 00000000000..a2286668eed Binary files /dev/null and b/sound/music/regional/xanu/xanu_rock_2.ogg differ