Massively upgrades sensor readout fluff (#16073)

* jesus christ part 1

* i cant be cool

* unathi start

* finishing the fight

* lore requests

* fixes lore request

code/modules/client/asset_cache.dm

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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")

code/modules/overmap/exoplanets/exoplanet.dm

@@ -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

@@ -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,6 +34,22 @@
 	return
 
 /obj/effect/overmap/proc/get_scan_data(mob/user)
+	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()

code/modules/overmap/ships/ship.dm

@@ -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()

html/changelogs/kyres1-scan_readouts.yml

@@ -0,0 +1,8 @@
+author: kyres1
+
+delete-after: True
+
+changes:
+  - rscadd: "Adds a more complete readout of information to scan results. These readouts include non-mechanical statistics for the scanned objects, like its length, or an exoplanet's geology."
+  - rscadd: "Added visible scan images for all exoplanets and third-party ships seen ingame, with exception to most shuttles. These show up on printed papers, too!"
+  - bugfix: "Fixed the skybox sprites of the TCFL corvette and the tramp freighter being swapped."

maps/away/away_site/tajara/mining_jack/mining_jack.dm

@@ -57,6 +57,10 @@
 	icon_state = "shuttle"
 	moving_state = "shuttle_moving"
 	colors = list("#DAA06D")
+	designer = "Independent/no designation"
+	volume = "18 meters length, 15 meters beam/width, 7 meters vertical height"
+	sizeclass = "Multi-purpose Civilian Skipjack"
+	shiptype = "Short-term industrial prospecting, raw goods transport"
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod

maps/away/away_site/tajara/peoples_station/peoples_station.dm

@@ -19,6 +19,13 @@
 	icon = 'icons/obj/overmap/overmap_stationary.dmi'
 	icon_state = "battlestation"
 	color = "#8C8A81"
+	static_vessel = TRUE
+	generic_object = FALSE
+	scanimage = "pss.png"
+	designer = "People's Republic of Adhomai"
+	volume = "101 meters length, 115 meters beam/width, 32 meters vertical height"
+	weapons = "Dual extruding starboard-mounted medium and small caliber ballistic armament, two port obscured flight craft bays"
+	sizeclass = "Armed military surveillance and waypoint station"
 
 	initial_generic_waypoints = list(
 		"nav_peoples_station_ship_1",

maps/away/away_site/tajara/pra_satellite/pra_satellite.dm

@@ -14,6 +14,12 @@
 /obj/effect/overmap/visitable/sector/pra_satellite
 	name = "hadiist satellite"
 	desc = "A People's Republic of Adhomai satellite used to survey the system."
+	static_vessel = TRUE
+	generic_object = FALSE
+	designer = "People's Republic of Adhomai"
+	volume = "25 meters length, 25 meters beam/width, 8 meters vertical height"
+	sizeclass = "Small-scale surveillance station"
+
 	initial_generic_waypoints = list(
 		"nav_hadiist_satellite_1",
 		"nav_hadiist_satellite_2",

maps/away/ships/casino/casino.dm

@@ -20,6 +20,9 @@
 	icon_state = "generic"
 	moving_state = "generic_moving"
 	colors = list("#c3c7eb", "#a0a8ec")
+	volume = "57 meters length, 35 meters beam/width, 16 meters vertical height"
+	sizeclass = "Passenger Liner"
+	shiptype = "Long-distance freight and leisure transit"
 	vessel_mass = 15000
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECOND

maps/away/ships/coc_ranger/coc_ship.dm

@@ -80,6 +80,13 @@
 	icon_state = "xansan"
 	moving_state = "xansan_moving"
 	colors = list("#8492fd", "#4d61fc")
+	scanimage = "ranger.png"
+	designer = "Coalition of Colonies, Xanu Prime"
+	volume = "65 meters length, 31 meters beam/width, 14 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Dual extruding starboard-mounted medium caliber ballistic armament, starboard obscured flight craft bay"
+	sizeclass = "Xansan-class Gunboat"
+	shiptype = "Military patrol and combat utility"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000

maps/away/ships/dionae/diona_rokz_ship/diona_rokz_ship.dm

@@ -55,6 +55,10 @@
 	vessel_mass = 5000
 	fore_dir = SOUTH
 	vessel_size = SHIP_SIZE_SMALL
+	scanimage = "diona.png"
+	volume = "47 meters length, 31 meters beam/width, 15 meters vertical height"
+	drive = "Unknown"
+	sizeclass = "Low-Tonnage Organic Composite Craft"
 	initial_restricted_waypoints = list(
 		"Rokz Clan Shuttle" = list("nav_diona_rokz_ship_shuttle")
 	)

maps/away/ships/dionae/diona_serz_ship/diona_serz_ship.dm

@@ -61,6 +61,10 @@
 	vessel_mass = 5000
 	fore_dir = SOUTH
 	vessel_size = SHIP_SIZE_SMALL
+	scanimage = "diona.png"
+	volume = "47 meters length, 31 meters beam/width, 15 meters vertical height"
+	drive = "Unknown"
+	sizeclass = "Low-Tonnage Organic Composite Craft"
 	initial_restricted_waypoints = list(
 		"Serz Clan Shuttle" = list("nav_diona_serz_ship_shuttle")
 	)

maps/away/ships/dominia/dominian_corvette.dm

@@ -71,6 +71,13 @@
 	icon_state = "lammergeier"
 	moving_state = "lammergeier_moving"
 	colors = list("#df1032", "#d4296b")
+	scanimage = "dominian_corvette.png"
+	designer = "Zhurong Naval Arsenal, Empire of Dominia"
+	volume = "42 meters length, 75 meters beam/width, 18 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Dual wingtip-mounted extruding medium-caliber ballistic armament, aft obscured flight craft bay"
+	sizeclass = "Lammergeier-class Corvette"
+	shiptype = "Military patrol and combat utility"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000

maps/away/ships/dpra/hailstorm/hailstorm_ship.dm

@@ -19,6 +19,13 @@
 	icon_state = "hailstorm"
 	moving_state = "hailstorm_moving"
 	colors = list("#B9BDC4")
+	scanimage = "hailstorm.png"
+	designer = "Obfuscated, hull origin uncertain"
+	volume = "37 meters length, 24 meters beam/width, 11 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Dual bow-mounted extruding low-caliber rotary ballistic armament, port obscured flight craft bay"
+	sizeclass = "Hailstorm-type Retrofitted Skipjack"
+	shiptype = "Short-distance military tasking, low-level naval interdiction"
 	vessel_mass = 10000
 	max_speed = 1/(2 SECONDS)
 	fore_dir = NORTH

maps/away/ships/elyra/elyra_strike_craft.dm

@@ -29,6 +29,13 @@
 	icon_state = "corvette"
 	moving_state = "corvette_moving"
 	colors = list("#ffae17", "#ffcd70")
+	scanimage = "elyran_corvette.png"
+	designer = "Jewel Aerospace, Republic of Elyra"
+	volume = "32 meters length, 43 meters beam/width, 12 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Dual extruding fore-mounted medium caliber ballistic armament, fore obscured flight craft bay"
+	sizeclass = "Aslan-class Strike Craft"
+	shiptype = "Military patrol and combat utility"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000

maps/away/ships/iac/iac_rescue_ship.dm

@@ -67,6 +67,11 @@
 	icon_state = "sanctuary"
 	moving_state = "sanctuary_moving"
 	colors = list("#ace8fa", "#71abf7")
+	scanimage = "hospital.png"
+	designer = "Zeng-Hu Pharmaceuticals, Hephaestus Industries"
+	volume = "48 meters length, 32 meters beam/width, 19 meters vertical height"
+	sizeclass = "Sanctuary-class Rescue Ship"
+	shiptype = "Emergency medical logistics relief and distress response"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000

maps/away/ships/kataphracts/kataphract_ship.dm

@@ -17,6 +17,13 @@
 	icon_state = "voidbreaker"
 	moving_state = "voidbreaker_moving"
 	colors = list("#e38222", "#f0ba3e")
+	scanimage = "unathi_corvette.png"
+	designer = "Hephaestus Industries, Izweski Hegemonic Naval Guilds"
+	volume = "65 meters length, 45 meters beam/width, 21 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Not apparent, port obscured flight craft bay"
+	sizeclass = "Voidbreaker-class Armored Corvette"
+	shiptype = "Specialist long-distance extended-duration combat utility"
 	vessel_mass = 10000
 	max_speed = 1/(2 SECONDS)
 	fore_dir = NORTH

maps/away/ships/nka/nka_merchant/nka_merchant.dm

@@ -23,6 +23,13 @@
 	max_speed = 1/(2 SECONDS)
 	fore_dir = NORTH
 	vessel_size = SHIP_SIZE_SMALL
+	scanimage = "nka_freighter.png"
+	designer = "NanoTrasen, New Kingdom of Adhomai"
+	volume = "49 meters length, 28 meters beam/width, 11 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Not apparent, port obscured flight craft bay"
+	sizeclass = "Hma'trra Freighter"
+	shiptype = "Long-term shipping utilities"
 	initial_generic_waypoints = list(
 		"nka_merchant_ship_1",
 		"nka_merchant_ship_2",

maps/away/ships/orion/orion_express_ship.dm

@@ -30,6 +30,11 @@
 	icon_state = "waystation"
 	moving_state = "waystation"
 	colors = list("#a1a8e2", "#818be0")
+	scanimage = "oe_platform.png"
+	designer = "Orion Express, Refurbished Design"
+	volume = "51 meters length, 55 meters beam/width, 29 meters vertical height"
+	sizeclass = "Traveler-class Mobile Waystation"
+	shiptype = "Refuel, resupply and commercial logistics services"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000

maps/away/ships/pra/database_freighter/database_freighter.dm

@@ -23,6 +23,13 @@
 	max_speed = 1/(2 SECONDS)
 	fore_dir = NORTH
 	vessel_size = SHIP_SIZE_SMALL
+	scanimage = "pra_freighter.png"
+	designer = "People's Republic of Adhomai"
+	volume = "51 meters length, 28 meters beam/width, 12 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Not apparent, port obscured flight craft bay"
+	sizeclass = "Database Freighter"
+	shiptype = "Stellar, cosmic study and long-term research missions"
 	initial_generic_waypoints = list(
 		"nav_database_freighter_1",
 		"nav_database_freighter_2",

maps/away/ships/pra/headmaster/headmaster_ship.dm

@@ -23,6 +23,13 @@
 	max_speed = 1/(2 SECONDS)
 	fore_dir = NORTH
 	vessel_size = SHIP_SIZE_SMALL
+	scanimage = "headmaster.png"
+	designer = "People's Republic of Adhomai"
+	volume = "61 meters length, 35 meters beam/width, 17 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Extruding starboard-mounted medium caliber ballistic armament, starboard obscured flight craft bay"
+	sizeclass = "Headmaster Cruiser"
+	shiptype = "Military patrol and combat utility"
 	initial_generic_waypoints = list(
 		"nav_headmaster_ship_1",
 		"nav_headmaster_ship_2",

maps/away/ships/skrell_smuggler/tirakqi_freighter.dm

@@ -28,6 +28,12 @@
 	icon_state = "tirakqi"
 	moving_state = "tirakqi_moving"
 	colors = list("#27e4ee", "#4febbf")
+	scanimage = "skrell_freighter.png"
+	designer = "Nralakk Federation"
+	volume = "42 meters length, 31 meters beam/width, 19 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "No visible armament, starboard obscured flight craft bay"
+	sizeclass = "Unidentified-type Retrofitted Federation Freighter"
 	class = "ISV"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS

maps/away/ships/sol_merc/fsf_patrol_ship.dm

@@ -25,10 +25,17 @@
 /obj/effect/overmap/visitable/ship/fsf_patrol_ship
 	name = "FSF Corvette"
 	class = "FSFV"
-	desc = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew."
+	desc = "A small corvette manufactured for the Solarian Navy by Einstein Engines, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew."
 	icon_state = "corvette"
 	moving_state = "corvette_moving"
 	colors = list("#9dc04c", "#52c24c")
+	scanimage = "corvette.png"
+	designer = "Solarian Navy, Tiscareno y Volante Shipbuilding modifications"
+	volume = "41 meters length, 39 meters beam/width, 17 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Dual extruding fore and starboard-mounted medium caliber ballistic armament, fore obscured flight craft bay"
+	sizeclass = "Montevideo-class Corvette"
+	shiptype = "Military patrol and combat utility"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000

maps/away/ships/sol_pirate/sfa_patrol_ship.dm

@@ -64,10 +64,16 @@
 /obj/effect/overmap/visitable/ship/sfa_patrol_ship
 	name = "SFA Corvette"
 	class = "SFAV"
-	desc = "A small ship that appears to be, at its core, a Montevideo-class corvette, a Solarian anti-piracy and patrol corvette designed with ample automation and streamlined equipment which allows for it to be manned by a small crew. This one, however, seems to have been host to a myriad of haphazard and radical modifications, and is scarcely identifiable as the original craft. Beyond the changes made to the ship itself, it also appears to have suffered extensive damage and wear, and seems to be near-derelict"
+	desc = "A small ship that appears to be, at its core, a Montevideo-class corvette, a Solarian anti-piracy and patrol corvette designed with ample automation and streamlined equipment which allows for it to be manned by a small crew. This one, however, seems to have been host to a myriad of haphazard and radical modifications, and is scarcely identifiable as the original craft. Beyond the changes made to the ship itself, it also appears to have suffered extensive damage and wear, and seems to be near-derelict."
 	icon_state = "corvette"
 	moving_state = "corvette_moving"
 	colors = list("#9dc04c", "#52c24c")
+	scanimage = "corvette.png"
+	designer = "Solarian Navy, Southern Fleet Administration field-modified"
+	volume = "41 meters length, 39 meters beam/width, 17 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Dual extruding fore and starboard-mounted medium caliber ballistic armament, fore obscured flight craft bay"
+	sizeclass = "Unidentified-type Retrofitted Montevideo-class Corvette"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000

maps/away/ships/sol_ssmd/ssmd_ship.dm

@@ -93,6 +93,13 @@
 	icon_state = "corvette"
 	moving_state = "corvette_moving"
 	colors = list("#9dc04c", "#52c24c")
+	scanimage = "corvette.png"
+	designer = "Solarian Navy"
+	volume = "41 meters length, 43 meters beam/width, 19 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Dual extruding fore caliber ballistic armament, fore obscured flight craft bay"
+	sizeclass = "Uhlan-class Corvette"
+	shiptype = "Military reconnaissance and extended-duration combat utility"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000

maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm

@@ -21,6 +21,13 @@
 	icon_state = "tramp"
 	moving_state = "tramp_moving"
 	colors = list("#c3c7eb", "#a0a8ec")
+	scanimage = "tramp_freighter.png"
+	designer = "Independent/no designation"
+	volume = "55 meters length, 25 meters beam/width, 18 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Not apparent, port obscured flight craft bay"
+	sizeclass = "Zhsram Freighter"
+	shiptype = "Long-term shipping utilities"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000

maps/away/ships/tcfl_patrol/tcfl_peacekeeper_ship.dm

@@ -34,6 +34,13 @@
 	vessel_mass = 5000
 	fore_dir = SOUTH
 	vessel_size = SHIP_SIZE_SMALL
+	scanimage = "tcfl_cetus.png"
+	designer = "NanoTrasen, Stellar Corporate Conglomerate"
+	volume = "51 meters length, 42 meters beam/width, 12 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Two extruding wing mounted naval ballistic weapon mounts, aft obscured flight craft bay"
+	sizeclass = "Cetus Class Corvette"
+	shiptype = "Military patrol and combat utility"
 	initial_restricted_waypoints = list(
 		"TCFL Shuttle" = list("nav_hangar_tcfl")
 	)
@@ -50,7 +57,7 @@
 	..()
 
 /obj/effect/overmap/visitable/ship/tcfl_peacekeeper_ship/get_skybox_representation()
-	var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "tramp_freighter")
+	var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "tcfl_corvette")
 	skybox_image.pixel_x = rand(0,64)
 	skybox_image.pixel_y = rand(128,256)
 	return skybox_image

maps/away/ships/tramp_freighter/tramp_freighter.dm

@@ -34,6 +34,13 @@
 	vessel_mass = 5000
 	fore_dir = SOUTH
 	vessel_size = SHIP_SIZE_SMALL
+	scanimage = "tramp_freighter.png"
+	designer = "Independent, Unknown"
+	volume = "49 meters length, 46 meters beam/width, 12 meters vertical height"
+	drive = "Low-Speed Warp Acceleration FTL Drive"
+	weapons = "Starboard low-end ballistic weapon mount, aft obscured flight craft bay"
+	sizeclass = "Catspaw Class Freighter"
+	shiptype = "Long-term shipping utilities"
 	initial_restricted_waypoints = list(
 		"Freight Shuttle" = list("nav_hangar_tramp")
 	)
@@ -50,7 +57,7 @@
     ..()
 
 /obj/effect/overmap/visitable/ship/tramp_freighter/get_skybox_representation()
-	var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "tcfl_corvette")
+	var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "tramp_freighter")
 	skybox_image.pixel_x = rand(0,64)
 	skybox_image.pixel_y = rand(128,256)
 	return skybox_image

maps/away/ships/yacht/yacht.dm

@@ -14,6 +14,10 @@
 	icon_state = "generic"
 	moving_state = "generic_moving"
 	colors = list("#c3c7eb", "#a0a8ec")
+	designer = "Idris Incorporated"
+	volume = "27 meters length, 19 meters beam/width, 11 meters vertical height"
+	sizeclass = "Starfarer-line Pleasure Yacht"
+	shiptype = "Private passenger utility, long-distance travel case"
 	vessel_mass = 3000
 	max_speed = 1/(2 SECONDS)
 	initial_generic_waypoints = list(

maps/sccv_horizon/code/sccv_horizon_overmap.dm

@@ -10,6 +10,15 @@
 	burn_delay = 2 SECONDS
 	base = TRUE
 
+	scanimage = "horizon.png"
+	designer = "Stellar Corporate Conglomerate, Vickers Shipwright Dock - Valkyrie"
+	volume = "97 meters length, 161 meters beam/width, 48 meters vertical height"
+	drive = "First-Gen Warp Capable, Hybrid Phoron Bluespace Drive"
+	propulsion = "Superheated Composite Gas Thrust"
+	weapons = "Two extruding naval ballistic weapon mounts, unidentifiable spinal artillery mount"
+	sizeclass = "Venator Class Cruiser"
+	shiptype = "Prototype exploration and survey vessel"
+
 	initial_restricted_waypoints = list(
 		"Spark" = list("nav_hangar_mining"), 	//can't have random shuttles popping inside the ship
 		"Intrepid" = list("nav_hangar_intrepid")
@@ -62,6 +71,12 @@
 	vessel_mass = 5000
 	fore_dir = SOUTH
 	vessel_size = SHIP_SIZE_SMALL
+	scanimage = "intrepid.png"
+	designer = "Hephaestus Industries"
+	volume = "21 meters length, 16 meters beam/width, 6 meters vertical height"
+	weapons = "Extruding fore-mounted low-caliber ballistic rotary armament"
+	sizeclass = "Pathfinder Exploration Shuttle"
+	shiptype = "Field expeditions and private research uses"
 
 /obj/effect/overmap/visitable/ship/landable/intrepid/get_skybox_representation()
 	var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "intrepid")
@@ -83,6 +98,11 @@
 	icon_state = "spark"
 	moving_state = "spark_moving"
 	colors = list("#cfd4ff", "#78adf8")
+	scanimage = "spark.png"
+	designer = "Hephaestus Industries"
+	volume = "11 meters length, 9 meters beam/width, 4 meters vertical height"
+	sizeclass = "Pickaxe-Class Mining Shuttle"
+	shiptype = "Field survey and specialized prospecting"
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod