From 3c433fae00d60f9b36bc181067c8e5ab3859cf14 Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Tue, 20 Aug 2024 10:02:12 -0400 Subject: [PATCH] Updates Alignment for Lore Planets + Adds Alignment to Scan Report for Exoplanets (#19783) Updates alignment variable for colonized lore planets such as Moghes and Biesel Alignment now shows for exoplanets --------- Co-authored-by: Ben10083 --- .../mapping/planet_types/lore/konyang.dm | 1 + .../mapping/planet_types/lore/srandmarr.dm | 1 + .../mapping/planet_types/lore/tauceti.dm | 4 ++ .../mapping/planet_types/lore/uueoaesa.dm | 3 + code/modules/overmap/exoplanets/exoplanet.dm | 1 + code/modules/overmap/overmap_object.dm | 2 +- html/changelogs/Ben10083 - Alignment.yml | 58 +++++++++++++++++++ .../uueoaesa/tret/tret_industrial_complex_.dm | 1 + 8 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Ben10083 - Alignment.yml diff --git a/code/modules/mapping/planet_types/lore/konyang.dm b/code/modules/mapping/planet_types/lore/konyang.dm index ec90f9b2831..439f88b1df6 100644 --- a/code/modules/mapping/planet_types/lore/konyang.dm +++ b/code/modules/mapping/planet_types/lore/konyang.dm @@ -12,6 +12,7 @@ massvolume = "0.89/0.99" surfacegravity = "0.93" charted = "Charted 2305, Sol Alliance Department of Colonization." + alignment = "Coalition of Colonies" geology = "Low-energy tectonic heat signature, minimal surface disruption" weather = "Global full-atmosphere hydrological weather system. Substantial meteorological activity, violent storms unpredictable" surfacewater = "Majority potable, 88% surface water. Significant tidal forces from natural satellite" diff --git a/code/modules/mapping/planet_types/lore/srandmarr.dm b/code/modules/mapping/planet_types/lore/srandmarr.dm index 61737dc7b5c..9aa37ca1683 100644 --- a/code/modules/mapping/planet_types/lore/srandmarr.dm +++ b/code/modules/mapping/planet_types/lore/srandmarr.dm @@ -139,6 +139,7 @@ massvolume = "0.86/0.98" surfacegravity = "0.80" charted = "Tajaran homeworld, charted 2418CE, NanoTrasen Corporation" + alignment = "Contested" 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" diff --git a/code/modules/mapping/planet_types/lore/tauceti.dm b/code/modules/mapping/planet_types/lore/tauceti.dm index 90d58aecc65..8618ca4de9e 100644 --- a/code/modules/mapping/planet_types/lore/tauceti.dm +++ b/code/modules/mapping/planet_types/lore/tauceti.dm @@ -4,6 +4,7 @@ name = "Caprice" desc = "A scorching-hot volcanic planet close to Tau Ceti." charted = "Charted 2147CE, Sol Alliance Department of Colonization." + alignment = "Federal Republic of Biesel" icon_state = "globe1" color = "#cf1020" generated_name = FALSE @@ -57,6 +58,7 @@ name = "Valkyrie" desc = "The moon of Tau Ceti, the third planet to be settled in the system." charted = "Natural satellite of Tau Ceti, charted 2147CE, Sol Alliance Department of Colonization." + alignment = "Federal Republic of Biesel" icon_state = "globe1" rock_colors = list("#4a3f41") color = "#4a3f41" @@ -75,6 +77,7 @@ name = "New Gibson" desc = "An ice world just outside the outer edge of the habitable zone." charted = "Charted 2147CE, Sol Alliance Department of Colonization." + alignment = "Federal Republic of Biesel" icon_state = "globe1" features_budget = 1 possible_themes = list(/datum/exoplanet_theme/snow/tundra) @@ -143,6 +146,7 @@ /obj/effect/overmap/visitable/sector/exoplanet/biesel name = "Biesel" desc = "The third closest planet to Tau Ceti's star, Biesel is an Earth-like planet that benefits from a temperate climate and breathable atmosphere. It is the capital planet of the Republic of Biesel." + alignment = "Federal Republic of Biesel" icon_state = "globe2" color = "#5B8958" planetary_area = /area/exoplanet/grass diff --git a/code/modules/mapping/planet_types/lore/uueoaesa.dm b/code/modules/mapping/planet_types/lore/uueoaesa.dm index e80d927af44..e8b0a7b1317 100644 --- a/code/modules/mapping/planet_types/lore/uueoaesa.dm +++ b/code/modules/mapping/planet_types/lore/uueoaesa.dm @@ -39,6 +39,7 @@ features_budget = 1 surface_color = "#83857f" charted = "Natural satellite of Tret, Unathi core world. Charted 2403CE, Sol Alliance Department of Colonization" + alignment = "Izweski Hegemony" generated_name = FALSE small_flora_types = list(/datum/seed/koisspore) possible_themes = list(/datum/exoplanet_theme/barren/pid) @@ -122,6 +123,7 @@ massvolume = "0.97/1.03" surfacegravity = "0.93" charted = "Unathi homeworld. Charted 2403CE, Sol Alliance Department of Colonization" + alignment = "Izweski Hegemony" 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." @@ -263,6 +265,7 @@ massvolume = "0.94/1.0" surfacegravity = "0.98" charted = "Unathi core world. Charted 2403CE, Sol Alliance Department of Colonization" + alignment = "Izweski Hegemony" 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." diff --git a/code/modules/overmap/exoplanets/exoplanet.dm b/code/modules/overmap/exoplanets/exoplanet.dm index 460c0d2dc6f..9cb1eb76d9e 100644 --- a/code/modules/overmap/exoplanets/exoplanet.dm +++ b/code/modules/overmap/exoplanets/exoplanet.dm @@ -484,6 +484,7 @@ . += "
[name]" . += "
Estimated Mass and Volume: [massvolume]BSS(Biesels)" . += "
Surface Gravity: [surfacegravity]Gs" + . += "
Governing Body: [alignment]" . += "
Charted: [charted]" . += "
Geological Variables: [geology]" . += "
Surface Water Coverage: [surfacewater]" diff --git a/code/modules/overmap/overmap_object.dm b/code/modules/overmap/overmap_object.dm index f54695b8124..71be6fe4cee 100644 --- a/code/modules/overmap/overmap_object.dm +++ b/code/modules/overmap/overmap_object.dm @@ -62,7 +62,7 @@ . += "
" . += "
Native Database Specifications" . += "
" - . += "
Governing Body: [alignment]" + . += "
Governing Body: [alignment]" . += "
" . += "
Native Database Notes
" . += "
[desc]" diff --git a/html/changelogs/Ben10083 - Alignment.yml b/html/changelogs/Ben10083 - Alignment.yml new file mode 100644 index 00000000000..3e7d5f40a9d --- /dev/null +++ b/html/changelogs/Ben10083 - Alignment.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: Ben10083 + +# 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: "Updated Alignment information for lore planets such as Moghes and Biesel. Exoplanets now show governing body of planet (shown for lore planets that are colonized)." diff --git a/maps/away/away_site/uueoaesa/tret/tret_industrial_complex_.dm b/maps/away/away_site/uueoaesa/tret/tret_industrial_complex_.dm index c5f4b26acb3..1142d5de5ad 100644 --- a/maps/away/away_site/uueoaesa/tret/tret_industrial_complex_.dm +++ b/maps/away/away_site/uueoaesa/tret/tret_industrial_complex_.dm @@ -29,6 +29,7 @@ /obj/effect/overmap/visitable/sector/tret_industrial_complex name = "Tret" desc = "A large and inhospitable planet, now covered in mines, forges and factories - the new homeworld of the K'lax Hive." + alignment = "Izweski Hegemony" icon_state = "globe3" color = "#d69200" initial_generic_waypoints = list(