From 9984ef3e7754b0157da53db77fe1e2853cb2f685 Mon Sep 17 00:00:00 2001
From: WickedCybs <52309324+WickedCybs@users.noreply.github.com>
Date: Sun, 18 Dec 2022 14:23:13 -0500
Subject: [PATCH] Proper Overmap Ship Icons (#15358)

---
 html/changelogs/fixicon_wickedcybs.yml                    | 6 ++++++
 maps/away/away_site/tajara/mining_jack/mining_jack.dm     | 4 ++--
 .../away_site/tajara/peoples_station/peoples_station.dm   | 4 +++-
 maps/away/away_site/tajara/scrapper/scrapper.dm           | 4 ++--
 .../away_site/tajara/taj_safehouse/tajara_safehouse.dm    | 2 ++
 .../away_site/unathi_pirate/unathi_pirate_izharshan.dm    | 2 ++
 maps/away/ships/coc_ranger/coc_ship.dm                    | 6 ++++--
 maps/away/ships/einstein/ee_spy_ship.dm                   | 6 ++++--
 maps/away/ships/elyra/elyra_strike_craft.dm               | 6 ++++--
 maps/away/ships/orion/orion_express_ship.dm               | 4 ++--
 .../ships/pra/database_freighter/database_freighter.dm    | 8 ++++----
 maps/away/ships/pra/headmaster/headmaster_ship.dm         | 8 ++++----
 maps/away/ships/skrell_smuggler/tirakqi_freighter.dm      | 6 ++++--
 maps/away/ships/sol_merc/fsf_patrol_ship.dm               | 6 ++++--
 maps/away/ships/sol_pirate/sfa_patrol_ship.dm             | 6 ++++--
 maps/away/ships/sol_ssmd/ssmd_ship.dm                     | 6 ++++--
 maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm   | 8 ++++++--
 maps/away/ships/tcfl_patrol/tcfl_peacekeeper_ship.dm      | 6 ++++--
 maps/away/ships/tramp_freighter/tramp_freighter.dm        | 6 ++++--
 maps/away/ships/wildlands_militia/militia_ship.dm         | 6 ++++--
 20 files changed, 73 insertions(+), 37 deletions(-)
 create mode 100644 html/changelogs/fixicon_wickedcybs.yml

diff --git a/html/changelogs/fixicon_wickedcybs.yml b/html/changelogs/fixicon_wickedcybs.yml
new file mode 100644
index 00000000000..d869e105aea
--- /dev/null
+++ b/html/changelogs/fixicon_wickedcybs.yml
@@ -0,0 +1,6 @@
+author: WickedCybs
+
+delete-after: True
+
+changes:
+  - bugfix: "Motherships for shuttles will now use a more visible icon type on the overmap so they can differentiate themselves from their shuttles. Shuttles and motherships will share the same colour."
\ No newline at end of file
diff --git a/maps/away/away_site/tajara/mining_jack/mining_jack.dm b/maps/away/away_site/tajara/mining_jack/mining_jack.dm
index e66a315442c..58b6548da5c 100644
--- a/maps/away/away_site/tajara/mining_jack/mining_jack.dm
+++ b/maps/away/away_site/tajara/mining_jack/mining_jack.dm
@@ -49,8 +49,8 @@
 	class = "ACV"
 	desc = "A modified skipjack used by Tajaran miners. These models have been modified to mine as much as possible with a small crew. Due to its limited fuel supply, it usually does not go too far from its home base."
 	shuttle = "Mining Jack"
-	icon_state = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "shuttle_grey"
+	moving_state = "shuttle_grey_moving"
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dm b/maps/away/away_site/tajara/peoples_station/peoples_station.dm
index 0cf000fd608..6f96214540d 100644
--- a/maps/away/away_site/tajara/peoples_station/peoples_station.dm
+++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dm
@@ -49,8 +49,10 @@
 /obj/effect/overmap/visitable/ship/landable/peoples_station_fang
 	name = "Orbital Fleet Fang"
 	class = "PRAMV" //People's Republic of Adhomai Vessel
-	desc = "An interceptors used by Orbital Fleet in its carriers and stations."
+	desc = "An interceptor used by the Orbital Fleet in its carriers and stations."
 	shuttle = "Orbital Fleet Fang"
+	icon_state = "shuttle"
+	moving_state = "shuttle_red_moving"
 	max_speed = 1/(1 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 3000
diff --git a/maps/away/away_site/tajara/scrapper/scrapper.dm b/maps/away/away_site/tajara/scrapper/scrapper.dm
index e27be38b30e..287edd210ec 100644
--- a/maps/away/away_site/tajara/scrapper/scrapper.dm
+++ b/maps/away/away_site/tajara/scrapper/scrapper.dm
@@ -49,8 +49,8 @@
 	class = "ACV"
 	desc = "A horseshoe-shaped ship used by Adhomian Scrappers. Frequently used in repairs and scrapping operations."
 	shuttle = "Scrapper Ship"
-	icon_state = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "shuttle_grey"
+	moving_state = "shuttle_grey_moving"
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
diff --git a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm
index 324350fd64b..e841ed23123 100644
--- a/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm
+++ b/maps/away/away_site/tajara/taj_safehouse/tajara_safehouse.dm
@@ -43,6 +43,8 @@
 	designation = "Civilian Shuttle"
 	desc = "A civilian shuttle without any kind of identification."
 	shuttle = "Unmarked Civilian Shuttle"
+	icon_state = "shuttle_grey"
+	moving_state = "shuttle_grey_moving"
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
diff --git a/maps/away/away_site/unathi_pirate/unathi_pirate_izharshan.dm b/maps/away/away_site/unathi_pirate/unathi_pirate_izharshan.dm
index 55e4aee1381..9c8338c3e7e 100644
--- a/maps/away/away_site/unathi_pirate/unathi_pirate_izharshan.dm
+++ b/maps/away/away_site/unathi_pirate/unathi_pirate_izharshan.dm
@@ -76,6 +76,8 @@
 	shuttle = "Izharshan Freighter"
 	designation = "Anvil"
 	desc = "Though the sensors identify the engine signature and overall rough profile of the signal as being from an older Hegemonic Brick-class civilian freight shuttle, many modifications are detected, such as possible anti-ship weaponry onboard."
+	icon_state = "shuttle_green"
+	moving_state = "shuttle_green_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 7500 //This truck is too damn big
diff --git a/maps/away/ships/coc_ranger/coc_ship.dm b/maps/away/ships/coc_ranger/coc_ship.dm
index abea7a2d3c8..2146cb666c9 100644
--- a/maps/away/ships/coc_ranger/coc_ship.dm
+++ b/maps/away/ships/coc_ranger/coc_ship.dm
@@ -77,8 +77,8 @@
 	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 = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "ship_blue"
+	moving_state = "ship_blue_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -121,6 +121,8 @@
 	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"
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
diff --git a/maps/away/ships/einstein/ee_spy_ship.dm b/maps/away/ships/einstein/ee_spy_ship.dm
index 579ab468406..e37f3b5bb50 100644
--- a/maps/away/ships/einstein/ee_spy_ship.dm
+++ b/maps/away/ships/einstein/ee_spy_ship.dm
@@ -26,8 +26,8 @@
 	name = "Einstein Engines Research Ship"
 	class = "EERV"
 	desc = "A research ship belonging to Einstein Engines, the Stellar Corporate Conglomerate's main competitor."
-	icon_state = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "ship_green"
+	moving_state = "ship_green_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -70,6 +70,8 @@
 	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"
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
diff --git a/maps/away/ships/elyra/elyra_strike_craft.dm b/maps/away/ships/elyra/elyra_strike_craft.dm
index 5026dc02474..8f6070acd80 100644
--- a/maps/away/ships/elyra/elyra_strike_craft.dm
+++ b/maps/away/ships/elyra/elyra_strike_craft.dm
@@ -26,8 +26,8 @@
 	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 = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "ship_grey"
+	moving_state = "ship_grey_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -70,6 +70,8 @@
 	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"
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
diff --git a/maps/away/ships/orion/orion_express_ship.dm b/maps/away/ships/orion/orion_express_ship.dm
index 192d87a4ca7..5f2172672f3 100644
--- a/maps/away/ships/orion/orion_express_ship.dm
+++ b/maps/away/ships/orion/orion_express_ship.dm
@@ -26,8 +26,8 @@
 	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 = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "ship"
+	moving_state = "ship_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dm b/maps/away/ships/pra/database_freighter/database_freighter.dm
index 6a24e553261..966836c5eec 100644
--- a/maps/away/ships/pra/database_freighter/database_freighter.dm
+++ b/maps/away/ships/pra/database_freighter/database_freighter.dm
@@ -16,8 +16,8 @@
 	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_grey"
-	moving_state = "ship_grey_moving"
+	icon_state = "ship"
+	moving_state = "ship_moving"
 	vessel_mass = 10000
 	max_speed = 1/(2 SECONDS)
 	fore_dir = NORTH
@@ -63,8 +63,8 @@
 /obj/effect/overmap/visitable/ship/landable/database_freighter_shuttle
 	name = "Database Freighter Shuttle"
 	desc = "A simple and reliable shuttle design used by the Orbital Fleet."
-	icon_state = "shuttle_grey"
-	moving_state = "shuttle_grey_moving"
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
 	class = "PRAMV"
 	designation = "Yve'kha"
 	shuttle = "Database Freighter Shuttle"
diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dm b/maps/away/ships/pra/headmaster/headmaster_ship.dm
index 57dd90ca100..bb9a77dfd9b 100644
--- a/maps/away/ships/pra/headmaster/headmaster_ship.dm
+++ b/maps/away/ships/pra/headmaster/headmaster_ship.dm
@@ -16,8 +16,8 @@
 	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_grey"
-	moving_state = "ship_grey_moving"
+	icon_state = "ship"
+	moving_state = "ship_moving"
 	vessel_mass = 10000
 	max_speed = 1/(2 SECONDS)
 	fore_dir = NORTH
@@ -63,8 +63,8 @@
 /obj/effect/overmap/visitable/ship/landable/headmaster_shuttle
 	name = "Orbital Fleet Shuttle"
 	desc = "A simple and reliable shuttle design used by the Orbital Fleet."
-	icon_state = "shuttle_grey"
-	moving_state = "shuttle_grey_moving"
+	icon_state = "shuttle"
+	moving_state = "shuttle_moving"
 	class = "PRAMV"
 	designation = "Yve'kha"
 	shuttle = "Orbital Fleet Shuttle"
diff --git a/maps/away/ships/skrell_smuggler/tirakqi_freighter.dm b/maps/away/ships/skrell_smuggler/tirakqi_freighter.dm
index 2f837a535e5..0709311b1e1 100644
--- a/maps/away/ships/skrell_smuggler/tirakqi_freighter.dm
+++ b/maps/away/ships/skrell_smuggler/tirakqi_freighter.dm
@@ -25,8 +25,8 @@
 /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 = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "ship_blue"
+	moving_state = "ship_blue_moving"
 	class = "ISV"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
@@ -84,6 +84,8 @@
 	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"
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000
diff --git a/maps/away/ships/sol_merc/fsf_patrol_ship.dm b/maps/away/ships/sol_merc/fsf_patrol_ship.dm
index 250dd55645e..a80863166fd 100644
--- a/maps/away/ships/sol_merc/fsf_patrol_ship.dm
+++ b/maps/away/ships/sol_merc/fsf_patrol_ship.dm
@@ -26,8 +26,8 @@
 	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 = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "ship_green"
+	moving_state = "ship_green_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -70,6 +70,8 @@
 	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"
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
diff --git a/maps/away/ships/sol_pirate/sfa_patrol_ship.dm b/maps/away/ships/sol_pirate/sfa_patrol_ship.dm
index 05923ea7c14..1ad1d3c6736 100644
--- a/maps/away/ships/sol_pirate/sfa_patrol_ship.dm
+++ b/maps/away/ships/sol_pirate/sfa_patrol_ship.dm
@@ -65,8 +65,8 @@
 	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 = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "ship_green"
+	moving_state = "ship_green_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -109,6 +109,8 @@
 	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"
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
diff --git a/maps/away/ships/sol_ssmd/ssmd_ship.dm b/maps/away/ships/sol_ssmd/ssmd_ship.dm
index 603ebf38262..00b84b3cc26 100644
--- a/maps/away/ships/sol_ssmd/ssmd_ship.dm
+++ b/maps/away/ships/sol_ssmd/ssmd_ship.dm
@@ -90,8 +90,8 @@
 	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 = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "ship_green"
+	moving_state = "ship_green_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -134,6 +134,8 @@
 	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"
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm
index 8602a828fb0..dbe0300b02a 100644
--- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm
+++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dm
@@ -18,8 +18,8 @@
 	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 = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "ship_grey"
+	moving_state = "ship_grey_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -63,6 +63,8 @@
 	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" 
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
@@ -107,6 +109,8 @@
 	designation = "Cargo Hold"
 	desc = "A floating cargo container."
 	shuttle = "Adhomian Freight Cargo"
+	icon_state = "shuttle_grey"
+	moving_state = "shuttle_grey_moving" 
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
diff --git a/maps/away/ships/tcfl_patrol/tcfl_peacekeeper_ship.dm b/maps/away/ships/tcfl_patrol/tcfl_peacekeeper_ship.dm
index f3ff2a70fd6..08f8633d3b4 100644
--- a/maps/away/ships/tcfl_patrol/tcfl_peacekeeper_ship.dm
+++ b/maps/away/ships/tcfl_patrol/tcfl_peacekeeper_ship.dm
@@ -26,8 +26,8 @@
 	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 = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "ship_blue"
+	moving_state = "ship_blue_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -70,6 +70,8 @@
 	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" 
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dm b/maps/away/ships/tramp_freighter/tramp_freighter.dm
index ef8c1f28bd5..e719f8fbb99 100644
--- a/maps/away/ships/tramp_freighter/tramp_freighter.dm
+++ b/maps/away/ships/tramp_freighter/tramp_freighter.dm
@@ -26,8 +26,8 @@
 	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 = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "ship_grey"
+	moving_state = "ship_grey_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -70,6 +70,8 @@
 	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" 
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod
diff --git a/maps/away/ships/wildlands_militia/militia_ship.dm b/maps/away/ships/wildlands_militia/militia_ship.dm
index 7ae467d1c57..7aba4ad4086 100644
--- a/maps/away/ships/wildlands_militia/militia_ship.dm
+++ b/maps/away/ships/wildlands_militia/militia_ship.dm
@@ -26,8 +26,8 @@
 	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 = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "ship_grey"
+	moving_state = "ship_grey_moving"
 	max_speed = 1/(2 SECONDS)
 	burn_delay = 1 SECONDS
 	vessel_mass = 5000
@@ -70,6 +70,8 @@
 	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" 
 	max_speed = 1/(3 SECONDS)
 	burn_delay = 2 SECONDS
 	vessel_mass = 3000 //very inefficient pod