diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm
index 5de144facc..a5a215cf4a 100644
--- a/maps/submaps/admin_use_vr/kk_mercship.dmm
+++ b/maps/submaps/admin_use_vr/kk_mercship.dmm
@@ -8,7 +8,7 @@
/turf/space,
/area/space)
"ag" = (
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/hangar)
"aj" = (
/obj/structure/table/rack,
@@ -103,7 +103,7 @@
/area/ship/manta/hallways_aft)
"as" = (
/obj/machinery/porta_turret/stationary/syndie/CIWS,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/hangar)
"au" = (
/obj/effect/floor_decal/techfloor{
@@ -146,17 +146,17 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/engineering)
"aE" = (
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/armoury_st)
"aI" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 10
+/obj/structure/table/steel_reinforced,
+/obj/item/clothing/gloves/yellow,
+/obj/item/weapon/storage/toolbox/syndicate,
+/obj/effect/floor_decal/techfloor{
+ dir = 1
},
-/obj/machinery/alarm/alarms_hidden{
- pixel_y = 26
- },
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"aJ" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -323,15 +323,18 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hangar)
"bo" = (
-/obj/machinery/atmospherics/unary/heat_exchanger{
+/obj/structure/ship_munition/disperser_charge/emp,
+/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/obj/machinery/light_switch{
- dir = 4;
- pixel_x = -23
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/structure/railing{
+ dir = 4
},
/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/area/ship/manta/magazine)
"bp" = (
/obj/effect/floor_decal/techfloor{
dir = 8
@@ -354,6 +357,9 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"bt" = (
@@ -371,6 +377,12 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
+"bu" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/ship/manta/magazine)
"bv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -440,7 +452,7 @@
/obj/machinery/power/pointdefense{
id_tag = "mercenary_pd"
},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/armoury_st)
"bI" = (
/obj/structure/table/rack,
@@ -485,7 +497,7 @@
/obj/machinery/power/pointdefense{
id_tag = "mercenary_pd"
},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/hangar)
"bY" = (
/obj/structure/table/rack,
@@ -556,7 +568,7 @@
/area/ship/manta/dock_port)
"ce" = (
/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/hangar)
"ch" = (
/turf/simulated/wall/rshull,
@@ -588,6 +600,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"cq" = (
@@ -597,7 +613,7 @@
/turf/simulated/floor/plating,
/area/ship/manta/hallways_star)
"cr" = (
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/med)
"ct" = (
/obj/structure/table/rack,
@@ -623,10 +639,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
-"cA" = (
-/obj/machinery/atmospherics/pipe/simple/visible,
-/turf/simulated/wall/rshull,
-/area/ship/manta/radiator_star)
"cG" = (
/obj/structure/cable/orange{
d2 = 2;
@@ -656,7 +668,7 @@
/obj/machinery/power/pointdefense{
id_tag = "mercenary_pd"
},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/med)
"cK" = (
/obj/structure/cable/orange{
@@ -720,7 +732,7 @@
/area/ship/manta/armoury_st)
"cS" = (
/obj/machinery/porta_turret/stationary/syndie/CIWS,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/armoury_st)
"cW" = (
/obj/structure/undies_wardrobe,
@@ -778,14 +790,8 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/dock_star)
"da" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/obj/effect/floor_decal/techfloor{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/hallways_aft)
+/turf/simulated/floor/reinforced,
+/area/ship/manta/hangar)
"dc" = (
/obj/structure/bed/pod,
/obj/effect/landmark{
@@ -794,6 +800,12 @@
/obj/item/weapon/bedsheet/hos,
/turf/simulated/floor/wood,
/area/ship/manta/barracks/bed_2)
+"dg" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/ship/manta/magazine)
"dj" = (
/obj/effect/floor_decal/techfloor{
dir = 4
@@ -812,7 +824,7 @@
id = "Von_Braun_Hangar";
name = "Hangar Blast Door"
},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/hangar)
"dl" = (
/turf/simulated/wall/rshull,
@@ -850,11 +862,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
-"dt" = (
-/obj/machinery/atmospherics/portables_connector,
-/obj/machinery/portable_atmospherics/canister/nitrogen/engine_setup,
-/turf/simulated/floor/plating,
-/area/ship/manta/atmos)
"dC" = (
/obj/structure/cable/orange{
d1 = 2;
@@ -880,7 +887,7 @@
/area/ship/manta/recreation)
"dI" = (
/obj/machinery/porta_turret/stationary/syndie/CIWS,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/med)
"dJ" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -895,8 +902,8 @@
/obj/machinery/shipsensors{
dir = 1
},
-/turf/simulated/floor/reinforced,
-/area/ship/manta/mech_bay)
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
"dP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -913,9 +920,18 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hangar)
"dW" = (
-/obj/machinery/atmospherics/pipe/simple/visible,
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/obj/effect/map_helper/airlock/door/int_door,
+/obj/effect/floor_decal/techfloor{
+ dir = 1
+ },
+/obj/effect/floor_decal/techfloor,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/glass_external,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/gunnery)
"dX" = (
/obj/effect/floor_decal/techfloor{
dir = 1
@@ -1052,11 +1068,21 @@
/turf/simulated/floor/tiled/white,
/area/ship/manta/med)
"eG" = (
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/hallways_port)
"eH" = (
/obj/machinery/porta_turret/stationary/syndie/CIWS,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/hallways_port)
+"eI" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"eJ" = (
/obj/structure/table/rack,
@@ -1121,6 +1147,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"fj" = (
@@ -1292,7 +1321,7 @@
/area/ship/manta/med)
"fZ" = (
/obj/machinery/porta_turret/stationary/syndie/CIWS,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/recreation)
"gb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -1367,6 +1396,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"gC" = (
@@ -1532,7 +1564,7 @@
/obj/machinery/power/pointdefense{
id_tag = "mercenary_pd"
},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/hallways_port)
"hs" = (
/obj/structure/bed/chair/bay/comfy/red{
@@ -1551,15 +1583,18 @@
/turf/simulated/wall/rshull,
/area/ship/manta/hallways_port)
"hu" = (
-/obj/structure/catwalk,
+/obj/structure/ship_munition/disperser_charge/explosive,
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
/obj/structure/railing{
dir = 8
},
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 1
- },
/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/area/ship/manta/magazine)
"hv" = (
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/airlock/engineering{
@@ -1840,23 +1875,16 @@
/turf/simulated/floor/plating,
/area/ship/manta/engine)
"iw" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
+/obj/effect/map_helper/airlock/door/ext_door,
/obj/effect/floor_decal/techfloor{
dir = 8
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 1
+/obj/effect/floor_decal/techfloor{
+ dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/hallways_aft)
+/obj/machinery/door/airlock/glass_external,
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
"iA" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/effect/floor_decal/techfloor{
@@ -1886,13 +1914,20 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 1
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"iG" = (
-/obj/machinery/atmospherics/portables_connector,
-/obj/machinery/portable_atmospherics/canister/nitrogen/engine_setup,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/disposal/deliveryChute{
+ dir = 4
+ },
+/obj/structure/railing,
+/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/area/ship/manta/magazine)
"iI" = (
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/airlock/highsecurity{
@@ -1989,11 +2024,14 @@
/turf/simulated/floor/tiled/freezer,
/area/ship/manta/barracks)
"iX" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
+/obj/effect/floor_decal/techfloor{
+ dir = 8
},
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/gunnery)
"iZ" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 1
@@ -2048,7 +2086,7 @@
/obj/machinery/power/pointdefense{
id_tag = "mercenary_pd"
},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/recreation)
"jl" = (
/obj/structure/bed/chair/bay/shuttle{
@@ -2173,6 +2211,7 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 9
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"jI" = (
@@ -2353,11 +2392,15 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"kO" = (
/obj/machinery/porta_turret/stationary/syndie/CIWS,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/hallways_star)
"kP" = (
/obj/structure/closet/crate{
@@ -2370,7 +2413,7 @@
/turf/simulated/floor/plating,
/area/ship/manta/hallways_port)
"kW" = (
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/recreation)
"le" = (
/obj/effect/floor_decal/techfloor{
@@ -2392,6 +2435,22 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
+"lf" = (
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 4;
+ frequency = 1379;
+ id_tag = "northciv_airlock_pump"
+ },
+/obj/effect/floor_decal/techfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/techfloor/corner{
+ dir = 6
+ },
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/gunnery)
"lg" = (
/obj/effect/map_helper/airlock/atmos/chamber_pump,
/obj/machinery/atmospherics/unary/vent_pump/high_volume,
@@ -2418,6 +2477,9 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"lj" = (
@@ -2436,12 +2498,6 @@
/obj/item/ammo_magazine/m10mm,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
-"lk" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 9
- },
-/turf/simulated/wall/rshull,
-/area/ship/manta/radiator_port)
"lm" = (
/turf/simulated/wall/rshull,
/area/ship/manta/recreation)
@@ -2502,6 +2558,9 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"lG" = (
@@ -2648,11 +2707,15 @@
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"mb" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 6
+/obj/machinery/computer/ship/disperser{
+ req_one_access = list(150)
},
-/turf/space,
-/area/ship/manta/radiator_port)
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/obj/item/weapon/paper/manta_cannon_usage,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/gunnery)
"me" = (
/obj/machinery/shield_diffuser,
/obj/effect/floor_decal/industrial/warning{
@@ -2682,14 +2745,23 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"mp" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
+/obj/structure/table/rack,
+/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster,
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar,
+/obj/machinery/alarm/alarms_hidden{
+ pixel_y = 26
},
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/obj/effect/floor_decal/techfloor{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"ms" = (
/obj/structure/bed/chair/bay/shuttle{
dir = 8
@@ -2803,26 +2875,10 @@
},
/turf/simulated/floor/tiled/white,
/area/ship/manta/med)
-"mZ" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 10
- },
-/turf/simulated/wall/rshull,
-/area/ship/manta/radiator_port)
"na" = (
-/obj/structure/catwalk,
-/obj/structure/railing{
- dir = 1
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
-"nc" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"nf" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -2859,11 +2915,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"nl" = (
-/obj/machinery/atmospherics/binary/pump/on,
-/obj/effect/catwalk_plated/dark,
-/obj/structure/railing{
- dir = 8
- },
/obj/machinery/power/apc/hyper{
alarms_hidden = 1;
dir = 4;
@@ -2874,8 +2925,11 @@
d2 = 2;
icon_state = "0-2"
},
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/obj/effect/floor_decal/techfloor{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"np" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -2893,13 +2947,7 @@
/area/ship/manta/hallways_aft)
"nq" = (
/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
-"nr" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 6
- },
-/turf/simulated/wall/rshull,
-/area/ship/manta/radiator_star)
+/area/ship/manta/magazine)
"nu" = (
/obj/structure/cable{
d1 = 4;
@@ -2961,15 +3009,12 @@
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/plating,
/area/ship/manta/engine)
-"nI" = (
-/turf/simulated/floor/reinforced,
-/area/ship/manta/mech_bay)
"nJ" = (
/obj/machinery/power/pointdefense{
id_tag = "mercenary_pd"
},
-/turf/simulated/floor/reinforced,
-/area/ship/manta/mech_bay)
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
"nL" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 5
@@ -3042,17 +3087,15 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"oa" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/grille,
-/obj/structure/window/titanium/full,
-/obj/structure/window/titanium{
- dir = 4
- },
-/obj/structure/window/titanium{
+/obj/effect/floor_decal/techfloor{
dir = 8
},
-/turf/simulated/floor/airless,
-/area/ship/manta/radiator_star)
+/obj/machinery/computer/ship/sensors{
+ dir = 4;
+ req_one_access = list(150)
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/gunnery)
"ob" = (
/obj/structure/flora/pottedplant{
icon_state = "plant-10"
@@ -3066,21 +3109,12 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
-"oc" = (
-/turf/simulated/wall/rshull,
-/area/ship/manta/mech_bay)
"oe" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/turf/simulated/floor/plating,
/area/ship/manta/hallways_port)
-"og" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 5
- },
-/turf/simulated/floor/reinforced/airless,
-/area/ship/manta/radiator_star)
"oi" = (
/obj/effect/floor_decal/techfloor{
dir = 1
@@ -3099,6 +3133,10 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 10
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"om" = (
@@ -3130,26 +3168,12 @@
},
/turf/simulated/floor/plating,
/area/ship/manta/hallways_port)
-"os" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
- },
-/turf/simulated/wall/rshull,
-/area/ship/manta/radiator_port)
"ot" = (
-/obj/structure/catwalk,
-/obj/structure/railing{
- dir = 4
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
-"ou" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"ov" = (
/obj/machinery/power/apc/hyper{
alarms_hidden = 1;
@@ -3161,6 +3185,7 @@
d2 = 8;
icon_state = "0-8"
},
+/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plating,
/area/ship/manta/hallways_port)
"ow" = (
@@ -3170,15 +3195,15 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_star)
"oy" = (
-/obj/machinery/atmospherics/unary/heat_exchanger{
- dir = 1
- },
/obj/machinery/light_switch{
dir = 8;
pixel_x = 23
},
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/obj/effect/floor_decal/techfloor{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"oD" = (
/obj/structure/table/rack,
/obj/item/weapon/gun/energy/laser,
@@ -3276,14 +3301,13 @@
/turf/simulated/floor/tiled/dark,
/area/ship/manta/recreation)
"oT" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
- },
-/obj/machinery/light/small{
+/obj/mecha/combat/gygax/dark,
+/obj/machinery/mech_recharger,
+/obj/effect/floor_decal/techfloor{
dir = 1
},
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"oU" = (
/obj/machinery/door/firedoor/border_only,
/obj/structure/cable/orange{
@@ -3297,25 +3321,26 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/door/airlock/engineering{
- name = "Radiator Array";
+/obj/machinery/door/airlock/glass_security{
+ name = "Cannon Magazine";
req_one_access = list(150)
},
/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
-"oW" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
+/area/ship/manta/magazine)
+"oX" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
-/turf/simulated/wall/rshull,
-/area/ship/manta/radiator_star)
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/ship/manta/magazine)
"oY" = (
-/obj/machinery/scale,
/obj/effect/floor_decal/techfloor{
- dir = 8
+ dir = 10
},
+/obj/structure/table/steel_reinforced,
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/recreation)
+/area/ship/manta/gunnery)
"oZ" = (
/obj/effect/floor_decal/techfloor{
dir = 8
@@ -3336,20 +3361,18 @@
/turf/simulated/floor/reinforced/airless,
/area/ship/manta/dock_star)
"pn" = (
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/hallways_star)
-"pt" = (
-/obj/structure/catwalk,
-/obj/machinery/firealarm/alarms_hidden{
- dir = 1;
- pixel_y = -26
- },
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
"pw" = (
-/obj/machinery/atmospherics/unary/heat_exchanger,
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/obj/machinery/firealarm/alarms_hidden{
+ dir = 4;
+ pixel_x = 26
+ },
+/obj/effect/floor_decal/techfloor{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"py" = (
/turf/simulated/wall/shull,
/area/ship/manta/barracks/bed_2)
@@ -3361,42 +3384,37 @@
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"pB" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 5
+/obj/effect/floor_decal/techfloor,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/simulated/wall/rshull,
-/area/ship/manta/radiator_port)
-"pD" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 6
- },
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/ship/manta/atmos)
-"pE" = (
-/obj/machinery/atmospherics/pipe/manifold/visible{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/hallways_port)
+"pE" = (
/obj/machinery/meter,
-/obj/structure/catwalk,
+/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
"pH" = (
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
-"pM" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
+"pN" = (
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/turf/simulated/floor/reinforced,
-/area/ship/manta/radiator_star)
-"pN" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 5
- },
-/obj/structure/catwalk,
-/turf/simulated/floor/plating,
-/area/ship/manta/atmos)
+/turf/simulated/wall/rshull,
+/area/ship/manta/magazine)
"pO" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -3420,20 +3438,17 @@
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"pV" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 10
- },
/obj/machinery/power/apc/hyper{
alarms_hidden = 1;
dir = 4;
name = "Merc APC - East";
pixel_x = 24
},
-/obj/effect/catwalk_plated/dark,
/obj/structure/cable/orange{
d2 = 2;
icon_state = "0-2"
},
+/obj/effect/catwalk_plated/dark,
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
"pW" = (
@@ -3548,17 +3563,14 @@
/turf/simulated/floor/tiled/white,
/area/ship/manta/med)
"qB" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 5
+/obj/machinery/disperser/middle{
+ dir = 1
},
-/turf/space,
-/area/ship/manta/radiator_port)
-"qF" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 9
+/obj/machinery/light/no_nightshift{
+ dir = 8
},
-/turf/simulated/wall/rshull,
-/area/ship/manta/radiator_star)
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
"qH" = (
/obj/machinery/alarm/alarms_hidden{
dir = 8;
@@ -3593,6 +3605,12 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
+"qN" = (
+/obj/structure/table/rack,
+/obj/item/mecha_parts/mecha_equipment/shocker,
+/obj/effect/floor_decal/techfloor,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"qP" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -3613,8 +3631,11 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"qQ" = (
-/turf/simulated/wall/rshull,
-/area/ship/manta/radiator_star)
+/obj/machinery/power/pointdefense{
+ id_tag = "mercenary_pd"
+ },
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/magazine)
"qR" = (
/obj/machinery/bodyscanner{
dir = 8
@@ -3670,55 +3691,43 @@
/turf/simulated/floor/tiled/white,
/area/ship/manta/med)
"rm" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
- },
-/turf/space,
-/area/ship/manta/radiator_port)
+/obj/machinery/porta_turret/stationary/syndie/CIWS,
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/mech_bay)
"rp" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
+/obj/machinery/power/pointdefense{
+ id_tag = "mercenary_pd"
},
/turf/simulated/floor/reinforced/airless,
-/area/ship/manta/radiator_port)
+/area/ship/manta/mech_bay)
"rq" = (
-/obj/effect/floor_decal/techfloor/corner{
- dir = 9
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/recreation)
-"rr" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 9
- },
-/turf/simulated/floor/reinforced/airless,
-/area/ship/manta/radiator_port)
-"rs" = (
/obj/machinery/door/firedoor/border_only,
/obj/structure/grille,
-/obj/structure/window/titanium/full,
-/obj/structure/window/titanium{
- dir = 4
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+ dir = 1
},
-/obj/structure/window/titanium{
- dir = 8
+/obj/structure/window/plastitanium,
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
+"rs" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 10
},
-/turf/simulated/floor/airless,
-/area/ship/manta/radiator_port)
-"rt" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"ry" = (
-/obj/machinery/atmospherics/pipe/simple/visible,
-/obj/machinery/light/small{
- dir = 4
+/obj/structure/table/rack,
+/obj/item/mecha_parts/mecha_equipment/tool/jetpack,
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray,
+/obj/effect/floor_decal/techfloor{
+ dir = 6
},
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"rA" = (
/turf/simulated/wall/shull,
-/area/ship/manta/radiator_port)
+/area/ship/manta/mech_bay)
"rC" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -3790,15 +3799,15 @@
/obj/machinery/power/pointdefense{
id_tag = "mercenary_pd"
},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/holding)
"rS" = (
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/holding)
"rT" = (
/obj/machinery/porta_turret/stationary/syndie/CIWS,
-/turf/simulated/floor/reinforced,
-/area/ship/manta/mech_bay)
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
"rU" = (
/obj/machinery/door/airlock/engineering{
name = "Lander Fuel Storage";
@@ -3832,18 +3841,17 @@
},
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
+"rY" = (
+/obj/structure/ship_munition/disperser_charge/explosive,
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/ship/manta/magazine)
"sa" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
-"se" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/obj/machinery/meter,
-/obj/machinery/light/small,
-/turf/simulated/floor/plating,
-/area/ship/manta/atmos)
"sg" = (
/obj/effect/floor_decal/techfloor{
dir = 4
@@ -3885,12 +3893,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
-"ss" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 5
- },
-/turf/simulated/wall/rshull,
-/area/ship/manta/radiator_star)
"su" = (
/obj/structure/bed/chair/comfy/black{
dir = 1
@@ -3960,10 +3962,18 @@
/turf/simulated/floor/tiled/white,
/area/ship/manta/med)
"sM" = (
-/obj/machinery/atmospherics/portables_connector,
-/obj/machinery/portable_atmospherics/canister/nitrogen/engine_setup,
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/obj/structure/table/rack,
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive,
+/obj/item/mecha_parts/mecha_equipment/omni_shield,
+/obj/item/mecha_parts/mecha_equipment/repair_droid,
+/obj/machinery/firealarm/alarms_hidden{
+ pixel_y = 26
+ },
+/obj/effect/floor_decal/techfloor{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"sN" = (
/turf/simulated/wall/shull,
/area/ship/manta/bridge)
@@ -3980,23 +3990,15 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 10
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"sV" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/obj/effect/floor_decal/techfloor{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/engineering)
-"sX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/turf/simulated/wall/shull,
-/area/ship/manta/engineering)
+/obj/machinery/porta_turret/stationary/syndie/CIWS,
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/magazine)
"sY" = (
/obj/effect/floor_decal/techfloor{
dir = 4
@@ -4010,7 +4012,7 @@
/area/ship/manta/med)
"sZ" = (
/obj/machinery/porta_turret/stationary/syndie/CIWS,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/holding)
"th" = (
/obj/machinery/alarm/alarms_hidden{
@@ -4029,8 +4031,16 @@
/obj/machinery/alarm/alarms_hidden{
pixel_y = 26
},
+/obj/effect/map_helper/airlock/sensor/int_sensor,
+/obj/machinery/airlock_sensor{
+ dir = 4;
+ pixel_x = -22
+ },
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 8
+ },
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/hallways_port)
+/area/ship/manta/gunnery)
"tk" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/item/weapon/reagent_containers/food/snacks/sandwich,
@@ -4062,7 +4072,7 @@
/obj/machinery/power/pointdefense{
id_tag = "mercenary_pd"
},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/hallways_star)
"tt" = (
/obj/effect/floor_decal/techfloor{
@@ -4174,6 +4184,10 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 10
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"ub" = (
@@ -4282,12 +4296,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hangar)
-"uz" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/turf/simulated/wall/shull,
-/area/ship/manta/radiator_port)
"uC" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 1
@@ -4446,58 +4454,39 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/engineering)
-"ve" = (
-/obj/structure/table/rack,
-/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster,
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar,
-/obj/effect/floor_decal/techfloor{
- dir = 9
- },
-/obj/machinery/alarm/alarms_hidden{
- pixel_y = 26
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
-"vl" = (
-/obj/machinery/mech_recharger,
-/obj/mecha/combat/gygax/dark,
-/obj/effect/floor_decal/techfloor{
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
-"vn" = (
-/obj/structure/table/steel_reinforced,
-/obj/item/clothing/gloves/yellow,
-/obj/item/weapon/storage/toolbox/syndicate,
-/obj/effect/floor_decal/techfloor{
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
"vt" = (
-/obj/structure/table/rack,
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/explosive,
-/obj/item/mecha_parts/mecha_equipment/omni_shield,
-/obj/item/mecha_parts/mecha_equipment/repair_droid,
+/obj/effect/floor_decal/techfloor/corner{
+ dir = 6
+ },
/obj/effect/floor_decal/techfloor{
- dir = 5
+ dir = 1
},
-/obj/machinery/firealarm/alarms_hidden{
- pixel_y = 26
- },
-/obj/machinery/light/no_nightshift{
+/obj/effect/floor_decal/industrial/warning{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+ dir = 1
+ },
+/obj/machinery/meter,
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
+/area/ship/manta/gunnery)
"vu" = (
-/obj/machinery/scale,
/obj/effect/floor_decal/techfloor{
- dir = 4
+ dir = 6
},
+/obj/machinery/power/apc/hyper{
+ alarms_hidden = 1;
+ name = "Merc APC - South";
+ pixel_y = -24
+ },
+/obj/structure/cable/orange,
+/obj/machinery/alarm/alarms_hidden{
+ dir = 8;
+ pixel_x = 26
+ },
+/obj/structure/table/steel_reinforced,
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/recreation)
+/area/ship/manta/gunnery)
"vw" = (
/obj/machinery/power/apc/hyper{
alarms_hidden = 1;
@@ -4548,8 +4537,8 @@
/obj/effect/floor_decal/techfloor{
dir = 8
},
-/obj/machinery/light/no_nightshift{
- dir = 8
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 1
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
@@ -4618,6 +4607,9 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 6
},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"vV" = (
@@ -4649,6 +4641,9 @@
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"wb" = (
@@ -4674,6 +4669,9 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 10
},
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"wc" = (
@@ -4704,10 +4702,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
-"wg" = (
-/obj/machinery/atmospherics/unary/heat_exchanger,
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
"wi" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -4803,9 +4797,6 @@
/obj/item/modular_computer/console/preset/mercenary{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
/obj/effect/floor_decal/techfloor,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/engineering)
@@ -5026,9 +5017,6 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
/obj/effect/floor_decal/techfloor{
dir = 8
},
@@ -5076,14 +5064,12 @@
/turf/simulated/floor/plating,
/area/ship/manta/dock_star)
"xE" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
- },
-/obj/machinery/light/small{
- dir = 1
+/obj/structure/catwalk,
+/obj/machinery/light_switch{
+ pixel_y = 23
},
/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/area/ship/manta/magazine)
"xF" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -5127,6 +5113,16 @@
"xL" = (
/turf/space,
/area/ship/manta/engine)
+"xM" = (
+/obj/effect/map_helper/airlock/sensor/ext_sensor,
+/obj/machinery/airlock_sensor{
+ pixel_y = 24
+ },
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 4
+ },
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
"xN" = (
/obj/effect/floor_decal/techfloor,
/obj/structure/cable/orange{
@@ -5140,7 +5136,7 @@
/obj/machinery/shipsensors{
dir = 1
},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/airless,
/area/ship/manta/med)
"xP" = (
/obj/effect/floor_decal/techfloor,
@@ -5234,9 +5230,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/barracks)
"yh" = (
-/obj/machinery/atmospherics/pipe/simple/visible,
/obj/structure/railing,
-/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
"yj" = (
@@ -5497,35 +5491,11 @@
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
"yY" = (
-/obj/effect/floor_decal/techfloor{
- dir = 8
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
-"yZ" = (
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
-"za" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
-"zb" = (
-/obj/effect/floor_decal/techfloor/corner{
- dir = 5
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
-"ze" = (
-/obj/effect/floor_decal/techfloor{
+/obj/machinery/disperser/front{
dir = 1
},
-/obj/machinery/door/blast/regular{
- closed_layer = 4;
- id = "Manta_Wargear";
- layer = 4
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
"zf" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 8
@@ -5536,6 +5506,7 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 9
},
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"zj" = (
@@ -5612,6 +5583,14 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/engineering)
+"zr" = (
+/obj/structure/table/rack,
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion,
+/obj/effect/floor_decal/techfloor{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"zv" = (
/obj/structure/table/rack,
/obj/item/weapon/gun/energy/plasmastun,
@@ -5686,9 +5665,12 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"zE" = (
-/obj/machinery/atmospherics/pipe/simple/visible,
-/turf/simulated/wall/rshull,
-/area/ship/manta/radiator_port)
+/obj/effect/floor_decal/techfloor{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/hallways_port)
"zH" = (
/obj/structure/table/rack,
/obj/item/weapon/tank/oxygen/red,
@@ -5772,12 +5754,36 @@
/obj/structure/flora/pottedplant/mysterious,
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
-"Ab" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
- dir = 1
+"Ac" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/structure/grille,
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+ dir = 8
},
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/obj/structure/window/plastitanium{
+ dir = 4
+ },
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
+"Aj" = (
+/obj/effect/floor_decal/techfloor,
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/hallways_port)
"Ak" = (
/obj/effect/floor_decal/techfloor{
dir = 8
@@ -5844,6 +5850,9 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"AD" = (
@@ -5935,9 +5944,14 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/barracks)
"Bi" = (
-/obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/recreation)
+/area/ship/manta/gunnery)
"Bk" = (
/obj/machinery/power/apc/hyper{
alarms_hidden = 1;
@@ -5975,12 +5989,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/ship/manta/bridge)
-"Bv" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/turf/simulated/wall/shull,
-/area/ship/manta/atmos)
"Bw" = (
/obj/effect/floor_decal/techfloor{
dir = 4
@@ -5999,9 +6007,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_star)
"BL" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
/obj/effect/floor_decal/techfloor{
dir = 6
},
@@ -6046,51 +6051,18 @@
/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
-"BW" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction,
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
"BY" = (
/obj/effect/floor_decal/techfloor{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/ship/manta/holding)
-"Ca" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
"Cf" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/grille,
-/obj/structure/window/titanium/full,
-/obj/structure/window/titanium{
- dir = 4
+/obj/machinery/atmospherics/pipe/tank/air{
+ start_pressure = 740.5
},
-/obj/structure/window/titanium{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
- },
-/turf/simulated/floor/airless,
-/area/ship/manta/radiator_star)
-"Cj" = (
-/obj/structure/cable/orange{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
+/turf/simulated/floor/plating,
+/area/ship/manta/hallways_port)
"Cn" = (
/obj/machinery/power/apc/hyper{
alarms_hidden = 1;
@@ -6117,22 +6089,34 @@
/turf/simulated/floor/tiled/dark,
/area/ship/manta/holding)
"Cu" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/machinery/light/no_nightshift{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
+/obj/effect/map_helper/airlock/sensor/chamber_sensor,
+/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
+ dir = 1;
+ id_tag = "manta_cannon_lock";
+ pixel_y = -23
},
-/obj/effect/floor_decal/techfloor/corner{
+/obj/effect/floor_decal/techfloor{
dir = 6
},
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 9
+ },
+/obj/machinery/airlock_sensor{
+ dir = 1;
+ pixel_x = 25;
+ pixel_y = -23
+ },
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
+/area/ship/manta/gunnery)
"Cw" = (
/obj/structure/bed/chair/comfy/black{
dir = 4
@@ -6143,58 +6127,16 @@
/obj/structure/table/reinforced,
/obj/item/weapon/storage/belt/utility/full,
/obj/item/device/multitool,
-/obj/effect/floor_decal/techfloor{
- dir = 4
- },
/obj/machinery/alarm/alarms_hidden{
dir = 8;
pixel_x = 26
},
+/obj/effect/floor_decal/techfloor{
+ dir = 5
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
"CB" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/black{
- dir = 8
- },
-/obj/structure/catwalk,
-/obj/structure/railing,
-/obj/structure/railing{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
-"CD" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 9
- },
-/turf/space,
-/area/ship/manta/radiator_star)
-"CF" = (
-/obj/machinery/door/firedoor/multi_tile{
- dir = 1
- },
-/obj/machinery/door/airlock/multi_tile/metal{
- dir = 1;
- name = "Mech Bay";
- req_one_access = list(999)
- },
-/obj/effect/floor_decal/techfloor,
-/obj/machinery/door/blast/regular{
- closed_layer = 4;
- id = "Manta_Wargear";
- layer = 4
- },
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -6203,23 +6145,16 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/mech_bay)
+"CF" = (
+/turf/simulated/wall/rshull,
+/area/ship/manta/gunnery)
"CK" = (
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/effect/floor_decal/techfloor/corner{
- dir = 10
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/bed/chair/bay/comfy/red{
+ dir = 1
},
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/hallways_port)
+/area/ship/manta/gunnery)
"CP" = (
/obj/structure/closet/wardrobe/merc,
/obj/machinery/light/no_nightshift{
@@ -6275,27 +6210,28 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
"Dc" = (
-/obj/effect/floor_decal/techfloor{
- dir = 4
- },
/obj/structure/cable/orange{
- d1 = 1;
+ d1 = 4;
d2 = 8;
- icon_state = "1-8"
+ icon_state = "4-8"
},
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/effect/floor_decal/techfloor,
+/obj/effect/floor_decal/techfloor{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/glass_security{
+ name = "Gunnery Control";
+ req_one_access = list(150)
+ },
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/hallways_port)
+/area/ship/manta/gunnery)
"De" = (
/obj/structure/bed/pod,
/obj/effect/landmark{
@@ -6350,12 +6286,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
-"Dm" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 10
- },
-/turf/space,
-/area/ship/manta/radiator_star)
"Dn" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 6
@@ -6397,13 +6327,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_as)
-"Dr" = (
-/obj/structure/catwalk,
-/obj/structure/railing{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
"Du" = (
/obj/structure/table/rack,
/obj/effect/floor_decal/techfloor{
@@ -6491,22 +6414,15 @@
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
"DL" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/black{
- dir = 4
- },
-/obj/structure/catwalk,
-/obj/structure/railing,
-/obj/structure/railing{
- dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
+ dir = 9
},
+/obj/structure/catwalk,
/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/area/ship/manta/magazine)
"DR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -6626,6 +6542,21 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
+"Ex" = (
+/obj/effect/floor_decal/techfloor/corner{
+ dir = 9
+ },
+/obj/effect/floor_decal/techfloor/corner{
+ dir = 10
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/hallways_port)
"Ey" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -6639,6 +6570,9 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 6
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"EA" = (
@@ -6826,6 +6760,11 @@
},
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
+"FC" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/obj/structure/catwalk,
+/turf/simulated/floor/plating,
+/area/ship/manta/magazine)
"FH" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -6915,14 +6854,6 @@
/obj/item/weapon/paper/manta_new_personnel_brief,
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
-"Gi" = (
-/obj/structure/catwalk,
-/obj/structure/railing{
- dir = 1
- },
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
"Gk" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -6951,13 +6882,26 @@
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
"Gu" = (
-/obj/structure/closet/athletic_mixed,
-/obj/effect/floor_decal/techfloor{
+/obj/structure/cable/orange{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/structure/window/titanium,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment,
+/obj/effect/floor_decal/techfloor/corner{
+ dir = 9
+ },
+/obj/effect/floor_decal/techfloor/corner{
+ dir = 10
+ },
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/recreation)
+/area/ship/manta/hallways_port)
"Gz" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/wood,
@@ -7065,23 +7009,14 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/dock_port)
"Hg" = (
-/obj/structure/table/rack,
-/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster,
-/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag,
-/obj/effect/floor_decal/techfloor{
- dir = 10
+/obj/machinery/disperser/back{
+ dir = 1
},
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
"Hh" = (
/turf/simulated/floor/plating,
/area/ship/manta/engine)
-"Hl" = (
-/obj/structure/table/rack,
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/ion,
-/obj/effect/floor_decal/techfloor,
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
"Hm" = (
/obj/item/weapon/paper_bin{
pixel_x = -3;
@@ -7097,51 +7032,23 @@
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
"Hr" = (
-/obj/structure/table/rack,
-/obj/item/mecha_parts/mecha_equipment/shocker,
-/obj/effect/floor_decal/techfloor,
-/obj/machinery/power/apc/hyper{
- alarms_hidden = 1;
- name = "Merc APC - South";
- pixel_y = -24
- },
-/obj/structure/cable/orange,
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
-"Hv" = (
-/obj/structure/cable/orange{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/obj/effect/floor_decal/techfloor{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/hallways_aft)
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
"Hz" = (
-/obj/structure/table/rack,
-/obj/item/mecha_parts/mecha_equipment/tool/jetpack,
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray,
-/obj/effect/floor_decal/techfloor{
- dir = 6
- },
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = 23
- },
/obj/machinery/light/no_nightshift{
dir = 4
},
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/mech_bay)
+/obj/structure/disposaloutlet{
+ dir = 8
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 1
+ },
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
"HB" = (
/obj/structure/catwalk,
/obj/structure/railing{
@@ -7274,6 +7181,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
+/obj/structure/disposalpipe/segment{
+ dir = 1;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"Io" = (
@@ -7331,9 +7242,6 @@
/obj/machinery/computer/ship/engines{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
/obj/effect/floor_decal/techfloor,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/engineering)
@@ -7355,6 +7263,9 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 5
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"II" = (
@@ -7391,6 +7302,9 @@
/obj/machinery/light/no_nightshift{
dir = 1
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"IO" = (
@@ -7506,15 +7420,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
-"Jr" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/obj/effect/floor_decal/techfloor{
- dir = 8
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/hallways_aft)
"Js" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -7593,8 +7498,8 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
"JL" = (
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"JW" = (
/obj/effect/floor_decal/techfloor{
dir = 8
@@ -7615,12 +7520,25 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_star)
"JX" = (
-/obj/structure/reagent_dispensers/water_cooler/full,
-/obj/effect/floor_decal/techfloor{
+/obj/structure/cable/orange{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/effect/floor_decal/techfloor/corner{
+ dir = 5
+ },
+/obj/effect/floor_decal/techfloor/corner{
+ dir = 6
+ },
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/recreation)
+/area/ship/manta/gunnery)
"JY" = (
/obj/effect/floor_decal/corner/white/diagonal,
/turf/simulated/floor/tiled/dark,
@@ -7703,6 +7621,9 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"Kq" = (
@@ -7802,6 +7723,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"KP" = (
@@ -7813,6 +7735,12 @@
},
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
+"KR" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
"KW" = (
/obj/machinery/light_switch{
dir = 4;
@@ -8073,9 +8001,6 @@
/turf/simulated/wall/shull,
/area/ship/manta/engineering)
"Mh" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
/obj/effect/floor_decal/techfloor,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/engineering)
@@ -8106,9 +8031,13 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"Mr" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging,
+/obj/machinery/firealarm/alarms_hidden{
+ dir = 1;
+ pixel_y = -26
+ },
+/obj/structure/catwalk,
/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/area/ship/manta/magazine)
"Ms" = (
/obj/machinery/sleeper{
desc = "A stasis pod with built-in injectors, a dialysis machine, and a limited health scanner. This one is preconfigured to stasis levels, for keeping captives (or teammates) alive as long as possible.";
@@ -8126,13 +8055,27 @@
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
"Mv" = (
-/obj/structure/closet/athletic_mixed,
/obj/effect/floor_decal/techfloor{
- dir = 8
+ dir = 4
+ },
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/cable/orange{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
},
-/obj/structure/window/titanium,
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/recreation)
+/area/ship/manta/hallways_port)
"Mw" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
@@ -8184,9 +8127,11 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
"MU" = (
-/obj/machinery/atmospherics/pipe/simple/visible,
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/obj/effect/floor_decal/techfloor{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"MV" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -8254,6 +8199,9 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"Ni" = (
@@ -8415,9 +8363,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"NV" = (
-/obj/machinery/atmospherics/unary/heat_exchanger{
- dir = 1
- },
/obj/machinery/light_switch{
dir = 8;
pixel_x = 23
@@ -8467,8 +8412,11 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"Oq" = (
-/turf/simulated/wall/rshull,
-/area/ship/manta/radiator_port)
+/obj/effect/floor_decal/techfloor{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"Or" = (
/obj/machinery/chemical_dispenser/bar_coffee/full{
dir = 4
@@ -8498,6 +8446,12 @@
/obj/item/device/camera,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
+"Ov" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/turf/simulated/wall/rshull,
+/area/ship/manta/gunnery)
"Ox" = (
/obj/machinery/airlock_sensor{
pixel_y = -23
@@ -8532,6 +8486,10 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 10
},
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"OK" = (
@@ -8559,12 +8517,6 @@
/obj/structure/sign/warning/radioactive,
/turf/simulated/wall/shull,
/area/ship/manta/engineering)
-"OP" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 1
- },
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
"OQ" = (
/obj/machinery/recharge_station,
/obj/machinery/light/no_nightshift{
@@ -8684,6 +8636,10 @@
"Pn" = (
/turf/simulated/wall/shull,
/area/ship/manta/hangar)
+"Pt" = (
+/obj/structure/sign/vacuum,
+/turf/simulated/wall/rshull,
+/area/ship/manta/gunnery)
"Py" = (
/obj/machinery/door/blast/shutters{
density = 0;
@@ -8704,10 +8660,6 @@
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/dark,
/area/ship/manta/holding)
-"PE" = (
-/obj/machinery/atmospherics/unary/heat_exchanger,
-/turf/simulated/floor/plating,
-/area/ship/manta/atmos)
"PJ" = (
/obj/machinery/vending/fitness{
prices = list()
@@ -8757,11 +8709,6 @@
/turf/simulated/floor/wood,
/area/ship/manta/commander)
"PU" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/black{
- dir = 4
- },
-/obj/structure/catwalk,
-/obj/structure/railing,
/obj/structure/cable/orange{
d1 = 1;
d2 = 4;
@@ -8773,26 +8720,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/obj/effect/floor_decal/techfloor{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"PW" = (
-/obj/machinery/door/firedoor/border_only,
-/obj/structure/grille,
-/obj/structure/window/titanium/full,
-/obj/structure/window/titanium{
- dir = 4
- },
-/obj/structure/window/titanium{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
- },
-/turf/simulated/floor/airless,
-/area/ship/manta/radiator_port)
+/turf/simulated/wall/rshull,
+/area/ship/manta/mech_bay)
"Qb" = (
-/obj/machinery/atmospherics/pipe/manifold4w/visible,
/obj/machinery/meter,
+/obj/machinery/atmospherics/pipe/manifold/visible,
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
"Qc" = (
@@ -8842,11 +8780,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
"Qh" = (
-/obj/machinery/atmospherics/binary/pump/on,
-/obj/effect/catwalk_plated/dark,
-/obj/structure/railing{
- dir = 4
- },
/obj/machinery/power/apc/hyper{
alarms_hidden = 1;
dir = 8;
@@ -8857,8 +8790,9 @@
d2 = 2;
icon_state = "0-2"
},
+/obj/effect/catwalk_plated/dark,
/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/area/ship/manta/magazine)
"Qj" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -8868,12 +8802,14 @@
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
"Qu" = (
-/obj/machinery/fitness/heavy/lifter,
-/obj/effect/floor_decal/techfloor{
- dir = 9
+/obj/effect/floor_decal/techfloor,
+/obj/machinery/light/no_nightshift,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1
},
+/obj/structure/table/steel_reinforced,
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/recreation)
+/area/ship/manta/gunnery)
"Qw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 8
@@ -8889,10 +8825,6 @@
/turf/simulated/floor/plating,
/area/ship/manta/engine)
"Qx" = (
-/obj/structure/table/woodentable,
-/obj/item/stack/medical/bruise_pack,
-/obj/item/stack/medical/bruise_pack,
-/obj/item/weapon/melee/telebaton,
/obj/effect/floor_decal/techfloor{
dir = 1
},
@@ -8926,14 +8858,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/teleporter)
-"QE" = (
-/obj/structure/catwalk,
-/obj/machinery/firealarm/alarms_hidden{
- dir = 1;
- pixel_y = -26
- },
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
"QH" = (
/obj/effect/floor_decal/techfloor{
dir = 8
@@ -8963,14 +8887,11 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
"QO" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
- },
-/turf/simulated/floor/reinforced/airless,
-/area/ship/manta/radiator_star)
+/turf/simulated/wall/rshull,
+/area/ship/manta/magazine)
"QT" = (
/turf/simulated/wall/shull,
-/area/ship/manta/radiator_star)
+/area/ship/manta/magazine)
"QU" = (
/obj/effect/floor_decal/industrial/warning{
dir = 1
@@ -9013,13 +8934,33 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
-"RA" = (
-/obj/machinery/fitness/heavy/lifter,
+"Rw" = (
+/obj/effect/map_helper/airlock/atmos/chamber_pump,
+/obj/machinery/atmospherics/unary/vent_pump/high_volume{
+ dir = 4;
+ frequency = 1379;
+ id_tag = "northciv_airlock_pump"
+ },
/obj/effect/floor_decal/techfloor{
- dir = 5
+ dir = 9
},
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/recreation)
+/area/ship/manta/gunnery)
+"RA" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/obj/machinery/button/remote/blast_door{
+ id = "Manta_Cannon";
+ name = "Firing Port Control";
+ req_access = list(150)
+ },
+/obj/structure/table/steel_reinforced,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/gunnery)
"RC" = (
/obj/structure/table/rack,
/obj/item/ammo_magazine/m9mm,
@@ -9157,6 +9098,12 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
+"RS" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"RU" = (
/obj/structure/table/rack,
/obj/effect/floor_decal/techfloor,
@@ -9247,14 +9194,14 @@
/turf/simulated/floor/plating,
/area/ship/manta/engine)
"Sn" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 6
- },
/obj/machinery/alarm/alarms_hidden{
pixel_y = 26
},
+/obj/structure/catwalk,
+/obj/structure/railing,
+/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/area/ship/manta/magazine)
"Sq" = (
/obj/machinery/computer/security/telescreen/entertainment{
icon_state = "frame";
@@ -9295,14 +9242,7 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hangar)
-"SG" = (
-/obj/machinery/atmospherics/pipe/manifold/visible,
-/turf/simulated/floor/plating,
-/area/ship/manta/atmos)
"SI" = (
-/obj/machinery/atmospherics/unary/heat_exchanger{
- dir = 1
- },
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
"SJ" = (
@@ -9328,8 +9268,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/obj/machinery/door/blast/regular{
+ closed_layer = 4;
+ id = "Manta_Wargear";
+ layer = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"SV" = (
/obj/structure/cable/orange{
d1 = 2;
@@ -9354,6 +9299,9 @@
/obj/effect/floor_decal/techfloor/corner{
dir = 9
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"SW" = (
@@ -9493,6 +9441,16 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_star)
+"Tq" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 8
+ },
+/obj/machinery/light/no_nightshift{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/hallways_port)
"Tv" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -9545,12 +9503,16 @@
/turf/simulated/floor/wood,
/area/ship/manta/barracks/bed_2)
"TH" = (
-/obj/machinery/atmospherics/pipe/simple/visible,
-/obj/machinery/light/small{
- dir = 8
+/obj/structure/ship_munition/disperser_charge/emp,
+/obj/structure/railing{
+ dir = 4
},
/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/area/ship/manta/magazine)
+"TK" = (
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/wall/rshull,
+/area/ship/manta/hallways_port)
"TM" = (
/obj/structure/table/rack,
/obj/item/weapon/storage/toolbox/syndicate,
@@ -9572,6 +9534,9 @@
icon_state = "4-8"
},
/obj/machinery/light/no_nightshift,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"TS" = (
@@ -9587,15 +9552,14 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
"TT" = (
-/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"TY" = (
/obj/item/weapon/gun/energy/sizegun,
/obj/item/weapon/gun/energy/sizegun,
@@ -9747,7 +9711,7 @@
dir = 8
},
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/recreation)
+/area/ship/manta/gunnery)
"UM" = (
/obj/machinery/door/blast/shutters{
density = 0;
@@ -9772,15 +9736,15 @@
/turf/simulated/floor/tiled/dark,
/area/ship/manta/holding)
"UQ" = (
-/obj/effect/floor_decal/techfloor{
- dir = 4
- },
/obj/machinery/firealarm/alarms_hidden{
dir = 4;
pixel_x = 26
},
+/obj/effect/floor_decal/techfloor{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
-/area/ship/manta/recreation)
+/area/ship/manta/gunnery)
"UR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -9854,11 +9818,8 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_as)
"Vk" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
- },
-/turf/simulated/floor/reinforced,
-/area/ship/manta/radiator_port)
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/mech_bay)
"Vl" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -9975,12 +9936,6 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
-"VH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
-/turf/simulated/wall/shull,
-/area/ship/manta/radiator_star)
"VL" = (
/obj/structure/table/rack,
/obj/item/weapon/storage/firstaid/toxin,
@@ -10028,6 +9983,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"VW" = (
@@ -10062,9 +10020,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"Wi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
@@ -10199,6 +10154,13 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hangar)
+"Xg" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden,
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/hallways_port)
"Xl" = (
/obj/structure/cable/orange{
d1 = 1;
@@ -10251,7 +10213,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
"Xp" = (
-/obj/machinery/atmospherics/pipe/simple/visible,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -10263,8 +10224,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/structure/catwalk,
/obj/structure/railing,
+/obj/structure/catwalk,
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
"Xq" = (
@@ -10374,9 +10335,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_star)
"XH" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
- dir = 4
- },
/obj/structure/flora/pottedplant/dead,
/obj/effect/floor_decal/techfloor{
dir = 10
@@ -10384,11 +10342,8 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/engineering)
"XO" = (
-/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
- dir = 4
- },
-/turf/space,
-/area/ship/manta/radiator_star)
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/magazine)
"XQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -10446,14 +10401,8 @@
/area/ship/manta/holding)
"XY" = (
/obj/structure/catwalk,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/area/ship/manta/magazine)
"Yd" = (
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
@@ -10515,6 +10464,19 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
+"Yn" = (
+/obj/effect/floor_decal/techfloor{
+ dir = 8
+ },
+/obj/machinery/light/no_nightshift{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 2;
+ icon_state = "pipe-c"
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/hallways_port)
"Yo" = (
/obj/machinery/door/window/brigdoor/northleft{
req_access = list(150);
@@ -10687,6 +10649,15 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/dock_star)
+"Zb" = (
+/obj/machinery/door/blast/regular{
+ closed_layer = 4;
+ dir = 4;
+ id = "Manta_Cannon";
+ layer = 4
+ },
+/turf/simulated/floor/reinforced/airless,
+/area/ship/manta/gunnery)
"Zh" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -10699,6 +10670,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
/area/ship/manta/holding)
+"Zn" = (
+/obj/structure/table/rack,
+/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster,
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag,
+/obj/effect/floor_decal/techfloor{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"Zp" = (
/obj/effect/floor_decal/techfloor{
dir = 8
@@ -10728,11 +10708,6 @@
/turf/simulated/wall/shull,
/area/ship/manta/dock_port)
"Zz" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/black{
- dir = 8
- },
-/obj/structure/catwalk,
-/obj/structure/railing,
/obj/structure/cable/orange{
d1 = 1;
d2 = 8;
@@ -10744,8 +10719,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/catwalk,
/turf/simulated/floor/plating,
-/area/ship/manta/radiator_star)
+/area/ship/manta/magazine)
"ZB" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -10805,25 +10781,18 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
"ZO" = (
-/obj/machinery/vending/fitness{
- dir = 4;
- prices = list()
- },
-/obj/effect/floor_decal/techfloor{
- dir = 8
- },
+/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
"ZQ" = (
/turf/simulated/wall/rshull,
/area/ship/manta/bridge)
"ZS" = (
-/obj/structure/catwalk,
-/obj/structure/railing{
- dir = 1
+/obj/effect/floor_decal/techfloor/corner{
+ dir = 10
},
-/turf/simulated/floor/plating,
-/area/ship/manta/radiator_port)
+/turf/simulated/floor/tiled/techfloor,
+/area/ship/manta/mech_bay)
"ZT" = (
/turf/simulated/wall/rshull,
/area/ship/manta/armoury_st)
@@ -16743,12 +16712,12 @@ yz
yz
yz
yz
-nI
-nI
-nI
+Hr
+Hr
+Hr
nJ
-nI
-nI
+Hr
+Hr
yz
yz
yz
@@ -16885,16 +16854,16 @@ yz
yz
yz
rT
-oc
-oc
-oc
-oc
-oc
-oc
-fZ
-kW
-kW
-jh
+CF
+CF
+CF
+CF
+CF
+CF
+rT
+Hr
+Hr
+nJ
lm
lm
lm
@@ -17025,18 +16994,18 @@ yz
yz
yz
yz
-nI
-oc
-oc
-ve
-yY
+Hr
+Hr
+Zb
+Hr
yY
+qB
Hg
-oc
-lm
-lm
-lm
-lm
+CF
+CF
+CF
+CF
+CF
lm
RF
bA
@@ -17168,19 +17137,19 @@ yz
yz
yz
nJ
-oc
-oc
-vl
-yZ
-Ca
-Hl
-oc
-Qu
-UI
-ZO
-oY
-Mv
+CF
+CF
+Ac
+Ac
+CF
+xM
rq
+iX
+oa
+UI
+oY
+lm
+KH
gh
gh
gf
@@ -17308,23 +17277,23 @@ yz
yz
yz
yz
-nI
-oc
-oc
-oc
-vn
-za
-Cj
Hr
-oc
+CF
+CF
+CF
+Rw
+lf
+iw
+KR
+rq
+mb
+CK
+Bi
+Qu
+lm
Qx
gh
-Bi
-gk
-gk
-gk
-gk
-gk
+ZO
Yi
hD
CQ
@@ -17450,20 +17419,20 @@ yz
yz
yz
yz
-nI
+Hr
dO
-oc
-oc
+CF
+CF
vt
-zb
Cu
+CF
Hz
-oc
+rq
RA
UQ
JX
vu
-Gu
+lm
Cz
Tl
dH
@@ -17474,8 +17443,8 @@ lm
lm
kW
yz
-mb
-qB
+yz
+yz
yz
yz
yz
@@ -17593,19 +17562,19 @@ yz
yz
yz
eH
-oc
-oc
-oc
-oc
-ze
CF
-oc
-oc
-lq
-lq
-lq
-lq
-lq
+CF
+CF
+dW
+Pt
+CF
+Ov
+CF
+CF
+CF
+Dc
+CF
+lm
lq
lq
Qf
@@ -17616,10 +17585,10 @@ ik
lm
fZ
yz
-rm
-rm
-mb
-qB
+yz
+yz
+yz
+yz
yz
yz
yz
@@ -17738,17 +17707,17 @@ ht
ht
ht
tj
-vI
-zg
-CK
+Ex
vI
bp
-bp
-bp
-bp
-vI
-bp
-bp
+Yn
+zE
+zE
+zE
+Gu
+Tq
+zE
+eI
QJ
ZI
hw
@@ -17758,12 +17727,12 @@ io
lm
lm
kW
-rm
-rm
-rm
-rm
-mb
-qB
+yz
+yz
+yz
+yz
+yz
+yz
yz
yz
yz
@@ -17882,12 +17851,12 @@ ht
tt
vU
zk
-Dc
-HJ
+zk
HJ
HJ
HJ
HJ
+Mv
HJ
aM
br
@@ -17900,14 +17869,14 @@ MV
js
lm
kW
-rm
-rm
-rm
-rm
-rm
-rm
-mb
-qB
+yz
+yz
+yz
+yz
+yz
+yz
+yz
+yz
yz
yz
yz
@@ -18043,13 +18012,13 @@ jx
lm
lm
Vk
-rm
-rm
-rm
-rm
-rm
-rm
-rm
+yz
+yz
+yz
+yz
+yz
+yz
+yz
yz
yz
yz
@@ -18185,13 +18154,13 @@ jz
kz
lm
rp
-rp
-rm
-rm
-rm
-rm
-rm
-rm
+Vk
+yz
+yz
+yz
+yz
+yz
+yz
yz
yz
yz
@@ -18317,8 +18286,8 @@ Eh
zl
tx
ua
-bp
-vI
+zE
+Tq
zg
co
lq
@@ -18326,14 +18295,14 @@ Rj
jB
oS
lm
-rp
-os
-rp
-rp
-rm
-rm
-rm
+PW
+PW
rm
+Vk
+yz
+yz
+yz
+yz
yz
yz
yz
@@ -18444,11 +18413,11 @@ yz
yz
eH
ht
-kT
+Cf
ov
-ht
-tx
-fg
+TK
+Xg
+Aj
zl
Dq
Iq
@@ -18469,13 +18438,13 @@ jB
kG
lm
PW
-mZ
-rr
-os
+PW
+PW
+PW
rp
-rp
-rm
-rm
+Vk
+yz
+yz
yz
yz
yz
@@ -18604,7 +18573,7 @@ ZT
ZT
ZT
tx
-fg
+pB
lq
Lb
Aw
@@ -18613,10 +18582,10 @@ lm
mp
Oq
rs
-mZ
-rr
-os
-rp
+PW
+PW
+PW
+Vk
rm
yz
yz
@@ -18746,20 +18715,20 @@ bI
bY
ZT
tx
-fg
+pB
lq
ex
JY
Gd
-lq
-mp
+lm
+RS
JL
ZS
Oq
-rs
-mZ
-rr
-rp
+zr
+PW
+PW
+PW
yz
yz
yz
@@ -18888,20 +18857,20 @@ bR
bZ
ZT
tx
-fg
+pB
lq
iA
jD
kJ
-lq
+lm
oT
na
TT
ot
-pt
+ZS
Oq
-rs
-os
+Zn
+PW
yz
yz
WF
@@ -19030,20 +18999,20 @@ bR
Us
ZT
tx
-fg
+pB
lq
lq
ZG
lq
-lq
+lm
aI
-nc
+JL
CB
-ou
-rt
-rt
-rt
-lk
+JL
+JL
+JL
+qN
+PW
yz
yz
WF
@@ -19177,7 +19146,7 @@ iB
iB
jF
kL
-Zr
+EA
sM
nl
PU
@@ -19185,8 +19154,8 @@ oy
pw
MU
ry
-zE
-pB
+PW
+PW
WF
WF
lg
@@ -19319,16 +19288,16 @@ KJ
KJ
KJ
mo
-Zr
-rA
-rA
+EA
+PW
+PW
SO
+PW
+PW
+PW
+PW
+PW
rA
-rA
-rA
-rA
-rA
-uz
Zy
Zy
KI
@@ -19470,7 +19439,7 @@ rC
yk
rC
jv
-iw
+rC
WU
Nw
pO
@@ -19612,7 +19581,7 @@ rD
qH
rD
oF
-da
+rD
ub
up
Ox
@@ -19754,7 +19723,7 @@ ZU
ZU
ZU
ZU
-Bv
+ZU
ZU
Ue
Ue
@@ -19892,11 +19861,11 @@ AC
ZU
VG
VG
-pD
+SI
yh
SI
-PE
-SG
+SI
+SI
ZU
Va
vB
@@ -20179,8 +20148,8 @@ HB
qM
qM
rK
-dt
-SG
+SI
+SI
ZU
UH
vM
@@ -20321,8 +20290,8 @@ Dn
BU
pW
Gr
-dt
-SG
+SI
+SI
ZU
Oi
vO
@@ -20430,11 +20399,11 @@ yz
ce
dk
ec
-ag
+da
jd
je
je
-ag
+da
tW
xe
je
@@ -20442,8 +20411,8 @@ je
je
je
ux
-ag
-ag
+da
+da
aJ
tm
WV
@@ -20460,11 +20429,11 @@ IK
ZU
bw
Qb
-pN
+qM
LH
yW
HD
-se
+Wi
ZU
Ni
RK
@@ -20585,7 +20554,7 @@ Ki
je
Eg
qg
-ag
+da
aJ
Yj
ZQ
@@ -20605,8 +20574,8 @@ bP
pV
Xp
NV
-PE
-SG
+SI
+SI
ZU
Ni
LU
@@ -20748,7 +20717,7 @@ ZU
xQ
ZU
ZU
-Bv
+ZU
ZU
YB
Hh
@@ -20869,7 +20838,7 @@ Ms
jK
je
fp
-ag
+da
aJ
Yj
uk
@@ -21011,7 +20980,7 @@ Ms
jK
je
fp
-ag
+da
aJ
Yj
uk
@@ -21032,7 +21001,7 @@ sg
sg
KZ
sg
-sV
+sg
NJ
Ok
fz
@@ -21174,7 +21143,7 @@ zR
zR
UV
zR
-sX
+zR
zR
iv
zf
@@ -21295,7 +21264,7 @@ Kv
je
UY
qg
-ag
+da
aJ
LC
ZQ
@@ -21424,11 +21393,11 @@ yz
ce
dk
ec
-ag
+da
jd
je
je
-ag
+da
uy
xq
je
@@ -21436,8 +21405,8 @@ je
je
je
ux
-ag
-ag
+da
+da
aJ
bc
lM
@@ -22168,7 +22137,7 @@ zR
zR
zR
zR
-sX
+zR
zR
Ue
Ue
@@ -22310,7 +22279,7 @@ yw
qJ
yw
Dj
-Jr
+yw
LW
Tz
Ub
@@ -22452,7 +22421,7 @@ EI
qP
EI
sq
-Hv
+EI
EN
OV
cZ
@@ -22585,16 +22554,16 @@ IV
IV
IV
VW
-Zr
-QT
-QT
+EA
+pN
+QO
oU
+QO
+QO
+QO
+QO
+QO
QT
-QT
-QT
-QT
-QT
-VH
rJ
rJ
YZ
@@ -22727,16 +22696,16 @@ iS
aU
NQ
VW
-Zr
+EA
iG
Qh
Zz
bo
-wg
-dW
TH
-cA
-qF
+TH
+TH
+QO
+QO
PK
PK
vV
@@ -22869,15 +22838,15 @@ iS
Oj
NQ
VW
-Zr
+EA
Sn
-Ab
+FC
DL
-BW
-OP
+oX
+XY
+XY
Mr
-Mr
-ss
+QO
yz
yz
PK
@@ -23011,15 +22980,15 @@ iS
GI
NQ
VW
-Zr
+EA
xE
-Gi
+XY
XY
hu
-QE
-qQ
-oa
-oW
+rY
+rY
+rY
+QO
yz
yz
PK
@@ -23153,14 +23122,14 @@ nS
iS
NQ
VW
-Zr
-iX
-nq
-Dr
-qQ
-oa
-nr
-og
+EA
+bu
+bu
+bu
+QO
+QO
+QO
+QO
QO
yz
yz
@@ -23295,14 +23264,14 @@ Ns
iS
NQ
VW
-Zr
-iX
-qQ
-oa
-nr
-og
-oW
+EA
+nq
+dg
+nq
QO
+QO
+QO
+sV
XO
yz
yz
@@ -23438,14 +23407,14 @@ iW
NQ
VW
EA
-Cf
-nr
-og
-oW
QO
QO
+QO
+QO
+qQ
XO
-XO
+yz
+yz
yz
yz
yz
@@ -23581,13 +23550,13 @@ NQ
VW
EA
QO
-oW
-QO
QO
+sV
XO
-XO
-XO
-XO
+yz
+yz
+yz
+yz
yz
yz
yz
@@ -23722,13 +23691,7 @@ QH
QH
nh
EA
-QO
-QO
-XO
-XO
-XO
-XO
-XO
+qQ
XO
yz
yz
@@ -23790,6 +23753,12 @@ yz
yz
yz
yz
+yz
+yz
+yz
+yz
+yz
+yz
"}
(92,1,1) = {"
yz
@@ -23864,13 +23833,6 @@ Zr
Zr
EA
EA
-pM
-XO
-XO
-XO
-XO
-XO
-XO
XO
yz
yz
@@ -23932,6 +23894,13 @@ yz
yz
yz
yz
+yz
+yz
+yz
+yz
+yz
+yz
+yz
"}
(93,1,1) = {"
yz
@@ -24006,14 +23975,14 @@ xv
LZ
mT
pn
-XO
-XO
-XO
-XO
-XO
-XO
-Dm
-CD
+yz
+yz
+yz
+yz
+yz
+yz
+yz
+yz
yz
yz
yz
@@ -24148,12 +24117,12 @@ MM
mT
mT
pn
-XO
-XO
-XO
-XO
-Dm
-CD
+yz
+yz
+yz
+yz
+yz
+yz
yz
yz
yz
@@ -24290,10 +24259,10 @@ Th
mT
kO
yz
-XO
-XO
-Dm
-CD
+yz
+yz
+yz
+yz
yz
yz
yz
@@ -24432,8 +24401,8 @@ mT
mT
pn
yz
-Dm
-CD
+yz
+yz
yz
yz
yz
diff --git a/maps/submaps/admin_use_vr/mercship.dm b/maps/submaps/admin_use_vr/mercship.dm
index 3efc7456cb..6e9665d843 100644
--- a/maps/submaps/admin_use_vr/mercship.dm
+++ b/maps/submaps/admin_use_vr/mercship.dm
@@ -108,6 +108,14 @@
/area/ship/manta/recreation
name = "\improper Mercenary Cruiser - Recreation & Supplies"
icon_state = "recreation_area"
+
+/area/ship/manta/gunnery
+ name = "\improper Mercenary Cruiser - Gunnery"
+ icon_state = "security_sub"
+
+/area/ship/manta/magazine
+ name = "\improper Mercenary Cruiser - Cannon Magazine"
+ icon_state = "darkred"
/area/shuttle/manta_ship_boat
name = "\improper SAARE Lander"
@@ -237,7 +245,7 @@ The shield generator's a hungry beast and will drain the cruiser's reserves fair
info = {"To All New Personnel,
\
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.
\
\
-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.
\
+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. There's a pair of small airlocks at the back side which are used for crew transfer shuttles, and are a likely entry point for hostile boarders.
\
\
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 somehow 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.
\
\
@@ -245,7 +253,7 @@ You don't want to know how long it's going to take to pay off.
\
\
Capt. Thorne
\
-P.S. If you need to refuel the lander for some reason, there's a pair of spare fuel canisters in that closet space in the port fore wing edge, opposite the assault armory."}
+P.S. If you need to refuel the lander for some reason, there's a spare fuel canister in that closet space in the port fore wing edge, opposite the assault armory."}
/obj/item/weapon/paper/manta_approach_tactics
name = "Installation Approach"
@@ -265,6 +273,25 @@ I don't care if they're 'not being cooperative', for the love of fuck if another
\
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."}
+/obj/item/weapon/paper/manta_cannon_usage
+ name = "Cannon Operation Instructions"
+ info = {"To All Personnel,
\
+Heads up people, we've got a new toy.
\
+
\
+According to the suits, that toy is an Obstruction Field Disperser. If you are reading this, you already found it, good job on not needing two hands and a map to find your own arse. Operation of the OFD is simple:
\
+1. Load a charge from the magazine (located in the starboard aft section). You want an EM2-QUASAR for electrical storms or ion clouds, and an XP4-INDARRA for asteroids, dust clouds, and carp schools. Get someone else to handle loading if you need multiple consecutive shots. You have four of each.
\
+2. Set strength and range/radius.
\
+3. Aim and calibrate the ignition chamber. You need to get the right sequence of four numbers. A correct number ups the accuracy value by 25%. A correct number in the wrong slot adds 17%.
\
+4. OPEN THE FIRING PORT with the big button to your right. Visually verify the port is open.
\
+5. Press the big red FIRE button, once you have verified the loaded charge, the target, and that the port is open.
\
+With any luck you hit and maybe blew some stupid space-fish into space-giblets. You're done!
\
+
\
+Do not fire the cannon whilst it's cooling down or whilst the port is closed, or it will explode. If you need to remove a loaded charge (for instance because your loader sent the wrong one) or clear a jam, use the airlock. No, the cannon cannot be used as a deployment system. Yes, I tried to get drop pods installed, but the suits are still waffling about the idea. Don't try to fire it at ships or stations, you'll probably miss.
\
+
\
+In the meantime, happy hunting. Go bag me some carp. The mech bay can be found in the port aft section opposite the magazine if you need to use the Gygax.
\
+
\
+Capt. Thorne"}
+
/obj/machinery/computer/cryopod/merc
name = "mercenary oversight console"
desc = "An interface between mercenaries and the cryo oversight systems tasked with keeping track of all mercenaries who enter or exit cryostasis."