cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-20 19:43:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revisits Adhomai and other sector content (#18703)

Browse Source 
This pr fixes and updates some old space systems contents.

---------

Signed-off-by: Alberyk <Alberyk@users.noreply.github.com>
Co-authored-by: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
Alberyk
2024-04-02 01:46:14 +00:00
committed by GitHub
co-authored by Greenjoe12345 SleepyGemmy
parent 29b123000a
commit 9f458cd0bc
96 changed files with 4910 additions and 4394 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/background/space_sectors/badlands.dm
+27 -3
View File
@@ -5,7 +5,15 @@
but natives aren't known to treat settlements kindly."
skybox_icon = "badlands"
sector_welcome_message = 'sound/AI/welcome_badlands.ogg'
possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid, /obj/effect/overmap/visitable/sector/exoplanet/grass/grove, /obj/effect/overmap/visitable/sector/exoplanet/barren, /obj/effect/overmap/visitable/sector/exoplanet/lava, /obj/effect/overmap/visitable/sector/exoplanet/desert, /obj/effect/overmap/visitable/sector/exoplanet/snow)
possible_exoplanets = list(
/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid,
/obj/effect/overmap/visitable/sector/exoplanet/grass/grove,
/obj/effect/overmap/visitable/sector/exoplanet/barren,
/obj/effect/overmap/visitable/sector/exoplanet/lava,
/obj/effect/overmap/visitable/sector/exoplanet/desert,
/obj/effect/overmap/visitable/sector/exoplanet/snow,
/obj/effect/overmap/visitable/sector/exoplanet/crystal
)
starlight_color = "#b13636"
starlight_power = 2
starlight_range = 4
@@ -16,7 +24,15 @@
amount of old, dying stars and impassable nebulae. Due to close proximity to patrols on either end of this space, it isn't frequented much by criminal elements and is one of the \
safer parts of the known Frontier. After 2462, the Republic of Elyra has occupied the majority of Valley Hale, now bordering the Republic of Biesel."
skybox_icon = "valley_hale"
possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid, /obj/effect/overmap/visitable/sector/exoplanet/grass/grove, /obj/effect/overmap/visitable/sector/exoplanet/barren, /obj/effect/overmap/visitable/sector/exoplanet/lava, /obj/effect/overmap/visitable/sector/exoplanet/desert, /obj/effect/overmap/visitable/sector/exoplanet/snow)
possible_exoplanets = list(
/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid,
/obj/effect/overmap/visitable/sector/exoplanet/grass/grove,
/obj/effect/overmap/visitable/sector/exoplanet/barren,
/obj/effect/overmap/visitable/sector/exoplanet/lava,
/obj/effect/overmap/visitable/sector/exoplanet/desert,
/obj/effect/overmap/visitable/sector/exoplanet/snow,
/obj/effect/overmap/visitable/sector/exoplanet/crystal
)
starlight_color = "#e68831"
starlight_power = 2
starlight_range = 4
@@ -50,7 +66,15 @@
almost perpetual snowfall and extremely low temperatures. It is currently divided between three factions involved in a cold war: the People's Republic of Adhomai, the Democratic People's \
Republic of Adhomai, and the New Kingdom of Adhomai."
skybox_icon = "srandmarr"
possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/barren/aethemir, /obj/effect/overmap/visitable/sector/exoplanet/barren/raskara, /obj/effect/overmap/visitable/sector/exoplanet/barren/azmar, /obj/effect/overmap/visitable/sector/exoplanet/lava/sahul, /obj/effect/overmap/visitable/sector/exoplanet/adhomai)
possible_exoplanets = list(
/obj/effect/overmap/visitable/sector/exoplanet/barren/aethemir,
/obj/effect/overmap/visitable/sector/exoplanet/barren/raskara,
/obj/effect/overmap/visitable/sector/exoplanet/barren/azmar,
/obj/effect/overmap/visitable/sector/exoplanet/lava/sahul
)
guaranteed_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/adhomai)
scheduled_port_visits = list("Thursday", "Sunday")
ports_of_call = list("the city of Nal'tor", "the city of Kaltir", "the city of Crevus")
cargo_price_coef = list("nt" = 1.2, "hpi" = 1.2, "zhu" = 1.2, "een" = 1.2, "get" = 1.2, "arz" = 1.2, "blm" = 1.2, "iac" = 1.2, "zsc" = 0.5, "vfc" = 1.2, "bis" = 1.2, "xmg" = 1.2, "npi" = 1.2)
starlight_color = "#50b7bb"
starlight_power = 2
code/modules/maps/planet_types/lore/srandmarr.dm
+2 -2
View File
@@ -5,6 +5,7 @@
desc = "A planet comprised mainly of solid common minerals and silicate."
color = "#bf7c39"
icon_state = "globe1"
charted = "Tajaran core world, charted 2418CE, NanoTrasen Corporation"
rock_colors = list(COLOR_GRAY80)
features_budget = 1
surface_color = "#B1A69B"
@@ -37,7 +38,6 @@
charted = "Tajaran core world, charted 2418CE, NanoTrasen Corporation"
color = "#8f4754"
icon_state = "globe2"
rock_colors = null
plant_colors = null
rock_colors = list("#4a3f41")
features_budget = 1
@@ -135,7 +135,7 @@
geology = "Minimal tectonic heat, miniscule geothermal signature overall"
weather = "Global full-atmosphere hydrological weather system. Substantial meteorological activity, violent storms unpredictable"
surfacewater = "Majority frozen, 78% surface water. Significant tidal forces from natural satellite"
rock_colors = null
rock_colors = list("#6fb1b5")
plant_colors = null
flora_diversity = 0
has_trees = FALSE
code/modules/materials/materials.dm
+5 -5
View File
@@ -405,12 +405,12 @@
drop_sound = 'sound/items/drop/boots.ogg'
pickup_sound = 'sound/items/pickup/boots.ogg'
/material/stone/concrete
/material/concrete
name = MATERIAL_CONCRETE
icon_base = "concrete"
icon_colour = "#D2D1CD"
colour_blend = FALSE
wall_icon = 'icons/turf/smooth/concrete_wall.dmi'
icon_colour = COLOR_CONCRETE
wall_colour = COLOR_CONCRETE
wall_icon = 'icons/turf/smooth/composite_solid_color.dmi'
table_icon = 'icons/obj/structure/tables/steel_table.dmi'
stack_type = null
golem = null
code/modules/mining/mine_turfs.dm
+1 -6
View File
@@ -529,8 +529,7 @@ var/list/mineral_can_smooth_with = list(
mined_turf = /turf/simulated/floor/exoplanet/mineral
/turf/simulated/mineral/random/adhomai
icon = 'icons/turf/smooth/icy_wall.dmi'
actual_icon = 'icons/turf/smooth/icy_wall.dmi'
color = "#97A7AA"
mined_turf = /turf/simulated/floor/exoplanet/mineral/adhomai
/turf/simulated/mineral/random/high_chance
@@ -564,8 +563,6 @@ var/list/mineral_can_smooth_with = list(
mined_turf = /turf/simulated/floor/exoplanet/mineral
/turf/simulated/mineral/random/high_chance/adhomai
icon = 'icons/turf/smooth/icy_wall.dmi'
actual_icon = 'icons/turf/smooth/icy_wall.dmi'
mined_turf = /turf/simulated/floor/exoplanet/mineral/adhomai
/turf/simulated/mineral/random/higher_chance
@@ -617,8 +614,6 @@ var/list/mineral_can_smooth_with = list(
mined_turf = /turf/simulated/floor/exoplanet/mineral
/turf/simulated/mineral/adhomai
icon = 'icons/turf/smooth/icy_wall.dmi'
actual_icon = 'icons/turf/smooth/icy_wall.dmi'
mined_turf = /turf/simulated/floor/exoplanet/mineral/adhomai
/turf/simulated/mineral/crystal
code/modules/overmap/exoplanets/decor/_areas.dm
+2
View File
@@ -9,6 +9,7 @@
name = "Adhomian Wilderness"
ambience = list('sound/effects/wind/tundra0.ogg', 'sound/effects/wind/tundra1.ogg', 'sound/effects/wind/tundra2.ogg', 'sound/effects/wind/spooky0.ogg', 'sound/effects/wind/spooky1.ogg')
base_turf = /turf/simulated/floor/exoplanet/mineral/adhomai
area_blurb = "The freezing wind blows through the unforgiving Adhomian wilderness."
/area/exoplanet/barren
name = "\improper Planetary surface"
@@ -23,6 +24,7 @@
name = "Raskara Surface"
ambience = AMBIENCE_OTHERWORLDLY
base_turf = /turf/simulated/floor/exoplanet/barren/raskara
area_blurb = "The dark surface of the moon is quiet. The ambience is eerie."
/area/exoplanet/barren/burzsia
name = "Burzsia Surface"
code/modules/overmap/exoplanets/decor/turfs/ice.dm
+6
View File
@@ -7,5 +7,11 @@
/turf/simulated/floor/exoplanet/ice/update_icon()
return
/turf/simulated/floor/exoplanet/ice/cold //temperature is -5 celsius
temperature = 268.15
/turf/simulated/floor/exoplanet/ice/dark
icon_state = "icedark"
/turf/simulated/floor/exoplanet/ice/dark/cold //temperature is -5 celsius
temperature = 268.15
code/modules/overmap/exoplanets/decor/turfs/snow.dm
+6
View File
@@ -26,8 +26,14 @@
/turf/simulated/floor/exoplanet/snow/melt()
ChangeTurf(/turf/simulated/floor/exoplanet/permafrost)
/turf/simulated/floor/exoplanet/snow/cold //temperature is -5 celsius
temperature = 268.15
/turf/simulated/floor/exoplanet/permafrost
name = "permafrost"
icon = 'icons/turf/flooring/snow.dmi'
icon_state = "permafrost"
footstep_sound = /singleton/sound_category/asteroid_footstep
/turf/simulated/floor/exoplanet/permafrost/cold //temperature is -5 celsius
temperature = 268.15
code/modules/overmap/exoplanets/decor/turfs/wood.dm
+2 -1
View File
@@ -1,13 +1,14 @@
/turf/simulated/floor/exoplanet/wood
name = "wooden floor"
icon = 'icons/turf/flooring/tiles.dmi'
icon_state = "wood_preview"
icon_state = "wood"
initial_flooring = /singleton/flooring/wood
footstep_sound = /singleton/sound_category/wood_footstep
tile_outline = "wood"
tile_decal_state = "wood"
broken_overlay = "wood"
tile_outline_alpha = 75
color = WOOD_COLOR_GENERIC
/turf/simulated/floor/exoplanet/wood/bamboo
initial_flooring = /singleton/flooring/wood/bamboo