cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-21 04:48:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Massively upgrades sensor readout fluff (#16073)

Browse Source 
* jesus christ part 1

* i cant be cool

* unathi start

* finishing the fight

* lore requests

* fixes lore request
This commit is contained in:
kyres1
2023-04-03 05:47:28 -05:00
committed by GitHub
parent 5ff04b914e
commit 54a35e35cc
73 changed files with 335 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/asset_cache.dm
+34
View File
@@ -455,6 +455,40 @@ var/list/asset_datums = list()
"izweskiflag_small.png" = 'html/images/izweskiflag_small.png',
"goldenlogo.png" = 'html/images/factions/goldenlogo.png',
"goldenlogo_small.png" = 'html/images/factions/goldenlogo_small.png',
//scan images that appear on sensors
"no_data.png" = 'html/images/scans/no_data.png',
"horizon.png" = 'html/images/scans/horizon.png',
"intrepid.png" = 'html/images/scans/intrepid.png',
"spark.png" = 'html/images/scans/spark.png',
"corvette.png" = 'html/images/scans/corvette.png',
"elyran_corvette.png" = 'html/images/scans/elyran_corvette.png',
"dominian_corvette.png" = 'html/images/scans/dominian_corvette.png',
"tcfl_cetus.png" = 'html/images/scans/tcfl_cetus.png',
"unathi_corvette.png" = 'html/images/scans/unathi_corvette.png',
"ranger.png" = 'html/images/scans/ranger.png',
"oe_platform.png" = 'html/images/scans/oe_platform.png',
"hospital.png" = 'html/images/scans/hospital.png',
"skrell_freighter.png" = 'html/images/scans/skrell_freighter.png',
"diona.png" = 'html/images/scans/diona.png',
"hailstorm.png" = 'html/images/scans/hailstorm.png',
"headmaster.png" = 'html/images/scans/headmaster.png',
"pss.png" = 'html/images/scans/pss.png',
"nka_freighter.png" = 'html/images/scans/nka_freighter.png',
"pra_freighter.png" = 'html/images/scans/pra_freighter.png',
"tramp_freighter.png" = 'html/images/scans/tramp_freighter.png',
"line_cruiser.png" = 'html/images/scans/line_cruiser.png',
//planet scan images
"exoplanet_empty.png" = 'html/images/scans/exoplanets/exoplanet_empty.png',
"barren.png" = 'html/images/scans/exoplanets/barren.png',
"lava.png" = 'html/images/scans/exoplanets/lava.png',
"grove.png" = 'html/images/scans/exoplanets/grove.png',
"desert.png" = 'html/images/scans/exoplanets/desert.png',
"snow.png" = 'html/images/scans/exoplanets/snow.png',
"adhomai.png" = 'html/images/scans/exoplanets/adhomai.png',
"raskara.png" = 'html/images/scans/exoplanets/raskara.png',
"comet.png" = 'html/images/scans/exoplanets/comet.png',
"asteroid.png" = 'html/images/scans/exoplanets/asteroid.png',
//end scan images
"bluebird.woff" = 'html/fonts/OFL/Bluebird.woff',
"grandhotel.woff" = 'html/fonts/OFL/GrandHotel.woff',
"lashema.woff" = 'html/fonts/OFL/Lashema.woff',
code/modules/maps/planet_types/barren.dm
+4
View File
@@ -2,6 +2,7 @@
name = "barren exoplanet"
desc = "An exoplanet that couldn't hold its atmosphere."
color = "#ad9c9c"
scanimage = "barren.png"
planetary_area = /area/exoplanet/barren
rock_colors = list(COLOR_BEIGE, COLOR_GRAY80, COLOR_BROWN)
possible_themes = list(/datum/exoplanet_theme/mountains)
@@ -59,7 +60,10 @@
/obj/effect/overmap/visitable/sector/exoplanet/barren/asteroid
name = "mineral asteroid"
desc = "A large, resource rich asteroid."
massvolume = "Miniscule, not immediately apparent in mass"
surfacegravity = "Miniscule, non-obstructive gravity well"
surface_color = COLOR_GRAY
scanimage = "asteroid.png"
map_generators = list(/datum/random_map/noise/exoplanet/barren/asteroid, /datum/random_map/noise/ore/rich)
rock_colors = list(COLOR_ASTEROID_ROCK)
planetary_area = /area/exoplanet/barren/asteroid
code/modules/maps/planet_types/desert.dm
+3
View File
@@ -2,6 +2,9 @@
name = "desert exoplanet"
desc = "An arid exoplanet with sparse biological resources but rich mineral deposits underground."
color = "#a08444"
scanimage = "desert.png"
geology = "Non-existent tectonic activity, minimal geothermal signature"
weather = "Global full-atmosphere geothermal weather system. Barely-habitable ambient high temperatures. Slow-moving, stagnant meteorological activity prone to unpredictable upset in wind condition"
planetary_area = /area/exoplanet/desert
rock_colors = list(COLOR_BEIGE, COLOR_PALE_YELLOW, COLOR_GRAY80, COLOR_BROWN)
plant_colors = list("#efdd6f","#7b4a12","#e49135","#ba6222","#5c755e","#420d22")
code/modules/maps/planet_types/grass.dm
+5 -1
View File
@@ -1,7 +1,11 @@
/obj/effect/overmap/visitable/sector/exoplanet/grass
name = "lush exoplanet"
desc = "Planet with abundant flora and fauna."
desc = "An exoplanet with abundant flora and fauna."
color = "#407c40"
scanimage = "jungle.png"
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 = "63% surface water, majority readings not visibly potable. Expected mineral toxicity or salt presence in water bodies"
planetary_area = /area/exoplanet/grass
rock_colors = list(COLOR_ASTEROID_ROCK, COLOR_GRAY80, COLOR_BROWN)
plant_colors = list("#0e1e14","#1a3e38","#5a7467","#9eab88","#6e7248", "RANDOM")
code/modules/maps/planet_types/jungle.dm
+2 -1
View File
@@ -1,7 +1,8 @@
/obj/effect/overmap/visitable/sector/exoplanet/grass/grove
name = "grove exoplanet"
desc = "Planet with abundant, peaceful flora and fauna."
desc = "A temperate planet with abundant, peaceful flora and fauna."
color = "#346934"
scanimage = "grove.png"
planetary_area = /area/exoplanet/grass/grove
rock_colors = list(COLOR_BEIGE, COLOR_PALE_YELLOW, COLOR_GRAY80, COLOR_BROWN)
grass_color = null
code/modules/maps/planet_types/lava.dm
+5 -1
View File
@@ -1,7 +1,11 @@
/obj/effect/overmap/visitable/sector/exoplanet/lava
name = "lava exoplanet"
desc = "An exoplanet with a lot of volcanic activity."
desc = "An exoplanet with an excess of volcanic activity."
color = "#575d5e"
scanimage = "lava.png"
geology = "Extreme, surface-apparent tectonic activity. Unreadable high-energy geothermal readings. Surface traversal demands caution"
weather = "Global sub-atmospheric volcanic ambient weather system. Exercise extreme caution with unpredictable volcanic eruption"
surfacewater = "Majority superheated methane, silicon and metallic substances, 7% liquid surface area."
planetary_area = /area/exoplanet/barren
rock_colors = list(COLOR_DARK_GRAY)
possible_themes = list(/datum/exoplanet_theme/mountains)
code/modules/maps/planet_types/lore/srandmarr.dm
+14
View File
@@ -30,6 +30,7 @@
/obj/effect/overmap/visitable/sector/exoplanet/barren/azmar
name = "Az'Mar"
desc = "A small planet with a caustic shale crust. The surface is extremely hot and dense."
charted = "Tajaran core world, charted 2418CE, NanoTrasen Corporation"
color = "#8f4754"
icon_state = "globe2"
rock_colors = null
@@ -64,6 +65,7 @@
/obj/effect/overmap/visitable/sector/exoplanet/lava/sahul
name = "Sahul"
desc = "Az'mar's moon is a celestial body composed primarily of molten metals."
charted = "Natural satellite of Az'mar, Tajaran core world, charted 2418CE, NanoTrasen Corporation"
icon_state = "globe1"
color = "#cf1020"
generated_name = FALSE
@@ -81,6 +83,11 @@
color = "#ab46d4"
rock_colors = list("#373737")
planetary_area = /area/exoplanet/barren/raskara
scanimage = "raskara.png"
massvolume = "0.27/0.39"
surfacegravity = "0.25"
charted = "Natural satellite of Tajaran homeworld, charted 2418CE, NanoTrasen Corporation"
geology = "Zero tectonic heat, completely dormant geothermal signature. Presumed dead core"
possible_themes = list(/datum/exoplanet_theme/mountains)
map_generators = list(/datum/random_map/noise/exoplanet/barren/raskara, /datum/random_map/noise/ore)
features_budget = 1
@@ -126,6 +133,13 @@
icon_state = "globe2"
color = "#b5dfeb"
planetary_area = /area/exoplanet/adhomai
scanimage = "adhomai.png"
massvolume = "0.86/0.98"
surfacegravity = "0.80"
charted = "Tajaran homeworld, charted 2418CE, NanoTrasen Corporation"
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
plant_colors = null
possible_themes = list(/datum/exoplanet_theme/mountains/adhomai)
code/modules/maps/planet_types/snow.dm
+6 -2
View File
@@ -1,7 +1,11 @@
/obj/effect/overmap/visitable/sector/exoplanet/snow
name = "snow exoplanet"
desc = "Cold planet with limited plant life."
desc = "A frigid exoplanet with limited plant life."
color = "#dcdcdc"
scanimage = "snow.png"
geology = "Non-existent tectonic activity, minimal geothermal signature"
weather = "Global full-atmosphere hydrological weather system. Barely-habitable ambient low temperatures. Frequently dangerous, unpredictable meteorological upsets"
surfacewater = "Majority frozen, 70% surface water"
planetary_area = /area/exoplanet/snow
rock_colors = list(COLOR_DARK_BLUE_GRAY, COLOR_GUNMETAL, COLOR_GRAY80, COLOR_DARK_GRAY)
plant_colors = list("#d0fef5","#93e1d8","#93e1d8", "#b2abbf", "#3590f3", "#4b4e6d")
@@ -30,4 +34,4 @@
/area/exoplanet/snow
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/snow
base_turf = /turf/simulated/floor/exoplanet/snow
code/modules/overmap/exoplanets/exoplanet.dm
+33 -5
View File
@@ -1,5 +1,7 @@
/obj/effect/overmap/visitable/sector/exoplanet
name = "exoplanet"
scanimage = "exoplanet_empty.png" //Shouldn't be a scarcity of these, but this image would work if there's somehow nothing to give a new planet type
generic_object = FALSE
var/area/planetary_area
var/list/seeds = list()
var/list/animals = list()
@@ -14,6 +16,14 @@
var/daycolumn = 0 //Which column's light needs to be updated next?
var/daycycle_column_delay = 10 SECONDS
// Fluff, specifically for celestial objects.
var/massvolume = "0.95~/1.1" //Should use biesels as measurement as opposed to earths
var/surfacegravity = "0.99" //Should use Gs as measurement
var/charted = "No database entry- likely uncharted." //If it's on star charts or not, and who found it plus when
var/geology = "Dormant, unreadable tectonic activity" //Anything unique about tectonics and its core activity
var/weather = "No substantial meteorological readings" //Anything unique about terrestrial weather conditions
var/surfacewater = "NA/None Visible" //Water visible on the surface
var/maxx
var/maxy
var/landmark_type = /obj/effect/shuttle_landmark/automatic
@@ -412,22 +422,40 @@
/obj/effect/overmap/visitable/sector/exoplanet/get_scan_data(mob/user)
. = ..()
. += "<br><center><large><b>Scan Details</b></large>"
. += "<br><large><b>[name]</b></large></center>"
. += "<br><b>Estimated Mass and Volume: </b><small>[massvolume]BSS(Biesels)</small>"
. += "<br><b>Surface Gravity: </b><small>[surfacegravity]Gs</small>"
. += "<br><b>Charted: </b><small>[charted]</small>"
. += "<br><b>Geological Variables: </b><small>[geology]</small>"
. += "<br><b>Surface Water Coverage: </b><small>[surfacewater]</small>"
. += "<br><b>Apparent Weather Data: </b><small>[weather]</small>"
. += "<hr>"
. += "<br><center><b>Visible Light Viewport Magnified</b>"
. += "<br><img src = [scanimage]>"
. += "<br><small>High-Fidelity Image Capture of [name]</small>"
. += "<hr>"
. += "<br><b>Native Database Notes</b></center>"
. += "<br><small>[desc]</small>"
var/list/extra_data = list("<hr>")
if(atmosphere)
var/list/gases = list()
for(var/g in atmosphere.gas)
if(atmosphere.gas[g] > atmosphere.total_moles * 0.05)
gases += gas_data.name[g]
extra_data += "Atmosphere composition: [english_list(gases)]"
extra_data += "<b>Atmosphere composition:</b> [english_list(gases)]"
var/inaccuracy = rand(8,12)/10
extra_data += "Atmosphere pressure [atmosphere.return_pressure()*inaccuracy] kPa, temperature [atmosphere.temperature*inaccuracy] K"
extra_data += "<hr>"
extra_data += "<b>Atmosphere pressure:</b> [atmosphere.return_pressure()*inaccuracy] kPa, <b>temperature:</b> [atmosphere.temperature*inaccuracy] K"
if(seeds.len)
extra_data += "Xenoflora detected"
extra_data += "<br>Unrecognized xenoflora detected."
if(animals.len)
extra_data += "Life traces detected"
extra_data += "<br>Unrecognized xenofauna detected."
else
extra_data += "<br>No unrecognized biological signatures detected."
if(LAZYLEN(spawned_features))
var/ruin_num = 0
code/modules/overmap/overmap_object.dm
+28 -2
View File
@@ -4,6 +4,17 @@
icon_state = "object"
color = "#fffffe"
//RP fluff details to appear on scan readouts for any object we want to include these details with
var/scanimage = "no_data.png"
var/designer = "Unknown" //The shipyard or designer of the object if applicable
var/volume = "Unestimated" //Length height width of the object in tiles ingame
var/weapons = "Not apparent" //The expected armament or scale of armament that the design comes with if applicable. Can vary in visibility for obvious reasons
var/sizeclass = "Unknown" //The class of the design if applicable. Not a prefix. Should be things like battlestations or corvettes
var/shiptype = "Unknown" //The designated purpose of the design. Should briefly describe whether it's a combatant or study vessel for example
var/generic_object = TRUE //Used to give basic scan descriptions of every generic overmap object that excludes noteworthy locations, ships and exoplanets
var/static_vessel = FALSE //Used to expand scan details for visible space stations
var/list/map_z = list()
var/known = 0 //shows up on nav computers automatically
@@ -16,7 +27,6 @@
var/sensor_visibility = 10 //how likely it is to increase identification process each scan.
var/vessel_mass = 10000 // metric tonnes, very rough number, affects acceleration provided by engines
var/image/targeted_overlay
//Overlay of how this object should look on other skyboxes
@@ -24,7 +34,23 @@
return
/obj/effect/overmap/proc/get_scan_data(mob/user)
return desc
if(static_vessel == TRUE)
. += "<hr>"
. += "<br><center><large><b>Scan Details</b></large>"
. += "<br><large><b>[name]</b></large></center>"
. += "<br><small><b>Estimated Mass:</b> [vessel_mass]"
. += "<br><b>Projected Volume:</b> [volume]"
. += "<hr>"
. += "<br><center><b>Native Database Specifications</b>"
. += "<br><img src = [scanimage]></center>"
. += "<br><small><b>Manufacturer:</b> [designer]"
. += "<br><b>Class Designation:</b> [sizeclass]"
. += "<br><b>Weapons Estimation:</b> [weapons]</small>"
. += "<hr>"
. += "<br><center><b>Native Database Notes</b></center>"
. += "<br><small>[desc]</small>"
else if(generic_object == TRUE)
return desc
/obj/effect/overmap/proc/handle_wraparound()
var/nx = x
code/modules/overmap/ships/ship.dm
+22 -1
View File
@@ -19,8 +19,13 @@ var/const/OVERMAP_SPEED_CONSTANT = (1 SECOND)
obfuscated_name = "unidentified vessel"
sensor_range_override = FALSE
hide_from_reports = TRUE
generic_object = FALSE
var/moving_state = "ship_moving"
//RP fluff details to appear on scan readouts for mobile objects.
var/propulsion = "Chemical Composite Gas Thrust" //Slower than light propulsion method. No variation in this currently exists yet except the Horizon which heats its gas.
var/drive = "None equipped, FTL incapable" //Faster than light propulsion method, will usually be warp drives for third party ships and nothing for shuttles
var/list/known_ships = list() //List of ships known at roundstart - put types here.
var/base_sensor_visibility
@@ -79,11 +84,27 @@ var/const/OVERMAP_SPEED_CONSTANT = (1 SECOND)
/obj/effect/overmap/visitable/ship/get_scan_data(mob/user)
. = ..()
. += "<br>Mass: [vessel_mass] tons."
if(!is_still())
. += "<br>Heading: [dir2angle(get_heading())], speed [get_speed() * 1000]"
if(instant_contact)
. += "<br>It is broadcasting a distress signal."
. += "<hr>"
. += "<br><center><large><b>Scan Details</b></large>"
. += "<br><large><b>[name]</b></large></center>"
. += "<br><small><b>Estimated Mass:</b> [vessel_mass]"
. += "<br><b>Projected Volume:</b> [volume]"
. += "<br><b>STL Propulsion:</b> [propulsion]"
. += "<br><b>FTL Drive:</b> [drive]</small>"
. += "<hr>"
. += "<br><center><b>Native Database Specifications</b>"
. += "<br><img src = [scanimage]></center>"
. += "<br><small><b>Manufacturer:</b> [designer]"
. += "<br><b>Class Designation:</b> [sizeclass]"
. += "<br><b>Designated Purpose:</b> [shiptype]"
. += "<br><b>Weapons Estimation:</b> [weapons]</small>"
. += "<hr>"
. += "<br><center><b>Native Database Notes</b></center>"
. += "<br><small>[desc]</small>"
//Projected acceleration based on information from engines
/obj/effect/overmap/visitable/ship/proc/get_acceleration()