Merge pull request #2354 from CHOMPStationBot/upstream-merge-10807

[MIRROR] Replace all the overmap icons

code/controllers/subsystems/vis_overlays.dm

@@ -29,18 +29,18 @@ SUBSYSTEM_DEF(vis_overlays)
 			return
 
 //the "thing" var can be anything with vis_contents which includes images - in the future someone should totally allow vis overlays to be passed in as an arg instead of all this bullshit
-/datum/controller/subsystem/vis_overlays/proc/add_vis_overlay(atom/movable/thing, icon, iconstate, layer, plane, dir, alpha = 255, add_appearance_flags = NONE, unique = FALSE)
+/datum/controller/subsystem/vis_overlays/proc/add_vis_overlay(atom/movable/thing, icon, iconstate, layer, plane, dir, alpha = 255, add_appearance_flags = NONE, add_vis_flags = NONE, unique = FALSE)
 	var/obj/effect/overlay/vis/overlay
 	if(!unique)
 		. = "[icon]|[iconstate]|[layer]|[plane]|[dir]|[alpha]|[add_appearance_flags]"
 		overlay = vis_overlay_cache[.]
 		if(!overlay)
-			overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags)
+			overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags)
 			vis_overlay_cache[.] = overlay
 		else
 			overlay.unused = 0
 	else
-		overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags)
+		overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags)
 		overlay.cache_expiration = -1
 		var/cache_id = "\ref[overlay]@{[world.time]}"
 		vis_overlay_cache[cache_id] = overlay
@@ -56,7 +56,7 @@ SUBSYSTEM_DEF(vis_overlays)
 		thing.managed_vis_overlays += overlay
 	return overlay
 
-/datum/controller/subsystem/vis_overlays/proc/_create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags)
+/datum/controller/subsystem/vis_overlays/proc/_create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags)
 	var/obj/effect/overlay/vis/overlay = new
 	overlay.icon = icon
 	overlay.icon_state = iconstate
@@ -65,6 +65,7 @@ SUBSYSTEM_DEF(vis_overlays)
 	overlay.dir = dir
 	overlay.alpha = alpha
 	overlay.appearance_flags |= add_appearance_flags
+	overlay.vis_flags |= add_vis_flags
 	return overlay
 
 
@@ -75,3 +76,14 @@ SUBSYSTEM_DEF(vis_overlays)
 	thing.managed_vis_overlays -= overlays
 	if(!length(thing.managed_vis_overlays))
 		thing.managed_vis_overlays = null
+
+/atom/proc/add_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags, unique)
+	// The extremely minimal version where you just pass a string and nothing else
+	if(istext(icon))
+		iconstate = icon
+		icon = src.icon
+		
+	return SSvis_overlays.add_vis_overlay(src, icon, iconstate, layer, plane, dir, alpha, add_appearance_flags, add_vis_flags, unique)
+
+/atom/proc/remove_vis_overlay(list/overlays)
+	return SSvis_overlays.remove_vis_overlay(src, overlays)

code/modules/overmap/bluespace_rift_vr.dm

@@ -4,8 +4,6 @@
 	icon = 'icons/obj/overmap_vr.dmi'
 	icon_state = "portal"
 	color = "#2288FF"
-
-	known = FALSE			//shows up on nav computers automatically
 	scannable = TRUE       //if set to TRUE will show up on ship sensors for detailed scans
 
 	var/obj/effect/overmap/bluespace_rift/partner

code/modules/overmap/events/overmap_event.dm

@@ -9,7 +9,6 @@
 	icon = 'icons/obj/overmap.dmi'
 	icon_state = "event"
 	opacity = 1
-	known = FALSE
 	var/list/events							// List of event datum paths
 	var/list/event_icon_states				// Randomly picked from
 	var/difficulty = EVENT_LEVEL_MODERATE

code/modules/overmap/overmap_object.dm

@@ -3,20 +3,39 @@
 	icon = 'icons/obj/overmap.dmi'
 	icon_state = "object"
 
-	var/known = 1		//shows up on nav computers automatically
-	var/scannable       //if set to TRUE will show up on ship sensors for detailed scans
-	var/scanner_name	//name for scans, replaces name once scanned
-	var/scanner_desc	//description for scans
 
-	var/skybox_icon 		//Icon file to use for skybox
-	var/skybox_icon_state	//Icon state to use for skybox
-	var/skybox_pixel_x		//Shift from lower left corner of skybox
-	var/skybox_pixel_y		//Shift from lower left corner of skybox
-	var/image/cached_skybox_image	//Cachey
+	/// If set to TRUE will show up on ship sensors for detailed scans
+	var/scannable
+	/// Description for scans
+	var/scanner_desc
+
+	/// Icon file to use for skybox
+	var/skybox_icon
+	/// Icon state to use for skybox
+	var/skybox_icon_state
+	/// Shift from lower left corner of skybox
+	var/skybox_pixel_x
+	/// Shift from lower left corner of skybox
+	var/skybox_pixel_y
+	/// Cachey
+	var/image/cached_skybox_image
+
+	/// For showing to the pilot of the ship, so they see the 'real' appearance, despite others seeing the unknown ones
+	var/image/real_appearance
 
 	light_system = MOVABLE_LIGHT
 	light_on = FALSE
 
+/obj/effect/overmap/Initialize()
+	. = ..()
+	if(!global.using_map.use_overmap)
+		return INITIALIZE_HINT_QDEL
+
+/obj/effect/overmap/Destroy()
+	real_appearance?.loc = null
+	real_appearance = null
+	return ..()
+
 //Overlay of how this object should look on other skyboxes
 /obj/effect/overmap/proc/get_skybox_representation()
 	if(!cached_skybox_image)
@@ -45,23 +64,10 @@
 		SSskybox.rebuild_skyboxes(O.map_z)
 
 /obj/effect/overmap/proc/get_scan_data(mob/user)
-	if(scanner_name && (name != scanner_name)) //A silly check, but 'name' is part of appearance, so more expensive than you might think
-		name = scanner_name
-
 	var/dat = {"\[b\]Scan conducted at\[/b\]: [stationtime2text()] [stationdate2text()]\n\[b\]Grid coordinates\[/b\]: [x],[y]\n\n[scanner_desc]"}
 
 	return dat
 
-/obj/effect/overmap/Initialize()
-	. = ..()
-	if(!global.using_map.use_overmap)
-		return INITIALIZE_HINT_QDEL
-
-	if(known)
-		plane = PLANE_LIGHTING_ABOVE
-		for(var/obj/machinery/computer/ship/helm/H in global.machines)
-			H.get_known_sectors()
-
 /obj/effect/overmap/Crossed(var/obj/effect/overmap/visitable/other)
 	if(istype(other))
 		for(var/obj/effect/overmap/visitable/O in loc)

code/modules/overmap/overmap_planet.dm

@@ -1,8 +1,11 @@
 /obj/effect/overmap/visitable/planet
 	name = "planet"
-	icon_state = "globe"
+	icon_state = "lush"
 	in_space = 0
 
+	unknown_name = "unknown planet"
+	unknown_state = "planet"
+
 	var/datum/gas_mixture/atmosphere
 
 	var/atmosphere_color = "FFFFFF"

code/modules/overmap/sectors.dm

@@ -6,6 +6,15 @@
 	scannable = TRUE
 	scanner_desc = "!! No Data Available !!"
 
+	icon_state = "generic"
+
+	/// Shows up on nav computers automatically
+	var/known = TRUE
+	/// Name prior to being scanned if !known
+	var/unknown_name = "unknown sector"
+	/// Icon_state prior to being scanned if !known
+	var/unknown_state = "field"
+
 	var/list/map_z = list()
 	var/list/extra_z_levels //if you need to manually insist that these z-levels are part of this sector, for things like edge-of-map step trigger transitions rather than multi-z complexes
 
@@ -50,6 +59,19 @@
 	LAZYADD(SSshuttles.sectors_to_initialize, src) //Queued for further init. Will populate the waypoint lists; waypoints not spawned yet will be added in as they spawn.
 	SSshuttles.process_init_queues()
 
+	if(known)
+		plane = PLANE_LIGHTING_ABOVE
+		for(var/obj/machinery/computer/ship/helm/H in global.machines)
+			H.get_known_sectors()
+	else
+		real_appearance = image(icon, src, icon_state)
+		real_appearance.override = TRUE
+		name = unknown_name
+		icon_state = unknown_state
+		color = null
+		desc = "Scan this to find out more information."
+		
+
 // You generally shouldn't destroy these.
 /obj/effect/overmap/visitable/Destroy()
 	testing("Deleting [src] overmap sector at [x],[y]")
@@ -98,6 +120,15 @@
 		global.using_map.map_levels -= map_z
 	*/
 
+/obj/effect/overmap/visitable/get_scan_data()
+	if(!known)
+		known = TRUE
+		name = initial(name)
+		icon_state = initial(icon_state)
+		color = initial(color)
+		desc = initial(desc)
+	return ..()
+
 /obj/effect/overmap/visitable/proc/get_space_zlevels()
 	if(in_space)
 		return map_z
@@ -170,9 +201,9 @@
 		return FALSE
 	has_distress_beacon = TRUE
 
-	admin_chat_message(message = "Overmap panic button hit on z[z] ([scanner_name || name]) by '[user?.ckey || "Unknown"]'", color = "#FF2222") //VOREStation Add
+	admin_chat_message(message = "Overmap panic button hit on z[z] ([name]) by '[user?.ckey || "Unknown"]'", color = "#FF2222") //VOREStation Add
 	var/message = "This is an automated distress signal from a MIL-DTL-93352-compliant beacon transmitting on [PUB_FREQ*0.1]kHz. \
-	This beacon was launched from '[scanner_name || name]'. I can provide this additional information to rescuers: [get_distress_info()]. \
+	This beacon was launched from '[name]'. I can provide this additional information to rescuers: [get_distress_info()]. \
 	Per the Interplanetary Convention on Space SAR, those receiving this message must attempt rescue, \
 	or relay the message to those who can. This message will repeat one time in 5 minutes. Thank you for your urgent assistance."
 	
@@ -193,7 +224,7 @@
 	return "\[X:[x], Y:[y]\]"
 
 /obj/effect/overmap/visitable/proc/distress_update()
-	var/message = "This is the final message from the distress beacon launched from '[scanner_name || name]'. I can provide this additional information to rescuers: [get_distress_info()]. \
+	var/message = "This is the final message from the distress beacon launched from '[name]'. I can provide this additional information to rescuers: [get_distress_info()]. \
 	Please render assistance under your obligations per the Interplanetary Convention on Space SAR, or relay this message to a party who can. Thank you for your urgent assistance."
 
 	for(var/zlevel in levels_for_distress)

code/modules/overmap/ships/computers/ship.dm

@@ -69,6 +69,8 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
 	if(linked)
 		apply_visual(user)
 		user.reset_view(linked)
+		if(linked.real_appearance)
+			user.client?.images += linked.real_appearance
 	user.set_machine(src)
 	if(isliving(user))
 		var/mob/living/L = user
@@ -81,6 +83,8 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov
 
 /obj/machinery/computer/ship/proc/unlook(var/mob/user)
 	user.reset_view()
+	if(linked?.real_appearance)
+		user.client?.images -= linked.real_appearance
 	if(isliving(user))
 		var/mob/living/L = user
 		L.looking_elsewhere = 0

code/modules/overmap/ships/landable.dm

@@ -7,8 +7,7 @@
 	var/obj/effect/shuttle_landmark/ship/landmark       // Record our open space landmark for easy reference.
 	var/multiz = 0										// Index of multi-z levels, starts at 0
 	var/status = SHIP_STATUS_LANDED
-	icon_state = "shuttle"
-	moving_state = "shuttle_moving"
+	icon_state = "shuttle_nosprite"
 
 /obj/effect/overmap/visitable/ship/landable/Destroy()
 	GLOB.shuttle_pre_move_event.unregister(SSshuttles.shuttles[shuttle], src)

code/modules/overmap/ships/ship.dm

@@ -14,10 +14,13 @@
 	desc = "This marker represents a spaceship. Scan it for more information."
 	scanner_desc = "Unknown spacefaring vessel."
 	dir = NORTH
-	icon_state = "ship"
+	icon_state = "ship_nosprite"
 	appearance_flags = TILE_BOUND|KEEP_TOGETHER|LONG_GLIDE //VOREStation Edit
 	light_power = 4
-	var/moving_state = "ship_moving"
+
+	unknown_name = "unknown ship"
+	unknown_state = "ship"
+	known = FALSE // Ships start 'unknown' on the map and require scanning
 
 	var/vessel_mass = 10000             //tonnes, arbitrary number, affects acceleration provided by engines
 	var/vessel_size = SHIP_SIZE_LARGE	//arbitrary number, affects how likely are we to evade meteors
@@ -38,6 +41,9 @@
 	var/skill_needed = SKILL_ADEPT  //piloting skill needed to steer it without going in random dir
 	var/operator_skill
 
+	/// Vis contents overlay holding the ship's vector when in motion	
+	var/obj/effect/overlay/vis/vector
+
 /obj/effect/overmap/visitable/ship/Initialize()
 	. = ..()
 	min_speed = round(min_speed, SHIP_MOVE_RESOLUTION)
@@ -45,11 +51,14 @@
 	SSshuttles.ships += src
 	position_x = ((loc.x - 1) * WORLD_ICON_SIZE) + (WORLD_ICON_SIZE/2) + pixel_x + 1
 	position_y = ((loc.y - 1) * WORLD_ICON_SIZE) + (WORLD_ICON_SIZE/2) + pixel_y + 1
+	vector = add_vis_overlay("vector", dir = SOUTH, layer = 10, unique = TRUE)
+	vector.vis_flags = (VIS_INHERIT_PLANE|VIS_INHERIT_ID)
 
 /obj/effect/overmap/visitable/ship/Destroy()
 	STOP_PROCESSING(SSprocessing, src)
+	remove_vis_overlay(vector)
 	SSshuttles.ships -= src
-	. = ..()
+	return ..()
 
 /obj/effect/overmap/visitable/ship/relaymove(mob/user, direction, accel_limit)
 	accelerate(direction, accel_limit)
@@ -200,11 +209,13 @@
 
 /obj/effect/overmap/visitable/ship/update_icon()
 	if(!is_still())
-		icon_state = moving_state
-		transform = matrix().Turn(get_heading_degrees())
+		var/heading = get_heading_degrees()
+		dir = angle2dir(round(heading, 90))
+		vector.dir = NORTH
+		vector.transform = matrix().Turn(heading)
 	else
-		icon_state = initial(icon_state)
-		transform = null
+		dir = NORTH
+		vector.dir = SOUTH
 	..()
 
 /obj/effect/overmap/visitable/ship/set_dir(new_dir)

code/modules/tgui/modules/admin_shuttle_controller.dm

@@ -22,7 +22,7 @@
 	for(var/ship in SSshuttles.ships)
 		var/obj/effect/overmap/visitable/ship/S = ship
 		overmap_ships.Add(list(list(
-			"name" = S.scanner_name || S.name,
+			"name" = S.name,
 			"ref" = REF(S),
 		)))
 	data["overmap_ships"] = overmap_ships

maps/expedition_vr/aerostat/_aerostat.dm

@@ -8,10 +8,11 @@
 [i]Habitability[/i]: Low (High Temperature, Toxic Atmosphere)
 [b]Notice[/b]: Planetary environment not suitable for life. Landing may be hazardous."}
 	icon_state = "globe"
-	color = "#dfff3f" //Bright yellow
 	in_space = 0
 	initial_generic_waypoints = list("aerostat_west","aerostat_east","aerostat_south","aerostat_northwest","aerostat_northeast")
 	extra_z_levels = list(Z_LEVEL_AEROSTAT_SURFACE)
+	known = TRUE
+	icon_state = "chlorine"
 
 // -- Datums -- //
 

maps/expedition_vr/alienship/_alienship.dm

@@ -1,12 +1,13 @@
 // -- Datums -- //
 
 /obj/effect/overmap/visitable/sector/alienship
-	name = "Unknown Vessel"
+	name = "precursor vessel"
+	icon_state = "unkn_o"
+	unknown_state = "ship"
 	desc = "An unknown vessel detected by sensors."
 	start_x = 12
 	start_y = 12
 	icon_state = "ship"
-	color = "#ff00ff" //Sandy
 	initial_generic_waypoints = list("tether_excursion_alienship")
 
 // -- Objs -- //

maps/expedition_vr/beach/_beach.dm

@@ -8,10 +8,11 @@
 [i]Habitability[/i]: Moderate (High Temperature)
 [b]Notice[/b]: Request authorization from planetary authorities before attempting to construct settlements"}
 	icon_state = "globe"
-	color = "#ffd300" //Sandy
 	in_space = 0
 	initial_generic_waypoints = list("beach_e", "beach_c", "beach_nw")
 	extra_z_levels = list(Z_LEVEL_BEACH_CAVE)
+	known = TRUE
+	icon_state = "desert"
 
 //This is a special subtype of the thing that generates ores on a map
 //It will generate more rich ores because of the lower numbers than the normal one

maps/expedition_vr/space/_debrisfield.dm

@@ -9,6 +9,7 @@
 	known = FALSE
 	color = "#ee3333" //Redish, so it stands out against the other debris-like icons
 	initial_generic_waypoints = list("debrisfield_se", "debrisfield_nw")
+	icon_state = "spacehulk_g"
 
 // -- Objs -- //
 
@@ -146,7 +147,7 @@
 	. = ..()
 
 /obj/effect/overmap/visitable/ship/landable/tinycarrier
-	scanner_name = "TBD"
+	name = "TBD"
 	scanner_desc = "TBD"
 	vessel_mass = 12000
 	vessel_size = SHIP_SIZE_SMALL
@@ -156,7 +157,7 @@
 	. = ..()
 	var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/other/sysdef]
 	var/newname = "SDV [pick(O.ship_names)]"
-	scanner_name = newname
+	name = newname
 	scanner_desc = {"\[i\]Registration\[/i\]: [newname]
 \[i\]Class\[/i\]: Light Escort Carrier
 \[i\]Transponder\[/i\]: Transmitting (MIL), Weak Signal

maps/expedition_vr/space/_fueldepot.dm

@@ -9,6 +9,9 @@
 	icon_state = "fueldepot"
 	color = "#33FF33"
 	initial_generic_waypoints = list("fueldepot_east","fueldepot_west","fueldepot_north","fueldepot_south")
+	unknown_state = "station"
+	known = TRUE
+	icon_state = "fueldepot_g"
 
 /area/tether_away/fueldepot
 	name = "Away Mission - Fuel Depot"

maps/gateway_vr/carpfarm.dm

@@ -1,6 +1,6 @@
 /obj/effect/overmap/visitable/sector/tether_gateway/carpfarm
 	initial_generic_waypoints = list("carpfarm1", "carpfarm2")
-	scanner_name = "Carp-Infested Outpost"
+	name = "Carp-Infested Outpost"
 	scanner_desc = @{"[i]Registration[/i]: UNKNOWN
 [i]Class[/i]: Installation
 [i]Transponder[/i]: None Detected

maps/gateway_vr/listeningpost.dm

@@ -1,6 +1,6 @@
 /obj/effect/overmap/visitable/sector/tether_gateway/listeningpost
 	initial_generic_waypoints = list("tether_excursion_listeningpost")
-	scanner_name = "Strange Asteroid"
+	name = "Strange Asteroid"
 	scanner_desc = @{"[i]Registration[/i]: UNKNOWN
 [i]Class[/i]: Wreckage
 [i]Transponder[/i]: None Detected"}

maps/gateway_vr/snow_outpost.dm

@@ -1,7 +1,7 @@
 /obj/effect/overmap/visitable/sector/tether_gateway/snowoutpost
 	initial_generic_waypoints = list("tether_excursion_snow_outpost")
 	in_space = 0
-	scanner_name = "Snowy Outpost"
+	name = "Snowy Outpost"
 	scanner_desc = @{"[i]Stellar Body[/i]>: UNKNOWN
 [i]Class[/i]>: M-Class Planetoid
 [i]Habitability[/i]>: Moderate (Low Temperature)

maps/gateway_vr/snowfield.dm

@@ -1,11 +1,14 @@
 /obj/effect/overmap/visitable/sector/tether_gateway/snowfield
 	initial_generic_waypoints = list("tether_excursion_snowfield")
 	in_space = 0
-	scanner_name = "Snowy Field"
+	name = "Snowy Field"
 	scanner_desc = @{"[i]Stellar Body[/i]: UNKNOWN
 [i]Class[/i]: M-Class Planetoid
 [i]Habitability[/i]: Moderate (Low Temperature)
 [b]Notice[/b]: Very cold atmosphere, minimal life signs detected"}
+	unknown_state = "planet"
+	known = FALSE
+	icon_state = "frozen"
 
 // -- Areas -- //
 

maps/gateway_vr/variable/arynthilake.dm

@@ -4,8 +4,9 @@
 	scanner_desc = @{"It is difficult to tell just what is beyond this strange shimmering shape. The air beyond seems breathable."}
 	icon = 'icons/obj/overmap_vr.dmi'
 	icon_state = "shimmer"
-	color = "#171DFF" //bloo
 	in_space = 0
+	unknown_state = "field"
+	known = FALSE
 
 /datum/map_template/tether_lateload/gateway/arynthilake/on_map_loaded(z)
     . = ..()

maps/gateway_vr/variable/honlethhighlands.dm

@@ -6,6 +6,7 @@
 	icon_state = "shimmer"
 	color = "#171DFF" //bloo
 	in_space = 0
+	unknown_state = "field"
 
 /datum/map_template/tether_lateload/gateway/honlethhighlands_a/on_map_loaded(z)
     . = ..()

maps/gateway_vr/wildwest.dm

@@ -185,3 +185,6 @@
 	icon_state = "shimmer"
 	color = "#8b0b0b" //red
 	in_space = 1
+	unknown_state = "field"
+	known = FALSE
+	

maps/offmap_vr/om_ships/abductor.dm

@@ -26,20 +26,18 @@
 
 // The 'Abductor Ship'
 /obj/effect/overmap/visitable/ship/abductor
-	name = "spacecraft"
+	name = "strange spacecraft"
 	desc = "Spacefaring vessel."
-	icon_state = "shuttle"
-	moving_state = "shuttle"
-	scanner_name = "unknown vessel"
+	icon_state = "unkn_r"
 	scanner_desc = @{"[i]Registration[/i]: Unknown
 [i]Class[/i]: Corvette
 [i]Transponder[/i]: No transponder detected."
 [b]Notice[/b]: Deep scans detect unknown power signatures, and onboard transporter technology."}
-	color = "#11414c" //STEALTH
 	vessel_mass = 8000
 	vessel_size = SHIP_SIZE_SMALL
 	initial_generic_waypoints = list("abductor_port", "abductor_starboard")
 	fore_dir = NORTH
+	known = FALSE
 
 /obj/item/weapon/paper/alien/abductor
 	name = "Read Me"
@@ -82,19 +80,6 @@ You will find a dispenser within the room you started in which contains some bas
 	installation = /obj/item/weapon/gun/energy/ionrifle/weak
 	lethal = TRUE
 
-/obj/item/device/perfect_tele/frontier/unknown/abductor/one
-	loc_network = "abd1"
-/obj/item/device/perfect_tele/frontier/unknown/abductor/two
-	loc_network = "abd2"
-/obj/item/device/perfect_tele/frontier/unknown/abductor/three
-	loc_network = "abd3"
-/obj/item/device/perfect_tele/frontier/unknown/abductor/four
-	loc_network = "abd4"
-/obj/item/device/perfect_tele/frontier/unknown/abductor/five
-	loc_network = "abd5"
-/obj/item/device/perfect_tele/frontier/unknown/abductor/six
-	loc_network = "abd6"
-
 /obj/machinery/power/rtg/abductor/built/abductor
 	name = "Void Core"
 	power_gen = 5000000

maps/offmap_vr/om_ships/aro.dm

@@ -45,7 +45,6 @@
 /obj/effect/overmap/visitable/ship/aro
 	name = "Aronai Sieyes"
 	desc = "It's Aronai. Did you know he's actually a spaceship? Yeah it's weird."
-	color = "#00aaff" //Bluey
 	vessel_mass = 8000
 	vessel_size = SHIP_SIZE_SMALL
 	initial_generic_waypoints = list("aronai_fore", "aronai_aft", "aronai_port", "aronai_starboard")

maps/offmap_vr/om_ships/aro2.dm

@@ -56,12 +56,11 @@
 /obj/effect/overmap/visitable/ship/aro2
 	name = "spacecraft"
 	desc = "Spacefaring vessel. Friendly IFF detected."
-	scanner_name = "Aronai Sieyes"
+	name = "Aronai Sieyes"
 	scanner_desc = @{"[i]Registration[/i]: Aronai Sieyes
 [i]Class[/i]: Small Frigate (Low Displacement)
 [i]Transponder[/i]: Transmitting (CIV), non-hostile
 [b]Notice[/b]: Automated vessel"}
-	color = "#00aaff" //Bluey
 	vessel_mass = 8000
 	vessel_size = SHIP_SIZE_SMALL
 	initial_generic_waypoints = list("aronai2_fore", "aronai2_aft", "aronai2_port", "aronai2_starboard")

maps/offmap_vr/om_ships/aro3.dm

@@ -77,9 +77,9 @@
 
 // The 'ship'
 /obj/effect/overmap/visitable/ship/aro3
-	name = "spacecraft"
+	name = "Aronai Sieyes"
 	desc = "Spacefaring vessel. Friendly IFF detected."
-	scanner_name = "Aronai Sieyes"
+	icon_state = "moe_cruiser_g"
 	scanner_desc = @{"[i]Registration[/i]: Aronai Sieyes
 [i]Class[/i]: Small Frigate (Low Displacement)
 [i]Transponder[/i]: Transmitting (CIV), non-hostile
@@ -90,6 +90,7 @@
 	initial_generic_waypoints = list("aronai3_fore", "aronai3_aft", "aronai3_port", "aronai3_starboard")
 	initial_restricted_waypoints = list("Aro's Boat" = list("omship_spawn_aroboat3"))
 	fore_dir = NORTH
+	known = FALSE
 
 	skybox_icon = 'aro3.dmi'
 	skybox_icon_state = "skybox"

maps/offmap_vr/om_ships/bearcat.dm

@@ -0,0 +1,202 @@
+// Compile in the map for CI testing if we're testing compileability of all the maps
+#if MAP_TEST
+#include "bearcat.dmm"
+#endif
+
+// -- Datums -- //
+/datum/map_template/om_ships/bearcat
+	name = "OM Ship - Bearcat (New Z)"
+	desc = "An old salvage ship, abandoned but seemingly intact."
+	mappath = 'bearcat.dmm'
+
+// The 'shuttle'
+/datum/shuttle/autodock/overmap/bearcat
+	name = "Bearcat"
+	current_location = "omship_spawn_bearcat"
+	docking_controller_tag = "bearcat_docking"
+	shuttle_area = list(	/area/ship/scrap,
+				/area/shuttle/bearcat/cargo,
+				/area/shuttle/bearcat/command,
+				/area/shuttle/bearcat/command_captain,
+				/area/shuttle/bearcat/comms,
+				/area/shuttle/bearcat/crew,
+				/area/shuttle/bearcat/crew_corridors,
+				/area/shuttle/bearcat/crew_dorms,
+				/area/shuttle/bearcat/crew_kitchen,
+				/area/shuttle/bearcat/crew_medbay,
+				/area/shuttle/bearcat/crew_saloon,
+				/area/shuttle/bearcat/crew_toilets,
+				/area/shuttle/bearcat/crew_wash,
+				/area/shuttle/bearcat/dock_central,
+				/area/shuttle/bearcat/dock_port,
+				/area/shuttle/bearcat/dock_starboard,
+				/area/shuttle/bearcat/maintenance,
+				/area/shuttle/bearcat/maintenance_atmos,
+				/area/shuttle/bearcat/maintenance_engine,
+				/area/shuttle/bearcat/maintenance_engine_pod_port,
+				/area/shuttle/bearcat/maintenance_engine_pod_starboard,
+				/area/shuttle/bearcat/maintenance_enginecontrol,
+				/area/shuttle/bearcat/maintenance_power,
+				/area/shuttle/bearcat/maintenance_storage,
+				/area/shuttle/bearcat/unused1,
+				/area/shuttle/bearcat/unused2
+				) //it's a miracle this thing works
+	defer_initialisation = TRUE //We're not loaded until an admin does it
+	fuel_consumption = 4 //chonker uses more fuel
+	move_direction = NORTH
+	ceiling_type = /turf/simulated/floor/reinforced/airless
+
+// A shuttle lateloader landmark
+/obj/effect/shuttle_landmark/shuttle_initializer/bearcat
+	name = "IRV Bearcat"
+	base_area = /area/space
+	base_turf = /turf/space
+	landmark_tag = "omship_spawn_bearcat"
+	shuttle_type = /datum/shuttle/autodock/overmap/bearcat
+
+/obj/effect/overmap/visitable/ship/landable/bearcat
+	name = "Binturong-class Salvage Vessel"
+	scanner_desc = @{"[i]Registration[/i]: IRV Bearcat
+[i]Class:[/i] Corvette
+[i]Transponder[/i]: Transmitting \'Keep-Away\' Signal
+[b]Notice[/b]: Abandoned under unclear circumstances."}
+	known = FALSE
+	vessel_mass = 3500
+	vessel_size = SHIP_SIZE_LARGE
+	shuttle = "Bearcat"
+
+// The shuttle's 'shuttle' computer
+/obj/machinery/computer/shuttle_control/explore/bearcat
+	name = "short jump console"
+	shuttle_tag = "Bearcat"
+	req_one_access = list()
+
+// -- Objs -- //
+/obj/effect/shuttle_landmark/premade/bearcat/dock_w
+	name = "IRV Bearcat - Port Docking Ring"
+	landmark_tag = "bearcat_dock_w"
+
+/obj/effect/shuttle_landmark/premade/bearcat/dock_e
+	name = "IRV Bearcat - Starboard Docking Ring"
+	landmark_tag = "bearcat_dock_e"
+
+/area/ship/scrap
+	name = "\improper Bearcat"
+	has_gravity = 0		//predates artificial gravity - won't matter much due to all the walls to push off of!
+
+/area/shuttle/bearcat/crew
+	name = "\improper Bearcat Crew Compartments"
+	icon_state = "hallC"
+
+/area/shuttle/bearcat/crew_corridors
+	name = "\improper Bearcat Corridors"
+	icon_state = "hallC1"
+
+/area/shuttle/bearcat/crew_kitchen
+	name = "\improper Bearcat Galley"
+	icon_state = "kitchen"
+
+/area/shuttle/bearcat/crew_dorms
+	name = "\improper Bearcat Dorms"
+	icon_state = "crew_quarters"
+
+/area/shuttle/bearcat/crew_saloon
+	name = "\improper Bearcat Saloon"
+	icon_state = "conference"
+
+/area/shuttle/bearcat/crew_toilets
+	name = "\improper Bearcat Bathrooms"
+	icon_state = "toilet"
+
+/area/shuttle/bearcat/crew_wash
+	name = "\improper Bearcat Washroom"
+	icon_state = "locker"
+
+/area/shuttle/bearcat/crew_medbay
+	name = "\improper Bearcat Medical Bay"
+	icon_state = "medbay"
+
+/area/shuttle/bearcat/cargo
+	name = "\improper Bearcat Cargo Hold"
+	icon_state = "quartstorage"
+
+/area/shuttle/bearcat/dock
+	name = "\improper Bearcat Docking Bay"
+	icon_state = "start"
+
+/area/shuttle/bearcat/dock_central
+	name = "\improper Bearcat Passenger Bay"
+	icon_state = "start"
+
+/area/shuttle/bearcat/dock_port
+	name = "\improper Bearcat Docking Bay Port"
+	icon_state = "west"
+
+/area/shuttle/bearcat/dock_starboard
+	name = "\improper Bearcat Docking Bay Starboard"
+	icon_state = "east"
+
+/area/shuttle/bearcat/unused1
+	name = "\improper Bearcat Unused Compartment #1"
+	icon_state = "green"
+
+/area/shuttle/bearcat/unused2
+	name = "\improper Bearcat Unused Compartment #2"
+	icon_state = "yellow"
+
+/area/shuttle/bearcat/unused3
+	name = "\improper Bearcat Unused Compartment #3"
+	icon_state = "blueold"
+
+/area/shuttle/bearcat/maintenance
+	name = "\improper Bearcat Maintenance Compartments"
+	icon_state = "storage"
+
+/area/shuttle/bearcat/maintenance_storage
+	name = "\improper Bearcat Tools Storage"
+	icon_state = "eva"
+
+/area/shuttle/bearcat/maintenance_atmos
+	name = "\improper Bearcat Atmospherics Compartment"
+	icon_state = "atmos"
+	music = list('sound/ambience/ambiatm1.ogg')
+
+/area/shuttle/bearcat/maintenance_power
+	name = "\improper Bearcat Power Compartment"
+	icon_state = "engine_smes"
+	music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg')
+
+/area/shuttle/bearcat/maintenance_engine
+	name = "\improper Bearcat Main Engine Compartment"
+	icon_state = "engine"
+	music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg')
+
+/area/shuttle/bearcat/maintenance_engine_pod_port
+	name = "\improper Bearcat Port Engine Pod"
+	icon_state = "west"
+	music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg')
+
+/area/shuttle/bearcat/maintenance_engine_pod_starboard
+	name = "\improper Bearcat Starboard Engine Pod"
+	icon_state = "east"
+	music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg')
+
+/area/shuttle/bearcat/maintenance_enginecontrol
+	name = "\improper Bearcat Engine Control Room"
+	icon_state = "engine_monitoring"
+	music = list('sound/ambience/ambisin1.ogg','sound/ambience/ambisin2.ogg','sound/ambience/ambisin3.ogg')
+
+/area/shuttle/bearcat/command
+	name = "\improper Bearcat Command Deck"
+	icon_state = "centcom"
+	music = list('sound/ambience/signal.ogg')
+
+/area/shuttle/bearcat/command_captain
+	name = "\improper Bearcat Captain's Quarters"
+	icon_state = "captain"
+	music = list('sound/ambience/signal.ogg')
+
+/area/shuttle/bearcat/comms
+	name = "\improper Bearcat Communications Relay"
+	icon_state = "tcomsatcham"
+	music = list('sound/ambience/signal.ogg')

maps/offmap_vr/om_ships/cruiser.dm

@@ -125,14 +125,13 @@
 	mappath = 'cruiser.dmm'
 
 /obj/effect/overmap/visitable/ship/cruiser
-	name = "spacecraft"
+	name = "NDV Daedalus"
+	icon_state = "oberth_destroyer_g"
 	desc = "Spacefaring vessel. NanoTrasen IFF detected."
-	scanner_name = "NDV Daedalus"
 	scanner_desc = @{"[i]Registration[/i]: NDV Daedalus
 [i]Class[/i]: Light Cruiser
 [i]Transponder[/i]: Transmitting (MIL), NanoTrasen IFF
 [b]Notice[/b]: Military vessel, do not approach"}
-	color = "#0033ff" //Bluey
 	vessel_mass = 15000
 	vessel_size = SHIP_SIZE_LARGE
 	initial_generic_waypoints = list("cruiser_fore", "cruiser_aft", "cruiser_port", "cruiser_starboard", "ws_port_dock_1", "ws_port_dock_2", "ws_starboard_dock_1", "ws_starboard_dock_2")

maps/offmap_vr/om_ships/curashuttle.dm

@@ -56,12 +56,11 @@
 
 // The 'ship'
 /obj/effect/overmap/visitable/ship/landable/curashuttle
-	scanner_name = "CRV Doom Delay"
+	name = "CRV Doom Delay"
 	scanner_desc = @{"[i]Registration[/i]: Curabitur Scimed
 [i]Class[/i]: Small Shuttle
 [i]Transponder[/i]: Transmitting (CIV), non-hostile
 [b]Notice[/b]: Small private vessel"}
-	color = "#01A9DB"
 	vessel_mass = 2000
 	vessel_size = SHIP_SIZE_TINY
 	shuttle = "Cura"

maps/offmap_vr/om_ships/geckos.dm

@@ -0,0 +1,176 @@
+// Compile in the map for CI testing if we're testing compileability of all the maps
+#if MAP_TEST
+#include "gecko_sh.dmm"
+#include "gecko_cr.dmm"
+#endif
+
+// Map template for spawning the shuttle
+/datum/map_template/om_ships/gecko_stationhopper
+	name = "OM Ship - Gecko Stationhopper (new Z)"
+	desc = "A medium personnel transport shuttle."
+	mappath = 'gecko_sh.dmm'
+	annihilate = TRUE
+
+/datum/map_template/om_ships/gecko_cargohauler
+	name = "OM Ship - Gecko Cargo Hauler (new Z)"
+	desc = "A medium supply transport shuttle."
+	mappath = 'gecko_cr.dmm'
+	annihilate = TRUE
+
+/datum/map_template/om_ships/gecko_cargohauler_wreck
+	name = "OM Ship - Wrecked Gecko Cargo Hauler (new Z)"
+	desc = "A wrecked medium supply transport shuttle."
+	mappath = 'gecko_cr_wreck.dmm'
+	annihilate = TRUE
+
+// The shuttle's area(s)
+/area/shuttle/gecko_sh	
+	name = "\improper Gecko Stationhopper"
+	icon_state = "green"
+	requires_power = 1
+	has_gravity = 0
+
+/area/shuttle/gecko_sh_engineering
+	name = "\improper Gecko Stationhopper Engineering"
+	icon_state = "yellow"
+	requires_power = 1
+	has_gravity = 0
+
+/area/shuttle/gecko_sh_cockpit
+	name = "\improper Gecko Stationhopper Cockpit"
+	icon_state = "purple"
+	requires_power = 1
+	has_gravity = 0
+
+/area/shuttle/gecko_cr	
+	name = "\improper Gecko Cargo Hauler Bay"
+	icon_state = "green"
+	requires_power = 1
+	has_gravity = 0
+
+/area/shuttle/gecko_cr_engineering
+	name = "\improper Gecko Cargo Hauler Aft"
+	icon_state = "yellow"
+	requires_power = 1
+	has_gravity = 0
+
+/area/shuttle/gecko_cr_cockpit
+	name = "\improper Gecko Cargo Hauler Fore"
+	icon_state = "purple"
+	requires_power = 1
+	has_gravity = 0
+
+/area/shuttle/gecko_cr_wreck	
+	name = "\improper Wrecked Gecko Cargo Hauler Bay"
+	icon_state = "green"
+	requires_power = 1
+	has_gravity = 0
+
+/area/shuttle/gecko_cr_engineering_wreck
+	name = "\improper Wrecked Gecko Cargo Hauler Aft"
+	icon_state = "yellow"
+	requires_power = 1
+	has_gravity = 0
+
+/area/shuttle/gecko_cr_cockpit_wreck
+	name = "\improper Wrecked Gecko Cargo Hauler Fore"
+	icon_state = "purple"
+	requires_power = 1
+	has_gravity = 0
+
+// The shuttle's 'shuttle' computer
+/obj/machinery/computer/shuttle_control/explore/gecko_sh
+	name = "short jump console"
+	shuttle_tag = "Gecko Stationhopper"
+	req_one_access = list()
+
+/obj/machinery/computer/shuttle_control/explore/gecko_cr
+	name = "short jump console"
+	shuttle_tag = "Gecko Cargo Hauler"
+	req_one_access = list()
+
+/obj/machinery/computer/shuttle_control/explore/gecko_cr_wreck
+	name = "short jump console"
+	shuttle_tag = "Wrecked Gecko Cargo Hauler"
+	req_one_access = list()
+
+// The 'shuttle'
+/datum/shuttle/autodock/overmap/gecko_sh
+	name = "Gecko Stationhopper"
+	current_location = "omship_spawn_gecko_sh"
+	docking_controller_tag = "geck_sh_docking"
+	shuttle_area = list(/area/shuttle/gecko_sh,/area/shuttle/gecko_sh_cockpit,/area/shuttle/gecko_sh_engineering)
+	defer_initialisation = TRUE //We're not loaded until an admin does it
+	fuel_consumption = 7.5
+	ceiling_type = /turf/simulated/floor/reinforced/airless
+
+/datum/shuttle/autodock/overmap/gecko_cr
+	name = "Gecko Cargo Hauler"
+	current_location = "omship_spawn_gecko_cr"
+	docking_controller_tag = "geck_cr_docking"
+	shuttle_area = list(/area/shuttle/gecko_cr,/area/shuttle/gecko_cr_cockpit,/area/shuttle/gecko_cr_engineering)
+	defer_initialisation = TRUE //We're not loaded until an admin does it
+	fuel_consumption = 7.5
+	ceiling_type = /turf/simulated/floor/reinforced/airless
+
+/datum/shuttle/autodock/overmap/gecko_cr_wreck
+	name = "Wrecked Gecko Cargo Hauler"
+	current_location = "omship_spawn_gecko_cr_wreck"
+	docking_controller_tag = "geck_cr_wreck_docking"
+	shuttle_area = list(/area/shuttle/gecko_cr_wreck,/area/shuttle/gecko_cr_cockpit_wreck,/area/shuttle/gecko_cr_engineering_wreck)
+	defer_initialisation = TRUE //We're not loaded until an admin does it
+	fuel_consumption = 7.5
+	ceiling_type = /turf/simulated/floor/reinforced/airless
+
+// A shuttle lateloader landmark
+/obj/effect/shuttle_landmark/shuttle_initializer/gecko_sh
+	name = "ITV Gecko I"
+	base_area = /area/space
+	base_turf = /turf/space
+	landmark_tag = "omship_spawn_gecko_sh"
+	shuttle_type = /datum/shuttle/autodock/overmap/gecko_sh
+
+/obj/effect/shuttle_landmark/shuttle_initializer/gecko_cr
+	name = "ITV Gecko II"
+	base_area = /area/space
+	base_turf = /turf/space
+	landmark_tag = "omship_spawn_gecko_cr"
+	shuttle_type = /datum/shuttle/autodock/overmap/gecko_cr
+
+/obj/effect/shuttle_landmark/shuttle_initializer/gecko_cr_wreck
+	name = "ITV Gecko III"
+	base_area = /area/space
+	base_turf = /turf/space
+	landmark_tag = "omship_spawn_gecko_cr_wreck"
+	shuttle_type = /datum/shuttle/autodock/overmap/gecko_cr_wreck
+
+// The 'ship'
+/obj/effect/overmap/visitable/ship/landable/gecko_sh
+	name = "Gecko-class Transport"
+	scanner_desc = @{"[i]Registration[/i]: ITV Sticky Fingers
+[i]Class[/i]: Medium Shuttle
+[i]Transponder[/i]: Transmitting (CIV), non-hostile
+[b]Notice[/b]: Medium personnel transport vessel"}
+	vessel_mass = 6500
+	vessel_size = SHIP_SIZE_LARGE
+	shuttle = "Gecko Stationhopper"
+
+/obj/effect/overmap/visitable/ship/landable/gecko_cr
+	name = "Gecko-class Transport"
+	scanner_desc = @{"[i]Registration[/i]: ITV Sticky Business
+[i]Class[/i]: Medium Shuttle
+[i]Transponder[/i]: Transmitting (CIV), non-hostile
+[b]Notice[/b]: Medium cargo transport vessel"}
+	vessel_mass = 6500
+	vessel_size = SHIP_SIZE_LARGE
+	shuttle = "Gecko Cargo Hauler"
+
+/obj/effect/overmap/visitable/ship/landable/gecko_cr_wreck
+	name = "Wrecked Gecko-class Transport"
+	scanner_desc = @{"[i]Registration[/i]: ITV Sticky Situation
+[i]Class[/i]: Medium Shuttle
+[i]Transponder[/i]: Weakly transmitting (CIV), non-hostile
+[b]Notice[/b]: Medium cargo transport vessel, significant damage inflicted"}
+	vessel_mass = 6500
+	vessel_size = SHIP_SIZE_LARGE
+	shuttle = "Wrecked Gecko Cargo Hauler"

maps/offmap_vr/om_ships/generic_shuttle.dm

@@ -45,7 +45,7 @@
 
 // The 'ship'
 /obj/effect/overmap/visitable/ship/landable/generic_shuttle
-	scanner_name = "Private Vessel"
+	name = "Private Vessel"
 	scanner_desc = @{"[i]Registration[/i]: PRIVATE
 [i]Class[/i]: Small Shuttle
 [i]Transponder[/i]: Transmitting (CIV), non-hostile

maps/offmap_vr/om_ships/hybridshuttle.dm

@@ -41,12 +41,12 @@
 
 // The 'ship'
 /obj/effect/overmap/visitable/ship/landable/hybridshuttle
-	scanner_name = "XN-29 Prototype Shuttle"
+	name = "XN-29 Prototype Shuttle"
+	icon_state = "unkn_o"
 	scanner_desc = @{"[i]Registration[/i]: UNKNOWN
 [i]Class[/i]: Shuttle
 [i]Transponder[/i]: Transmitting (MIL), NanoTrasen
 [b]Notice[/b]: Experimental vessel"}
-	color = "#00aaff" //Bluey
 	vessel_mass = 3000
 	vessel_size = SHIP_SIZE_SMALL
 	shuttle = "XN-29 Prototype Shuttle"

maps/offmap_vr/om_ships/itglight.dm

@@ -85,14 +85,13 @@
 
 // The 'Dauntless'
 /obj/effect/overmap/visitable/ship/itglight
-	name = "spacecraft"
+	name = "ITG Dauntless"
+	icon_state = "serb_destroyer_g"
 	desc = "Spacefaring vessel. Friendly IFF detected."
-	scanner_name = "ITG Dauntless"
 	scanner_desc = @{"[i]Registration[/i]: ITG Dauntless
 [i]Class[/i]: Small Cargo Frigate (Low Displacement)
 [i]Transponder[/i]: Transmitting (CIV), non-hostile"
 [b]Notice[/b]: May carry passengers"}
-	color = "#d98c1a" //orng
 	vessel_mass = 8000
 	vessel_size = SHIP_SIZE_SMALL
 	initial_generic_waypoints = list("itglight_fore", "itglight_aft", "itglight_port", "itglight_starboard", "itglight_port_dock", "itglight_starboard_dock")

maps/offmap_vr/om_ships/mackerels.dm

@@ -0,0 +1,241 @@
+// Compile in the map for CI testing if we're testing compileability of all the maps
+#if MAP_TEST
+#include "mackerel_sh.dmm"
+#include "mackerel_lc.dmm"
+#include "mackerel_lc_wreck.dmm"
+#include "mackerel_hc.dmm"
+#include "mackerel_hc_skel.dmm"
+#endif
+
+// Map template for spawning the shuttle
+/datum/map_template/om_ships/mackerel_stationhopper
+	name = "OM Ship - Mackerel Stationhopper (new Z)"
+	desc = "A small personnel transport shuttle."
+	mappath = 'mackerel_sh.dmm'
+	annihilate = TRUE
+
+/datum/map_template/om_ships/mackerel_lightcargo
+	name = "OM Ship - Mackerel Light Cargo (new Z)"
+	desc = "A small light cargo transport shuttle."
+	mappath = 'mackerel_lc.dmm'
+	annihilate = TRUE
+
+/datum/map_template/om_ships/mackerel_heavycargo
+	name = "OM Ship - Mackerel Heavy Cargo (new Z)"
+	desc = "A small secure cargo transport shuttle."
+	mappath = 'mackerel_hc.dmm'
+	annihilate = TRUE
+
+/datum/map_template/om_ships/mackerel_heavycargo_skel
+	name = "OM Ship - Mackerel Heavy Cargo Spartanized (new Z)"
+	desc = "A small heavy cargo transport shuttle."
+	mappath = 'mackerel_hc_skel.dmm'
+	annihilate = TRUE
+
+/datum/map_template/om_ships/mackerel_lightcargo_wreck
+	name = "OM Ship - Mackerel Light Cargo Wreck (new Z)"
+	desc = "A small light cargo transport shuttle, struck by... something. Ouch."
+	mappath = 'mackerel_lc_wreck.dmm'
+	annihilate = TRUE
+
+// The shuttle's area(s)
+/area/shuttle/mackerel_sh	
+	name = "\improper Mackerel Stationhopper"
+	icon_state = "green"
+	requires_power = 1
+	has_gravity = 0
+	
+/area/shuttle/mackerel_lc	
+	name = "\improper Mackerel Light Cargo"
+	icon_state = "green"
+	requires_power = 1
+	has_gravity = 0
+	
+/area/shuttle/mackerel_hc	
+	name = "\improper Mackerel Heavy Cargo"
+	icon_state = "green"
+	requires_power = 1
+	has_gravity = 0
+	
+/area/shuttle/mackerel_hc_skel	
+	name = "\improper Mackerel Heavy Cargo Spartan"
+	icon_state = "green"
+	requires_power = 1
+	has_gravity = 0
+	
+/area/shuttle/mackerel_hc_skel_cockpit
+	name = "\improper Mackerel Heavy Cargo Cockpit"
+	icon_state = "purple"
+	requires_power = 1
+	has_gravity = 0
+	
+/area/shuttle/mackerel_hc_skel_eng
+	name = "\improper Mackerel Heavy Cargo Engineering"
+	icon_state = "yellow"
+	requires_power = 1
+	has_gravity = 0
+	
+/area/shuttle/mackerel_lc_wreck	
+	name = "\improper Wrecked Mackerel Light Cargo"
+	icon_state = "green"
+	requires_power = 1
+	has_gravity = 0
+
+// The shuttle's 'shuttle' computer
+/obj/machinery/computer/shuttle_control/explore/mackerel_sh
+	name = "short jump console"
+	shuttle_tag = "Mackerel Stationhopper"
+	req_one_access = list()
+
+/obj/machinery/computer/shuttle_control/explore/mackerel_lc
+	name = "short jump console"
+	shuttle_tag = "Mackerel Light Cargo"
+	req_one_access = list()
+
+/obj/machinery/computer/shuttle_control/explore/mackerel_lc_wreck
+	name = "short jump console"
+	shuttle_tag = "Mackerel Light Cargo II"
+	req_one_access = list()
+
+/obj/machinery/computer/shuttle_control/explore/mackerel_hc
+	name = "short jump console"
+	shuttle_tag = "Mackerel Heavy Cargo"
+	req_one_access = list()
+
+/obj/machinery/computer/shuttle_control/explore/mackerel_hc_skel
+	name = "short jump console"
+	shuttle_tag = "Mackerel Heavy Cargo Spartan"
+	req_one_access = list()
+
+// The 'shuttle'
+/datum/shuttle/autodock/overmap/mackerel_sh
+	name = "Mackerel Stationhopper"
+	current_location = "omship_spawn_mackerel_sh"
+	docking_controller_tag = "mackerel_sh_docking"
+	shuttle_area = list(/area/shuttle/mackerel_sh)
+	defer_initialisation = TRUE
+	fuel_consumption = 1
+	ceiling_type = /turf/simulated/floor/reinforced/airless
+
+/datum/shuttle/autodock/overmap/mackerel_lc
+	name = "Mackerel Light Cargo"
+	current_location = "omship_spawn_mackerel_lc"
+	docking_controller_tag = "mackerel_lc_docking"
+	shuttle_area = list(/area/shuttle/mackerel_lc)
+	defer_initialisation = TRUE
+	fuel_consumption = 1
+	ceiling_type = /turf/simulated/floor/reinforced/airless
+
+/datum/shuttle/autodock/overmap/mackerel_hc
+	name = "Mackerel Heavy Cargo"
+	current_location = "omship_spawn_mackerel_hc"
+	docking_controller_tag = "mackerel_hc_docking"
+	shuttle_area = list(/area/shuttle/mackerel_hc)
+	defer_initialisation = TRUE
+	fuel_consumption = 1.25 //slightly higher due to the added framework/plating
+	ceiling_type = /turf/simulated/floor/reinforced/airless
+
+/datum/shuttle/autodock/overmap/mackerel_hc_skel
+	name = "Mackerel Heavy Cargo Spartan"
+	current_location = "omship_spawn_mackerel_hc_skel"
+	docking_controller_tag = "mackerel_hc_skel_docking"
+	shuttle_area = list(/area/shuttle/mackerel_hc_skel,/area/shuttle/mackerel_hc_skel_cockpit,/area/shuttle/mackerel_hc_skel_eng)
+	defer_initialisation = TRUE
+	fuel_consumption = 1.20 //slightly lower due to the stripped-down internals
+	ceiling_type = /turf/simulated/floor/reinforced/airless
+
+/datum/shuttle/autodock/overmap/mackerel_lc_wreck
+	name = "Mackerel Light Cargo II"
+	current_location = "omship_spawn_mackerel_lc_wreck"
+	docking_controller_tag = "mackerel_lc_wreck_docking"
+	shuttle_area = list(/area/shuttle/mackerel_lc_wreck)
+	defer_initialisation = TRUE
+	fuel_consumption = 1
+	ceiling_type = /turf/simulated/floor/reinforced/airless
+
+// A shuttle lateloader landmark
+/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_sh
+	name = "ITV Mackerel I"
+	base_area = /area/space
+	base_turf = /turf/space
+	landmark_tag = "omship_spawn_mackerel_sh"
+	shuttle_type = /datum/shuttle/autodock/overmap/mackerel_sh
+
+/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_lc
+	name = "ITV Mackerel II"
+	base_area = /area/space
+	base_turf = /turf/space
+	landmark_tag = "omship_spawn_mackerel_lc"
+	shuttle_type = /datum/shuttle/autodock/overmap/mackerel_lc
+
+/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_hc
+	name = "ITV Mackerel III"
+	base_area = /area/space
+	base_turf = /turf/space
+	landmark_tag = "omship_spawn_mackerel_hc"
+	shuttle_type = /datum/shuttle/autodock/overmap/mackerel_hc
+
+/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_hc_skel
+	name = "ITV Mackerel IV"
+	base_area = /area/space
+	base_turf = /turf/space
+	landmark_tag = "omship_spawn_mackerel_hc_skel"
+	shuttle_type = /datum/shuttle/autodock/overmap/mackerel_hc_skel
+
+/obj/effect/shuttle_landmark/shuttle_initializer/mackerel_lc_wreck
+	name = "ITV Mackerel II KIA"
+	base_area = /area/space
+	base_turf = /turf/space
+	landmark_tag = "omship_spawn_mackerel_lc_wreck"
+	shuttle_type = /datum/shuttle/autodock/overmap/mackerel_lc_wreck
+
+// The 'ship'
+/obj/effect/overmap/visitable/ship/landable/mackerel_sh
+	name = "Mackerel-class Transport"
+	scanner_desc = @{"[i]Registration[/i]: ITV Phish Phlake
+[i]Class[/i]: Small Shuttle
+[i]Transponder[/i]: Transmitting (CIV), non-hostile
+[b]Notice[/b]: Small private vessel"}
+	vessel_mass = 1000
+	vessel_size = SHIP_SIZE_TINY
+	shuttle = "Mackerel Stationhopper"
+
+/obj/effect/overmap/visitable/ship/landable/mackerel_lc
+	name = "Mackerel-class Transport"
+	scanner_desc = @{"[i]Registration[/i]: ITV Phishy Business
+[i]Class[/i]: Small Shuttle
+[i]Transponder[/i]: Transmitting (CIV), non-hostile
+[b]Notice[/b]: Small private vessel"}
+	vessel_mass = 1000
+	vessel_size = SHIP_SIZE_TINY
+	shuttle = "Mackerel Light Cargo"
+
+/obj/effect/overmap/visitable/ship/landable/mackerel_hc
+	name = "Mackerel-class Transport"
+	scanner_desc = @{"[i]Registration[/i]: ITV Phish Pharma
+[i]Class[/i]: Small Shuttle
+[i]Transponder[/i]: Transmitting (CIV), non-hostile
+[b]Notice[/b]: Small private vessel"}
+	vessel_mass = 1500
+	vessel_size = SHIP_SIZE_TINY
+	shuttle = "Mackerel Heavy Cargo"
+
+/obj/effect/overmap/visitable/ship/landable/mackerel_hc_skel
+	name = "Mackerel-class Transport (Spartanized)"
+	scanner_desc = @{"[i]Registration[/i]: ITV Phish Pond
+[i]Class[/i]: Small Shuttle
+[i]Transponder[/i]: Transmitting (CIV), non-hostile
+[b]Notice[/b]: Small private vessel"}
+	vessel_mass = 1500
+	vessel_size = SHIP_SIZE_TINY
+	shuttle = "Mackerel Heavy Cargo Spartan"
+
+/obj/effect/overmap/visitable/ship/landable/mackerel_lc_wreck
+	name = "Wrecked Mackerel-class Transport"
+	scanner_desc = @{"[i]Registration[/i]: ITV Phish Phood
+[i]Class[/i]: Small Shuttle Wreck
+[i]Transponder[/i]: Not Transmitting
+[b]Notice[/b]: Critical Damage Sustained"}
+	vessel_mass = 1000
+	vessel_size = SHIP_SIZE_TINY
+	shuttle = "Mackerel Light Cargo II"

maps/offmap_vr/om_ships/mercship.dm

@@ -64,12 +64,12 @@
 // The 'ship'
 /obj/effect/overmap/visitable/ship/mercship
 	name = "Unknown Vessel"
+	icon_state = "moe_destroyer_r"
 	desc = "Spacefaring vessel. No IFF detected."
 	scanner_desc = @{"[i]Registration[/i]: UNKNOWN
 [i]Class[/i]: UNKNOWN
 [i]Transponder[/i]: None Detected
 [b]Notice[/b]: Unregistered vessel"}
-	color = "#f23000" //Red
 	vessel_mass = 8000
 	vessel_size = SHIP_SIZE_SMALL
 	initial_generic_waypoints = list("carrier_fore", "carrier_aft", "carrier_port", "carrier_starboard", "base_dock")

maps/offmap_vr/om_ships/salamander.dm

@@ -148,12 +148,11 @@
 
 // The 'ship'
 /obj/effect/overmap/visitable/ship/landable/salamander
-	scanner_name = "Salamander-class Corvette"
+	name = "Salamander-class Corvette"
 	scanner_desc = @{"[i]Registration[/i]: ITV Independence
 [i]Class[/i]: Corvette
 [i]Transponder[/i]: Transmitting (CIV), non-hostile
 [b]Notice[/b]: Multirole independent vessel"}
-	color = "#00AA00" //green, because money
 	vessel_mass = 4500
 	vessel_size = SHIP_SIZE_LARGE
 	fore_dir = EAST
@@ -179,12 +178,11 @@
 
 // The 'ship'
 /obj/effect/overmap/visitable/ship/landable/salamander_wreck
-	scanner_name = "Wrecked Salamander-class Corvette"
+	name = "Wrecked Salamander-class Corvette"
 	scanner_desc = @{"[i]Registration[/i]: ITV Unity
 [i]Class[/i]: Corvette
 [i]Transponder[/i]: Not Transmitting
 [b]Notice[/b]: Damage to hull is consistent with intentional scuttling procedures, no distress call logged"}
-	color = "#008800" //green, because money
 	vessel_mass = 4500
 	vessel_size = SHIP_SIZE_LARGE
 	fore_dir = EAST

maps/offmap_vr/om_ships/screebarge.dm

@@ -48,7 +48,6 @@
 /obj/effect/overmap/visitable/ship/landable/screebarge
 	name = "Battle Barge"
 	desc = "Some sort of makeshift battle barge. Appears to be armed."
-	color = "#95c633" //Greenish
 	vessel_mass = 3000
 	vessel_size = SHIP_SIZE_SMALL
 	shuttle = "Battle Barge"

maps/offmap_vr/om_ships/shelter_5.dm

@@ -40,7 +40,7 @@
 
 // The 'ship'
 /obj/effect/overmap/visitable/ship/landable/escapepod
-	scanner_name = "Escape Pod"
+	name = "Escape Pod"
 	scanner_desc = @{"[i]Registration[/i]: NOT AVAILABLE
 [i]Class[/i]: Escape Pod
 [i]Transponder[/i]: Transmitting (CIV), non-hostile

maps/offmap_vr/om_ships/shelter_6.dm

@@ -42,12 +42,11 @@
 
 // The 'ship'
 /obj/effect/overmap/visitable/ship/landable/tabiranth
-	scanner_name = "Experimental Dropship"
+	name = "Experimental Dropship"
 	scanner_desc = @{"[i]Registration[/i]: UNKNOWN
 [i]Class[/i]: Assault Dropship
 [i]Transponder[/i]: Transmitting (MIL), NanoTrasen
 [b]Notice[/b]: Experimental vessel"}
-	color = "#8800ff" //Indigo
 	vessel_mass = 3000
 	vessel_size = SHIP_SIZE_SMALL
 	shuttle = "NDV Tabiranth"

maps/offmap_vr/om_ships/vespa.dm

@@ -120,12 +120,11 @@
 // The 'ship'
 /obj/effect/overmap/visitable/ship/vespa
 	desc = "A spacefaring vessel, of Hephaestus design."
-	scanner_name = "HPV Vespa"
+	name = "HPV Vespa"
 	scanner_desc = @{"[i]Registration[/i]: HPV Vespa
 [i]Class[/i]: Cruiser
 [i]Transponder[/i]: Transmitting (CIV), Hephaestus Industries
 [b]Notice[/b]: Corporate vessel"}
-	color = "#4cad73" //Green
 	vessel_mass = 10000
 	vessel_size = SHIP_SIZE_LARGE
 	initial_generic_waypoints = list("hpv_port", "hpv_starboard", "hpv_hangar")

maps/offmap_vr/talon/talon_v2.dm

@@ -38,18 +38,18 @@ var/global/list/latejoin_talon = list()
 ///////////////////////////
 //// The Talon
 /obj/effect/overmap/visitable/ship/talon
-	scanner_name = "ITV Talon"
+	name = "ITV Talon"
+	icon_state = "talon_v2"
 	scanner_desc = @{"[i]Registration[/i]: ITV Talon
 [i]Class[/i]: Frigate
 [i]Transponder[/i]: Transmitting (CIV)
 [b]Notice[/b]: Independent trader vessel"}
-	color = "#aacccc"
 	vessel_mass = 10000
 	vessel_size = SHIP_SIZE_LARGE
 	initial_generic_waypoints = list("talon_v2_near_fore_port", "talon_v2_near_fore_star", "talon_v2_near_aft_port", "talon_v2_near_aft_star", "talon_v2_wing_port", "talon_v2_wing_star")
 	initial_restricted_waypoints = list("Talon's Shuttle" = list("offmap_spawn_talonboat"))
 
-	skybox_icon = 'talon.dmi' //Art by Gwyvern, distributed under Creative Commons license
+	skybox_icon = 'talon.dmi'
 	skybox_icon_state = "skybox"
 	skybox_pixel_x = 270
 	skybox_pixel_y = 60

maps/southern_cross/overmap/sectors.dm

@@ -11,11 +11,7 @@
 	mountain_color = "#735555"
 	ice_color = "FFFFFF"
 	icecaps = "icecaps"
-
-	initial_generic_waypoints = list(
-		"outpost_nw",
-		"outpost_s"
-	)
+	icon_state = "frozen" //CHOMP comment: Not sure what this does at the moment, but we're doing it live.
 
 /obj/effect/overmap/visitable/planet/Sif/Initialize()
 	atmosphere = new(CELL_VOLUME)
@@ -74,3 +70,7 @@
 			Z_LEVEL_STATION_TWO,
 			Z_LEVEL_STATION_THREE,
 			Z_LEVEL_MISC)
+
+/obj/effect/overmap/visitable/planet/Sif/Initialize()
+	. = ..()
+	docking_codes = null

maps/submaps/admin_use_vr/ert.dm

@@ -110,12 +110,12 @@
 // The 'ship'
 /obj/effect/overmap/visitable/ship/ert_ship
 	name = "NRV Von Braun"
+	icon_state = "oberth_destroyer_g"
 	desc = "Spacefaring vessel. Broadcasting Corporate Emergency Responder IFF."
 	scanner_desc = @{"[i]Registration[/i]: Nanotrasen RRV Von Braun
 [i]Class[/i]: [i]Kepler[/i]-class Frigate
 [i]Transponder[/i]: Broadcasting (ER-CORP)
 [b]Notice[/b]: Impeding or interfering with emergency response vessels is a breach of numerous interstellar codes. Approach with caution."}
-	color = "#9999ff" //Blue
 	vessel_mass = 8000
 	vessel_size = SHIP_SIZE_LARGE
 	fore_dir = EAST

maps/submaps/admin_use_vr/fun.dm

@@ -162,9 +162,8 @@
 
 // This is a stationary overmap sector, you can spawn it in any zlevel and it will pop onto the overmap to represent those zlevels. It always moves to 2,2 on the overmap and you can move it elsewhere.
 /obj/effect/overmap/visitable/admin_use
-	name = "space destination"
+	name = "REPLACE ME"
 	desc = "Some space destination!"
-	scanner_name = "REPLACE ME"
 	scanner_desc = @{"[i]Registration[/i]: REPLACE ME
 [i]Class[/i]: REPLACE ME
 [i]Transponder[/i]: REPLACE ME
@@ -180,9 +179,8 @@
 
 // This is the same, but makes a whole spaceship!
 /obj/effect/overmap/visitable/ship/admin_use
-	name = "spacecraft"
+	name = "REPLACE ME"
 	desc = "Spacefaring vessel."
-	scanner_name = "REPLACE ME"
 	scanner_desc = @{"[i]Registration[/i]: REPLACE ME
 [i]Class[/i]: REPLACE ME
 [i]Transponder[/i]: REPLACE ME

maps/submaps/admin_use_vr/guttersite.dm

@@ -6,9 +6,8 @@
 	scanner_desc = @{"[i]Transponder[/i]: Strong Comms Signal
 [b]Notice[/b]: WARNING! KEEP OUT! MEMBERS ONLY!"}
 	icon = 'icons/obj/overmap_vr.dmi'
-	icon_state = "guttersite"
+	icon_state = "os_fortress_r"
 	known = FALSE
-	color = "#ee3333" //Redish, so it stands out against the other debris-like icons
 	initial_generic_waypoints = list("guttersite_lshuttle", "guttersite_sshuttle", "guttersite_mshuttle")
 
 // -- Objs -- //

maps/submaps/admin_use_vr/mercship.dm

@@ -139,7 +139,6 @@
 [i]Class[/i]: [i]Manta[/i]-class Cruiser
 [i]Transponder[/i]: Broadcasting (PMC)
 [b]Notice[/b]: SAARE are unlikely to tolerate civilian or corporate personnel interfering with their affairs. Approach with caution."}
-	color = "#333333" //TACTICAL BLACK
 	vessel_mass = 8000
 	vessel_size = SHIP_SIZE_LARGE
 	initial_generic_waypoints = list("manta_ship_near_fore", "manta_ship_near_aft", "manta_ship_near_port", "manta_ship_near_star", "manta_ship_port", "manta_ship_star", "manta_ship_base_dock", "omship_spawn_manta_lander")
@@ -201,14 +200,12 @@
 	defer_initialisation = TRUE
 
 /obj/effect/overmap/visitable/ship/landable/manta_ship_boat
-	scanner_name = "SAARE Landing Craft"
+	name = "SAARE Landing Craft"
 	desc = "Spacefaring vessel. Broadcasting Private Military Contractor IFF."
 	scanner_desc = @{"[i]Registration[/i]: SAARE Mercenary Cruiser Typhon Four-Niner's Lander
 [i]Class[/i]: Unknown Shuttle-approximate
 [i]Transponder[/i]: Broadcasting (PMC)
 [b]Notice[/b]: SAARE are unlikely to tolerate civilian or corporate personnel interfering with their affairs. Approach with caution."}
-	color = "#3366FF"
-	color = "#333333" //TACTICAL BLACK
 	vessel_mass = 500
 	vessel_size = SHIP_SIZE_TINY
 	shuttle = "Boarding Craft"

maps/submaps/depreciated_vr/talon.dm

@@ -38,12 +38,12 @@ var/global/list/latejoin_talon = list()
 ///////////////////////////
 //// The Talon
 /obj/effect/overmap/visitable/ship/talon
-	scanner_name = "ITV Talon"
+	name = "ITV Talon"
+	icon_state = "talon_v2"
 	scanner_desc = @{"[i]Registration[/i]: ITV Talon
 [i]Class[/i]: Frigate
 [i]Transponder[/i]: Transmitting (CIV)
 [b]Notice[/b]: Independent trader vessel"}
-	color = "#aacccc"
 	vessel_mass = 10000
 	vessel_size = SHIP_SIZE_LARGE
 	initial_generic_waypoints = list("talon_fore", "talon_aft", "talon_port", "talon_starboard")

maps/tether/tether_defines.dm

@@ -238,8 +238,7 @@
 [i]Transponder[/i]: Transmitting (CIV), NanoTrasen IFF
 [b]Notice[/b]: NanoTrasen Base, authorized personnel only"}
 	base = 1
-	icon_state = "globe"
-	color = "#d35b5b"
+	icon_state = "reddwarf"
 	initial_generic_waypoints = list(
 		"tether_dockarm_d1a1", //Bottom left,
 		"tether_dockarm_d1a2", //Top left,

maps/tether/tether_shuttles.dm

@@ -200,6 +200,7 @@
 /obj/effect/overmap/visitable/ship/landable/excursion
 	name = "Excursion Shuttle"
 	desc = "The traditional Excursion Shuttle. NT Approved!"
+	icon_state = "htu_destroyer_g"
 	vessel_mass = 8000
 	vessel_size = SHIP_SIZE_SMALL
 	shuttle = "Excursion Shuttle"
@@ -225,6 +226,7 @@
 /obj/effect/overmap/visitable/ship/landable/tourbus
 	name = "Tour Bus"
 	desc = "A small 'space bus', if you will."
+	icon_state = "htu_frigate_g"
 	vessel_mass = 2000
 	vessel_size = SHIP_SIZE_SMALL
 	shuttle = "Tour Bus"
@@ -250,6 +252,7 @@
 /obj/effect/overmap/visitable/ship/landable/medivac
 	name = "Medivac Shuttle"
 	desc = "A medical evacuation shuttle."
+	icon_state = "htu_frigate_g"
 	vessel_mass = 4000
 	vessel_size = SHIP_SIZE_SMALL
 	shuttle = "Medivac Shuttle"
@@ -275,6 +278,7 @@
 /obj/effect/overmap/visitable/ship/landable/securiship
 	name = "Securiship Shuttle"
 	desc = "A security transport ship."
+	icon_state = "htu_frigate_g"
 	vessel_mass = 4000
 	vessel_size = SHIP_SIZE_SMALL
 	shuttle = "Securiship Shuttle"