mercenary cruiser

code/game/machinery/portable_turret_vr.dm

@@ -10,3 +10,16 @@
 	check_weapons = TRUE
 	auto_repair = TRUE
 	can_salvage = FALSE
+
+/obj/machinery/porta_turret/stationary/syndie/CIWS
+	name = "mercenary CIWS turret"
+	desc = "A ship-grade weapons turret designed for anti-fighter defense."
+	req_one_access = list(access_syndicate)
+	installation = /obj/item/weapon/gun/energy/lasercannon
+	health = 500
+	maxhealth = 500
+	enabled = TRUE
+	lethal = TRUE
+	check_weapons = TRUE
+	auto_repair = TRUE
+	can_salvage = FALSE

maps/submaps/admin_use_vr/ert.dmm

@@ -173,13 +173,6 @@
 	},
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/eng_storage)
-"ba" = (
-/obj/machinery/alarm/alarms_hidden{
-	dir = 1;
-	pixel_y = -26
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/ship/ert/hallways_aft)
 "bg" = (
 /turf/space,
 /turf/space,
@@ -312,9 +305,13 @@
 /obj/machinery/computer/operating,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/med_surg)
-"cU" = (
+"cP" = (
+/obj/machinery/recharge_station,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/ert/bridge)
+"cS" = (
 /turf/simulated/wall/shull,
-/area/ship/ert/med)
+/area/ship/ert/hallways_aft)
 "cV" = (
 /obj/machinery/vending/assist,
 /turf/simulated/floor/tiled/techfloor,
@@ -402,6 +399,9 @@
 /obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/barracks)
+"dq" = (
+/turf/simulated/wall/shull,
+/area/ship/ert/med_surg)
 "dr" = (
 /obj/structure/table/rack/steel,
 /obj/item/toy/plushie/squid/blue{
@@ -614,10 +614,6 @@
 /obj/item/weapon/storage/box/cdeathalarm_kit,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/barracks)
-"eQ" = (
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/ert/bridge)
 "eX" = (
 /obj/structure/table/steel_reinforced,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -654,10 +650,6 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/dock_star)
-"fu" = (
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/ert/med)
 "fx" = (
 /obj/structure/table/steel_reinforced,
 /obj/item/rig_module/rescue_pharm,
@@ -1332,6 +1324,9 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/atmos)
+"kW" = (
+/turf/simulated/wall/shull,
+/area/ship/ert/dock_star)
 "kX" = (
 /obj/machinery/atmospherics/pipe/manifold/visible{
 	dir = 1
@@ -1409,6 +1404,13 @@
 "lL" = (
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/dock_port)
+"lO" = (
+/obj/machinery/alarm/alarms_hidden{
+	dir = 1;
+	pixel_y = -26
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/ship/ert/hallways_aft)
 "lR" = (
 /obj/machinery/firealarm/alarms_hidden{
 	dir = 1;
@@ -1861,9 +1863,6 @@
 /obj/item/device/survivalcapsule,
 /turf/simulated/floor/wood,
 /area/ship/ert/commander)
-"oc" = (
-/turf/simulated/wall/shull,
-/area/ship/ert/eng_storage)
 "og" = (
 /obj/machinery/door/firedoor/glass,
 /obj/structure/grille,
@@ -1879,6 +1878,15 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/ert_ship_boat)
+"oi" = (
+/turf/simulated/wall/shull,
+/area/ship/ert/hangar)
+"oj" = (
+/obj/machinery/alarm/alarms_hidden{
+	pixel_y = 26
+	},
+/turf/simulated/floor/tiled/techmaint,
+/area/ship/ert/hallways_aft)
 "ok" = (
 /obj/machinery/alarm/alarms_hidden{
 	pixel_y = 26
@@ -2205,6 +2213,9 @@
 /obj/machinery/body_scanconsole,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/med_surg)
+"pV" = (
+/turf/simulated/wall/shull,
+/area/ship/ert/atmos)
 "pW" = (
 /obj/structure/table/rack/steel,
 /obj/item/weapon/gun/energy/plasmastun,
@@ -2346,6 +2357,10 @@
 /obj/effect/floor_decal/industrial/outline/grey,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/mech_bay)
+"qR" = (
+/obj/machinery/recharge_station,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/ert/atmos)
 "qS" = (
 /obj/structure/table/rack/steel,
 /obj/item/mecha_parts/mecha_equipment/tool/jetpack,
@@ -2437,6 +2452,10 @@
 	},
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/engine)
+"rM" = (
+/obj/machinery/recharge_station,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/ert/hallways_aft)
 "rO" = (
 /obj/machinery/shipsensors{
 	dir = 4
@@ -2724,9 +2743,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/ship/ert/engine)
-"tS" = (
-/turf/simulated/wall/shull,
-/area/ship/ert/mech_bay)
 "tV" = (
 /obj/effect/floor_decal/industrial/warning{
 	dir = 8
@@ -2964,6 +2980,9 @@
 /obj/effect/floor_decal/industrial/warning,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/teleporter)
+"vX" = (
+/turf/simulated/wall/shull,
+/area/ship/ert/engineering)
 "wd" = (
 /obj/structure/sign/department/conference_room{
 	name = "OUTFITTING"
@@ -3437,6 +3456,9 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/med_surg)
+"zc" = (
+/turf/simulated/wall/shull,
+/area/ship/ert/eng_storage)
 "zg" = (
 /obj/item/modular_computer/console/preset/engineering{
 	dir = 4
@@ -3807,9 +3829,6 @@
 "BW" = (
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/hallways)
-"BY" = (
-/turf/simulated/wall/shull,
-/area/ship/ert/med_surg)
 "Ce" = (
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -3858,6 +3877,9 @@
 /obj/machinery/porta_turret/industrial/military,
 /turf/simulated/floor/reinforced/airless,
 /area/ship/ert/med_surg)
+"Cx" = (
+/turf/simulated/wall/shull,
+/area/ship/ert/mech_bay)
 "CH" = (
 /obj/machinery/door/firedoor/border_only,
 /obj/structure/fans/hardlight,
@@ -3994,9 +4016,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/dock_port)
-"DG" = (
-/turf/simulated/wall/shull,
-/area/ship/ert/engineering)
 "DJ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
@@ -4063,9 +4082,6 @@
 "DS" = (
 /turf/simulated/wall/rshull,
 /area/ship/ert/hallways_aft)
-"DT" = (
-/turf/simulated/wall/shull,
-/area/ship/ert/atmos)
 "Ec" = (
 /obj/structure/table/rack/steel,
 /obj/item/weapon/storage/backpack/ert/security,
@@ -5091,6 +5107,9 @@
 /obj/effect/floor_decal/industrial/outline/yellow,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/eng_storage)
+"KI" = (
+/turf/simulated/wall/shull,
+/area/ship/ert/med)
 "KJ" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
@@ -5284,10 +5303,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/med_surg)
-"LQ" = (
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/ert/atmos)
 "LR" = (
 /obj/machinery/door/airlock/external,
 /obj/effect/map_helper/airlock/door/ext_door,
@@ -5936,12 +5951,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/shuttle/ert_ship_boat)
-"Pf" = (
-/obj/machinery/alarm/alarms_hidden{
-	pixel_y = 26
-	},
-/turf/simulated/floor/tiled/techmaint,
-/area/ship/ert/hallways_aft)
 "Pl" = (
 /obj/structure/grille,
 /obj/structure/window/reinforced/full,
@@ -5963,9 +5972,10 @@
 "Pq" = (
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/med)
-"Px" = (
-/turf/simulated/wall/shull,
-/area/ship/ert/hangar)
+"PA" = (
+/obj/machinery/recharge_station,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/ert/med)
 "PC" = (
 /obj/machinery/door/blast/regular{
 	dir = 4;
@@ -6008,9 +6018,6 @@
 /obj/structure/cable/yellow,
 /turf/simulated/floor/tiled/techfloor,
 /area/ship/ert/engineering)
-"PO" = (
-/turf/simulated/wall/shull,
-/area/ship/ert/hallways_aft)
 "PS" = (
 /obj/machinery/shield_capacitor,
 /obj/effect/floor_decal/industrial/outline/blue,
@@ -6135,9 +6142,6 @@
 "QT" = (
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/med)
-"QU" = (
-/turf/simulated/wall/shull,
-/area/ship/ert/dock_star)
 "QX" = (
 /obj/structure/window/reinforced,
 /obj/machinery/computer/shuttle_control/explore/ert_ship_boat{
@@ -6575,10 +6579,6 @@
 	},
 /turf/simulated/floor/tiled/techmaint,
 /area/ship/ert/teleporter)
-"UP" = (
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/ert/hallways_aft)
 "UT" = (
 /obj/machinery/door/airlock/glass_security{
 	req_one_access = list(103)
@@ -13337,17 +13337,17 @@ yz
 yz
 bO
 kJ
-DT
+pV
 kP
 kP
 rS
 gA
 gA
 CT
-LQ
-DT
+qR
+pV
 wO
-DG
+vX
 zh
 WS
 lB
@@ -13479,7 +13479,7 @@ yz
 yz
 bR
 kJ
-DT
+pV
 kS
 os
 os
@@ -13487,14 +13487,14 @@ vg
 bp
 Dn
 gn
-DT
+pV
 NR
-DG
+vX
 ry
 Xg
 Sc
 Nb
-DG
+vX
 XW
 XW
 XW
@@ -13621,7 +13621,7 @@ yz
 yz
 bO
 kJ
-DT
+pV
 kT
 gA
 gA
@@ -13763,7 +13763,7 @@ yz
 yz
 bW
 kJ
-DT
+pV
 kY
 oy
 oy
@@ -13771,9 +13771,9 @@ vg
 bp
 DK
 Io
-DT
+pV
 NZ
-DG
+vX
 XS
 Xu
 ZI
@@ -13905,7 +13905,7 @@ yz
 yz
 wr
 kJ
-DT
+pV
 ls
 ls
 ls
@@ -13913,14 +13913,14 @@ gA
 gA
 DQ
 Ip
-DT
+pV
 NZ
-DG
+vX
 hN
 PH
 ZI
 My
-DG
+vX
 XW
 XW
 XW
@@ -14047,25 +14047,25 @@ yz
 xx
 DS
 DS
-DT
-DT
-DT
-DT
-DT
-DT
-DT
-DT
-DT
+pV
+pV
+pV
+pV
+pV
+pV
+pV
+pV
+pV
 Oa
-DG
-DG
-DG
-DG
-DG
-DG
-DG
-DG
-DG
+vX
+vX
+vX
+vX
+vX
+vX
+vX
+vX
+vX
 XW
 XW
 cJ
@@ -14472,8 +14472,8 @@ yz
 yz
 sB
 DS
-PO
-UP
+cS
+rM
 lu
 DS
 NI
@@ -14491,8 +14491,8 @@ iA
 jA
 DS
 lu
-UP
-PO
+rM
+cS
 DS
 sB
 yz
@@ -14614,9 +14614,9 @@ yz
 Ib
 DS
 DS
-PO
-PO
-Pf
+cS
+cS
+oj
 DS
 Qh
 Iv
@@ -14632,8 +14632,8 @@ eF
 Ms
 Kf
 DS
-ba
-PO
+lO
+cS
 DS
 DS
 DS
@@ -14757,7 +14757,7 @@ HE
 JB
 iB
 iB
-PO
+cS
 lu
 DS
 RV
@@ -14775,7 +14775,7 @@ Ms
 jI
 DS
 lu
-PO
+cS
 Sz
 Sz
 Sz
@@ -14917,8 +14917,8 @@ Mv
 wo
 Sz
 Un
-QU
-QU
+kW
+kW
 rt
 Sz
 FO
@@ -15202,7 +15202,7 @@ jA
 Sz
 uu
 na
-QU
+kW
 kX
 SJ
 Sz
@@ -15624,12 +15624,12 @@ ZM
 ZM
 ZM
 ZM
-QU
-QU
-QU
+kW
+kW
+kW
 ix
-QU
-QU
+kW
+kW
 Sz
 Sz
 yz
@@ -15759,7 +15759,7 @@ ZM
 ZM
 ED
 Ao
-eQ
+cP
 Oi
 Sj
 zg
@@ -15771,7 +15771,7 @@ Ar
 hP
 Br
 PS
-oc
+zc
 XG
 GJ
 yz
@@ -15913,7 +15913,7 @@ Zv
 Zv
 Br
 PS
-oc
+zc
 XG
 qF
 yz
@@ -16055,7 +16055,7 @@ Zv
 xC
 sW
 PS
-oc
+zc
 XG
 aV
 yz
@@ -17332,8 +17332,8 @@ ZT
 yI
 ZR
 pz
-cU
-cU
+KI
+KI
 ZT
 eD
 yz
@@ -18610,8 +18610,8 @@ ZT
 PD
 un
 VJ
-cU
-cU
+KI
+KI
 ZT
 eD
 yz
@@ -18736,7 +18736,7 @@ fj
 ip
 mV
 pt
-Px
+oi
 xG
 CL
 GR
@@ -18748,12 +18748,12 @@ WE
 hV
 WA
 EB
-Px
+oi
 qA
 oQ
 dx
 Nd
-fu
+PA
 kx
 TU
 yz
@@ -19179,7 +19179,7 @@ OZ
 Cq
 tg
 km
-fu
+PA
 kx
 TU
 yz
@@ -19299,12 +19299,12 @@ yz
 yz
 af
 bM
-tS
-tS
+Cx
+Cx
 jK
 nn
 pK
-tS
+Cx
 yj
 WC
 WC
@@ -19320,8 +19320,8 @@ uq
 ga
 po
 Rv
-BY
-BY
+dq
+dq
 MZ
 Jg
 yz
@@ -19441,12 +19441,12 @@ yz
 yz
 ag
 bM
-tS
+Cx
 fx
 jQ
 np
 pM
-tS
+Cx
 yj
 WC
 YW
@@ -19458,12 +19458,12 @@ HO
 YW
 WC
 dk
-BY
+dq
 gf
 TF
 SB
 hv
-BY
+dq
 MZ
 aC
 yz
@@ -19583,7 +19583,7 @@ yz
 yz
 ah
 bM
-tS
+Cx
 fE
 jQ
 np
@@ -19605,7 +19605,7 @@ pU
 TF
 SB
 wp
-BY
+dq
 MZ
 ci
 yz
@@ -19725,7 +19725,7 @@ yz
 yz
 ah
 bM
-tS
+Cx
 fP
 jU
 nt
@@ -19747,7 +19747,7 @@ ij
 LB
 xU
 GT
-BY
+dq
 MZ
 ci
 yz
@@ -19867,7 +19867,7 @@ yz
 yz
 ai
 bM
-tS
+Cx
 fU
 jY
 nv
@@ -19889,7 +19889,7 @@ mh
 LZ
 LJ
 hS
-BY
+dq
 MZ
 Cr
 yz
@@ -20009,7 +20009,7 @@ yz
 yz
 ah
 bM
-tS
+Cx
 fZ
 jQ
 np
@@ -20031,7 +20031,7 @@ pb
 bj
 SB
 MC
-BY
+dq
 MZ
 ci
 yz
@@ -20173,7 +20173,7 @@ MZ
 zb
 PG
 MZ
-BY
+dq
 MZ
 ci
 yz
@@ -20315,7 +20315,7 @@ aQ
 bj
 SB
 aQ
-BY
+dq
 MZ
 Jg
 yz
@@ -20457,7 +20457,7 @@ cO
 bj
 SB
 Mb
-BY
+dq
 MZ
 ci
 yz
@@ -20599,7 +20599,7 @@ NJ
 bj
 SB
 NJ
-BY
+dq
 MZ
 ci
 yz
@@ -20741,7 +20741,7 @@ wZ
 gZ
 CP
 wZ
-BY
+dq
 MZ
 Cr
 yz
@@ -20883,7 +20883,7 @@ ij
 nq
 LJ
 ij
-BY
+dq
 MZ
 ci
 yz
@@ -21020,12 +21020,12 @@ WC
 WC
 WC
 zr
-BY
+dq
 mN
 SB
 SB
 mN
-BY
+dq
 MZ
 ci
 yz
@@ -21162,12 +21162,12 @@ QE
 QE
 QE
 Ff
-BY
+dq
 vb
 SB
 SB
 vb
-BY
+dq
 MZ
 aC
 yz
@@ -21305,10 +21305,10 @@ CH
 CH
 yX
 MZ
-BY
+dq
 sT
 sT
-BY
+dq
 MZ
 MZ
 Jg
@@ -21448,8 +21448,8 @@ za
 hW
 MZ
 MZ
-BY
-BY
+dq
+dq
 MZ
 MZ
 Cr

maps/submaps/admin_use_vr/mercship.dm

@@ -0,0 +1,264 @@
+	// Compile in the map for CI testing if we're testing compileability of all the maps
+#if MAP_TEST
+#include "mercship.dmm"
+#endif
+
+
+// Map template for spawning the shuttle
+/datum/map_template/om_ships/manta_ship
+	name = "OM Ship - Mercenary Cruiser (New Z)"
+	desc = "Mercenary Manta Cruiser."
+	mappath = 'kk_mercship.dmm'
+
+// The ship's area(s)
+/area/ship/manta
+	name = "\improper ERT Ship (Use a Subtype!)"
+	icon_state = "shuttle2"
+	requires_power = 1
+	dynamic_lighting = 1
+
+/area/ship/manta/engine
+	name = "\improper Mercenary Cruiser - Engine Bay"
+	icon_state = "engine"
+
+/area/ship/manta/engineering
+	name = "\improper Mercenary Cruiser - Engineering Control Room"
+	icon_state = "engine_monitoring"
+
+/area/ship/manta/bridge
+	name = "\improper Mercenary Cruiser - Bridge"
+	icon_state = "syndie-control"
+
+/area/ship/manta/atmos
+	name = "\improper Mercenary Cruiser - Atmospherics"
+	icon_state = "atmos"
+                                   
+/area/ship/manta/mech_bay
+	name = "\improper Mercenary Cruiser - Mech Bay"
+	icon_state = "mechbay"
+
+/area/ship/manta/armoury_st
+	name = "\improper Mercenary Cruiser - Standard Armoury"
+	icon_state = "armory"
+
+/area/ship/manta/armoury_as
+	name = "\improper Mercenary Cruiser - Assault Armoury"
+	icon_state = "Tactical"
+
+/area/ship/manta/hangar
+	name = "\improper Mercenary Cruiser - Hangar"
+	icon_state = "hangar"
+
+/area/ship/manta/barracks
+	name = "\improper Mercenary Cruiser - Barracks"
+	icon_state = "syndie-elite"
+
+/area/ship/manta/barracks/bed_1
+	name = "\improper Mercenary Cruiser - Bunkroom 1"
+	icon_state = "syndie-elite"
+
+/area/ship/manta/barracks/bed_2
+	name = "\improper Mercenary Cruiser - Bunkroom 2"
+	icon_state = "syndie-elite"
+
+/area/ship/manta/med
+	name = "\improper Mercenary Cruiser - Medical"
+	icon_state = "medbay"
+
+/area/ship/manta/hallways_star
+	name = "\improper Mercenary Cruiser - Starboard Corridors"
+	icon_state = "smaint"
+
+/area/ship/manta/hallways_port
+	name = "\improper Mercenary Cruiser - Port Corridors"
+	icon_state = "pmaint"
+
+/area/ship/manta/hallways_aft
+	name = "\improper Mercenary Cruiser - Aft Corridors"
+	icon_state = "green"
+
+/area/ship/manta/dock_star
+	name = "\improper Mercenary Cruiser - Starboard Airlock"
+	icon_state = "exit"
+
+/area/ship/manta/dock_port
+	name = "\improper Mercenary Cruiser - Port Airlock"
+	icon_state = "exit"
+
+/area/ship/manta/radiator_star
+	name = "\improper Mercenary Cruiser - Starboard Radiator Array"
+	icon_state = "east"
+
+/area/ship/manta/radiator_port
+	name = "\improper Mercenary Cruiser - Port Radiator Array"
+	icon_state = "west"
+
+/area/ship/manta/teleporter
+	name = "\improper Mercenary Cruiser - Teleporter"
+	icon_state = "teleporter"
+
+/area/ship/manta/commander
+	name = "\improper Mercenary Cruiser - Commander's Room"
+	icon_state = "head_quarters"
+	
+/area/ship/manta/holding
+	name = "\improper Mercenary Cruiser - Holding Cells"
+	icon_state = "brig"
+	
+/area/ship/manta/recreation
+	name = "\improper Mercenary Cruiser - Recreation & Supplies"
+	icon_state = "recreation_area"
+
+/area/shuttle/manta_ship_boat
+	name = "\improper Boarding Craft"
+	icon_state = "syndie-ship"
+	requires_power = 0
+
+// The 'shuttle' of the excursion shuttle
+// /datum/shuttle/autodock/overmap/manta_ship
+//	name = "Unknown Vessel"
+//	warmup_time = 0
+//	current_location = "tether_excursion_hangar"
+//	docking_controller_tag = "expshuttle_docker"
+//	shuttle_area = list(/area/ship/manta/engineering, /area/ship/manta/engineeringcntrl, /area/ship/manta/bridge, /area/ship/manta/atmos, /area/ship/manta/air, /area/ship/manta/engine, /area/ship/manta/engine1, /area/ship/manta/armoury, /area/ship/manta/hangar, /area/ship/manta/barracks, /area/ship/manta/fighter, /area/ship/manta/med, /area/ship/manta/med1, /area/ship/manta/hall1, /area/ship/manta/hall2)
+//	fuel_consumption = 3
+
+// The 'ship'
+/obj/effect/overmap/visitable/ship/manta_ship
+	name = "SAARE Typhon Four-Niner"
+	desc = "Spacefaring vessel. Broadcasting Private Military Contractor IFF."
+	scanner_desc = @{"[i]Registration[/i]: SAARE Mercenary Cruiser [i]Typhon Four-Niner[/i]
+[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")
+//	initial_restricted_waypoints = list("Mercenary Cruiser's Bay" = list("omship_spawn_manta_lander"))
+
+/obj/effect/landmark/map_data/manta_ship
+	height = 1
+
+/obj/effect/shuttle_landmark/premade/manta_ship_port
+	name = "SAARE Cruiser - Port Airlock"
+	landmark_tag = "manta_ship_port"
+
+/obj/effect/shuttle_landmark/premade/manta_ship_star
+	name = "SAARE Cruiser - Starboard Airlock"
+	landmark_tag = "manta_ship_star"
+
+/obj/effect/shuttle_landmark/premade/manta_ship_near_fore
+	name = "Near SAARE Cruiser (Fore)"
+	landmark_tag = "manta_ship_near_fore"
+
+/obj/effect/shuttle_landmark/premade/manta_ship_near_aft
+	name = "Near SAARE Cruiser (Aft)"
+	landmark_tag = "manta_ship_near_aft"
+
+/obj/effect/shuttle_landmark/premade/manta_ship_near_port
+	name = "Near SAARE Cruiser (Port)"
+	landmark_tag = "manta_ship_near_port"
+
+/obj/effect/shuttle_landmark/premade/manta_ship_near_star
+	name = "Near SAARE Cruiser (Starboard)"
+	landmark_tag = "manta_ship_near_star"
+
+// The shuttle's 'shuttle' computer
+/obj/machinery/computer/shuttle_control/explore/manta_ship_boat
+	name = "boat control console"
+	shuttle_tag = "Boarding Craft"
+
+// A shuttle lateloader landmark
+/obj/effect/shuttle_landmark/shuttle_initializer/manta_ship_boat
+	name = "Mercenary Cruiser's Bay"
+	base_area = /area/ship/manta/hangar
+	base_turf = /turf/simulated/floor/plating
+	landmark_tag = "omship_spawn_manta_lander"
+	docking_controller = "manta_boarding_shuttle_dock"
+	shuttle_type = /datum/shuttle/autodock/overmap/manta_ship_boat
+
+// The 'shuttle'
+/obj/machinery/computer/shuttle_control/explore/manta_ship_boat
+	name = "LC control console"
+	shuttle_tag = "Boarding Craft"
+	req_one_access = list(150)
+
+/datum/shuttle/autodock/overmap/manta_ship_boat
+	name = "Boarding Craft"
+	current_location = "omship_spawn_manta_lander"
+	docking_controller_tag = "manta_boarding_shuttle"
+	shuttle_area = /area/shuttle/manta_ship_boat
+	fuel_consumption = 0 //this thing is too big already, let's just handwave everything
+	defer_initialisation = TRUE
+
+/obj/effect/overmap/visitable/ship/landable/manta_ship_boat
+	scanner_name = "Unknown Landing Craft"
+	desc = "Spacefaring vessel. No IFF detected."
+	scanner_desc = @{"[i]Registration[/i]: None detected.
+[i]Class[/i]: Unknown (Frigate-approximate Mass)
+[i]Transponder[/i]: Not Responding
+[b]Notice[/b]: Failure to broadcast a valid IFF signal via transponder is a breach of numerous interstellar codes. Approach with caution."}
+	color = "#3366FF"
+	color = "#333333" //TACTICAL BLACK
+	vessel_mass = 500
+	vessel_size = SHIP_SIZE_TINY
+	shuttle = "Boarding Craft"
+
+/obj/machinery/cryopod/manta_ship
+	announce_channel = "Mercenary"
+	on_store_message = "has entered cryogenic storage."
+	on_store_name = "Mercenary Cruiser Cryo"
+	on_enter_visible_message = "starts climbing into the"
+	on_enter_occupant_message = "You feel cool air surround you. You go numb as your senses turn inward."
+	on_store_visible_message_1 = "hums and hisses as it moves"
+	on_store_visible_message_2 = "into cryogenic storage."
+	
+//Misc Stuff
+/obj/item/weapon/paper/manta_shields
+	name = "Shield Setup"
+	info = {"To All Personnel,<br>\
+The cruiser's shield generator is intended to keep asteroids and pesky railgun rounds off our ass, so make sure you use it if we get into a scuffle.<br>\
+<br>\
+Recommended settings as follows:<br>\
+Photonic: Off (or else the point defense won't work!!)<br>\
+Electromagnetic: On<br>\
+Humanoid: Off<br>\
+Atmosphere: Off<br>\
+Hull Shield: On<br>\
+Radius: 26<br>\
+<br>\
+The shield generator's a hungry beast and will drain the cruiser's reserves fairly quick, so don't overuse it. Don't be afraid to use it either, as this ship's a <i>serious</i> investment. If you fuck up, I <u>won't</u> be sticking my neck out for you, you get me? This 'Lieutenant Commander Sykes' asshole is enough of a pain already.<br>\
+<br>\
+<i>Capt. Thorne</i>"}
+
+/obj/item/weapon/paper/manta_new_personnel_brief
+	name = "Fresh Personnel Primer"
+	info = {"To All <i>New</i> Personnel,<br>\
+Welcome to your new home, the SAARE Typhon Four-Niner. This Manta-class Cruiser is equipped with everything you should ever need to conduct operations against any target we may encounter during our contracts. If you're reading this, you're probably in the Barracks right now; at the outer edge of the starboard wing are the Holding Cells. To the fore of the barracks is the Medbay, pray you don't end up there.<br>\
+<br>\
+Front and center is the Landing Craft Hangar, and just behind that is the Bridge. Off the Bridge, you'll find my quarters and the teleporter room. Aft of the Bridge is Engineering and the Engine Bay; I suggest steering clear unless you want to get an accidental dose of radiation. Engineering is flanked by the Radiator Arrays which are supposed to help keep our heat signature under control, as well as a pair of small airlocks.<br>\
+<br>\
+Finally, over in the port wing you'll find the recreation area and kitchen along with all of the armory and outfitting space for weapons, armor, and even our mech. If you <i>somehow</i> get authorization to take that out you better bring it back in one piece, by the way; it wasn't cheap. If it gets wrecked I'm taking the repair and replacement costs out of your paychecks until it's paid off.<br>\
+<br>\
+You don't want to know how long it's going to take to pay off.<br>\
+<br>\
+<i>Capt. Thorne</i>"}
+
+/obj/item/weapon/paper/manta_approach_tactics
+	name = "Installation Approach"
+	info = {"To All Personnel,<br>\
+Word of advice: this ship isn't exactly sneaky, despite our best efforts. If we pull up around a major site <i>they're going to notice</i>. Now sure we have the whole transponder thing that should throw them off for a bit, but sooner or later they're gonna catch on, <i>especially</i> if you go in loud. Fortunately for you all, our handy-dandy little landing craft <i>is</i> stealthy, and can get you aboard most ships, stations, or outposts without too much fuss. Better yet it's an all-passive system, so you don't even need to turn it on or worry about some idiot accidentally turning it off.<br>\
+<br>\
+We've also been supplied with a few packs of 'liberated' SAARE gear for use as disguises, so use them if you need to. Sometimes the stealthy approach is the best path.<br>\
+<br>\
+<i>Capt. Thorne</i>"}
+
+/obj/item/weapon/paper/manta_prisoners
+	name = "Prisoner Management"
+	info = {"To All Personnel,<br>\
+I don't care if they're 'not being cooperative', for the love of fuck if another high-value prisoner 'disappears' under your watch <i>you are fucking next</i>, do I make myself clear? I don't care if it's some schmuck we picked up during a raid who happened to be in the wrong place at the wrong time, but if it's someone we're trying to extract information from or ransom or whatever then they better not vanish.<br>\
+<br>\
+<i>Capt. Thorne</i><br>\
+<br>\
+P.S. If you gotta cut 'em up or whatever try not to make too much of a mess, and clean up when you're done. Don't trail blood all over my damn ship, and don't get them killed by infections either."}

maps/tether/submaps/_tether_submaps.dm

@@ -54,18 +54,33 @@
 
 //////////////////////////////////////////////////////////////////////////////
 //Antag/Event/ERT Areas
+
+#include "../../submaps/admin_use_vr/ert.dm"
+#include "../../submaps/admin_use_vr/mercship.dm"
+
+/*
+//not loading this here, it's already defined in the ert.dm
 /datum/map_template/admin_use/ert
 	name = "Special Area - ERT"
 	desc = "It's the ERT ship! Lorge."
 	mappath = 'maps/submaps/admin_use_vr/ert.dmm'
+*/
 
 /datum/map_template/admin_use/trader
 	name = "Special Area - Trader"
 	desc = "Big trader ship."
 	mappath = 'maps/submaps/admin_use_vr/tradeship.dmm'
 
+/*
+//not loading this here, it's already defined in the mercship.dm
 /datum/map_template/admin_use/mercenary
-	name = "Special Area - Merc Base"
+	name = "Special Area - Merc Ship"
+	desc = "Prepare tae be boarded, arr!"
+	mappath = 'maps/submaps/admin_use_vr/kk_mercship.dmm'
+*/
+
+/datum/map_template/admin_use/old_mercenary
+	name = "Special Area - Old Merc Base"
 	desc = "So much red!"
 	mappath = 'maps/submaps/admin_use_vr/mercbase.dmm'
 
@@ -330,8 +345,6 @@
 #if AWAY_MISSION_TEST
 #include "../../submaps/admin_use_vr/spa.dmm"
 #endif
-
-#include "../../submaps/admin_use_vr/ert.dm"
 #include "../../submaps/admin_use_vr/fun.dm"
 /datum/map_template/tether_lateload/fun/spa
 	name = "Space Spa"