Makes overmap pretty (#15752)

code/game/gamemodes/meteor/meteor.dm

@@ -52,7 +52,7 @@
 	if(current_map.use_overmap)
 		var/area/map = global.map_overmap
 		for(var/turf/T in map)
-			T.overlays += image('icons/obj/overmap.dmi', "meteor[rand(1,4)]")
+			T.overlays += image('icons/obj/overmap/overmap_effects.dmi', "meteor[rand(1,4)]")
 	next_wave = round_duration_in_ticks + meteor_wave_delay
 
 /datum/game_mode/meteor/process()

code/modules/maps/planet_types/barren.dm

@@ -12,8 +12,8 @@
 	water_color = null
 
 	possible_random_ruins = list(
-		/datum/map_template/ruin/exoplanet/abandoned_mining, 
-		/datum/map_template/ruin/exoplanet/hideout, 
+		/datum/map_template/ruin/exoplanet/abandoned_mining,
+		/datum/map_template/ruin/exoplanet/hideout,
 		/datum/map_template/ruin/exoplanet/crashed_shuttle_01,
 		/datum/map_template/ruin/exoplanet/crashed_sol_shuttle_01,
 		/datum/map_template/ruin/exoplanet/crashed_skrell_shuttle_01,
@@ -25,7 +25,7 @@
 		/datum/map_template/ruin/exoplanet/crashed_pod,
 		/datum/map_template/ruin/exoplanet/crashed_coc_skipjack,
 		/datum/map_template/ruin/exoplanet/drill_site)
- 
+
 /obj/effect/overmap/visitable/sector/exoplanet/barren/generate_habitability()
 	return HABITABILITY_BAD
 
@@ -59,6 +59,10 @@
 	if(prob(20))
 		overlays += image('icons/turf/decals/decals.dmi', "asteroid[rand(0,9)]")
 
+/obj/effect/overmap/visitable/sector/exoplanet/barren/Initialize()
+  . = ..()
+  icon_state = "asteroid[rand(1,3)]"
+
 /turf/simulated/floor/exoplanet/barren/Initialize()
 	. = ..()
 	update_icon()
@@ -79,8 +83,8 @@
 	planetary_area = /area/exoplanet/barren/asteroid
 
 	possible_random_ruins = list(
-		/datum/map_template/ruin/exoplanet/abandoned_mining, 
-		/datum/map_template/ruin/exoplanet/hideout, 
+		/datum/map_template/ruin/exoplanet/abandoned_mining,
+		/datum/map_template/ruin/exoplanet/hideout,
 		/datum/map_template/ruin/exoplanet/crashed_shuttle_01,
 		/datum/map_template/ruin/exoplanet/crashed_sol_shuttle_01,
 		/datum/map_template/ruin/exoplanet/crashed_skrell_shuttle_01,

code/modules/overmap/_defines.dm

@@ -11,7 +11,7 @@ var/global/list/map_sectors = list()
 	dynamic_lighting = 0
 
 /turf/unsimulated/map
-	icon = 'icons/turf/space.dmi'
+	icon = 'icons/obj/overmap/overmap.dmi'
 	icon_state = "map"
 	permit_ao = FALSE
 

code/modules/overmap/contacts/_contacts.dm

@@ -27,7 +27,7 @@
 
 	images += marker
 
-	radar = image(loc = effect, icon = 'icons/obj/overmap.dmi', icon_state = "sensor_range")
+	radar = image(loc = effect, icon = 'icons/obj/overmap/overmap_effects.dmi', icon_state = "sensor_range")
 	radar.color = source.color
 	radar.tag = "radar"
 	radar.add_filter("blur", 1, list("blur", size = 1))

code/modules/overmap/events/event.dm

@@ -167,7 +167,7 @@
 //  And with them "existing" on the overmap Z-level things quickly get odd.
 /obj/effect/overmap/event
 	name = "event"
-	icon = 'icons/obj/overmap.dmi'
+	icon = 'icons/obj/overmap/overmap_effects.dmi'
 	icon_state = "blank"
 	opacity = 0
 	var/list/events

code/modules/overmap/exoplanets/exoplanet.dm

@@ -1,7 +1,5 @@
 /obj/effect/overmap/visitable/sector/exoplanet
 	name = "exoplanet"
-	icon_state = "globe"
-	in_space = 0
 	var/area/planetary_area
 	var/list/seeds = list()
 	var/list/animals = list()
@@ -63,6 +61,10 @@
 		else
 			habitability_class = HABITABILITY_BAD
 
+/obj/effect/overmap/visitable/sector/exoplanet/Initialize()
+  . = ..()
+  icon_state = "globe[rand(1,3)]"
+
 /obj/effect/overmap/visitable/sector/exoplanet/New(nloc, max_x, max_y)
 	if(!current_map.use_overmap)
 		return

code/modules/overmap/overmap_object.dm

@@ -1,6 +1,6 @@
 /obj/effect/overmap
 	name = "map object"
-	icon = 'icons/obj/overmap.dmi'
+	icon = 'icons/obj/overmap/overmap_effects.dmi'
 	icon_state = "object"
 	color = "#fffffe"
 
@@ -71,9 +71,6 @@
 		for(var/obj/effect/overmap/visitable/O in loc)
 			SSskybox.rebuild_skyboxes(O.map_z)
 
-/obj/effect/overmap/update_icon()
-	filters = filter(type="drop_shadow", color = color + "F0", size = 2, offset = 1, x = 0, y = 0)
-
 /obj/effect/overmap/proc/signal_hit(var/list/hit_data)
 	return
 
@@ -109,7 +106,7 @@
 	if(do_after(usr, 5 SECONDS))
 		C.targeting = FALSE
 		targeting = O
-		O.targeted_overlay = icon('icons/obj/overmap_heads_up_display.dmi', "lock")
+		O.targeted_overlay = icon('icons/obj/overmap/overmap_effects.dmi', "lock")
 		O.add_overlay(O.targeted_overlay)
 		if(designation && class && !obfuscated)
 			if(!O.maptext)

code/modules/overmap/sectors.dm

@@ -171,7 +171,7 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap
 /obj/effect/overmap/visitable/proc/toggle_distress_status()
 	has_called_distress_beacon = !has_called_distress_beacon
 	if(has_called_distress_beacon)
-		var/image/distress_overlay = image('icons/obj/overmap.dmi', "distress")
+		var/image/distress_overlay = image('icons/obj/overmap/overmap_effects.dmi', "distress")
 		applied_distress_overlay = distress_overlay
 		add_overlay(applied_distress_overlay)
 		filters = filter(type = "outline", size = 2, color = COLOR_RED)

code/modules/overmap/ships/ship.dm

@@ -13,7 +13,8 @@ var/const/OVERMAP_SPEED_CONSTANT = (1 SECOND)
 /obj/effect/overmap/visitable/ship
 	name = "generic ship"
 	desc = "Space faring vessel."
-	icon_state = "ship"
+	icon = 'icons/obj/overmap/overmap_ships.dmi'
+	icon_state = "generic"
 	requires_contact = TRUE
 	obfuscated_name = "unidentified vessel"
 	var/moving_state = "ship_moving"
@@ -41,6 +42,8 @@ var/const/OVERMAP_SPEED_CONSTANT = (1 SECOND)
 
 	comms_support = TRUE
 
+	var/list/colors = list() //Pick a color from this list on init
+
 /obj/effect/overmap/visitable/ship/Initialize()
 	. = ..()
 	glide_size = world.icon_size
@@ -49,6 +52,9 @@ var/const/OVERMAP_SPEED_CONSTANT = (1 SECOND)
 	base_sensor_visibility = round((vessel_mass/SENSOR_COEFFICENT),1)
 	SSshuttle.ships += src
 
+	if(LAZYLEN(colors))
+		color = pick(colors)
+
 /obj/effect/overmap/visitable/ship/find_z_levels(var/fore_direction)
 	. = ..(fore_dir)
 

html/changelogs/kyres1-2-2-2023-pretty_overmap.yml

@@ -0,0 +1,42 @@
+################################
+# 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
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: kyres1
+
+# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Added new sprites based off of our current roster of third-party ships."
+  - tweak: "Remade all overmap sprites."

maps/away/ships/casino/casino.dm

@@ -17,8 +17,9 @@
 	name = "passenger liner"
 	class = "ICV"
 	desc = "A spaceborne casino slash passenger liner of an uncertain design. It's hardly nimble, quite defenceless and is likely far from any safe transit routes. Sensors detect that it is undamaged and without any signs of activity within."
-	icon_state = "ship_grey"
-	moving_state = "ship_grey_moving"
+	icon_state = "generic"
+	moving_state = "generic_moving"
+	colors = list("#c3c7eb", "#a0a8ec")
 	vessel_mass = 15000
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECOND
@@ -75,8 +76,9 @@
 	name = "Casino Cutter"
 	desc = "A generic small, boxy transport shuttle. It looks like a brick and it handles like one too."
 	shuttle = "Casino Cutter"
-	icon_state = "shuttle_grey"
-	moving_state = "shuttle_grey_moving"
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
+	colors = list("#c3c7eb", "#a0a8ec")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 3000 //Hard to move

maps/away/ships/coc_ranger/coc_ship.dm

@@ -77,8 +77,9 @@
 	name = "Ranger Gunboat"
 	class = "FPBS"
 	desc = "The Xansan-class is not, in fact, a distinct design in of itself. It is instead Xanu Prime’s variant of the Lagos-class gunboat, a Solarian light attack ship design. While the Lagos-class has been out of service with the Alliance’s navy for centuries, the blueprints were captured during the Interstellar war by Xanu Prime militiamen from a regional naval shipyard during the opening stages of the conflict, and were immediately used to construct ships of the class for use by Xanu Prime’s burgeoning military. While the Xansan-class has been retired from Xanu service, the leftover ships were donated en masse to the Frontier Marshal Bureau, and the Rangers make use of the craft to this day, in spite of their advanced age."
-	icon_state = "ship_blue"
-	moving_state = "ship_blue_moving"
+	icon_state = "xansan"
+	moving_state = "xansan_moving"
+	colors = list("#8492fd", "#4d61fc")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -121,8 +122,9 @@
 	designation = "Pony"
 	desc = "An inefficient design of ultra-light shuttle. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. Manufactured by Hephaestus."
 	shuttle = "Ranger Shuttle"
-	icon_state = "shuttle_blue"
-	moving_state = "shuttle_blue_moving"
+	icon_state = "pod"
+	moving_state = "pod_moving"
+	colors = list("#8492fd", "#4d61fc")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod

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

@@ -47,8 +47,9 @@
 	name = "Rokz Clan Ship"
 	class = "RCS"
 	desc = "A ship belonging to the Rokz voidtamer clan, a group of dionae who specialize in selling space fauna."
-	icon_state = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "diona"
+	moving_state = "diona_moving"
+	colors = list("#5cc04c", "#78f898")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -110,6 +111,9 @@
 	vessel_mass = 3000 //very inefficient pod
 	fore_dir = NORTH
 	vessel_size = SHIP_SIZE_TINY
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
+	colors = list("#5cc04c", "#78f898")
 
 /obj/machinery/computer/shuttle_control/explore/diona_rokz_ship
 	name = "shuttle control console"

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

@@ -53,8 +53,9 @@
 	name = "Serz Clan Ship"
 	class = "SCS"
 	desc = "A ship belonging to the Serz voidtamer clan, a group of dionae who specialize in selling space fauna."
-	icon_state = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "diona"
+	moving_state = "diona_moving"
+	colors = list("#5cc04c", "#78f898")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -116,6 +117,9 @@
 	vessel_mass = 3000 //very inefficient pod
 	fore_dir = NORTH
 	vessel_size = SHIP_SIZE_TINY
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
+	colors = list("#5cc04c", "#78f898")
 
 /obj/machinery/computer/shuttle_control/explore/diona_serz_ship
 	name = "shuttle control console"

maps/away/ships/dominia/dominian_corvette.dm

@@ -68,8 +68,9 @@
 	name = "Dominian Corvette"
 	class = "HIMS"
 	desc = "One of the most common ships in the Imperial Fleet, Lammergeier-class corvettes are often used as the vanguard of battlefleets entering a system marked for annexation into the glorious Empire as it is tasked to find and scout routes for the larger fleet. Though intended for scouting and screening work the Lammergeier is, like its larger counterparts, quite heavily armed and armored for a typical corvette. Any frontier savages who attempt to meet one with force of arms will soon find themselves staring down the barrels of Zhurong’s finest weaponry, and the Fleet-trained Ma’zals entrusted to operate it. The heavy armament and sensors of the Lammergeier-class come at a cost: it lacks a shield generator and is much larger than a typical Solarian corvette, thus requiring a larger crew. Lammergeier-class captains are generally loyal Ma’zals, such as the citizens of Novi Jadran, and are authorized to take whatever measures are necessary to ensure their crew remains loyal to both Empire and Goddess. This one’s transponder marks it as belonging to the Empire’s First Battlefleet – a battle-hardened formation responsible for patrolling the region of the northern Sparring Sea between the Empire, Hegemony, and Republic of dominia."
-	icon_state = "ship_red"
-	moving_state = "ship_red_moving"
+	icon_state = "lammergeier"
+	moving_state = "lammergeier_moving"
+	colors = list("#df1032", "#d4296b")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -124,6 +125,9 @@
 	designation = "Chariot"
 	desc = "A light shuttle used by the Imperial Fleet to move small amounts of cargo or personnel between vessels, the Yupmi-class shuttle is a dependable utility craft. Like most Dominian vessels it is relatively well armored for its size but is not a combat vessel by any means. A short operational range means a Yupmi should never stray too far from its vessel of origin as it will soon run out of fuel."
 	shuttle = "Dominian Shuttle"
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
+	colors = list("#df1032", "#d4296b")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod

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

@@ -16,8 +16,9 @@
 	name = "Hailstorm Ship"
 	desc = "A skipjack armed with multiple mass-driver weapons designed for patrolling and brief engagements. When used for patrols, the Hailstorm is loaded with supplies to last weeks on its own; its crew is specifically trained to be as frugal as possible while aboard."
 	class = "DPRAMV" //Democratic People's Republic of Adhomai Vessel
-	icon_state = "ship"
-	moving_state = "ship_moving"
+	icon_state = "hailstorm"
+	moving_state = "hailstorm_moving"
+	colors = list("#f0d295", "#ecb037")
 	vessel_mass = 10000
 	max_speed = 1/(2 SECONDS)
 	fore_dir = NORTH
@@ -63,6 +64,7 @@
 	desc = "A simple and reliable shuttle design used by the Spacer Militia Shuttle."
 	icon_state = "shuttle"
 	moving_state = "shuttle_moving"
+	colors = list("#f0d295", "#ecb037")
 	class = "DPRAMV"
 	designation = "Yve'kha"
 	shuttle = "Spacer Militia Shuttle"
@@ -100,4 +102,4 @@
 /obj/effect/shuttle_landmark/hailstorm_shuttle/transit
 	name = "In transit"
 	landmark_tag = "nav_transit_hailstorm_shuttle"
-	base_turf = /turf/space/transit/north
+	base_turf = /turf/space/transit/north

maps/away/ships/einstein/ee_spy_ship.dm

@@ -26,8 +26,9 @@
 	name = "Einstein Engines Research Ship"
 	class = "EERV"
 	desc = "A research ship belonging to Einstein Engines, the Stellar Corporate Conglomerate's main competitor."
-	icon_state = "ship_green"
-	moving_state = "ship_green_moving"
+	icon_state = "light_cruiser"
+	moving_state = "light_cruiser_moving"
+	colors = list("#18e9b5", "#6aa9dd")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -70,8 +71,9 @@
 	designation = "Canary"
 	desc = "A shuttle used by Einstein Engines. For research purposes only."
 	shuttle = "Einstein Engines Shuttle"
-	icon_state = "shuttle_green"
-	moving_state = "shuttle_green_moving"
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
+	colors = list("#18e9b5", "#6aa9dd")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod

maps/away/ships/elyra/elyra_strike_craft.dm

@@ -26,8 +26,9 @@
 	name = "Elyran Naval Strike Craft"
 	class = "ENV"
 	desc = "The Aslan-class Strike Craft is among the oldest designs in the Elyran naval arsenal, and is one of the ship classes slated to be retired in the ongoing Elyran military modernization plan. Not an independent vessel in of itself, it is instead an oversized attack craft designed to be launched from the General Abd Al-Hamid-class Carrier, a type of Elyran capital ship, named after the Republic's foremost national hero. As such, it has limited crew facilities and life support capabilities, and is instead reliant on its mothership for long-term operation. This ship is an interdiction variant, with its torpedo bay and railgun hardpoint replaced by a hangar and a boarding pod launch room, respectively."
-	icon_state = "ship_grey"
-	moving_state = "ship_grey_moving"
+	icon_state = "corvette"
+	moving_state = "corvette_moving"
+	colors = list("#ffae17", "#ffcd70")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -70,8 +71,9 @@
 	designation = "Colibri"
 	desc = "Easily mistaken for a Wisp-class (which it is almost identical to), this shuttle is in fact an Elyran Dromedary-class, which is an unlicensed copy of the Hephaestus Wisp-class, and one of the designs slated for retirement in the ongoing military modernization program. Hephaestus Industries has attempted to sue the Elyran government many times for the navy's unlicensed production of its intellectual property, and Elyran courts have, unsurprisingly, always ruled in favor of the government - much to the frustration of the megacorporation, which has no other method of recourse. An inefficient design of ultra-light shuttle. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. This one's transponder identifies it as an Elyran Naval Infantry recovery shuttle."
 	shuttle = "Elyran Naval Shuttle"
-	icon_state = "shuttle_grey"
-	moving_state = "shuttle_grey_moving"
+	icon_state = "pod"
+	moving_state = "pod_moving"
+	colors = list("#ffae17", "#ffcd70")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod

maps/away/ships/iac/iac_rescue_ship.dm

@@ -64,8 +64,9 @@
 	name = "IAC Rescue Ship"
 	class = "IAV"
 	desc = "The Sanctuary-class rescue ship is a fast response medical vessel, based in large part off of the Asclepius-class medical transport, a widespread clinic ship, designed to operate mainly between planets rather than in open space. Most Sanctuary-class hulls are heavily refitted to accomodate for the new conditions in the Wildlands, sporting additional thrusters and a hangar bay, created from what was originally a waiting room. However, it is still limited by its origins, having only the bare minimum of crew and atmospherics facilities, as well as being rather obviously unarmed, often needing to return to port for repairs or supplies."
-	icon_state = "ship"
-	moving_state = "ship_moving"
+	icon_state = "sanctuary"
+	moving_state = "sanctuary_moving"
+	colors = list("#ace8fa", "#71abf7")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -129,6 +130,9 @@
 	designation = "Heka"
 	desc = "An inefficient design of ultra-light shuttle known as the Wisp-class. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. Manufactured by Hephaestus. This one's transponder identifies it as belonging to a Interstellar Aid Corps vessel."
 	shuttle = "IAC Ambulance Shuttle"
+	icon_state = "pod"
+	moving_state = "pod_moving"
+	colors = list("#ace8fa", "#71abf7")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod

maps/away/ships/kataphracts/kataphract_ship.dm

@@ -14,8 +14,9 @@
 	class used by their counterparts in the Hegemony Navy. These vessels are rarely seen together and strive for maximum self-suffiency as they are the homes and primary means of transportation \
 	for questing Kataphracts and their followers. They usually carry enough firepower to deter the common pirate as well as a set of boarding pods for offensive actions. This ship however has no weapon hardpoints detected. It remains capable due to its sturdy design."
 	class = "IHKV" //Izweski Hegemony Kataphract Vessel
-	icon_state = "ship_green"
-	moving_state = "ship_green_moving"
+	icon_state = "voidbreaker"
+	moving_state = "voidbreaker_moving"
+	colors = list("#e38222", "#f0ba3e")
 	vessel_mass = 10000
 	max_speed = 1/(2 SECONDS)
 	fore_dir = NORTH
@@ -76,8 +77,9 @@
 	designation = "Sasuna"
 	desc = "A small egg shaped shuttle of the 'Spearhead' class, commonly seen carried by Izweski Hegemony vessels. They're never far from their motherships and are a telltale sign of an Unathi presence within a sector. Affectionately called the 'Hatchling' by its operators. The transponder for this vessel identifies it as belonging to a traveling Kataphract Guild of the Hegemony."
 	shuttle = "Kataphract Transport"
-	icon_state = "shuttle_green"
-	moving_state = "shuttle_green_moving"
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
+	colors = list("#e38222", "#f0ba3e")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 6000 //Ship has a lot of thrusters, so if its too low the shuttle goes too fast. Also, imagine a hard egg flying towards you.

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

@@ -16,8 +16,9 @@
 	name = "Her Majesty's Mercantile Flotilla Ship"
 	desc = "The Hma'trra class is a modified version of the corporate freighter sold by the SCC to the New Kingdom. It is simple model adapted to the long journey between Adhomai and Tau Ceti."
 	class = "NKAMV" //New Kingdom of Adhomai Vessel
-	icon_state = "ship"
-	moving_state = "ship_moving"
+	icon_state = "hmatrra"
+	moving_state = "hmatrra_moving"
+	colors = list("#3e9af0", "#2b5cff")
 	vessel_mass = 10000
 	max_speed = 1/(2 SECONDS)
 	fore_dir = NORTH
@@ -62,6 +63,7 @@
 	desc = "A simple corporate shuttle design used by Her Majesty's Mercantile Flotilla."
 	icon_state = "shuttle"
 	moving_state = "shuttle_moving"
+	colors = list("#3e9af0", "#2955e6")
 	class = "NKAMV"
 	designation = "Tajani"
 	shuttle = "Her Majesty's Mercantile Flotilla Shuttle"
@@ -98,4 +100,4 @@
 /obj/effect/shuttle_landmark/nka_merchant_shuttle/transit
 	name = "In transit"
 	landmark_tag = "nav_transit_nka_merchant_shuttle"
-	base_turf = /turf/space/transit/north
+	base_turf = /turf/space/transit/north

maps/away/ships/orion/orion_express_ship.dm

@@ -26,8 +26,10 @@
 	name = "Orion Express Mobile Station"
 	class = "OEV"
 	desc = "The Traveler-class mobile station is a relatively old design, but nonetheless venerable and one of the building blocks of interstellar commerce. While relatively small, is a treasured asset in the Orion Express corporation's fleet, and has been referred to as “the gas station of the stars”, offering food, supplies, and fuel to anyone who may need it."
-	icon_state = "ship"
-	moving_state = "ship_moving"
+	icon = 'icons/obj/overmap/overmap_stationary.dmi'
+	icon_state = "waystation"
+	moving_state = "waystation"
+	colors = list("#a1a8e2", "#818be0")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -78,6 +80,9 @@
 	designation = "Packmaster"
 	desc = "The Troubadour-class skiff is not quite an independent design, and is instead essentially a component of the larger Traveler-class station as a whole, seamlessly attaching and detaching for operations as is necessary. This one's transponder identifies it as part of an Orion Express refueling station."
 	shuttle = "Orion Express Shuttle"
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
+	colors = list("#a1a8e2", "#818be0")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod

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

@@ -16,8 +16,9 @@
 	name = "Database Freighter"
 	desc = "Made from adapted designs of the first freighter Tajara ever worked upon, Database freighters are PRA vessels made specially for gathering information on star systems and what passes through them."
 	class = "PRAMV" //People's Republic of Adhomai Vessel
-	icon_state = "ship"
-	moving_state = "ship_moving"
+	icon_state = "tramp"
+	moving_state = "tramp_moving"
+	colors = list("#fad89f", "#f1d378")
 	vessel_mass = 10000
 	max_speed = 1/(2 SECONDS)
 	fore_dir = NORTH
@@ -65,6 +66,7 @@
 	desc = "A simple and reliable shuttle design used by the Orbital Fleet."
 	icon_state = "shuttle"
 	moving_state = "shuttle_moving"
+	colors = list("#fad89f", "#f1d378")
 	class = "PRAMV"
 	designation = "Yve'kha"
 	shuttle = "Database Freighter Shuttle"
@@ -102,4 +104,4 @@
 /obj/effect/shuttle_landmark/database_freighter_shuttle/transit
 	name = "In transit"
 	landmark_tag = "nav_transit_database_freighter_shuttle"
-	base_turf = /turf/space/transit/north
+	base_turf = /turf/space/transit/north

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

@@ -16,8 +16,9 @@
 	name = "Headmaster Ship"
 	desc = "The second heaviest ship created by the People's Republic of Adhomai. As of now, it's the lightest heavy ship ever designed, barely staying above the classification of a cruiser."
 	class = "PRAMV" //People's Republic of Adhomai Vessel
-	icon_state = "ship"
-	moving_state = "ship_moving"
+	icon_state = "headmaster"
+	moving_state = "headmaster_moving"
+	colors = list("#fad89f", "#f1d378")
 	vessel_mass = 10000
 	max_speed = 1/(2 SECONDS)
 	fore_dir = NORTH
@@ -65,6 +66,7 @@
 	desc = "A simple and reliable shuttle design used by the Orbital Fleet."
 	icon_state = "shuttle"
 	moving_state = "shuttle_moving"
+	colors = list("#fad89f", "#f1d378")
 	class = "PRAMV"
 	designation = "Yve'kha"
 	shuttle = "Orbital Fleet Shuttle"
@@ -102,4 +104,4 @@
 /obj/effect/shuttle_landmark/headmaster_shuttle/transit
 	name = "In transit"
 	landmark_tag = "nav_transit_headmaster_shuttle"
-	base_turf = /turf/space/transit/north
+	base_turf = /turf/space/transit/north

maps/away/ships/skrell_smuggler/tirakqi_freighter.dm

@@ -25,8 +25,9 @@
 /obj/effect/overmap/visitable/ship/tirakqi_freighter
 	name = "Ti'Rakqi Freighter"
 	desc = "A large skrellian freighter often seen skulking around space near the borders of the Traverse. This model has a large cargo hold, swift engines, and a deceptively large fuel reserve. Perfect for any smuggler on the go. This one's transponder identifies it as belonging to an independent freighter."
-	icon_state = "ship_blue"
-	moving_state = "ship_blue_moving"
+	icon_state = "tirakqi"
+	moving_state = "tirakqi_moving"
+	colors = list("#27e4ee", "#4febbf")
 	class = "ISV"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
@@ -84,8 +85,9 @@
 	designation = "Ku'ku"
 	desc = "A simple and fast transport shuttle. This one's transponder identifies it as belonging to an independent freighter."
 	shuttle = "Ti'Rakqi Shuttle"
-	icon_state = "shuttle_blue"
-	moving_state = "shuttle_blue_moving"
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
+	colors = list("#27e4ee", "#4febbf")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000

maps/away/ships/sol_merc/fsf_patrol_ship.dm

@@ -26,8 +26,9 @@
 	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."
-	icon_state = "ship_green"
-	moving_state = "ship_green_moving"
+	icon_state = "corvette"
+	moving_state = "corvette_moving"
+	colors = list("#9dc04c", "#52c24c")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -70,8 +71,9 @@
 	designation = "Condottiere"
 	desc = "An inefficient design of ultra-light shuttle known as the Wisp-class. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. Manufactured by Hephaestus."
 	shuttle = "FSF Shuttle"
-	icon_state = "shuttle_green"
-	moving_state = "shuttle_green_moving"
+	icon_state = "pod"
+	moving_state = "pod_moving"
+	colors = list("#9dc04c", "#52c24c")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod

maps/away/ships/sol_pirate/sfa_patrol_ship.dm

@@ -65,8 +65,9 @@
 	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"
-	icon_state = "ship_green"
-	moving_state = "ship_green_moving"
+	icon_state = "corvette"
+	moving_state = "corvette_moving"
+	colors = list("#9dc04c", "#52c24c")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -109,8 +110,9 @@
 	designation = "Pickford"
 	desc = "An inefficient design of ultra-light shuttle known as the Wisp-class. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. Manufactured by Hephaestus."
 	shuttle = "SFA Shuttle"
-	icon_state = "shuttle_green"
-	moving_state = "shuttle_green_moving"
+	icon_state = "pod"
+	moving_state = "pod_moving"
+	colors = list("#9dc04c", "#52c24c")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod

maps/away/ships/sol_ssmd/ssmd_ship.dm

@@ -90,8 +90,9 @@
 	class = "SSMDV"
 	desc = "A long-range reconnaissance corvette design in use by the Solarian Navy, the Uhlan-class is a relatively costly and somewhat uncommon ship to be seen in the Alliance's fleets, and is typically reserved for more elite (or at least better equipped and trained) units. Designed to operate alone or as part of a small task force with minimal support in unfriendly space, it is most commonly seen assigned to probing, surveillance, harassment, and strike operations. \
 	In spite of its small size, the Uhlan has relatively generous crew facilities and it is well-armed relative to its size and role, all made possible by extensive automation."
-	icon_state = "ship_green"
-	moving_state = "ship_green_moving"
+	icon_state = "corvette"
+	moving_state = "corvette_moving"
+	colors = list("#9dc04c", "#52c24c")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -134,8 +135,9 @@
 	designation = "Vizsla"
 	desc = "A modestly sized shuttle design used by the Solarian armed forces, the Destrier is well-armored but somewhat slow, and was explicitly designed to be as survivable as possible for operations during combat. Notably features a fast-deployment exosuit catapult."
 	shuttle = "SSMD Shuttle"
-	icon_state = "shuttle_green"
-	moving_state = "shuttle_green_moving"
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
+	colors = list("#9dc04c", "#52c24c")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod

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

@@ -18,8 +18,9 @@
 	name = "Adhomian Freighter"
 	class = "ACV"
 	desc = "Built with reliability in mind, the Zhsram Freighter is one of the most common Adhomian designs. This vessel is cheap and has a sizeable cargo storage. It is frequently used by Tajaran traders and smugglers."
-	icon_state = "ship_grey"
-	moving_state = "ship_grey_moving"
+	icon_state = "tramp"
+	moving_state = "tramp_moving"
+	colors = list("#c3c7eb", "#a0a8ec")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -63,8 +64,9 @@
 	designation = "Rafama"
 	desc = "An inefficient and rustic looking shuttle. This one's transponder identifies it as belonging to an independent freighter."
 	shuttle = "Adhomian Freight Shuttle"
-	icon_state = "shuttle_grey"
-	moving_state = "shuttle_grey_moving" 
+	icon_state = "pod"
+	moving_state = "pod_moving"
+	colors = list("#c3c7eb", "#a0a8ec")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
@@ -110,7 +112,7 @@
 	desc = "A floating cargo container."
 	shuttle = "Adhomian Freight Cargo"
 	icon_state = "shuttle_grey"
-	moving_state = "shuttle_grey_moving" 
+	moving_state = "shuttle_grey_moving"
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
@@ -157,4 +159,4 @@
 	name = "Cargo Hold - Starboard Side"
 	landmark_tag = "nav_tajaran_smuggler_cargo_2"
 	base_turf = /turf/space/dynamic
-	base_area = /area/space
+	base_area = /area/space

maps/away/ships/tcfl_patrol/tcfl_peacekeeper_ship.dm

@@ -26,8 +26,9 @@
 	name = "TCFL Corvette"
 	class = "BLV"
 	desc = "Serving as the very foundation of the SCC's (And more specifically, NanoTrasen's) fleet of asset protection vessels, the Cetus-class is versatile and durable, but also clumsy and somewhat underpowered in regards to its engine and propulsion. It features small weapon hardpoints in its thruster arms, and a massive hangar host to the design's interdiction counterpart - the Hydrus-class shuttle. This one appears to be a Decanus-class, the Tau Ceti Foreign Legion variation of the design."
-	icon_state = "ship_blue"
-	moving_state = "ship_blue_moving"
+	icon_state = "cetus"
+	moving_state = "cetus_moving"
+	colors = list("#263aeb", "#3d8cfa")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -70,8 +71,9 @@
 	class = "Stake"
 	desc = "A large and unusually-shaped shuttle, the Hydrus-class is deceptively fast and is designed to operate out of a Cetus-class corvette's rear hangar bay, interdicting targets that its mothership intercepts. This one appears to be a Velite-class Interceptor - the TCFL designation for this design."
 	shuttle = "TCFL Shuttle"
-	icon_state = "shuttle_blue"
-	moving_state = "shuttle_blue_moving" 
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
+	colors = list("#263aeb", "#3d8cfa")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod

maps/away/ships/tramp_freighter/tramp_freighter.dm

@@ -26,8 +26,9 @@
 	name = "Tramp Freighter"
 	class = "ICV"
 	desc = "A freighter of mixed repute, the Catspaw-class is a rare independent design, and a favorite of small-scale freight businesses. It has a shielded cargo bay and an internal hangar, capable of accommodating a small shuttle. Its other features, however, are lacking - with cramped crew amenities and no defenses to speak of, the Catspaw is risky to operate in unpoliced space."
-	icon_state = "ship_grey"
-	moving_state = "ship_grey_moving"
+	icon_state = "tramp"
+	moving_state = "tramp_moving"
+	colors = list("#c3c7eb", "#a0a8ec")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -70,8 +71,9 @@
 	designation = "Dame"
 	desc = "An inefficient design of ultra-light shuttle known as the Wisp-class. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. Manufactured by Hephaestus. This one's transponder identifies it as belonging to an independent freighter."
 	shuttle = "Freight Shuttle"
-	icon_state = "shuttle_grey"
-	moving_state = "shuttle_grey_moving"
+	icon_state = "pod"
+	moving_state = "pod_moving"
+	colors = list("#c3c7eb", "#a0a8ec")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod

maps/away/ships/wildlands_militia/militia_ship.dm

@@ -26,8 +26,9 @@
 	name = "Militia Ship"
 	class = "IPV"
 	desc = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus."
-	icon_state = "ship_grey"
-	moving_state = "ship_grey_moving"
+	icon_state = "generic"
+	moving_state = "generic_moving"
+	colors = list("#c3c7eb", "#a0a8ec")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -70,8 +71,9 @@
 	designation = "Boulevard"
 	desc = "An inefficient design of ultra-light shuttle known as the Wisp-class. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. Manufactured by Hephaestus. This one's transponder identifies it as belonging to an independent militia."
 	shuttle = "Militia Ship"
-	icon_state = "shuttle_grey"
-	moving_state = "shuttle_grey_moving" 
+	icon_state = "pod"
+	moving_state = "pod_moving"
+	colors = list("#c3c7eb", "#a0a8ec")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod

maps/away/ships/yacht/yacht.dm

@@ -9,10 +9,11 @@
 
 /obj/effect/overmap/visitable/ship/yacht
 	name = "private yacht"
-	desc = "Sensor array is detecting a private pleasure yacht with unknown lifeforms dectected within. The design appears to be from the Idris Incorporated 'Starfarer' line." 
+	desc = "Sensor array is detecting a private pleasure yacht with unknown lifeforms dectected within. The design appears to be from the Idris Incorporated 'Starfarer' line."
 	class = "IPV"
-	icon_state = "ship_grey"
-	moving_state = "ship_grey_moving"
+	icon_state = "generic"
+	moving_state = "generic_moving"
+	colors = list("#c3c7eb", "#a0a8ec")
 	vessel_mass = 3000
 	max_speed = 1/(2 SECONDS)
 	initial_generic_waypoints = list(

maps/runtime/runtime_overmap.dm

@@ -3,6 +3,10 @@
 	class = "NSS"
 	designation = "Runtime"
 	desc = "A large cube-shaped station, a penal colony of sorts for the likes of video game developers."
+	icon = 'icons/obj/overmap/overmap_stationary.dmi'
+	icon_state = "runtime_penal_colony"
+	moving_state = "runtime_penal_colony"
+	colors = list("#f147cd", "#f79aea")
 	vessel_mass = 100000
 	burn_delay = 2 SECONDS
 	base = TRUE
@@ -47,4 +51,4 @@
 
 /obj/effect/shuttle_landmark/runtime/transit
 	name = "In transit"
-	landmark_tag = "nav_transit_runtime"
+	landmark_tag = "nav_transit_runtime"

maps/sccv_horizon/code/sccv_horizon_overmap.dm

@@ -2,6 +2,9 @@
 	class = "SCCV"
 	designation = "Horizon"
 	desc = "A line without compare, the Venator-series consists of one vessel so far: the SCCV Horizon, the lead ship of its class. Designed to be an entirely self-sufficient general-purpose surveying ship and to carry multiple replacement crews simultaneously, the Venator is equipped with both a bluespace and a warp drive and two different engines. Defying typical cruiser dimensions, the Venator is home to a sizable residential deck below the operations deck of the ship, where the crew is housed. It also features weapon hardpoints in its prominent wing nacelles. This one's transponder identifies it, obviously, as the SCCV Horizon."
+	icon_state = "venator"
+	moving_state = "venator_moving"
+	colors = list("#cfd4ff", "#78adf8")
 	fore_dir = SOUTH
 	vessel_mass = 70000
 	burn_delay = 2 SECONDS
@@ -45,6 +48,9 @@
 	desc = "A standard-sized exploration shuttle manufactured by Hephaestus, the Pathfinder-class is commonly used by the corporations of the SCC. Featuring well-rounded facilities and equipment, the Pathfinder is excellent, albeit pricey, platform. This one's transponder identifies it as the SCCV Intrepid, which actually uses \
 			a specially modified Pathfinder-class chassis fitted with a 40mm Francisca rotary gun."
 	shuttle = "Intrepid"
+	icon_state = "intrepid"
+	moving_state = "intrepid_moving"
+	colors = list("#cfd4ff", "#78adf8")
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -62,6 +68,9 @@
 	designation = "Spark"
 	desc = "A common, modestly-sized short-range shuttle manufactured by Hephaestus. Most frequently used as a mining platform, the Pickaxe-class is entirely reliant on a reasonably-sized mothership for anything but short-term functionality. This one's transponder identifies it as belonging to the Stellar Corporate Conglomerate."
 	shuttle = "Spark"
+	icon_state = "spark"
+	moving_state = "spark_moving"
+	colors = list("#cfd4ff", "#78adf8")
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod