Update smoller admin ship

maps/tether/submaps/_tether_submaps.dm

@@ -446,3 +446,4 @@
 
 #include "om_ships/hybridshuttle.dm"
 #include "om_ships/screebarge.dm"
+#include "om_ships/aro.dm"

maps/tether/submaps/om_ships/aro.dm

@@ -0,0 +1,76 @@
+// Compile in the map for CI testing if we're testing compileability of all the maps
+#if MAP_TEST
+#include "aro.dmm"
+#endif
+
+// Map template for spawning the shuttle
+/datum/map_template/om_ships/aro
+	name = "OM Ship - Aronai (New Z)"
+	desc = "It's Aronai! As a spaceship."
+	mappath = 'aro.dmm'
+
+// The shuttle's area(s)
+/area/ship/aro
+	name = "\improper Aro Ship (Use a Subtype!)"
+	icon_state = "shuttle2"
+	requires_power = 1
+
+/area/ship/aro/engineering
+	name = "\improper Aro Ship - Engineering"
+/area/ship/aro/midshipshangars
+	name = "\improper Aro Ship - Midships and Hangars"
+/area/ship/aro/midshipshangars
+	name = "\improper Aro Ship - Midships and Hangars"
+/area/ship/aro/centralarea
+	name = "\improper Aro Ship - Central Area"
+/area/ship/aro/recreation
+	name = "\improper Aro Ship - Recreation"
+/area/ship/aro/bridge
+	name = "\improper Aro Ship - Bridge"
+/area/ship/aro/engines
+	name = "\improper Aro Ship - Engines"
+/area/ship/aro/holodeck
+	name = "\improper Aro Ship - Holodeck"
+
+/obj/machinery/computer/HolodeckControl/holodorm/aro
+	name = "aro holodeck control"
+	projection_area = /area/ship/aro/holodeck
+
+// The ship's boat
+/area/shuttle/aroboat
+	name = "\improper Aro's Ship's Boat"
+	icon_state = "shuttle"
+
+// The 'ship'
+/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")
+	initial_restricted_waypoints = list("Aro's Ship's Boat" = list("omship_spawn_aroboat"))
+
+// The shuttle's 'shuttle' computer
+/obj/machinery/computer/shuttle_control/explore/aroboat
+	name = "boat control console"
+	shuttle_tag = "Aro's Ship's Boat"
+	req_one_access = list(access_cent_general)
+
+// A shuttle lateloader landmark
+/obj/effect/shuttle_landmark/shuttle_initializer/aroboat
+	name = "Aronai's Boat Bay"
+	base_area = /area/ship/aro/midshipshangars
+	base_turf = /turf/simulated/floor/tiled/techfloor
+	landmark_tag = "omship_spawn_aroboat"
+	docking_controller = "aroship_boatbay"
+	shuttle_type = /datum/shuttle/autodock/overmap/aroboat
+
+// The 'shuttle'
+/datum/shuttle/autodock/overmap/aroboat
+	name = "Aro's Ship's Boat"
+	current_location = "omship_spawn_aroboat"
+	docking_controller_tag = "aroboat_docker"
+	shuttle_area = /area/shuttle/aroboat
+	fuel_consumption = 0
+	defer_initialisation = TRUE

maps/tether/tether-10-colony.dmm

@@ -25271,9 +25271,6 @@
 	},
 /turf/simulated/shuttle/floor/alien,
 /area/unknown/dorm3)
-"WI" = (
-/turf/simulated/floor/wood,
-/area/houseboat)
 "WL" = (
 /obj/structure/table/rack,
 /obj/item/weapon/storage/box/pillbottles,
@@ -30606,7 +30603,7 @@ Qh
 So
 OR
 OR
-WI
+OR
 Fh
 Ki
 Hp

maps/tether/tether_areas2.dm

@@ -1152,58 +1152,6 @@
 /area/unknown/dorm4
 	name = "Unknown Dorm 4"
 
-//////// Small Cruiser Areas ////////
-/area/houseboat
-	name = "Small Cruiser"
-	requires_power = 0
-	flags = RAD_SHIELDED
-	base_turf = /turf/space
-	icon_state = "red2"
-	lightswitch = TRUE
-
-/area/houseboat/holodeck_area
-	name = "Small Cruiser - Holodeck"
-	icon_state = "blue2"
-
-/area/houseboat/holodeck/off
-	name = "Small Cruiser Holo - Off"
-	icon_state = "blue2"
-/area/houseboat/holodeck/beach
-	name = "Small Cruiser Holo - Beach"
-	icon_state = "blue2"
-/area/houseboat/holodeck/snow
-	name = "Small Cruiser Holo - Snow"
-	icon_state = "blue2"
-/area/houseboat/holodeck/desert
-	name = "Small Cruiser Holo - Desert"
-	icon_state = "blue2"
-/area/houseboat/holodeck/picnic
-	name = "Small Cruiser Holo - Picnic"
-	icon_state = "blue2"
-/area/houseboat/holodeck/thunderdome
-	name = "Small Cruiser Holo - Thunderdome"
-	icon_state = "blue2"
-/area/houseboat/holodeck/basketball
-	name = "Small Cruiser Holo - Basketball"
-	icon_state = "blue2"
-/area/houseboat/holodeck/gaming
-	name = "Small Cruiser Holo - Gaming Table"
-	icon_state = "blue2"
-/area/houseboat/holodeck/space
-	name = "Small Cruiser Holo - Space"
-	icon_state = "blue2"
-/area/houseboat/holodeck/bunking
-	name = "Small Cruiser Holo - Bunking"
-	icon_state = "blue2"
-
-/area/shuttle/cruiser/cruiser
-	name = "Small Cruiser Shuttle - Cruiser"
-	icon_state = "blue2"
-	base_turf = /turf/simulated/floor/tiled/techfloor
-/area/shuttle/cruiser/station
-	name = "Small Cruiser Shuttle - Station"
-	icon_state = "blue2"
-
 // ERT/Deathsquad Shuttle
 /area/shuttle/specialops/centcom
 	name = "Special Operations Shuttle - Centcom"

maps/tether/tether_things.dm

@@ -321,50 +321,6 @@ var/global/list/latejoin_tram   = list()
 	name = "warship holodeck control"
 	projection_area = /area/mothership/holodeck/holo
 
-// Small Ship Holodeck
-/obj/machinery/computer/HolodeckControl/houseboat
-	projection_area = /area/houseboat/holodeck_area
-	powerdown_program = "Turn Off"
-	default_program = "Empty Court"
-
-	supported_programs = list(
-	"Basketball" 		= new/datum/holodeck_program(/area/houseboat/holodeck/basketball, list('sound/music/THUNDERDOME.ogg')),
-	"Thunderdome"		= new/datum/holodeck_program(/area/houseboat/holodeck/thunderdome, list('sound/music/THUNDERDOME.ogg')),
-	"Beach" 			= new/datum/holodeck_program(/area/houseboat/holodeck/beach),
-	"Desert" 			= new/datum/holodeck_program(/area/houseboat/holodeck/desert,
-													list(
-														'sound/effects/weather/wind/wind_2_1.ogg',
-											 			'sound/effects/weather/wind/wind_2_2.ogg',
-											 			'sound/effects/weather/wind/wind_3_1.ogg',
-											 			'sound/effects/weather/wind/wind_4_1.ogg',
-											 			'sound/effects/weather/wind/wind_4_2.ogg',
-											 			'sound/effects/weather/wind/wind_5_1.ogg'
-												 		)
-		 											),
-	"Snowfield" 		= new/datum/holodeck_program(/area/houseboat/holodeck/snow,
-													list(
-														'sound/effects/weather/wind/wind_2_1.ogg',
-											 			'sound/effects/weather/wind/wind_2_2.ogg',
-											 			'sound/effects/weather/wind/wind_3_1.ogg',
-											 			'sound/effects/weather/wind/wind_4_1.ogg',
-											 			'sound/effects/weather/wind/wind_4_2.ogg',
-											 			'sound/effects/weather/wind/wind_5_1.ogg'
-												 		)
-		 											),
-	"Space" 			= new/datum/holodeck_program(/area/houseboat/holodeck/space,
-													list(
-														'sound/ambience/ambispace.ogg',
-														'sound/music/main.ogg',
-														'sound/music/space.ogg',
-														'sound/music/traitor.ogg',
-														)
-													),
-	"Picnic Area" 		= new/datum/holodeck_program(/area/houseboat/holodeck/picnic, list('sound/music/title2.ogg')),
-	"Gaming" 			= new/datum/holodeck_program(/area/houseboat/holodeck/gaming, list('sound/music/traitor.ogg')),
-	"Bunking"			= new/datum/holodeck_program(/area/houseboat/holodeck/bunking, list()),
-	"Turn Off" 			= new/datum/holodeck_program(/area/houseboat/holodeck/off, list())
-	)
-
 // Our map is small, if the supermatter is ejected lets not have it just blow up somewhere else
 /obj/machinery/power/supermatter/touch_map_edge()
 	qdel(src)