diff --git a/_maps/map_files/Arachne/TGS_Arachne.dmm b/_maps/map_files/Arachne/TGS_Arachne.dmm index b303fd13ddd93..a7d1da7f7832e 100644 --- a/_maps/map_files/Arachne/TGS_Arachne.dmm +++ b/_maps/map_files/Arachne/TGS_Arachne.dmm @@ -90,14 +90,11 @@ }, /turf/open/floor/mainship/red, /area/mainship/shipboard/firing_range) -"ahj" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/mainship/orange/corner{ - dir = 8 - }, -/area/mainship/living/pilotbunks) +"ahs" = ( +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/firealarm, +/turf/open/floor/mainship/orange, +/area/mainship/living/tankerbunks) "ahx" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -288,15 +285,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/mainship/floor, /area/mainship/engineering/upper_engine_monitoring) -"aoX" = ( -/obj/machinery/vending/nanomed{ - dir = 1 - }, -/obj/effect/ai_node, -/turf/open/floor/mainship/orange{ - dir = 1 - }, -/area/mainship/hallways/hangar/flight_control) "apm" = ( /obj/structure/prop/mainship/ship_memorial, /turf/open/floor/grass, @@ -330,10 +318,15 @@ "aqt" = ( /turf/open/floor/wood, /area/mainship/command/corporateliaison) -"aro" = ( -/obj/effect/ai_node, -/turf/open/floor/plating, -/area/mainship/living/tankerbunks) +"arc" = ( +/obj/machinery/light/mainship{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/mainship/black{ + dir = 4 + }, +/area/mainship/living/pilotbunks) "arw" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/firealarm, @@ -747,11 +740,6 @@ dir = 5 }, /area/mainship/hallways/starboard_ert) -"aKV" = ( -/turf/open/floor/mainship/orange{ - dir = 1 - }, -/area/mainship/hallways/hangar/flight_control) "aLj" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 5 @@ -1096,7 +1084,9 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "beT" = ( @@ -1138,12 +1128,14 @@ }, /area/mainship/living/grunt_rnr) "bfZ" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/camera/autoname/mainship, -/turf/open/floor/mainship/orange/corner{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 1 }, -/area/mainship/hallways/hangar/flight_control) +/turf/open/floor/mainship/black, +/area/mainship/living/pilotbunks) "bgn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -1268,7 +1260,7 @@ "bnf" = ( /obj/machinery/vending/cargo_supply, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/mainship/green{ dir = 2 }, @@ -1370,9 +1362,20 @@ }, /area/mainship/engineering/engineering_workshop) "bpv" = ( -/obj/structure/table/mainship/nometal, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, +/obj/structure/cable, +/turf/open/floor/mainship/orange{ + dir = 4 + }, +/area/mainship/living/tankerbunks) "bpK" = ( /obj/effect/turf_decal/warning_stripes/thin, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -1726,16 +1729,8 @@ }, /turf/open/floor/mainship/floor, /area/mainship/squads/req) -"bFa" = ( -/obj/effect/decal/cleanable/blood/oil{ - name = "grease"; - pixel_x = -5; - pixel_y = -6 - }, -/turf/open/floor/plating, -/area/mainship/living/tankerbunks) "bFc" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/machinery/holopad, /turf/open/floor/plating/plating_catwalk, @@ -1769,7 +1764,7 @@ "bGJ" = ( /obj/structure/dropship_equipment/shuttle/flare_launcher, /turf/open/floor/mainship/orange{ - dir = 4 + dir = 6 }, /area/mainship/hallways/hangar) "bHp" = ( @@ -1820,7 +1815,7 @@ /turf/open/floor/mainship/floor, /area/mainship/living/numbertwobunks) "bIO" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/disposalpipe/junction/yjunc{ dir = 8 @@ -1863,14 +1858,11 @@ /turf/open/floor/wood, /area/mainship/command/corporateliaison) "bKM" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/obj/machinery/light/mainship{ - dir = 1 - }, +/obj/effect/turf_decal/warning_stripes/thin, /obj/structure/cable, +/obj/machinery/power/apc/mainship, /turf/open/floor/mainship/orange, -/area/mainship/hallways/hangar/flight_control) +/area/mainship/living/tankerbunks) "bLH" = ( /obj/structure/window/reinforced{ dir = 4 @@ -1890,14 +1882,10 @@ /turf/open/floor/mainship/black, /area/mainship/hallways/port_hallway) "bMa" = ( -/obj/structure/window/framed/mainship/requisitions, -/obj/machinery/door/firedoor/mainship{ - dir = 8 - }, -/obj/docking_port/stationary/marine_dropship/crash_target, -/obj/machinery/door/poddoor/shutters/mainship/open/hangar, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar/flight_control) +/obj/machinery/door/poddoor/mainship/mech, +/obj/machinery/door/firedoor/mainship, +/turf/open/floor/mainship/floor, +/area/mainship/living/tankerbunks) "bMC" = ( /obj/machinery/vending/uniform_supply, /obj/machinery/camera/autoname/mainship{ @@ -2197,19 +2185,6 @@ /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) -"cef" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/holopad, -/turf/open/floor/mainship/orange{ - dir = 8 - }, -/area/mainship/hallways/hangar/flight_control) "cek" = ( /obj/effect/turf_decal/warning_stripes/box/small, /obj/effect/turf_decal/warning_stripes/box/small{ @@ -2288,7 +2263,7 @@ "chN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/structure/disposalpipe/junction/flipped{ dir = 4 }, @@ -2350,15 +2325,6 @@ }, /turf/open/floor/mainship/floor, /area/mainship/engineering/starboard_atmos) -"ckG" = ( -/obj/machinery/door/airlock/mainship/generic/pilot/quarters{ - dir = 1 - }, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) "ckM" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 4 @@ -2619,7 +2585,7 @@ "cuU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/camera/autoname/mainship{ dir = 1 }, @@ -2726,14 +2692,18 @@ }, /area/mainship/living/commandbunks) "cza" = ( +/obj/effect/ai_node, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/ai_node, -/turf/open/floor/mainship/orange{ +/turf/open/floor/mainship/black{ dir = 8 }, /area/mainship/living/pilotbunks) @@ -2788,7 +2758,7 @@ /turf/open/floor/mainship/floor, /area/mainship/hallways/port_ert) "cAR" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/effect/ai_node, /turf/open/floor/mainship/floor, @@ -2915,11 +2885,15 @@ }, /turf/open/floor/mainship/floor, /area/mainship/shipboard/chief_mp_office) -"cHG" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/computer/security/marinemainship_network, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) +"cGW" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/living/tankerbunks) "cIX" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/grass, @@ -2946,16 +2920,6 @@ "cJw" = ( /turf/open/floor/mainship/silver, /area/mainship/hallways/port_ert) -"cKm" = ( -/obj/machinery/door/airlock/mainship/generic/pilot/quarters{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) "cKw" = ( /obj/structure/mirror, /obj/structure/sink, @@ -3086,11 +3050,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating/plating_catwalk, /area/mainship/medical/upper_medical) -"cPM" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/light/mainship, -/turf/open/floor/mainship/black, -/area/mainship/hallways/hangar) "cPU" = ( /obj/effect/spawner/random/misc/plant, /obj/structure/cable, @@ -3339,20 +3298,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/mainship/orange, /area/mainship/engineering/engineering_workshop) -"cWw" = ( -/obj/machinery/firealarm{ - dir = 8 - }, -/turf/open/floor/mainship/black{ - dir = 4 - }, -/area/mainship/hallways/hangar) -"cWK" = ( -/obj/structure/cable, -/turf/open/floor/mainship/orange{ - dir = 4 - }, -/area/mainship/living/pilotbunks) "cWN" = ( /obj/machinery/door/window/secure/bridge{ dir = 8 @@ -3989,25 +3934,14 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar/droppod) "dxr" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/door_control/old/cic/hangar_shutters{ - pixel_x = 8; - pixel_y = 10 - }, -/obj/machinery/door_control/old{ - id = "ammo1"; - name = "Dropship Armament Storage"; - pixel_x = 8; - pixel_y = 3 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 }, -/obj/machinery/door_control/old{ - id = "ammo2"; - name = "Dropship Ammo Storage"; - pixel_x = 8; - pixel_y = -4 +/obj/structure/cable, +/turf/open/floor/mainship/orange{ + dir = 4 }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) +/area/mainship/living/tankerbunks) "dxv" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -4024,16 +3958,19 @@ /turf/open/floor/mainship/black, /area/mainship/hallways/starboard_hallway) "dyl" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 10 + dir = 9 }, -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/obj/structure/cable, +/turf/open/floor/mainship/orange{ dir = 4 }, -/turf/open/floor/mainship/floor, /area/mainship/living/tankerbunks) "dyr" = ( /obj/structure/disposalpipe/segment/corner{ @@ -4041,6 +3978,20 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/engineering/starboard_atmos) +"dyw" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/living/tankerbunks) "dzr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ @@ -4174,11 +4125,27 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/ai_node, /turf/open/floor/mainship/floor, /area/mainship/engineering/engineering_workshop) "dDc" = ( /turf/closed/wall/mainship, /area/mainship/command/corporateliaison) +"dDu" = ( +/obj/structure/window/framed/mainship, +/obj/machinery/door/firedoor/mainship, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/mainship/floor, +/area/mainship/living/tankerbunks) "dDO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -4199,10 +4166,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/living/pilotbunks) -"dEY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/layer1, -/turf/open/floor/plating, -/area/mainship/living/tankerbunks) "dGb" = ( /turf/open/floor/plating, /area/mainship/medical/upper_medical) @@ -4263,7 +4226,7 @@ "dHM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/structure/disposalpipe/junction/flipped{ dir = 4 }, @@ -5050,14 +5013,6 @@ }, /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/starboard_hallway) -"esT" = ( -/obj/machinery/light/mainship{ - dir = 4 - }, -/turf/open/floor/mainship/orange{ - dir = 8 - }, -/area/mainship/living/pilotbunks) "esW" = ( /obj/structure/closet/crate/ammo, /turf/open/floor/plating, @@ -5067,6 +5022,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) +"etD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/effect/ai_node, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "etL" = ( /obj/effect/soundplayer, /turf/closed/wall/mainship, @@ -5446,7 +5408,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold4w/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, /obj/structure/cable, /turf/open/floor/mainship/red{ dir = 8 @@ -5509,12 +5471,6 @@ dir = 1 }, /area/mainship/squads/req) -"eMA" = ( -/obj/machinery/vending/snack, -/turf/open/floor/mainship/orange{ - dir = 1 - }, -/area/mainship/hallways/hangar/flight_control) "eNb" = ( /obj/machinery/light/mainship, /turf/open/floor/mainship/sterile/side, @@ -5774,10 +5730,12 @@ /turf/open/floor/mainship/sterile/dark, /area/mainship/hallways/port_ert) "eVP" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/plating/plating_catwalk, /area/mainship/living/pilotbunks) "eWn" = ( @@ -5856,10 +5814,11 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/engineering/starboard_atmos) "eYK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/disposalpipe/junction, -/turf/open/floor/mainship/orange{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/turf/open/floor/mainship/black{ dir = 1 }, /area/mainship/living/pilotbunks) @@ -5955,6 +5914,16 @@ }, /turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) +"fej" = ( +/obj/machinery/door/poddoor/mainship/mech{ + name = "Vehicle Bay Shutters"; + id = "vehicle_shutters" + }, +/obj/machinery/door/firedoor/mainship{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/tankerbunks) "feu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6082,8 +6051,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/effect/ai_node, +/obj/structure/cable, /turf/open/floor/mainship/floor, /area/mainship/living/pilotbunks) "fjj" = ( @@ -6202,17 +6172,9 @@ }, /turf/open/floor/mainship/research, /area/mainship/medical/upper_medical) -"for" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/disposalpipe/segment, -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/hallways/starboard_hallway) "foM" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/disposalpipe/junction/flipped{ dir = 4 @@ -6268,13 +6230,10 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 +/obj/effect/ai_node, +/turf/open/floor/mainship/orange{ + dir = 8 }, -/turf/open/floor/mainship/floor, /area/mainship/living/tankerbunks) "ftG" = ( /obj/machinery/cic_maptable/drawable/big{ @@ -6304,6 +6263,7 @@ "fur" = ( /obj/structure/rack, /obj/item/uav_turret/droid, +/obj/item/uav_turret/droid, /turf/open/floor/mainship/cargo, /area/mainship/command/airoom) "fuI" = ( @@ -6480,14 +6440,20 @@ /turf/open/floor/wood, /area/mainship/living/cafeteria_officer) "fBI" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /obj/machinery/light/mainship{ dir = 8 }, -/turf/open/floor/mainship/orange{ +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/mainship/black{ dir = 4 }, /area/mainship/living/pilotbunks) @@ -6541,7 +6507,7 @@ "fFA" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold4w/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, /turf/open/floor/plating/plating_catwalk, /area/mainship/squads/general) "fFS" = ( @@ -6590,6 +6556,17 @@ /obj/machinery/door/firedoor, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/chemistry) +"fHe" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/mainship/orange{ + dir = 1 + }, +/area/mainship/living/tankerbunks) "fHx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ @@ -6603,12 +6580,6 @@ }, /turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) -"fHP" = ( -/obj/structure/cable, -/turf/open/floor/mainship/black{ - dir = 4 - }, -/area/mainship/hallways/hangar) "fIp" = ( /obj/structure/table/mainship/nometal, /obj/machinery/computer/camera, @@ -6696,10 +6667,6 @@ dir = 8 }, /area/mainship/hallways/hangar) -"fKK" = ( -/obj/structure/cable, -/turf/open/floor/mainship/orange/corner, -/area/mainship/living/pilotbunks) "fLd" = ( /obj/effect/spawner/random/misc/paperbin{ pixel_x = 7; @@ -6908,6 +6875,13 @@ dir = 4 }, /area/mainship/hallways/hangar) +"fUa" = ( +/obj/machinery/door/poddoor/mainship/mech{ + name = "Vehicle Bay Shutters"; + id = "vehicle_shutters" + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/tankerbunks) "fUS" = ( /obj/structure/cable, /obj/effect/ai_node, @@ -6997,12 +6971,10 @@ }, /area/mainship/hallways/hangar) "fZg" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/computer/emails{ - pixel_y = 5 +/turf/open/floor/mainship/black/corner{ + dir = 8 }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) +/area/mainship/living/pilotbunks) "fZl" = ( /obj/effect/turf_decal/warning_stripes/thin, /turf/open/floor/mainship/floor, @@ -7065,12 +7037,6 @@ dir = 4 }, /area/mainship/squads/general) -"gdx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar/flight_control) "gdD" = ( /obj/machinery/computer/security/marinemainship{ dir = 8; @@ -7081,13 +7047,6 @@ dir = 8 }, /area/mainship/command/cic) -"gdS" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/disposalpipe/junction/flipped{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar/flight_control) "gdV" = ( /obj/machinery/atmospherics/pipe/simple, /obj/structure/cable, @@ -7194,7 +7153,7 @@ /turf/closed/wall/mainship/research/containment/wall/purple, /area/mainship/medical/medical_science) "gjQ" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, @@ -7318,14 +7277,10 @@ /turf/open/floor/mech_bay_recharge_floor, /area/mainship/command/airoom) "gpD" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - dir = 8; - on = 1 - }, -/obj/machinery/firealarm{ +/obj/machinery/camera/autoname/mainship{ dir = 8 }, -/turf/open/floor/mainship/orange{ +/turf/open/floor/mainship/black{ dir = 8 }, /area/mainship/living/pilotbunks) @@ -7492,10 +7447,13 @@ /turf/open/floor/wood, /area/mainship/living/cafeteria_officer) "gvu" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/layer1, -/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/warning_stripes/thin, +/obj/structure/closet/emcloset, +/obj/machinery/light/mainship{ + dir = 1 + }, /turf/open/floor/mainship/orange, -/area/mainship/hallways/hangar/flight_control) +/area/mainship/living/tankerbunks) "gvF" = ( /turf/open/floor/mainship/black{ dir = 8 @@ -7799,6 +7757,7 @@ /obj/machinery/light/mainship{ dir = 4 }, +/obj/item/stack/sandbags_empty/half, /turf/open/floor/plating/plating_catwalk, /area/mainship/engineering/engineering_workshop) "gJr" = ( @@ -8147,8 +8106,10 @@ /area/mainship/shipboard/brig) "gXF" = ( /obj/effect/ai_node, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) +/turf/open/floor/mainship/black{ + dir = 8 + }, +/area/mainship/living/pilotbunks) "gYt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -8277,14 +8238,6 @@ dir = 8 }, /area/mainship/living/grunt_rnr) -"heV" = ( -/obj/structure/window/framed/mainship, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/mainship, -/turf/open/floor/mainship/floor, -/area/mainship/living/pilotbunks) "hfg" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -8337,14 +8290,6 @@ /obj/effect/turf_decal/warning_stripes/thin, /turf/open/floor/mainship/mono, /area/mainship/squads/req) -"hgl" = ( -/obj/structure/bed/chair/comfy{ - dir = 8 - }, -/turf/open/floor/mainship/orange{ - dir = 4 - }, -/area/mainship/hallways/hangar/flight_control) "hgr" = ( /obj/structure/table/mainship/nometal, /obj/machinery/computer/squad_changer, @@ -8429,7 +8374,7 @@ "hlj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/structure/disposalpipe/segment/corner{ dir = 8 }, @@ -8513,7 +8458,7 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/port_hull) "hnH" = ( -/turf/open/floor/mainship/orange/corner{ +/turf/open/floor/mainship/black/corner{ dir = 1 }, /area/mainship/living/pilotbunks) @@ -8863,10 +8808,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/door/poddoor/mainship/mech, /obj/machinery/door/firedoor/mainship{ dir = 8 }, +/obj/structure/cable, +/obj/machinery/door/poddoor/mainship/mech{ + name = "Vehicle Bay Shutters"; + id = "vehicle_shutters" + }, /turf/open/floor/mainship/mono, /area/mainship/living/tankerbunks) "hBd" = ( @@ -8914,10 +8863,17 @@ }, /area/mainship/hallways/port_ert) "hCq" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/computer/shuttle/shuttle_control/dropship, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 6 + }, +/obj/machinery/door_control/mainship/mech{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/mainship/orange/corner{ + dir = 2 + }, +/area/mainship/living/tankerbunks) "hDj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ @@ -8987,7 +8943,7 @@ "hER" = ( /obj/structure/dropship_equipment/shuttle/flare_launcher, /turf/open/floor/mainship/orange{ - dir = 8 + dir = 10 }, /area/mainship/hallways/hangar) "hEZ" = ( @@ -9077,14 +9033,6 @@ "hIO" = ( /turf/closed/wall/mainship, /area/mainship/hallways/hangar) -"hIQ" = ( -/obj/structure/table/mainship/nometal, -/obj/item/megaphone, -/obj/machinery/light/mainship, -/turf/open/floor/mainship/orange/corner{ - dir = 4 - }, -/area/mainship/hallways/hangar/flight_control) "hJf" = ( /obj/machinery/door/airlock/mainship/generic/glass{ dir = 8 @@ -9162,6 +9110,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 10 }, +/obj/effect/ai_node, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) "hNU" = ( @@ -9373,6 +9322,7 @@ dir = 5 }, /obj/structure/cable, +/obj/effect/ai_node, /turf/open/floor/mainship/floor, /area/mainship/engineering/engineering_workshop) "hYA" = ( @@ -9665,7 +9615,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/structure/cable, /obj/machinery/mech_bay_recharge_port{ dir = 8 @@ -9763,14 +9713,6 @@ }, /turf/open/floor/mainship/floor, /area/mainship/engineering/upper_engine_monitoring) -"inL" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar/flight_control) "inM" = ( /obj/machinery/door/airlock/multi_tile/mainship/comdoor{ dir = 8 @@ -9864,8 +9806,20 @@ /turf/open/floor/mainship/mono, /area/mainship/squads/req) "iro" = ( -/turf/closed/wall/mainship, -/area/mainship/hallways/hangar/flight_control) +/obj/structure/rack, +/obj/item/tool/crowbar, +/obj/effect/spawner/random/engineering/toolbox, +/obj/item/stack/cable_coil, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable, +/turf/open/floor/mainship/orange/corner{ + dir = 4 + }, +/area/mainship/living/tankerbunks) "irt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -9925,18 +9879,15 @@ /turf/open/floor/mainship/floor, /area/mainship/command/telecomms) "iua" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/visible/layer1, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ +/obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/machinery/camera/autoname/mainship{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/floor/mainship/orange{ + dir = 1 }, -/obj/machinery/light/mainship, -/turf/open/floor/mainship/floor, /area/mainship/living/tankerbunks) "iuE" = ( /obj/structure/closet/secure_closet/medical3, @@ -9951,10 +9902,6 @@ dir = 6 }, /area/mainship/shipboard/firing_range) -"iva" = ( -/obj/machinery/holopad, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar/flight_control) "ivy" = ( /turf/open/floor/plating/plating_catwalk, /area/mainship/squads/general) @@ -10042,7 +9989,7 @@ "iyV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/mainship/purple{ dir = 4 }, @@ -10075,7 +10022,7 @@ /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/cmo_office) "izM" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -10131,11 +10078,7 @@ }, /area/mainship/medical/upper_medical) "iCP" = ( -/obj/structure/cable, -/obj/machinery/camera/autoname/mainship{ - dir = 4 - }, -/turf/open/floor/mainship/orange{ +/turf/open/floor/mainship/black{ dir = 4 }, /area/mainship/living/pilotbunks) @@ -10267,7 +10210,7 @@ /area/mainship/command/corporateliaison) "iGR" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/mainship/sterile/side{ dir = 1 @@ -10292,8 +10235,14 @@ }, /area/mainship/hallways/port_ert) "iHE" = ( -/turf/open/floor/mainship/orange, -/area/mainship/hallways/hangar/flight_control) +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 10 + }, +/obj/structure/closet/firecloset, +/turf/open/floor/mainship/orange/corner{ + dir = 8 + }, +/area/mainship/living/tankerbunks) "iIJ" = ( /turf/open/floor/mainship/orange{ dir = 8 @@ -10412,7 +10361,7 @@ /area/mainship/shipboard/weapon_room) "iNv" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold4w/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/open/floor/mainship/floor, /area/mainship/engineering/engineering_workshop) @@ -10554,12 +10503,6 @@ dir = 1 }, /area/mainship/medical/lower_medical) -"iRF" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/obj/structure/cable, -/obj/machinery/firealarm, -/turf/open/floor/mainship/floor, -/area/mainship/living/tankerbunks) "iSa" = ( /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating/plating_catwalk, @@ -10930,13 +10873,6 @@ /obj/structure/morgue, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/morgue) -"jiF" = ( -/obj/machinery/door/firedoor/mainship{ - dir = 8 - }, -/obj/machinery/light/mainship, -/turf/open/floor/mainship/stripesquare, -/area/mainship/hallways/hangar) "jiL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -10960,6 +10896,12 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) +"jja" = ( +/obj/machinery/firealarm{ + dir = 8 + }, +/turf/open/floor/mainship/floor, +/area/mainship/squads/req) "jjn" = ( /turf/closed/wall/mainship/white, /area/mainship/medical/upper_medical) @@ -11001,7 +10943,7 @@ /area/mainship/living/numbertwobunks) "jlh" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold4w/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -11434,12 +11376,20 @@ "jCa" = ( /turf/open/floor/mainship/red, /area/mainship/command/cic) -"jCj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/junction/flipped, -/turf/open/floor/mainship/orange, -/area/mainship/living/pilotbunks) +"jDg" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/ai_node, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "jDI" = ( /obj/structure/barricade/metal{ dir = 1 @@ -11595,20 +11545,17 @@ /turf/open/floor/plating, /area/mainship/hallways/port_hallway) "jKk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 5 - }, /obj/effect/turf_decal/warning_stripes/thin{ dir = 5 }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ +/obj/machinery/door_control/mainship/mech{ + dir = 4; + name = "Vehicle Bay Shutter"; + id = "vehicle_shutters" + }, +/turf/open/floor/mainship/orange/corner{ dir = 4 }, -/turf/open/floor/mainship/floor, /area/mainship/living/tankerbunks) "jKK" = ( /turf/open/floor/mainship/floor, @@ -11751,7 +11698,7 @@ /area/mainship/hull/starboard_hull) "jQw" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -11939,9 +11886,7 @@ /area/mainship/command/corporateliaison) "jZO" = ( /obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, +/obj/structure/disposalpipe/trunk, /turf/open/floor/mainship/black{ dir = 4 }, @@ -12163,12 +12108,13 @@ }, /area/mainship/hallways/hangar) "kmn" = ( -/obj/structure/table/mainship/nometal, -/obj/item/phone, -/obj/machinery/power/apc/mainship, +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/light/mainship{ + dir = 1 + }, /obj/structure/cable, -/turf/open/floor/mainship/orange/corner, -/area/mainship/hallways/hangar/flight_control) +/turf/open/floor/mainship/orange, +/area/mainship/living/tankerbunks) "kmZ" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/plating/plating_catwalk, @@ -12519,7 +12465,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/effect/ai_node, /turf/open/floor/mainship/black/corner{ dir = 1 @@ -12696,7 +12642,7 @@ /area/mainship/hallways/hangar) "kER" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/structure/disposalpipe/junction{ dir = 8 }, @@ -12796,16 +12742,6 @@ /obj/structure/curtain/open/shower, /turf/open/floor/plating/plating_catwalk, /area/mainship/medical/medical_science) -"kHL" = ( -/obj/machinery/door/airlock/mainship/generic/pilot/quarters{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/open/floor/mainship/floor, -/area/mainship/living/pilotbunks) "kIg" = ( /obj/machinery/marine_selector/gear/engi, /turf/open/floor/mainship/black{ @@ -12826,7 +12762,7 @@ /area/mainship/engineering/engineering_workshop) "kIx" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/disposalpipe/junction{ dir = 4 @@ -12848,18 +12784,16 @@ dir = 8 }, /area/mainship/medical/lower_medical) -"kJT" = ( -/obj/structure/cable, -/obj/structure/rack, -/obj/item/storage/toolbox/mechanical, -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/mainship/floor, -/area/mainship/living/tankerbunks) "kKd" = ( -/obj/structure/cable, /obj/effect/turf_decal/warning_stripes/thin, -/obj/machinery/power/apc/mainship, -/turf/open/floor/mainship/floor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating/plating_catwalk, /area/mainship/living/tankerbunks) "kKF" = ( /obj/structure/window/framed/mainship, @@ -13039,14 +12973,9 @@ /turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) "kPm" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar/flight_control) +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating, +/area/mainship/living/tankerbunks) "kPp" = ( /obj/structure/bed/chair/office/light{ dir = 1 @@ -13233,7 +13162,7 @@ /area/mainship/medical/chemistry) "kXK" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 4 @@ -13480,9 +13409,9 @@ /turf/open/floor/plating, /area/mainship/engineering/engineering_workshop) "liC" = ( -/obj/vehicle/unmanned/droid/scout, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/vehicle/unmanned/droid, /turf/open/floor/mech_bay_recharge_floor, /area/mainship/command/airoom) "liE" = ( @@ -13569,10 +13498,6 @@ }, /turf/open/floor/mainship/research, /area/mainship/medical/upper_medical) -"lmo" = ( -/obj/effect/soundplayer, -/turf/closed/wall/mainship, -/area/mainship/hallways/hangar/flight_control) "lmX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -13876,10 +13801,6 @@ dir = 1 }, /area/mainship/squads/general) -"lyb" = ( -/obj/structure/closet/firecloset/full, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) "lym" = ( /obj/effect/ai_node, /turf/open/floor/wood, @@ -13986,6 +13907,7 @@ /obj/machinery/camera/autoname/mainship{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/open/floor/mainship/black/corner{ dir = 4 }, @@ -13995,7 +13917,7 @@ /obj/item/tool/taperoll/engineering, /obj/item/clothing/gloves/insulated, /obj/item/lightreplacer, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/mainship/floor, /area/mainship/engineering/engineering_workshop) @@ -14120,6 +14042,16 @@ /obj/machinery/door/firedoor/mainship, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) +"lGy" = ( +/obj/machinery/door_control/mainship/mech{ + dir = 8; + name = "Vehicle Bay Shutter"; + id = "vehicle_shutters" + }, +/turf/open/floor/mainship/black{ + dir = 4 + }, +/area/mainship/hallways/hangar) "lHe" = ( /obj/effect/ai_node, /turf/open/floor/mainship/black/corner{ @@ -14212,19 +14144,13 @@ }, /area/mainship/hull/starboard_hull) "lNB" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/cable, /turf/open/floor/mainship/floor, /area/mainship/command/cic) "lNL" = ( -/obj/machinery/door/airlock/mainship/generic/mech_pilot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, +/obj/machinery/door/airlock/mainship/generic/pilot/quarters, /obj/machinery/door/firedoor, /turf/open/floor/mainship/floor, /area/mainship/living/tankerbunks) @@ -14755,7 +14681,7 @@ /turf/closed/wall/mainship, /area/mainship/living/commandbunks) "miU" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/mainship/floor, /area/mainship/living/evacuation) @@ -14815,18 +14741,6 @@ }, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) -"mkw" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/turf/open/floor/mainship/orange{ - dir = 4 - }, -/area/mainship/living/pilotbunks) "mkO" = ( /obj/structure/bed/chair/sofa{ dir = 1 @@ -15043,6 +14957,15 @@ /obj/machinery/light/mainship/small, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/starboard_hull) +"mvD" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 + }, +/obj/structure/closet/toolcloset, +/turf/open/floor/mainship/orange/corner{ + dir = 1 + }, +/area/mainship/living/tankerbunks) "mvW" = ( /turf/open/floor/mainship/silver{ dir = 5 @@ -15482,14 +15405,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/floor, /area/mainship/squads/req) -"mNP" = ( -/obj/structure/cable, -/obj/machinery/door/poddoor/mainship/mech, -/obj/machinery/door/firedoor/mainship{ - dir = 8 - }, -/turf/open/floor/mainship/mono, -/area/mainship/living/tankerbunks) "mOa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -15533,10 +15448,9 @@ /area/mainship/squads/req) "mPC" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/effect/ai_node, -/obj/docking_port/stationary/marine_dropship/crash_target, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "mPK" = ( @@ -15546,6 +15460,18 @@ /obj/structure/cable, /turf/open/floor/mainship/research, /area/mainship/medical/upper_medical) +"mPT" = ( +/obj/machinery/camera/autoname/mainship{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/mainship/black, +/area/mainship/hallways/hangar) "mQp" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 @@ -15617,8 +15543,13 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment, /obj/structure/cable, -/turf/open/floor/mainship/floor, +/turf/open/floor/mainship/orange{ + dir = 8 + }, /area/mainship/living/tankerbunks) "mUv" = ( /obj/structure/closet/emcloset, @@ -15658,6 +15589,17 @@ "mXB" = ( /turf/closed/wall/mainship, /area/mainship/engineering/starboard_atmos) +"mXC" = ( +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/mainship/orange, +/area/mainship/living/tankerbunks) "mXH" = ( /obj/structure/table/mainship/nometal, /obj/item/tool/lighter/zippo{ @@ -15705,7 +15647,6 @@ /obj/machinery/camera/autoname/mainship{ dir = 4 }, -/obj/effect/ai_node, /turf/open/floor/mainship/orange{ dir = 8 }, @@ -15817,6 +15758,17 @@ /obj/machinery/marine_selector/clothes/synth, /turf/open/floor/plating/plating_catwalk, /area/mainship/engineering/engineering_workshop) +"ndO" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 1 + }, +/turf/open/floor/mainship/orange{ + dir = 1 + }, +/area/mainship/living/tankerbunks) "neB" = ( /obj/effect/spawner/random/misc/plant, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -15862,6 +15814,16 @@ }, /turf/open/floor/wood, /area/mainship/command/corporateliaison) +"nfy" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "nfH" = ( /obj/structure/table/mainship/nometal, /obj/machinery/camera/autoname/mainship, @@ -16000,7 +15962,7 @@ "nmt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/mainship/sterile/side{ dir = 9 }, @@ -16011,12 +15973,6 @@ }, /turf/open/floor/plating, /area/mainship/hull/port_hull) -"nmW" = ( -/obj/machinery/vending/marineFood, -/turf/open/floor/mainship/orange{ - dir = 1 - }, -/area/mainship/hallways/hangar/flight_control) "nnc" = ( /obj/structure/disposalpipe/segment, /obj/effect/ai_node, @@ -16289,18 +16245,12 @@ dir = 4 }, /obj/machinery/door/firedoor, -/turf/open/floor/mainship/floor, -/area/mainship/living/pilotbunks) -"nyG" = ( -/obj/structure/window/framed/mainship/requisitions, -/obj/machinery/door/firedoor/mainship{ - dir = 2 - }, -/obj/machinery/door/poddoor/shutters/mainship/open/hangar{ - dir = 2 +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) +/area/mainship/living/pilotbunks) "nyM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -16417,16 +16367,6 @@ /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) -"nDU" = ( -/obj/structure/window/framed/mainship, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/mainship{ - dir = 2 - }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) "nEI" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -16558,7 +16498,6 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 8 }, -/obj/effect/ai_node, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) "nJH" = ( @@ -16635,13 +16574,16 @@ /turf/closed/wall/mainship/white, /area/mainship/medical/morgue) "nLY" = ( -/obj/structure/window/framed/mainship/requisitions, -/obj/machinery/door/poddoor/shutters/mainship/open/hangar, -/obj/machinery/door/firedoor/mainship{ - dir = 8 +/obj/machinery/door/poddoor/mainship/mech, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar/flight_control) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor/mainship, +/turf/open/floor/mainship/floor, +/area/mainship/living/tankerbunks) "nME" = ( /obj/structure/cable, /obj/machinery/power/apc/mainship{ @@ -16810,23 +16752,9 @@ }, /turf/open/floor/wood, /area/mainship/living/grunt_rnr) -"nSL" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/power/monitor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar/flight_control) "nSM" = ( /turf/open/floor/mainship/cargo, /area/mainship/engineering/engine_core) -"nSU" = ( -/obj/machinery/door/airlock/mainship/generic/mech_pilot, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/turf/open/floor/mainship/floor, -/area/mainship/living/tankerbunks) "nTa" = ( /obj/structure/table/mainship/nometal, /obj/machinery/reagentgrinder, @@ -16871,21 +16799,6 @@ }, /turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) -"nTZ" = ( -/obj/machinery/door/airlock/mainship/generic/pilot/quarters{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/door/poddoor/shutters/mainship/open/hangar{ - dir = 2 - }, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) "nUb" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/mainship/sterile/dark, @@ -16926,6 +16839,16 @@ /obj/machinery/light/mainship, /turf/open/floor/mainship/sterile/purple/side, /area/mainship/medical/upper_medical) +"nWn" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ + dir = 4; + on = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/living/tankerbunks) "nWx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -17006,9 +16929,6 @@ /obj/machinery/door/firedoor/mainship{ dir = 8 }, -/obj/machinery/light/mainship{ - dir = 1 - }, /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/starboard_hallway) "nZH" = ( @@ -17029,9 +16949,6 @@ /obj/effect/soundplayer, /turf/closed/wall/mainship, /area/mainship/living/cryo_cells) -"oaN" = ( -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar/flight_control) "oaU" = ( /obj/machinery/marine_selector/clothes/engi, /turf/open/floor/mainship/black{ @@ -17259,7 +17176,7 @@ /area/mainship/hull/port_hull) "olm" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) @@ -17420,11 +17337,7 @@ }, /area/mainship/hallways/hangar/droppod) "osB" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/mainship/orange/corner{ +/turf/open/floor/mainship/black/corner{ dir = 4 }, /area/mainship/living/pilotbunks) @@ -17618,17 +17531,6 @@ dir = 4 }, /area/mainship/hallways/port_hallway) -"ozH" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/ai_node, -/turf/open/floor/mainship/floor, -/area/mainship/engineering/engineering_workshop) "ozU" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -17737,12 +17639,6 @@ /obj/structure/bed/chair/comfy, /turf/open/floor/mainship/floor, /area/mainship/command/cic) -"oCX" = ( -/obj/effect/decal/cleanable/blood/oil/streak{ - dir = 4 - }, -/turf/open/floor/plating, -/area/mainship/living/tankerbunks) "oDl" = ( /turf/open/floor/mainship/black{ dir = 10 @@ -17937,6 +17833,17 @@ }, /turf/open/floor/mainship/floor, /area/mainship/command/airoom) +"oLd" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/structure/disposalpipe/segment/corner, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "oLL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18211,7 +18118,7 @@ /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/operating_room_one) "oZE" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/cable, /turf/open/floor/mainship/floor, @@ -18344,7 +18251,7 @@ }, /area/mainship/command/airoom) "pdI" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, @@ -18383,13 +18290,6 @@ dir = 4 }, /area/mainship/medical/upper_medical) -"pfr" = ( -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) -"pfx" = ( -/obj/effect/decal/cleanable/blood/gibs/robot, -/turf/open/floor/plating, -/area/mainship/living/tankerbunks) "pfy" = ( /obj/effect/ai_node, /turf/open/floor/wood, @@ -18430,8 +18330,8 @@ }, /area/mainship/hallways/starboard_hallway) "phV" = ( -/obj/structure/cable, /obj/structure/rack, +/obj/item/storage/toolbox/mechanical, /obj/item/storage/toolbox/electrical{ pixel_x = -5; pixel_y = 4 @@ -18439,7 +18339,19 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 6 }, -/turf/open/floor/mainship/floor, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/light/mainship{ + dir = 8 + }, +/turf/open/floor/mainship/orange/corner{ + dir = 2 + }, /area/mainship/living/tankerbunks) "phY" = ( /obj/structure/cable, @@ -18670,28 +18582,22 @@ /turf/closed/wall/mainship, /area/mainship/hull/starboard_hull) "ptK" = ( -/obj/structure/cable, /obj/effect/turf_decal/warning_stripes/thin, -/obj/structure/closet/firecloset/full, -/obj/machinery/light/mainship{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/structure/disposalpipe/segment/corner{ dir = 1 }, -/turf/open/floor/mainship/floor, +/obj/structure/cable, +/turf/open/floor/plating/plating_catwalk, /area/mainship/living/tankerbunks) "ptL" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/open/floor/mainship/orange/corner{ + dir = 1 }, -/turf/open/floor/mainship/floor, /area/mainship/living/tankerbunks) "ptU" = ( /turf/open/floor/mainship/sterile/side, @@ -18708,7 +18614,7 @@ "put" = ( /obj/structure/table/mainship/nometal, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, @@ -18949,27 +18855,11 @@ }, /turf/open/floor/plating, /area/mainship/medical/upper_medical) -"pEn" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/living/pilotbunks) "pES" = ( /obj/machinery/vending/armor_supply, /obj/machinery/light/mainship, /turf/open/floor/mainship/mono, /area/mainship/living/pilotbunks) -"pFg" = ( -/obj/structure/cable, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/machinery/door_control/mainship/mech{ - dir = 4 - }, -/turf/open/floor/mainship/floor, -/area/mainship/living/tankerbunks) "pGa" = ( /obj/structure/closet/secure_closet/guncabinet/mp_armory, /turf/open/floor/mainship/sterile/dark, @@ -19127,12 +19017,16 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/obj/machinery/vending/tool, -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera/autoname/mainship{ dir = 8 }, -/turf/open/floor/mainship/floor, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/turf/open/floor/mainship/orange{ + dir = 8 + }, /area/mainship/living/tankerbunks) "pNg" = ( /obj/machinery/holopad, @@ -19565,13 +19459,13 @@ /turf/open/floor/mainship/research, /area/mainship/medical/upper_medical) "qeB" = ( -/obj/structure/window/framed/mainship/requisitions, /obj/machinery/door/poddoor/shutters/mainship/open/hangar, /obj/machinery/door/firedoor/mainship{ dir = 8 }, +/obj/structure/window/framed/mainship, /turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) +/area/mainship/living/pilotbunks) "qfD" = ( /obj/structure/bed/chair/nometal, /obj/machinery/light/mainship{ @@ -19628,6 +19522,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, /turf/open/floor/mainship/floor, /area/mainship/living/pilotbunks) "qjP" = ( @@ -19637,14 +19535,6 @@ /obj/machinery/holopad, /turf/open/floor/mainship/red, /area/mainship/shipboard/firing_range) -"qjY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/turf/open/floor/mainship/floor, -/area/mainship/living/tankerbunks) "qkF" = ( /obj/machinery/chem_master, /turf/open/floor/mainship/sterile/side{ @@ -19804,7 +19694,7 @@ /area/mainship/living/bridgebunks) "qpQ" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, @@ -19968,12 +19858,6 @@ /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, /area/mainship/engineering/starboard_atmos) -"qyy" = ( -/obj/structure/cable, -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/hallways/starboard_hallway) "qyM" = ( /obj/machinery/griddle, /obj/structure/disposalpipe/segment{ @@ -20150,25 +20034,14 @@ /turf/open/floor/wood, /area/mainship/hallways/starboard_ert) "qIa" = ( -/obj/machinery/door/airlock/mainship/generic/pilot/quarters{ - dir = 1 - }, -/obj/machinery/door/poddoor/shutters/mainship/open/hangar{ - dir = 2 - }, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar/flight_control) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall/mainship, +/area/mainship/living/tankerbunks) "qIr" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/computer/atmos_alert, -/obj/machinery/light/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/orange, -/area/mainship/hallways/hangar/flight_control) +/turf/open/floor/mainship/black/corner, +/area/mainship/living/pilotbunks) "qIC" = ( /obj/structure/window/framed/mainship/hull, /turf/open/floor/mainship/floor, @@ -20378,15 +20251,6 @@ /obj/structure/closet/secure_closet/engineering_welding, /turf/open/floor/mainship/cargo, /area/mainship/squads/req) -"qRL" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, -/obj/structure/disposalpipe/segment/corner, -/turf/open/floor/mainship/orange{ - dir = 8 - }, -/area/mainship/hallways/hangar/flight_control) "qRZ" = ( /obj/machinery/door/airlock/mainship/research/glass/wing{ dir = 2 @@ -20413,15 +20277,6 @@ dir = 4 }, /area/mainship/medical/lower_medical) -"qSV" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment, -/obj/machinery/light/mainship, -/turf/open/floor/mainship/orange/corner{ - dir = 1 - }, -/area/mainship/hallways/hangar/flight_control) "qTP" = ( /obj/machinery/door/airlock/mainship/maint{ dir = 2 @@ -20513,11 +20368,15 @@ /turf/open/floor/mainship/floor, /area/mainship/engineering/engineering_workshop) "qVG" = ( -/obj/structure/cable, /obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, -/turf/open/floor/mainship/floor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable, +/turf/open/floor/mainship/orange{ + dir = 4 + }, /area/mainship/living/tankerbunks) "qWn" = ( /turf/open/floor/grass, @@ -20543,9 +20402,9 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/mainship/floor, +/turf/open/floor/mainship/orange{ + dir = 8 + }, /area/mainship/living/tankerbunks) "qXD" = ( /obj/machinery/light/mainship{ @@ -20659,12 +20518,6 @@ dir = 6 }, /area/mainship/hallways/hangar/droppod) -"rcX" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/orange, -/area/mainship/hallways/hangar/flight_control) "rdC" = ( /obj/structure/table/mainship/nometal, /obj/machinery/computer/crew, @@ -20735,12 +20588,22 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, /obj/machinery/light/mainship{ dir = 4 }, -/obj/effect/ai_node, -/obj/machinery/holopad, -/turf/open/floor/mainship/floor, +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/mainship/orange{ + dir = 8 + }, /area/mainship/living/tankerbunks) "rgl" = ( /obj/structure/cable, @@ -20826,7 +20689,7 @@ amount = 25 }, /turf/open/floor/mainship/orange{ - dir = 4 + dir = 5 }, /area/mainship/hallways/hangar) "rif" = ( @@ -20876,14 +20739,13 @@ /turf/open/floor/plating, /area/mainship/hull/starboard_hull) "rjM" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/light/mainship, -/turf/open/floor/mainship/orange{ - dir = 1 +/obj/effect/ai_node, +/obj/effect/decal/cleanable/blood/oil{ + name = "grease"; + pixel_x = -7 }, -/area/mainship/hallways/hangar/flight_control) +/turf/open/floor/plating, +/area/mainship/living/tankerbunks) "rjQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 9 @@ -21239,12 +21101,13 @@ /area/mainship/engineering/upper_engine_monitoring) "rzu" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 8 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, -/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/structure/disposalpipe/junction, /turf/open/floor/plating/plating_catwalk, /area/mainship/living/pilotbunks) "rAj" = ( @@ -21820,8 +21683,9 @@ }, /area/mainship/medical/upper_medical) "rXs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable, /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/mainship/living/pilotbunks) @@ -21911,7 +21775,7 @@ /turf/open/floor/wood, /area/mainship/hallways/port_ert) "sal" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /obj/structure/cable, /turf/open/floor/wood, @@ -21942,22 +21806,15 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/starboard_hull) "sbi" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/vending/nanomed{ dir = 1 }, -/turf/open/floor/mainship/floor, +/turf/open/floor/mainship/orange{ + dir = 1 + }, /area/mainship/living/tankerbunks) "sbO" = ( /obj/structure/cable, @@ -22038,7 +21895,7 @@ /turf/open/floor/plating, /area/mainship/command/airoom) "sfd" = ( -/obj/structure/cable, +/obj/structure/disposalpipe/segment, /turf/open/floor/mainship/black{ dir = 4 }, @@ -22263,6 +22120,13 @@ /obj/structure/rack, /turf/open/floor/plating, /area/mainship/squads/req) +"smQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/disposalpipe/segment, +/obj/docking_port/stationary/marine_dropship/crash_target, +/turf/open/floor/mainship/sterile/dark, +/area/mainship/medical/lower_medical) "snb" = ( /obj/effect/landmark/start/latejoin, /turf/open/floor/mainship/black{ @@ -22407,6 +22271,20 @@ /obj/structure/ship_ammo/cas/rocket/keeper, /turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) +"suD" = ( +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/mainship/orange, +/area/mainship/living/tankerbunks) "suO" = ( /obj/machinery/door/airlock/mainship/command/CPToffice{ dir = 2 @@ -22422,6 +22300,17 @@ }, /turf/open/floor/mainship/floor, /area/mainship/living/commandbunks) +"svj" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/mainship/orange{ + dir = 1 + }, +/area/mainship/living/tankerbunks) "svI" = ( /obj/machinery/loadout_vendor, /turf/open/floor/mainship/sterile/purple, @@ -22638,13 +22527,14 @@ }, /area/mainship/hallways/hangar) "sIO" = ( -/obj/structure/window/framed/mainship, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/mainship{ dir = 2 }, +/obj/structure/cable, +/obj/structure/window/framed/mainship, /turf/open/floor/mainship/floor, /area/mainship/living/pilotbunks) "sIR" = ( @@ -22848,6 +22738,7 @@ "sUB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable, /turf/open/floor/mainship/black{ dir = 1 }, @@ -23180,8 +23071,6 @@ /turf/open/floor/plating, /area/mainship/hull/starboard_hull) "tqd" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/window/framed/mainship, /obj/machinery/door/firedoor/mainship{ dir = 2 @@ -23232,13 +23121,6 @@ dir = 1 }, /area/mainship/living/evacuation) -"trQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/hallways/starboard_hallway) "tsI" = ( /obj/machinery/door/poddoor/mainship/ammo{ dir = 2; @@ -23255,19 +23137,13 @@ /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/hangar) "tsS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/light/mainship, +/turf/open/floor/mainship/orange{ + dir = 1 }, -/turf/open/floor/mainship/floor, /area/mainship/living/tankerbunks) "ttg" = ( /obj/machinery/camera/autoname/mainship{ @@ -23581,7 +23457,7 @@ "tFh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/effect/ai_node, /turf/open/floor/mainship/orange{ dir = 8 @@ -23624,7 +23500,7 @@ /area/mainship/living/grunt_rnr) "tIN" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -23809,21 +23685,6 @@ }, /turf/open/floor/grass, /area/mainship/living/starboard_garden) -"tRk" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/mainship/floor, -/area/mainship/living/tankerbunks) "tRx" = ( /obj/structure/table/mainship/nometal, /obj/machinery/chem_dispenser/beer{ @@ -23948,6 +23809,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 8 }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 + }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "uab" = ( @@ -24097,9 +23961,21 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 10 }, -/obj/machinery/vending/engivend, +/obj/structure/closet/secure_closet/engineering_welding, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/disposalpipe/segment/corner, /obj/structure/cable, -/turf/open/floor/mainship/floor, +/obj/machinery/light/mainship{ + dir = 4 + }, +/turf/open/floor/mainship/orange/corner{ + dir = 8 + }, /area/mainship/living/tankerbunks) "uhS" = ( /obj/effect/turf_decal/warning_stripes/thick{ @@ -24370,25 +24246,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/ntlogo/nt3, /area/mainship/medical/upper_medical) -"usx" = ( -/obj/effect/decal/cleanable/blood/oil{ - name = "grease"; - pixel_x = -7 - }, -/turf/open/floor/plating, -/area/mainship/living/tankerbunks) "usI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/floor, /area/mainship/command/airoom) -"utM" = ( -/obj/structure/cable, -/turf/open/floor/mainship/orange{ - dir = 1 - }, -/area/mainship/hallways/hangar/flight_control) "uub" = ( /obj/machinery/door/airlock/mainship/research{ dir = 2 @@ -24398,7 +24261,6 @@ /obj/machinery/door/firedoor{ dir = 1 }, -/obj/effect/ai_node, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) "uud" = ( @@ -24444,15 +24306,12 @@ /turf/open/floor/plating, /area/mainship/living/evacuation) "uvX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, -/obj/machinery/camera/autoname/mainship{ +/turf/open/floor/mainship/orange{ dir = 4 }, -/turf/open/floor/mainship/floor, /area/mainship/living/tankerbunks) "uwN" = ( /obj/structure/cable, @@ -24679,7 +24538,7 @@ "uEC" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/effect/ai_node, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) @@ -25206,12 +25065,6 @@ /obj/structure/window/framed/mainship, /turf/open/floor/mainship/floor, /area/mainship/shipboard/brig_cells) -"vcI" = ( -/obj/structure/disposalpipe/segment/corner{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar/flight_control) "vdi" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/mainship/sterile/corner{ @@ -25504,10 +25357,13 @@ /turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) "vnZ" = ( -/obj/machinery/door/poddoor/mainship/mech, /obj/machinery/door/firedoor/mainship{ dir = 8 }, +/obj/machinery/door/poddoor/mainship/mech{ + name = "Vehicle Bay Shutters"; + id = "vehicle_shutters" + }, /turf/open/floor/mainship/mono, /area/mainship/living/tankerbunks) "vol" = ( @@ -25695,13 +25551,18 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "vvS" = ( -/obj/structure/rack, -/obj/item/tool/crowbar, -/obj/effect/spawner/random/engineering/toolbox, -/obj/item/stack/cable_coil, /obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable, -/turf/open/floor/mainship/floor, +/turf/open/floor/plating/plating_catwalk, /area/mainship/living/tankerbunks) "vwt" = ( /obj/structure/rack, @@ -26087,9 +25948,14 @@ /turf/open/floor/mainship/floor, /area/mainship/command/cic) "vMS" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/visible/layer1, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, -/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/obj/structure/disposalpipe/junction/flipped, /turf/open/floor/plating/plating_catwalk, /area/mainship/living/pilotbunks) "vNz" = ( @@ -26938,7 +26804,7 @@ /turf/open/floor/mainship/floor, /area/mainship/engineering/starboard_atmos) "wzR" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -26959,16 +26825,6 @@ dir = 1 }, /area/mainship/hallways/port_ert) -"wAA" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar/flight_control) "wAE" = ( /obj/structure/bed/chair{ dir = 8 @@ -27036,7 +26892,7 @@ /area/mainship/shipboard/brig) "wCN" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/disposalpipe/junction{ dir = 8 @@ -27150,15 +27006,17 @@ }, /area/mainship/command/cic) "wGl" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ +/obj/effect/ai_node, +/obj/machinery/light/mainship{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/hallways/hangar/flight_control) +/turf/open/floor/mainship/orange{ + dir = 8 + }, +/area/mainship/living/tankerbunks) "wGu" = ( /obj/machinery/crema_switch{ id = 2; @@ -27241,7 +27099,7 @@ /area/mainship/living/cryo_cells) "wJE" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plating, /area/mainship/medical/medical_science) @@ -27368,7 +27226,7 @@ /area/mainship/medical/lower_medical) "wOQ" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 4 @@ -27452,15 +27310,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/mainship/floor, /area/mainship/hallways/port_ert) -"wTx" = ( -/obj/machinery/vending/coffee, -/obj/machinery/camera/autoname/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/orange{ - dir = 1 - }, -/area/mainship/hallways/hangar/flight_control) "wTK" = ( /obj/machinery/bot/roomba, /turf/open/floor/mainship/red{ @@ -27527,7 +27376,7 @@ "wXK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold4w/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/starboard_hallway) @@ -27611,7 +27460,7 @@ "xdD" = ( /obj/structure/dropship_equipment/shuttle/weapon_holder/machinegun, /turf/open/floor/mainship/orange{ - dir = 8 + dir = 9 }, /area/mainship/hallways/hangar) "xem" = ( @@ -27621,7 +27470,7 @@ "xen" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/mainship/floor, /area/mainship/hallways/starboard_hallway) "xez" = ( @@ -27675,9 +27524,10 @@ }, /area/mainship/squads/general) "xgg" = ( -/obj/structure/cable, +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/camera/autoname/mainship, /turf/open/floor/mainship/orange, -/area/mainship/hallways/hangar/flight_control) +/area/mainship/living/tankerbunks) "xgp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -27856,7 +27706,7 @@ /area/mainship/medical/medical_science) "xop" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold4w/supply/visible/layer1, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /obj/structure/disposalpipe/segment, /turf/open/floor/mainship/sterile/side{ @@ -28001,12 +27851,6 @@ "xwJ" = ( /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) -"xwR" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/plating, -/area/mainship/living/tankerbunks) "xwV" = ( /obj/structure/rack, /obj/structure/ob_ammo/warhead/incendiary, @@ -28116,14 +27960,6 @@ /obj/machinery/self_destruct/console, /turf/open/floor/mainship/tcomms, /area/mainship/command/self_destruct) -"xCm" = ( -/obj/structure/window/framed/mainship, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor/mainship, -/turf/open/floor/mainship/floor, -/area/mainship/living/tankerbunks) "xCr" = ( /obj/machinery/camera/autoname/mainship{ dir = 1 @@ -28399,12 +28235,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/port_hull) -"xOi" = ( -/obj/structure/cable, -/turf/open/floor/mainship/orange{ - dir = 8 - }, -/area/mainship/living/pilotbunks) "xOn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ @@ -28931,6 +28761,19 @@ dir = 1 }, /area/mainship/command/cic) +"ylE" = ( +/obj/machinery/door/firedoor/mainship{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/window/framed/mainship, +/turf/open/floor/mainship/floor, +/area/mainship/living/pilotbunks) "ylH" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/grass, @@ -34208,7 +34051,7 @@ goY uEC kse eUB -ozH +eRd ukp owW mZd @@ -34485,7 +34328,7 @@ sMT yeb kMa xop -nNN +smQ tqM nNN cSO @@ -37046,7 +36889,7 @@ cpj cpj cpj cpj -cpj +jja cpj fEb xlZ @@ -37440,14 +37283,14 @@ ixI ixI ixI ixI -ixI +aib ixI ffD ixI ixI ixI -aib -ixI +nfy +etD ixI nDC oJJ @@ -37540,19 +37383,19 @@ oUe vtz qEX nHc +vSg +tys +kpw +tys +sWV uGv tys tys +aGN tys -sWV -cWw -vSg -fHP -kpw tys -uGv +lGy lWW -nHc eUr sdU uEz @@ -37640,19 +37483,19 @@ poV ssO cVV xPo -jiF -lmo -nLY -nLY +cVV +mrs +eiz +bMa nLY bMa -iro eiz mrs -mNP +fUa +vnZ hAQ vnZ -eiz +fej eiz mrs nnu @@ -37743,17 +37586,17 @@ hIO hFf vtz kEL -iro +eiz hCq dxr bpv -cHG +qVG iro phV -pFg +qVG qVG dyl -qjY +uvX uvX jKk eOG @@ -37845,16 +37688,16 @@ orq oUe vtz van -iro +eiz kmn -hgl -hgl -hIQ -iro +iQF +iQF +iQF +nWn kKd iQF iQF -xwR +iQF iQF iQF tsS @@ -37947,16 +37790,16 @@ orq oUe vtz dBe -iro +eiz bKM -vcI -iva -eMA -iro -kJT -usx +mmP +bzN +mmP +svj +mXC +iQF +iQF iQF -oCX iQF iQF sbi @@ -38049,22 +37892,22 @@ orq oUe vtz fRR -nyG +eiz xgg -gdx -oaN -wTx -iro +rOU +iQF +rOU +dyw ptK iQF -mmP iQF -mmP -dEY +iQF +iQF +iQF iua tqd -trQ -wOQ +nnu +kDg pnh eQh jLZ @@ -38149,21 +37992,21 @@ mQp mQp weJ oUe -xqh -vjQ -nTZ -rcX +vtz +fRR +eiz +ahs kPm -wAA -nmW -iro -vvS iQF -rOU iQF -rOU -bzN -tRk +fHe +suD +iQF +iQF +iQF +iQF +iQF +ndO eiz wIF wNT @@ -38252,20 +38095,20 @@ hul tsI bca beP -cPM -nyG +fRR +eiz gvu -gdS -inL +iQF +iQF rjM -iro -iRF +cGW +vvS +iQF +iQF iQF -bFa -pfx -aro iQF -tRk +iQF +tsS eOG dNX kDg @@ -38353,14 +38196,14 @@ nPa nPa igO oUe -wXN +jDg fRR qIa iHE -gdx +qXu wGl -aoX -iro +qXu +mvD ugZ pNb mUj @@ -38455,21 +38298,21 @@ pef sIN orq oUe -vtz -fRR -nyG -iHE -gdx -wGl -aKV -lmo +khM +kEL +eiz pya +lNL pya -nSU -eiz lNL pya -xCm +pya +pya +lNL +dDu +lNL +pya +pya mrs nnu kDg @@ -38557,23 +38400,23 @@ geW fZU orq oUe -vtz +khM fRR -iro +cGx qIr -nSL -wGl -utM -cKm -fKK iCP -cWK +fhU +iCP +iCP +fhU +iCP +iCP fBI -mkw +iCP iCP osB -kHL -qyy +cGx +dNX kDg pnh eQh @@ -38659,23 +38502,23 @@ sIT gis orq oUe -vtz -van -iro +oLd +mPT +ylE bfZ -qRL -cef -qSV -nDU -jCj -pEn +eVP +eVP +eVP +eVP +eVP +eVP eVP rzu vMS rXs eYK sIO -for +qSb hlj pnh eQh @@ -38761,20 +38604,20 @@ mQp qUh hIO hFf -vtz -kEL -iro +wXN +fRR +cGx fZg -lyb -pfr +ggB +ggB gXF -ckG -ahj -esT -xOi +gpD +ggB +ggB +ggB gpD cza -esT +ggB hnH cGx dNX @@ -38865,13 +38708,13 @@ ssO cVV xPo cVV -lmo +lXb qeB qeB qeB qeB -lmo -heV +lXb +cBC cBC vXt xMD @@ -38974,7 +38817,7 @@ tEM psG xMD jZO -fhU +arc sfd lCp qjy diff --git a/_maps/map_files/Fort_Phobos/Fort_Phobos.dmm b/_maps/map_files/Fort_Phobos/Fort_Phobos.dmm index 7f1eb902de65e..b368b7e7dc1ab 100644 --- a/_maps/map_files/Fort_Phobos/Fort_Phobos.dmm +++ b/_maps/map_files/Fort_Phobos/Fort_Phobos.dmm @@ -266,6 +266,15 @@ dir = 8 }, /area/mainship/patrol_base/som/hanger) +"cT" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood/oil/armorblood, +/turf/open/floor/mainship/red{ + dir = 4 + }, +/area/mainship/patrol_base/som/hanger) "cY" = ( /obj/machinery/light{ dir = 1 @@ -409,6 +418,12 @@ /obj/structure/bed/chair/dropship/passenger, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/som/hanger) +"ew" = ( +/obj/structure/bed/chair/nometal{ + dir = 4 + }, +/turf/open/floor/mainship/purple/full, +/area/mainship/patrol_base/som/prep) "ey" = ( /obj/machinery/shower{ dir = 8 @@ -516,6 +531,9 @@ /turf/closed/shuttle/dropship2/window, /area/mainship/patrol_base/som) "gk" = ( +/obj/structure/bed/chair/nometal{ + dir = 8 + }, /turf/open/floor/mainship/green/full, /area/mainship/patrol_base/som/prep) "gl" = ( @@ -854,10 +872,10 @@ /turf/open/floor/mainship_hull/gray, /area/mainship/patrol_base/som) "kH" = ( -/obj/structure/prop/brokenvendor/brokenuniformvendor, /obj/machinery/camera/autoname/mainship/somship{ dir = 4 }, +/obj/structure/table/mainship/nometal, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/som/prep) "kN" = ( @@ -985,6 +1003,7 @@ "mt" = ( /obj/effect/landmark/reward_spawn_location/som, /obj/effect/turf_decal/warning_stripes/box/empty, +/obj/structure/closet/crate, /turf/open/floor/plating/ground/concrete, /area/mainship/patrol_base/som) "mB" = ( @@ -1091,7 +1110,7 @@ /turf/open/floor/mainship/som/nw, /area/mainship/patrol_base/som/barracks) "nQ" = ( -/obj/structure/prop/brokenvendor/brokenuniformvendor, +/obj/structure/table/mainship/nometal, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/som/prep) "nR" = ( @@ -1225,6 +1244,10 @@ dir = 8 }, /area/mainship/patrol_base/som/hanger) +"pN" = ( +/obj/structure/closet/crate, +/turf/open/floor/plating/ground/concrete, +/area/mainship/patrol_base/som) "pR" = ( /obj/structure/benchpress, /turf/open/floor/plating/ground/concrete, @@ -1356,8 +1379,15 @@ /turf/open/floor/freezer, /area/mainship/patrol_base/som/barracks) "qB" = ( +/obj/structure/bed/chair/nometal{ + dir = 8 + }, /turf/open/floor/mainship/purple/full, /area/mainship/patrol_base/som/prep) +"qI" = ( +/obj/effect/decal/cleanable/blood/oil/streak, +/turf/open/floor/mainship_hull/gray, +/area/mainship/patrol_base/som/hanger) "qJ" = ( /obj/structure/table/black, /obj/machinery/prop/computer/communications, @@ -1416,6 +1446,13 @@ "rE" = ( /turf/open/floor/plating/ground/concrete, /area/mainship/patrol_base/som/barracks) +"rG" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/vending/engivend, +/turf/open/floor/plating/ground/concrete, +/area/mainship/patrol_base/som) "rI" = ( /obj/effect/decal/cleanable/blood/oil/streak{ dir = 8 @@ -1519,6 +1556,12 @@ "tc" = ( /turf/open/floor/mainship/red/corner, /area/mainship/patrol_base/som/prep) +"tf" = ( +/obj/structure/bed/chair/nometal{ + dir = 4 + }, +/turf/open/floor/mainship/orange/full, +/area/mainship/patrol_base/som/prep) "tj" = ( /obj/machinery/light{ dir = 4 @@ -2076,6 +2119,14 @@ }, /turf/open/floor/plating/ground/concrete, /area/mainship/patrol_base/som) +"yP" = ( +/obj/structure/bed/chair/nometal{ + dir = 8 + }, +/turf/open/floor/mainship/red{ + dir = 1 + }, +/area/mainship/patrol_base/som/prep) "yY" = ( /turf/closed/mineral/smooth/indestructible, /area/mainship/patrol_base/som/barracks) @@ -2188,6 +2239,12 @@ /obj/effect/turf_decal/warning_stripes/thick/autosmooth, /turf/open/floor/plating/ground/concrete, /area/mainship/patrol_base/som) +"Ab" = ( +/obj/structure/bed/chair/nometal{ + dir = 4 + }, +/turf/open/floor/mainship/green/full, +/area/mainship/patrol_base/som/prep) "Ac" = ( /turf/open/floor/mainship/white/corner{ dir = 4 @@ -2201,6 +2258,10 @@ dir = 4 }, /area/mainship/patrol_base/som/barracks) +"Ai" = ( +/obj/vehicle/ridden/powerloader, +/turf/open/floor/plating/ground/concrete, +/area/mainship/patrol_base/som) "Ap" = ( /turf/closed/wall/r_wall/unmeltable, /area/mainship/patrol_base/som) @@ -2415,6 +2476,12 @@ }, /turf/open/floor/mainship/office, /area/mainship/patrol_base/som/prep) +"CJ" = ( +/obj/structure/bed/chair/nometal{ + dir = 4 + }, +/turf/open/floor/mainship/blue/full, +/area/mainship/patrol_base/som/prep) "CK" = ( /obj/effect/turf_decal/trimline/blue/line{ dir = 8 @@ -2593,6 +2660,12 @@ dir = 8 }, /area/mainship/patrol_base/som) +"Eq" = ( +/obj/effect/decal/cleanable/blood/oil/armorblood{ + dir = 8 + }, +/turf/open/floor/mainship_hull/gray, +/area/mainship/patrol_base/som/hanger) "Es" = ( /obj/effect/turf_decal/siding{ dir = 1 @@ -2710,6 +2783,9 @@ /turf/open/floor/mainship/office, /area/mainship/patrol_base/som/prep) "FK" = ( +/obj/structure/bed/chair/nometal{ + dir = 8 + }, /turf/open/floor/mainship/orange/full, /area/mainship/patrol_base/som/prep) "FR" = ( @@ -3008,6 +3084,10 @@ dir = 4 }, /area/mainship/patrol_base/som/barracks) +"Jy" = ( +/obj/machinery/vending/coffee, +/turf/open/floor/mainship/red, +/area/mainship/patrol_base/som/prep) "JA" = ( /obj/effect/turf_decal/trimline/blue/arrow_cw{ dir = 8 @@ -3185,6 +3265,12 @@ dir = 1 }, /area/mainship/patrol_base/som) +"LN" = ( +/obj/effect/decal/cleanable/blood/oil/armorblood{ + dir = 4 + }, +/turf/open/floor/mainship_hull/gray, +/area/mainship/patrol_base/som/hanger) "LR" = ( /obj/structure/stairs/seamless/platform{ dir = 8 @@ -3295,10 +3381,10 @@ /turf/open/floor/mainship/blue/full, /area/mainship/patrol_base/som/prep) "MZ" = ( -/obj/structure/prop/brokenvendor/brokenuniformvendor, /obj/machinery/camera/autoname/mainship/somship{ dir = 8 }, +/obj/structure/table/mainship/nometal, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/som/prep) "Nd" = ( @@ -3500,6 +3586,12 @@ /obj/structure/largecrate/supply/weapons, /turf/open/floor/plating/ground/concrete/lines, /area/mainship/patrol_base/som) +"OO" = ( +/obj/effect/decal/cleanable/blood/oil/streak{ + dir = 8 + }, +/turf/open/floor/mainship_hull/gray, +/area/mainship/patrol_base/som/hanger) "OP" = ( /turf/closed/shuttle/dropship2/wallthree, /area/mainship/patrol_base/som) @@ -3608,6 +3700,12 @@ }, /turf/open/shuttle/dropship/seven, /area/mainship/patrol_base/som) +"PM" = ( +/obj/effect/decal/cleanable/blood/oil/armorblood{ + dir = 8 + }, +/turf/open/floor/plating/ground/concrete, +/area/mainship/patrol_base/som/hanger) "PS" = ( /obj/effect/turf_decal/trimline/blue/line{ dir = 8 @@ -3615,6 +3713,9 @@ /turf/open/floor/mainship/office, /area/mainship/patrol_base/som/prep) "PZ" = ( +/obj/structure/bed/chair/nometal{ + dir = 8 + }, /turf/open/floor/mainship/blue/full, /area/mainship/patrol_base/som/prep) "Qg" = ( @@ -3835,10 +3936,10 @@ /turf/open/floor/wood, /area/mainship/patrol_base/som/barracks) "SZ" = ( -/obj/structure/prop/brokenvendor/brokenuniformvendor, /obj/machinery/light{ dir = 4 }, +/obj/structure/table/mainship/nometal, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/som/prep) "Ta" = ( @@ -4317,10 +4418,10 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/som) "Yt" = ( -/obj/structure/prop/brokenvendor/brokenuniformvendor, /obj/machinery/light{ dir = 8 }, +/obj/structure/table/mainship/nometal, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/som/prep) "Yy" = ( @@ -6075,7 +6176,7 @@ ua Ud Yy Yy -Yy +OO Yy Yy Yy @@ -6195,10 +6296,10 @@ Iu ua ua Ud +Eq +qI Yy -Yy -Yy -Yy +LN Yy Yy Iu @@ -7776,7 +7877,7 @@ iY ei ei GV -Yy +Eq Iu ua ua @@ -8132,7 +8233,7 @@ QC TA Rq bk -Rq +PM AU kY kY @@ -8375,7 +8476,7 @@ an St zF RN -tj +cT NA NA NA @@ -9858,7 +9959,7 @@ Aw Aw Aw BG -nQ +gS kH Yt MJ @@ -9983,7 +10084,7 @@ Uz la FK FK -bF +yP hX ye gS @@ -10347,8 +10448,8 @@ ac Aw Uz Bd -FK -FK +tf +tf bF vd PH @@ -10468,7 +10569,7 @@ sx LF mt BG -nQ +gS nQ nQ PK @@ -10590,12 +10691,12 @@ sx LF mt BG -nQ +gS nQ nQ PK JD -ye +Jy gS We Bo @@ -11079,8 +11180,8 @@ LF Aw cx lZ -qB -qB +ew +ew bF JD hX @@ -11200,7 +11301,7 @@ sB ve mt Sq -nQ +gS nQ nQ PK @@ -11322,7 +11423,7 @@ oA ac mt BG -nQ +gS nQ nQ PK @@ -11547,7 +11648,7 @@ Uk Uk Uk vz -zj +rG Aw Aw Aw @@ -11669,7 +11770,7 @@ Uk Uk Uk vz -Aw +pN Aw Aw Aw @@ -11811,8 +11912,8 @@ ac Aw Uz cG -PZ -PZ +CJ +CJ bF CH ki @@ -11932,7 +12033,7 @@ To LF mt BG -nQ +gS nQ nQ PK @@ -12035,7 +12136,7 @@ Uk Uk Uk vz -Aw +pN Aw Aw Aw @@ -12054,12 +12155,12 @@ To LF mt BG -nQ +gS nQ nQ uh CH -ye +Jy gS We Bo @@ -12279,7 +12380,7 @@ Uk Uk Uk vz -Aw +Ai Aw Aw Aw @@ -12543,8 +12644,8 @@ Aw Aw Uz yg -gk -gk +Ab +Ab bF tc Yl @@ -12664,7 +12765,7 @@ Aw Aw Aw BG -nQ +gS MZ SZ qg diff --git a/_maps/map_files/Iteron/Iteron.dmm b/_maps/map_files/Iteron/Iteron.dmm index 90503ef472bac..5909e0e067cdb 100644 --- a/_maps/map_files/Iteron/Iteron.dmm +++ b/_maps/map_files/Iteron/Iteron.dmm @@ -8,6 +8,10 @@ }, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/hanger) +"an" = ( +/obj/structure/reagent_dispensers/fueltank/barrel, +/turf/open/floor/plating, +/area/mainship/patrol_base/hanger) "ao" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 6 @@ -31,16 +35,10 @@ dir = 1 }, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 + dir = 6 }, /turf/open/floor/prison/plate, /area/mainship/patrol_base) -"aJ" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/orange, -/area/mainship/patrol_base) "aL" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 10 @@ -59,11 +57,17 @@ }, /area/space) "aU" = ( -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/machinery/photocopier, +/turf/open/floor/mainship/blue{ dir = 4 }, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base/hanger) +/area/mainship/patrol_base) +"aX" = ( +/obj/structure/bed/chair/nometal{ + dir = 4 + }, +/turf/open/floor/mainship/blue, +/area/mainship/patrol_base/prep) "ba" = ( /turf/open/floor/plating, /area/mainship/patrol_base/hanger) @@ -74,52 +78,56 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) "bi" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 +/obj/structure/dropship_piece/tadpole/tadpole_nose/right{ + dir = 1; + pixel_y = 32 }, -/turf/open/floor/plating, -/area/mainship/patrol_base/hanger) -"bm" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 +/obj/structure/dropship_piece/tadpole/cockpit/right{ + dir = 1 }, /turf/open/floor/plating, /area/mainship/patrol_base/hanger) "bo" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 +/obj/structure/dropship_piece/two/weapon/rightright{ + dir = 1; + pixel_y = 32 + }, +/obj/effect/attach_point/weapon/minidropship{ + equipment_offset_y = 25 + }, +/obj/structure/dropship_piece/tadpole/engine{ + dir = 1; + pixel_x = 23 + }, +/turf/closed/shuttle/dropship2/rearcorner{ + dir = 1 }, -/turf/open/floor/prison/plate, /area/mainship/patrol_base/hanger) "bu" = ( /turf/closed/wall/mainship/outer/reinforced, /area/mainship/patrol_base) "bG" = ( -/obj/structure/drop_pod_launcher/supply, -/obj/structure/droppod/nonmob/supply_pod, -/turf/open/floor/prison/cleanmarked, -/area/mainship/patrol_base/hanger) -"bH" = ( -/obj/structure/closet/crate/bravo, -/obj/structure/closet/crate/bravo, -/obj/structure/closet/crate/bravo, -/obj/structure/closet/crate/bravo, -/obj/structure/closet/crate/bravo, -/obj/structure/closet/crate/bravo, -/obj/structure/closet/crate/bravo, -/obj/structure/closet/crate/bravo, -/turf/open/floor/prison/plate, +/obj/structure/largecrate, +/turf/open/floor/mainship/orange{ + dir = 5 + }, /area/mainship/patrol_base) -"bI" = ( +"bH" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, -/obj/machinery/light/mainship{ - dir = 1 +/turf/open/floor/plating, +/area/mainship/patrol_base/hanger) +"bI" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 }, /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, +/obj/machinery/light/mainship{ + dir = 1 + }, /turf/open/floor/prison/arrow/clean{ dir = 8 }, @@ -139,6 +147,7 @@ /obj/machinery/light/mainship{ dir = 1 }, +/obj/machinery/vending/nanomed, /turf/open/floor/prison/arrow/clean{ dir = 8 }, @@ -153,9 +162,9 @@ /obj/machinery/light/mainship{ dir = 1 }, -/obj/machinery/vending/nanomed, +/obj/item/radio/intercom/general, /turf/open/floor/prison/arrow/clean{ - dir = 8 + dir = 4 }, /area/mainship/patrol_base/hanger) "bX" = ( @@ -168,24 +177,15 @@ /obj/machinery/light/mainship{ dir = 1 }, -/obj/item/radio/intercom/general, /turf/open/floor/prison/arrow/clean{ dir = 4 }, /area/mainship/patrol_base/hanger) "bZ" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/machinery/light/mainship{ - dir = 1 - }, -/turf/open/floor/prison/arrow/clean{ - dir = 4 - }, +/obj/structure/droppod, +/obj/structure/drop_pod_launcher, +/obj/machinery/camera/autoname/mainship, +/turf/open/floor/prison/cleanmarked, /area/mainship/patrol_base/hanger) "cc" = ( /obj/structure/window/framed/mainship/hull, @@ -212,15 +212,16 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/barracks) "ct" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 +/obj/structure/prop/mainship/mission_planning_system, +/turf/open/floor/mainship/blue{ + dir = 6 }, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base/hanger) -"cF" = ( +/area/mainship/patrol_base) +"cG" = ( +/obj/structure/window/framed/mainship/hull, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/prep) +"cI" = ( /obj/structure/dropship_piece/tadpole/tadpole_nose/left{ dir = 1; pixel_y = 32 @@ -230,126 +231,70 @@ }, /turf/open/floor/plating, /area/mainship/patrol_base/hanger) -"cG" = ( -/obj/structure/dropship_piece/tadpole/tadpole_nose{ - dir = 1; - pixel_y = 32 - }, -/turf/closed/shuttle/dropship2/singlewindow{ - dir = 1 +"cQ" = ( +/obj/effect/attach_point/crew_weapon/minidropship, +/obj/machinery/door/poddoor/mainship/open{ + id = "minidropship_podlock" }, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base/hanger) -"cI" = ( -/obj/structure/dropship_piece/tadpole/tadpole_nose/right{ - dir = 1; - pixel_y = 32 +"da" = ( +/obj/structure/dropship_piece/tadpole/rearright{ + dir = 1 }, -/obj/structure/dropship_piece/tadpole/cockpit/right{ +/obj/structure/dropship_piece/tadpole/rearright{ dir = 1 }, /turf/open/floor/plating, /area/mainship/patrol_base/hanger) -"da" = ( +"dc" = ( /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base/hanger) -"db" = ( -/obj/structure/reagent_dispensers/fueltank/barrel, -/turf/open/floor/mainship/orange{ - dir = 9 +/turf/open/floor/mainship/purple{ + dir = 4 }, -/area/mainship/patrol_base) -"dc" = ( -/obj/effect/landmark/reward_spawn_location, -/obj/effect/turf_decal/warning_stripes/box/empty, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base) +/area/mainship/patrol_base/prep) "do" = ( +/obj/machinery/telecomms/relay/preset/telecomms, /turf/open/floor/mainship/orange{ - dir = 1 + dir = 9 }, /area/mainship/patrol_base) -"du" = ( +"dC" = ( /obj/structure/largecrate/packed, /turf/open/floor/mainship/orange{ dir = 1 }, /area/mainship/patrol_base) -"dw" = ( -/obj/structure/sign/directions/supply{ - dir = 1 - }, -/turf/closed/wall/mainship/outer/reinforced, -/area/mainship/patrol_base/prep) -"dC" = ( -/obj/structure/largecrate, -/turf/open/floor/mainship/orange{ - dir = 5 - }, -/area/mainship/patrol_base) "dE" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/prison/arrow/clean{ - dir = 8 - }, +/obj/structure/drop_pod_launcher/sentry, +/obj/structure/droppod/nonmob/turret_pod, +/turf/open/floor/prison/cleanmarked, /area/mainship/patrol_base/hanger) "dL" = ( -/obj/machinery/vending/mech_vendor, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 +/turf/open/floor/mainship/green{ + dir = 6 }, -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/prison/plate, /area/mainship/patrol_base) "dP" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/turf/open/floor/prison/arrow/clean{ - dir = 4 - }, -/area/mainship/patrol_base/hanger) -"dT" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 +/obj/structure/dropship_piece/tadpole/tadpole_nose{ + dir = 1; + pixel_y = 32 }, -/turf/open/floor/prison/arrow/clean{ - dir = 4 +/turf/closed/shuttle/dropship2/singlewindow{ + dir = 1 }, /area/mainship/patrol_base/hanger) "dU" = ( -/obj/effect/turf_decal/warning_stripes/box/arrow{ - dir = 4 - }, -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/patrol_base) -"dW" = ( -/obj/machinery/telecomms/relay/preset/telecomms, +/obj/machinery/camera/autoname/mainship, /turf/open/floor/mainship/orange{ - dir = 9 + dir = 1 }, /area/mainship/patrol_base) "dX" = ( /turf/open/floor/mainship/orange{ - dir = 5 + dir = 1 }, /area/mainship/patrol_base) "dY" = ( @@ -382,23 +327,30 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/barracks) "ec" = ( -/obj/structure/shuttle/engine/heater{ +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, -/turf/open/floor/mainship_hull/gray/dir{ +/turf/open/floor/prison/arrow/clean{ dir = 4 }, -/area/space) +/area/mainship/patrol_base/hanger) "ef" = ( /turf/open/space/basic, /area/space) "eo" = ( -/obj/structure/shuttle/engine/propulsion/burst/right{ +/obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/turf/open/floor/prison/arrow/clean{ + dir = 4 + }, +/area/mainship/patrol_base/hanger) "eu" = ( /turf/open/floor/mainship_hull/gray/dir{ dir = 8 @@ -407,15 +359,6 @@ "ev" = ( /turf/closed/wall/mainship/outer/reinforced, /area/mainship/patrol_base/command) -"ey" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/machinery/camera/autoname/mainship{ - dir = 8 - }, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base/hanger) "eA" = ( /obj/structure/window/framed/mainship/hull, /turf/open/floor/mainship/mono, @@ -428,10 +371,14 @@ /turf/closed/wall/mainship/outer/reinforced, /area/mainship/patrol_base/prep) "eN" = ( -/obj/structure/window/framed/mainship/hull, -/turf/open/floor/mainship/mono, +/obj/structure/bed/chair/nometal{ + dir = 4 + }, +/turf/open/floor/mainship/red{ + dir = 1 + }, /area/mainship/patrol_base/prep) -"eP" = ( +"ff" = ( /obj/structure/dropship_piece/two/weapon/leftleft{ dir = 1; pixel_y = 32 @@ -447,52 +394,18 @@ dir = 1 }, /area/mainship/patrol_base/hanger) -"eW" = ( -/turf/closed/shuttle/dropship2/glassone{ - dir = 1 - }, -/area/mainship/patrol_base/hanger) -"ff" = ( +"fk" = ( /obj/machinery/prop/computer/tadpole, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) -"fj" = ( -/turf/closed/shuttle/dropship2/glasstwo{ - dir = 1 - }, -/area/mainship/patrol_base/hanger) -"fk" = ( -/obj/structure/dropship_piece/two/weapon/rightright{ - dir = 1; - pixel_y = 32 - }, -/obj/effect/attach_point/weapon/minidropship{ - equipment_offset_y = 25 - }, -/obj/structure/dropship_piece/tadpole/engine{ - dir = 1; - pixel_x = 23 - }, -/turf/closed/shuttle/dropship2/rearcorner{ - dir = 1 - }, -/area/mainship/patrol_base/hanger) -"fq" = ( -/obj/structure/largecrate/random/barrel, -/obj/machinery/light{ - dir = 8 - }, +"fz" = ( /turf/open/floor/mainship/orange{ - dir = 8 + dir = 5 }, /area/mainship/patrol_base) -"fz" = ( -/obj/structure/reagent_dispensers/fueltank/barrel, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base) "fA" = ( /obj/effect/turf_decal/warning_stripes/thin, -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/effect/turf_decal/warning_stripes/box/arrow{ dir = 1 }, /turf/open/floor/prison/plate, @@ -501,45 +414,53 @@ /turf/open/floor/prison/plate, /area/mainship/patrol_base) "fI" = ( -/obj/structure/sign/pods, -/turf/open/floor/mainship/black, -/area/mainship/patrol_base) -"fL" = ( -/obj/structure/prop/mainship/prop_tech{ +/obj/structure/shuttle/engine/heater{ dir = 4 }, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base) -"fP" = ( -/obj/structure/largecrate, -/obj/machinery/light{ +/turf/open/floor/mainship_hull/gray/dir{ dir = 4 }, -/turf/open/floor/mainship/orange{ +/area/space) +"fL" = ( +/obj/structure/shuttle/engine/propulsion/burst/right{ dir = 4 }, -/area/mainship/patrol_base) -"fT" = ( -/turf/open/floor/mainship/orange{ - dir = 8 +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"fP" = ( +/turf/open/floor/mainship/red{ + dir = 9 }, -/area/mainship/patrol_base) +/area/mainship/patrol_base/prep) +"fT" = ( +/obj/structure/drop_pod_launcher/supply, +/obj/structure/droppod/nonmob/supply_pod, +/turf/open/floor/prison/cleanmarked, +/area/mainship/patrol_base/hanger) "fV" = ( /turf/open/floor/mainship/mono, /area/mainship/patrol_base) "gb" = ( -/obj/machinery/power/smes/buildable/empty, -/turf/open/floor/mainship/orange{ - dir = 4 +/obj/structure/table/mainship/nometal, +/turf/open/floor/mainship/red{ + dir = 1 }, -/area/mainship/patrol_base) +/area/mainship/patrol_base/prep) "gc" = ( -/obj/structure/shuttle/engine/propulsion/burst{ - dir = 4 +/obj/structure/bed/chair/nometal{ + dir = 8 }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) +/turf/open/floor/mainship/red{ + dir = 1 + }, +/area/mainship/patrol_base/prep) +"gl" = ( +/obj/structure/ship_ammo/cas/rocket/napalm, +/turf/open/floor/mainship/orange{ + dir = 8 + }, +/area/mainship/patrol_base) "gx" = ( /obj/structure/bookcase, /turf/open/floor/mainship/mono, @@ -561,6 +482,19 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) +"gP" = ( +/obj/machinery/holopad{ + active_power_usage = 130; + desc = "It's a floor-mounted device for projecting holographic images. This one appears to have a larger lense."; + holo_range = 7; + name = "modfied holopad" + }, +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/hanger) "gQ" = ( /obj/structure/bed/nometal, /turf/open/floor/mainship/mono, @@ -605,12 +539,13 @@ /turf/open/floor/freezer, /area/mainship/patrol_base) "hm" = ( -/obj/effect/landmark/campaign/mech_spawner/heavy, -/obj/effect/turf_decal/warning_stripes/box/empty, +/obj/vehicle/ridden/powerloader, /turf/open/floor/prison/plate, /area/mainship/patrol_base) "hA" = ( -/turf/open/floor/mainship/black/corner, +/turf/open/floor/mainship/black/corner{ + dir = 8 + }, /area/mainship/patrol_base) "hI" = ( /obj/effect/landmark/start/job/squadcorpsman, @@ -621,85 +556,70 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/barracks) "hP" = ( -/obj/structure/prop/brokenvendor/brokenuniformvendor, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/red{ + dir = 8 + }, /area/mainship/patrol_base/prep) +"hR" = ( +/obj/machinery/light/mainship{ + dir = 1 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 + }, +/turf/open/floor/prison/bright_clean, +/area/mainship/patrol_base/hanger) "hX" = ( /obj/structure/table/mainship/nometal, /turf/open/floor/mainship/blue{ dir = 1 }, /area/mainship/patrol_base/command) -"hZ" = ( -/turf/open/floor/mainship/red{ - dir = 9 - }, -/area/mainship/patrol_base/prep) "ia" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/machinery/camera/autoname/mainship{ +/obj/machinery/light/mainship{ dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/prep) -"if" = ( /turf/open/floor/mainship/red{ - dir = 1 + dir = 5 }, /area/mainship/patrol_base/prep) -"ik" = ( -/turf/open/floor/mainship/red{ - dir = 5 +"ii" = ( +/turf/open/floor/mainship/orange{ + dir = 8 }, /area/mainship/patrol_base/prep) "il" = ( -/obj/structure/prop/brokenvendor/brokenuniformvendor, -/obj/machinery/light/mainship{ - dir = 1 +/turf/open/floor/mainship/red{ + dir = 4 }, -/turf/open/floor/mainship/mono, /area/mainship/patrol_base/prep) "im" = ( +/obj/machinery/light/mainship{ + dir = 1 + }, /turf/open/floor/mainship/purple{ dir = 9 }, /area/mainship/patrol_base/prep) -"in" = ( +"iv" = ( +/obj/structure/bed/chair/nometal{ + dir = 4 + }, /turf/open/floor/mainship/purple{ dir = 1 }, /area/mainship/patrol_base/prep) -"ir" = ( +"iy" = ( +/obj/structure/table/mainship/nometal, /turf/open/floor/mainship/purple{ - dir = 5 + dir = 1 }, /area/mainship/patrol_base/prep) -"iv" = ( +"iE" = ( +/obj/structure/table/mainship/nometal, +/turf/open/floor/mainship/blue, +/area/mainship/patrol_base/command) +"iF" = ( /obj/machinery/computer/security/marinemainship{ pixel_y = 18 }, @@ -708,7 +628,7 @@ dir = 9 }, /area/mainship/patrol_base) -"iy" = ( +"iG" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, @@ -716,24 +636,8 @@ dir = 1 }, /area/mainship/patrol_base) -"iE" = ( -/obj/structure/table/mainship/nometal, -/turf/open/floor/mainship/blue, -/area/mainship/patrol_base/command) -"iF" = ( -/obj/structure/prop/mainship/sensor_computer1, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base) -"iG" = ( -/obj/structure/prop/mainship/sensor_computer3, -/obj/machinery/camera/autoname/mainship, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base) "iI" = ( -/obj/structure/prop/mainship/sensor_computer2, +/obj/structure/prop/mainship/sensor_computer1, /obj/machinery/light{ dir = 1 }, @@ -744,66 +648,98 @@ dir = 1 }, /area/mainship/patrol_base) -"iN" = ( -/obj/structure/bed/chair/office/dark, -/obj/machinery/computer/security/marinemainship{ - pixel_y = 18 +"iL" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 }, -/turf/open/floor/mainship/blue{ - dir = 5 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 10 }, -/area/mainship/patrol_base) -"iV" = ( -/obj/machinery/door/poddoor/mainship/open{ - id = "minidropship_podlock" +/turf/open/floor/prison/arrow/clean{ + dir = 4 + }, +/area/mainship/patrol_base/hanger) +"iM" = ( +/obj/machinery/light/mainship, +/turf/open/floor/mainship/blue{ + dir = 10 }, +/area/mainship/patrol_base/prep) +"iN" = ( +/obj/structure/prop/mainship/sensor_computer2, /obj/machinery/light{ dir = 1 }, /turf/open/floor/mainship/mono, -/area/mainship/patrol_base/hanger) +/area/mainship/patrol_base) "iX" = ( /turf/open/floor/mainship/mono, /area/mainship/patrol_base/hanger) "iY" = ( -/obj/docking_port/mobile/marine_dropship/minidropship, -/obj/structure/bed/chair/dropship/pilot{ +/obj/machinery/door/poddoor/mainship/open{ + id = "minidropship_podlock" + }, +/obj/machinery/light{ dir = 1 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base/hanger) "iZ" = ( -/obj/structure/largecrate/random/barrel, -/turf/open/floor/mainship/orange{ +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/machinery/camera/autoname/mainship{ dir = 8 }, -/area/mainship/patrol_base) -"jk" = ( -/obj/structure/largecrate/random/case/double, /turf/open/floor/prison/plate, +/area/mainship/patrol_base/hanger) +"ja" = ( +/obj/structure/table/mainship/nometal, +/turf/open/floor/mainship/orange, +/area/mainship/patrol_base/prep) +"jk" = ( +/obj/structure/largecrate/random/barrel, +/turf/open/floor/mainship/orange{ + dir = 8 + }, /area/mainship/patrol_base) "jn" = ( -/obj/structure/largecrate, +/obj/structure/largecrate/random/case/double, /turf/open/floor/prison/plate, /area/mainship/patrol_base) "jq" = ( +/obj/structure/bed/chair/nometal{ + dir = 8 + }, +/turf/open/floor/mainship/purple{ + dir = 1 + }, +/area/mainship/patrol_base/prep) +"jr" = ( +/obj/structure/ship_ammo/cas/minirocket, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/mainship/orange{ + dir = 8 + }, +/area/mainship/patrol_base) +"js" = ( /obj/structure/largecrate, /turf/open/floor/mainship/orange{ dir = 4 }, /area/mainship/patrol_base) -"js" = ( -/obj/machinery/light/mainship{ +"jy" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/turf/open/floor/prison/arrow/clean{ dir = 8 }, -/obj/structure/drop_pod_launcher/mech, -/obj/structure/droppod/nonmob/mech_pod, -/turf/open/floor/prison/cleanmarked, -/area/mainship/patrol_base/hanger) -"jy" = ( -/obj/structure/drop_pod_launcher, -/obj/structure/droppod, -/turf/open/floor/prison/cleanmarked, /area/mainship/patrol_base/hanger) "jI" = ( /obj/structure/drop_pod_launcher/leader, @@ -811,17 +747,31 @@ /turf/open/floor/prison/cleanmarked, /area/mainship/patrol_base/hanger) "jK" = ( -/obj/machinery/camera/autoname/mainship, +/obj/structure/reagent_dispensers/fueltank/barrel, /turf/open/floor/mainship/orange{ - dir = 1 + dir = 9 }, /area/mainship/patrol_base) "jL" = ( -/obj/structure/drop_pod_launcher/sentry, -/obj/structure/droppod/nonmob/turret_pod, +/obj/structure/drop_pod_launcher, +/obj/structure/droppod, /turf/open/floor/prison/cleanmarked, /area/mainship/patrol_base/hanger) +"jP" = ( +/obj/structure/dropship_piece/tadpole/rearleft{ + dir = 4 + }, +/obj/structure/dropship_piece/tadpole/engine{ + pixel_x = -23 + }, +/turf/open/floor/plating, +/area/mainship/patrol_base/hanger) "jU" = ( +/turf/open/floor/mainship/purple{ + dir = 5 + }, +/area/mainship/patrol_base/prep) +"ka" = ( /obj/machinery/light/mainship{ dir = 4 }, @@ -829,21 +779,16 @@ /obj/structure/droppod/nonmob/mech_pod, /turf/open/floor/prison/cleanmarked, /area/mainship/patrol_base/hanger) -"ka" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/mainship/orange{ - dir = 8 - }, -/area/mainship/patrol_base) "kb" = ( -/obj/structure/shuttle/engine/propulsion/burst/left{ - dir = 4 +/obj/structure/window/framed/mainship/hull, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base) +"ke" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 10 }, -/obj/structure/lattice, -/turf/open/space/basic, -/area/space) +/turf/open/floor/prison/bright_clean, +/area/mainship/patrol_base/hanger) "kf" = ( /obj/structure/ship_rail_gun, /turf/closed/wall/mainship/outer/reinforced, @@ -880,6 +825,15 @@ }, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) +"ku" = ( +/obj/machinery/light/mainship{ + dir = 1 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 + }, +/turf/open/floor/prison/bright_clean, +/area/mainship/patrol_base/hanger) "kx" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 10 @@ -913,56 +867,43 @@ /turf/open/floor/freezer, /area/mainship/patrol_base) "kM" = ( -/obj/effect/turf_decal/warning_stripes/box/arrow{ - dir = 4 +/turf/closed/shuttle/dropship2/glasstwo{ + dir = 1 }, -/turf/open/floor/mainship/mono, /area/mainship/patrol_base/hanger) -"kN" = ( -/turf/open/floor/mainship/red{ - dir = 8 - }, -/area/mainship/patrol_base/prep) "kP" = ( /turf/open/floor/mainship/mono, /area/mainship/patrol_base/prep) -"kV" = ( -/turf/open/floor/mainship/red{ - dir = 4 - }, -/area/mainship/patrol_base/prep) "la" = ( /turf/open/floor/mainship/purple{ dir = 8 }, /area/mainship/patrol_base/prep) -"lh" = ( -/turf/open/floor/mainship/purple{ - dir = 4 - }, -/area/mainship/patrol_base/prep) "ln" = ( -/obj/structure/table/mainship/nometal, -/turf/open/floor/mainship/blue{ +/obj/structure/largecrate/random/barrel, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/mainship/orange{ dir = 8 }, /area/mainship/patrol_base) "lu" = ( -/obj/structure/prop/mainship/prop_so{ - dir = 1 - }, -/obj/structure/bed/chair/office/dark{ - dir = 1 +/obj/structure/table/mainship/nometal, +/turf/open/floor/mainship/blue{ + dir = 8 }, -/turf/open/floor/mainship/mono, /area/mainship/patrol_base) "lI" = ( -/obj/structure/prop/mainship/prop_so, -/turf/open/floor/mainship/mono, +/obj/structure/reagent_dispensers/fueltank/barrel, +/turf/open/floor/prison/plate, /area/mainship/patrol_base) "lN" = ( -/obj/machinery/photocopier, -/turf/open/floor/mainship/blue{ +/obj/structure/largecrate, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/mainship/orange{ dir = 4 }, /area/mainship/patrol_base) @@ -997,88 +938,96 @@ }, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/barracks) -"lX" = ( -/obj/structure/window/framed/mainship/hull, -/turf/open/floor/mainship/mono, +"lU" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/item/radio/intercom/general, +/obj/machinery/light/mainship{ + light_color = "#da2f1b" + }, +/turf/open/floor/prison/arrow/clean{ + dir = 4 + }, /area/mainship/patrol_base/hanger) -"mn" = ( +"lX" = ( +/obj/machinery/power/smes/buildable/empty, +/turf/open/floor/mainship/orange{ + dir = 4 + }, +/area/mainship/patrol_base) +"mq" = ( +/obj/structure/shuttle/engine/propulsion/burst{ + dir = 4 + }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"mr" = ( /obj/machinery/door/poddoor/mainship/open{ id = "minidropship_podlock" }, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/hanger) -"mq" = ( -/obj/structure/patrol_point/tgmc_11, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/hanger) -"mr" = ( -/obj/effect/attach_point/crew_weapon/minidropship, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/hanger) -"mt" = ( -/obj/machinery/vending/tool, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base) "mw" = ( -/obj/structure/patrol_point/tgmc_13, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/hanger) -"mA" = ( -/obj/structure/patrol_point/tgmc_21, +/obj/structure/patrol_point/tgmc_11, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) "mI" = ( -/obj/structure/sign/directions/supply, -/turf/closed/wall/mainship/outer/reinforced, +/obj/structure/bed/chair/nometal{ + dir = 8 + }, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base/prep) "mL" = ( -/obj/structure/patrol_point/tgmc_23, +/obj/structure/patrol_point/tgmc_21, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) "mU" = ( /obj/effect/turf_decal/warning_stripes/thin, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 + dir = 9 }, /turf/open/floor/prison/plate, /area/mainship/patrol_base) +"mZ" = ( +/obj/structure/table/mainship/nometal, +/turf/open/floor/mainship/blue, +/area/mainship/patrol_base/prep) "na" = ( /obj/machinery/light{ - dir = 8 + dir = 4 }, -/obj/vehicle/ridden/powerloader, -/turf/open/floor/mainship/orange{ +/obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/area/mainship/patrol_base) -"nl" = ( -/obj/structure/largecrate/random/case/double, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base/hanger) +"nt" = ( +/turf/open/floor/mainship/purple{ + dir = 4 + }, +/area/mainship/patrol_base/prep) +"nz" = ( +/obj/structure/largecrate/packed, /turf/open/floor/mainship/orange{ - dir = 8 + dir = 4 }, /area/mainship/patrol_base) -"nt" = ( -/obj/structure/largecrate/packed, +"nA" = ( +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/mainship/orange{ dir = 4 }, /area/mainship/patrol_base) -"nz" = ( -/obj/structure/drop_pod_launcher/mech, -/obj/structure/droppod/nonmob/mech_pod, -/turf/open/floor/prison/cleanmarked, -/area/mainship/patrol_base/hanger) "nB" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/turf/open/floor/prison/arrow/clean{ - dir = 8 - }, -/area/mainship/patrol_base/hanger) +/obj/effect/landmark/campaign/mech_spawner/light, +/obj/effect/turf_decal/warning_stripes/box/empty, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base) "nL" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -1093,54 +1042,46 @@ /turf/open/floor/mainship/blue, /area/mainship/patrol_base/command) "nZ" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 }, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 + dir = 5 + }, +/turf/open/floor/prison/arrow/clean{ + dir = 8 }, -/turf/open/floor/prison/bright_clean, /area/mainship/patrol_base/hanger) "oe" = ( +/obj/machinery/vending/mech_vendor, /obj/effect/turf_decal/warning_stripes/thin, -/obj/effect/turf_decal/warning_stripes/box/arrow{ +/obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, /turf/open/floor/prison/plate, /area/mainship/patrol_base) "oj" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ +/obj/effect/landmark/campaign/mech_spawner, +/obj/effect/turf_decal/warning_stripes/box/empty, +/obj/machinery/camera/autoname/mainship, +/obj/machinery/camera/autoname/mainship, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base) +"om" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/hanger) -"om" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/prison/bright_clean, /area/mainship/patrol_base/hanger) "or" = ( /obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 6 + dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) @@ -1154,6 +1095,24 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) "oA" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base) +"oD" = ( +/turf/open/floor/mainship/orange{ + dir = 6 + }, +/area/mainship/patrol_base) +"oK" = ( +/obj/structure/largecrate/random/barrel, +/turf/open/floor/plating, +/area/mainship/patrol_base/hanger) +"oL" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 9 }, @@ -1165,26 +1124,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) -"oL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/turf/open/floor/prison/bright_clean, -/area/mainship/patrol_base/hanger) "oU" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 - }, -/turf/open/floor/prison/arrow/clean{ - dir = 4 - }, -/area/mainship/patrol_base/hanger) +/turf/open/floor/prison/plate, +/area/mainship/patrol_base) "pa" = ( /obj/machinery/cic_maptable, /turf/open/floor/mainship/blue{ @@ -1192,12 +1137,8 @@ }, /area/mainship/patrol_base/command) "pj" = ( -/obj/effect/landmark/campaign/mech_spawner, +/obj/effect/landmark/campaign/mech_spawner/heavy, /obj/effect/turf_decal/warning_stripes/box/empty, -/obj/machinery/light, -/obj/machinery/camera/autoname/mainship{ - dir = 1 - }, /turf/open/floor/prison/plate, /area/mainship/patrol_base) "pk" = ( @@ -1207,12 +1148,9 @@ }, /area/mainship/patrol_base/command) "pm" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/mainship/black{ - dir = 1 - }, +/obj/structure/prop/mainship/sensor_computer3, +/obj/machinery/camera/autoname/mainship, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base) "py" = ( /obj/structure/platform{ @@ -1270,49 +1208,77 @@ }, /area/mainship/patrol_base/command) "qk" = ( -/obj/structure/prop/brokenvendor/brokenuniformvendor, /obj/machinery/light{ dir = 8 }, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base/prep) -"qq" = ( -/obj/structure/prop/brokenvendor/brokenuniformvendor, -/obj/machinery/light{ - dir = 4 +/turf/open/floor/mainship/red{ + dir = 8 }, -/turf/open/floor/mainship/mono, /area/mainship/patrol_base/prep) "qr" = ( -/obj/structure/bed/chair/office/dark, -/obj/structure/prop/mainship/prop_so, -/turf/open/floor/mainship/blue{ - dir = 8 +/obj/docking_port/mobile/marine_dropship/minidropship, +/obj/structure/bed/chair/dropship/pilot{ + dir = 1 }, -/area/mainship/patrol_base) +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/hanger) "qv" = ( -/obj/machinery/cic_maptable/drawable/big, -/turf/open/floor/mainship/mono, +/obj/structure/largecrate, +/turf/open/floor/prison/plate, /area/mainship/patrol_base) +"qw" = ( +/obj/structure/droppod, +/obj/structure/drop_pod_launcher, +/obj/machinery/light/mainship{ + dir = 8 + }, +/turf/open/floor/prison/cleanmarked, +/area/mainship/patrol_base/hanger) "qy" = ( -/obj/structure/largecrate/random/case/double, -/turf/open/floor/mainship/mono, +/obj/machinery/light/mainship{ + dir = 8 + }, +/obj/structure/drop_pod_launcher/mech, +/obj/structure/droppod/nonmob/mech_pod, +/turf/open/floor/prison/cleanmarked, /area/mainship/patrol_base/hanger) "qB" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/mainship/orange{ + dir = 8 + }, +/area/mainship/patrol_base) +"qJ" = ( /obj/structure/prop/mainship/prop_so{ dir = 8; pixel_x = 9 }, /turf/open/floor/mainship/mono, /area/mainship/patrol_base) -"qJ" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/computer/emails, -/turf/open/floor/mainship/blue{ +"qM" = ( +/obj/machinery/light/mainship, +/turf/open/floor/mainship/orange{ + dir = 6 + }, +/area/mainship/patrol_base/prep) +"ra" = ( +/obj/structure/shuttle/engine/propulsion/burst/left{ dir = 4 }, +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) +"rb" = ( +/obj/effect/landmark/campaign/mech_spawner/light, +/obj/effect/turf_decal/warning_stripes/box/empty, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison/plate, /area/mainship/patrol_base) -"qS" = ( +"rf" = ( /obj/structure/dropship_piece/tadpole/engine{ dir = 1; pixel_x = -23; @@ -1324,27 +1290,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/hanger) -"ra" = ( -/obj/structure/patrol_point/tgmc_12, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base/hanger) -"rb" = ( -/obj/structure/rack, -/obj/item/tool/crowbar/red, -/obj/item/tool/crowbar/red, -/obj/item/tool/crowbar/red, -/obj/item/tool/crowbar/red, -/obj/item/tool/crowbar/red, -/obj/item/weapon/claymore/mercsword/machete, -/obj/item/weapon/claymore/mercsword/machete, -/obj/item/weapon/claymore/mercsword/machete, -/obj/item/weapon/claymore/mercsword/machete, -/obj/item/weapon/claymore/mercsword/machete, -/turf/open/floor/prison/bright_clean, -/area/mainship/patrol_base/hanger) -"rf" = ( -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/hanger) "rg" = ( /obj/machinery/light/mainship{ dir = 8 @@ -1355,95 +1300,67 @@ }, /area/mainship/patrol_base/command) "rp" = ( -/obj/structure/patrol_point/tgmc_14, +/obj/structure/patrol_point/tgmc_12, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/hanger) "rq" = ( -/obj/structure/dropship_piece/tadpole/engine{ - dir = 1; - pixel_x = 23; - pixel_y = -14 - }, -/obj/machinery/light, -/obj/machinery/door/poddoor/mainship/open{ - id = "minidropship_podlock" - }, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base/hanger) -"rs" = ( -/obj/structure/patrol_point/tgmc_22, -/turf/open/floor/mainship/mono, +/turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) "rB" = ( -/obj/structure/patrol_point/tgmc_24, +/obj/structure/patrol_point/tgmc_22, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/hanger) -"rF" = ( -/obj/structure/largecrate/random/case, -/turf/open/floor/mainship/orange{ - dir = 8 - }, -/area/mainship/patrol_base) "rJ" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/prison/arrow/clean{ - dir = 8 - }, -/area/mainship/patrol_base/hanger) +/obj/effect/landmark/campaign/mech_spawner, +/obj/effect/turf_decal/warning_stripes/box/empty, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base) "rK" = ( -/turf/open/floor/prison/bright_clean, -/area/mainship/patrol_base/hanger) -"rP" = ( -/obj/machinery/light/mainship, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 - }, -/turf/open/floor/prison/bright_clean, +/obj/structure/drop_pod_launcher/mech, +/obj/structure/droppod/nonmob/mech_pod, +/turf/open/floor/prison/cleanmarked, /area/mainship/patrol_base/hanger) "rR" = ( /obj/effect/turf_decal/warning_stripes/thin, /turf/open/floor/prison/bright_clean, /area/mainship/patrol_base/hanger) "rU" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 1 +/obj/effect/landmark/campaign/mech_spawner/heavy, +/obj/effect/turf_decal/warning_stripes/box/empty, +/obj/machinery/light{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/hanger) +/turf/open/floor/prison/plate, +/area/mainship/patrol_base) "rV" = ( -/obj/machinery/light/mainship, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 +/obj/structure/prop/mainship/prop_so{ + dir = 1 }, -/turf/open/floor/prison/bright_clean, -/area/mainship/patrol_base/hanger) +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base) "sb" = ( /obj/structure/table/mainship/nometal, /obj/machinery/computer/squad_changer, /turf/open/floor/mainship/blue, /area/mainship/patrol_base/command) "se" = ( -/obj/structure/largecrate/random/barrel, -/turf/open/floor/plating, -/area/mainship/patrol_base/hanger) +/obj/structure/prop/mainship/prop_so, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base) "sk" = ( +/obj/machinery/light/mainship, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/turf/open/floor/prison/arrow/clean{ - dir = 4 + dir = 10 }, +/turf/open/floor/prison/bright_clean, /area/mainship/patrol_base/hanger) "sr" = ( -/obj/structure/prop/mainship/doorblocker/engi{ - dir = 4 - }, +/obj/structure/window/framed/mainship/hull, /turf/open/floor/mainship/mono, -/area/mainship/patrol_base) +/area/mainship/patrol_base/hanger) "sz" = ( /turf/open/floor/mainship/blue{ dir = 8 @@ -1515,54 +1432,86 @@ dir = 9 }, /area/mainship/patrol_base/barracks) -"tH" = ( -/obj/effect/landmark/start/latejoin, -/turf/open/floor/mainship/black{ - dir = 1 - }, -/area/mainship/patrol_base/barracks) +"tv" = ( +/obj/machinery/door/poddoor/mainship/open{ + dir = 2; + id = "minidropship_podlock" + }, +/obj/structure/largecrate/packed, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/hanger) +"tC" = ( +/obj/structure/ship_ammo/cas/rocket/widowmaker, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base) +"tH" = ( +/obj/effect/landmark/start/latejoin, +/turf/open/floor/mainship/black{ + dir = 1 + }, +/area/mainship/patrol_base/barracks) "tI" = ( +/obj/machinery/vending/tool, /turf/open/floor/mainship/black{ dir = 1 }, /area/mainship/patrol_base/barracks) "tJ" = ( +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/structure/table/mainship/nometal, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/prep) "tR" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/mainship/purple{ - dir = 8 +/obj/effect/attach_point/crew_weapon/minidropship, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/hanger) +"tZ" = ( +/obj/machinery/light{ + dir = 4 }, -/area/mainship/patrol_base/prep) -"ua" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/computer/emails, /turf/open/floor/mainship/blue{ - dir = 10 + dir = 4 }, +/area/mainship/patrol_base/prep) +"ua" = ( +/obj/machinery/vending/engivend, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base) "uf" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/structure/sign/pods{ - dir = 4 - }, -/turf/open/floor/prison/plate, +/obj/structure/patrol_point/tgmc_13, +/turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) "ui" = ( +/obj/machinery/vending/mech_vendor, /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, -/obj/effect/turf_decal/warning_stripes/box/arrow, +/obj/effect/turf_decal/warning_stripes/thin, /turf/open/floor/prison/plate, /area/mainship/patrol_base) "um" = ( -/obj/machinery/cic_maptable, -/turf/open/floor/mainship/blue, -/area/mainship/patrol_base) +/obj/structure/patrol_point/tgmc_23, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/hanger) "ur" = ( /obj/machinery/light, /turf/open/floor/mainship/blue, @@ -1571,27 +1520,35 @@ /turf/open/floor/mainship/blue, /area/mainship/patrol_base) "uw" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/obj/structure/prop/mainship/prop_so{ - dir = 4 +/obj/structure/largecrate/random/case/double, +/turf/open/floor/mainship/orange{ + dir = 8 }, -/turf/open/floor/mainship/blue, /area/mainship/patrol_base) "ux" = ( -/obj/structure/prop/mainship/mission_planning_system, -/turf/open/floor/mainship/blue{ - dir = 6 - }, +/obj/structure/closet/crate/alpha, +/obj/structure/closet/crate/alpha, +/obj/structure/closet/crate/alpha, +/obj/structure/closet/crate/alpha, +/obj/structure/closet/crate/alpha, +/obj/structure/closet/crate/alpha, +/obj/structure/closet/crate/alpha, +/obj/structure/closet/crate/alpha, +/turf/open/floor/prison/plate, /area/mainship/patrol_base) "uA" = ( -/obj/structure/droppod, -/obj/structure/drop_pod_launcher, -/obj/machinery/camera/autoname/mainship{ - dir = 1 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/machinery/light/mainship{ + light_color = "#da2f1b" + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/turf/open/floor/prison/arrow/clean{ + dir = 8 }, -/turf/open/floor/prison/cleanmarked, /area/mainship/patrol_base/hanger) "uD" = ( /obj/structure/platform{ @@ -1601,13 +1558,13 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) "uN" = ( -/obj/structure/dropship_piece/tadpole/rearleft{ - dir = 1 +/obj/machinery/light{ + dir = 8 }, -/obj/structure/dropship_piece/tadpole/rearleft{ - dir = 1 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/prison/plate, /area/mainship/patrol_base/hanger) "uQ" = ( /obj/machinery/door/poddoor/mainship/open{ @@ -1617,69 +1574,87 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/hanger) "uS" = ( -/obj/machinery/door/poddoor/mainship/open{ - dir = 2; - id = "minidropship_podlock" - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/hanger) -"uU" = ( -/obj/structure/dropship_piece/tadpole/rearright{ +/obj/structure/dropship_piece/tadpole/rearleft{ dir = 1 }, -/obj/structure/dropship_piece/tadpole/rearright{ +/obj/structure/dropship_piece/tadpole/rearleft{ dir = 1 }, /turf/open/floor/plating, /area/mainship/patrol_base/hanger) "vb" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/mainship/orange{ - dir = 4 - }, +/obj/structure/closet/crate/charlie, +/obj/structure/closet/crate/charlie, +/obj/structure/closet/crate/charlie, +/obj/structure/closet/crate/charlie, +/obj/structure/closet/crate/charlie, +/obj/structure/closet/crate/charlie, +/obj/structure/closet/crate/charlie, +/obj/structure/closet/crate/charlie, +/turf/open/floor/prison/plate, /area/mainship/patrol_base) "vd" = ( -/obj/effect/turf_decal/warning_stripes/box/arrow{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 1 }, -/turf/open/floor/mainship/mono, +/turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/prep) "ve" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 9 }, -/turf/open/floor/prison/bright_clean, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) "vp" = ( /turf/open/floor/mainship/stripesquare, /area/mainship/patrol_base/hanger) "vr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 10 + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 1 + dir = 6 }, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) "vx" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 + dir = 1 }, /turf/open/floor/prison/bright_clean, /area/mainship/patrol_base/hanger) "vB" = ( -/obj/machinery/fuelcell_recycler, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/orange{ + dir = 8 + }, /area/mainship/patrol_base) "vC" = ( -/obj/machinery/power/fusion_engine{ - name = "\improper S-52 fusion reactor #4" +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 }, -/turf/open/floor/mainship/orange{ +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 + }, +/turf/open/floor/prison/arrow/clean{ dir = 4 }, -/area/mainship/patrol_base) +/area/mainship/patrol_base/hanger) "vF" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/mainship/mono, @@ -1725,6 +1700,14 @@ }, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) +"wh" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/mainship/orange{ + dir = 4 + }, +/area/mainship/patrol_base) "wm" = ( /obj/structure/sink{ dir = 1 @@ -1744,21 +1727,24 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) "wC" = ( -/turf/open/floor/mainship/green{ - dir = 9 +/obj/machinery/camera/autoname/mainship{ + dir = 8 }, -/area/mainship/patrol_base) +/turf/open/floor/mainship/purple{ + dir = 4 + }, +/area/mainship/patrol_base/prep) "xc" = ( -/obj/structure/table/mainship/nometal, +/obj/machinery/vending/cigarette, /turf/open/floor/mainship/black{ dir = 9 }, /area/mainship/patrol_base/barracks) "xm" = ( -/obj/structure/table/mainship/nometal, /obj/machinery/light{ dir = 1 }, +/obj/machinery/vending/coffee, /turf/open/floor/mainship/black{ dir = 1 }, @@ -1783,80 +1769,40 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/barracks) "xJ" = ( -/obj/structure/droppod, -/obj/structure/drop_pod_launcher, -/obj/machinery/camera/autoname/mainship, -/turf/open/floor/prison/cleanmarked, -/area/mainship/patrol_base/hanger) -"xO" = ( -/obj/machinery/vending/tool, -/turf/open/floor/mainship/black{ +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/machinery/light/mainship{ dir = 1 }, -/area/mainship/patrol_base/barracks) +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/turf/open/floor/prison/arrow/clean{ + dir = 8 + }, +/area/mainship/patrol_base/hanger) "xU" = ( -/obj/structure/table/mainship/nometal, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, -/obj/item/storage/belt/utility/full, /turf/open/floor/mainship/black{ - dir = 5 + dir = 1 }, /area/mainship/patrol_base/barracks) "xZ" = ( -/obj/structure/table/mainship/nometal, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 6 }, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 6 }, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/prep) "yc" = ( -/obj/structure/bed/chair/nometal{ +/obj/structure/bed/chair/office/dark, +/obj/structure/prop/mainship/prop_so, +/turf/open/floor/mainship/blue{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/prep) +/area/mainship/patrol_base) "ye" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -1873,96 +1819,60 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/prep) -"yr" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 +"yn" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/prep) +/obj/effect/turf_decal/warning_stripes/thin, +/turf/open/floor/prison/bright_clean, +/area/mainship/patrol_base/hanger) +"yr" = ( +/obj/machinery/cic_maptable/drawable/big, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base) "yt" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ +/obj/structure/table/mainship/nometal, +/obj/machinery/computer/emails, +/turf/open/floor/mainship/blue{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/prep) +/area/mainship/patrol_base) "yu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/structure/bed/chair/nometal{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/prep) "yy" = ( +/obj/structure/patrol_point/tgmc_14, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/hanger) +"yC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 10 }, -/obj/structure/table/mainship/nometal, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 10 }, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/prep) -"yC" = ( -/obj/machinery/light{ - dir = 1 +"yF" = ( +/obj/structure/dropship_piece/tadpole/engine{ + dir = 1; + pixel_x = 23; + pixel_y = -14 }, -/turf/open/floor/mainship/black{ - dir = 1 +/obj/machinery/light, +/obj/machinery/door/poddoor/mainship/open{ + id = "minidropship_podlock" }, -/area/mainship/patrol_base/prep) -"yF" = ( -/obj/structure/prop/mainship/doorblocker/patrol_base, /turf/open/floor/mainship/mono, -/area/mainship/patrol_base) +/area/mainship/patrol_base/hanger) "yH" = ( -/turf/open/floor/mainship/orange{ - dir = 4 - }, -/area/mainship/patrol_base) +/obj/structure/patrol_point/tgmc_24, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/hanger) "yJ" = ( /obj/machinery/door/poddoor/mainship/open{ dir = 2; @@ -1971,16 +1881,11 @@ /turf/open/floor/prison/bright_clean, /area/mainship/patrol_base/hanger) "yM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 1 - }, -/obj/machinery/door/poddoor/mainship/open{ - dir = 2; - id = "minidropship_podlock" +/obj/structure/largecrate/random/case, +/turf/open/floor/mainship/orange{ + dir = 8 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/hanger) +/area/mainship/patrol_base) "za" = ( /obj/structure/prop/mainship/mission_planning_system, /turf/open/floor/mainship/blue{ @@ -2015,12 +1920,14 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) "zA" = ( -/obj/effect/landmark/campaign/mech_spawner, -/obj/effect/turf_decal/warning_stripes/box/empty, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/camera/autoname/mainship, +/obj/structure/closet/crate/bravo, +/obj/structure/closet/crate/bravo, +/obj/structure/closet/crate/bravo, +/obj/structure/closet/crate/bravo, +/obj/structure/closet/crate/bravo, +/obj/structure/closet/crate/bravo, +/obj/structure/closet/crate/bravo, +/obj/structure/closet/crate/bravo, /turf/open/floor/prison/plate, /area/mainship/patrol_base) "zD" = ( @@ -2041,6 +1948,15 @@ dir = 1 }, /area/mainship/patrol_base) +"zT" = ( +/obj/structure/ship_ammo/cas/rocket/banshee, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/mainship/orange{ + dir = 8 + }, +/area/mainship/patrol_base) "zU" = ( /obj/machinery/light/mainship{ dir = 1 @@ -2050,65 +1966,82 @@ }, /area/mainship/patrol_base) "zY" = ( -/obj/structure/prop/mainship/hangar_stencil, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base/hanger) +/obj/structure/closet/crate/delta, +/obj/structure/closet/crate/delta, +/obj/structure/closet/crate/delta, +/obj/structure/closet/crate/delta, +/obj/structure/closet/crate/delta, +/obj/structure/closet/crate/delta, +/obj/structure/closet/crate/delta, +/obj/structure/closet/crate/delta, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base) "Ab" = ( -/obj/structure/bed/chair/nometal{ - dir = 1 - }, /turf/open/floor/mainship/black/corner{ dir = 1 }, /area/mainship/patrol_base/barracks) -"Af" = ( -/obj/effect/turf_decal/warning_stripes/box/arrow{ - dir = 4 - }, -/turf/open/floor/mainship/black/corner{ - dir = 4 - }, -/area/mainship/patrol_base/barracks) "Am" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/prep) -"Aq" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 1 +"Ao" = ( +/obj/structure/dropship_piece/tadpole/engine{ + pixel_x = 23 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/prep) +/turf/closed/shuttle/dropship2/rearcorner/alt, +/area/mainship/patrol_base/hanger) +"Aq" = ( +/turf/open/floor/prison/bright_clean, +/area/mainship/patrol_base/hanger) "AF" = ( -/obj/effect/turf_decal/warning_stripes/box/arrow{ +/obj/machinery/light/mainship, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 6 + }, +/turf/open/floor/prison/bright_clean, +/area/mainship/patrol_base/hanger) +"AL" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/mainship/orange{ dir = 4 }, -/turf/open/floor/mainship/mono, /area/mainship/patrol_base) "Bb" = ( -/turf/open/floor/mainship/black/corner{ +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/hanger) +"Bd" = ( +/obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, +/obj/machinery/light, +/turf/open/floor/prison/plate, /area/mainship/patrol_base) "Bh" = ( -/obj/machinery/light{ - dir = 1 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 }, -/obj/machinery/door/poddoor/campaign, -/turf/open/floor/mainship/black{ - dir = 1 +/turf/open/floor/prison/arrow/clean{ + dir = 4 }, /area/mainship/patrol_base/hanger) "Bl" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 +/obj/effect/turf_decal/warning_stripes/box/arrow{ + dir = 4 }, /turf/open/floor/mainship/black{ dir = 1 }, -/area/mainship/patrol_base/hanger) +/area/mainship/patrol_base) "Bn" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -2118,16 +2051,11 @@ }, /area/mainship/patrol_base/hanger) "Bp" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/effect/turf_decal/warning_stripes/box/arrow{ - dir = 1 - }, -/turf/open/floor/mainship/black{ - dir = 1 +/obj/structure/prop/mainship/doorblocker/engi{ + dir = 4 }, -/area/mainship/patrol_base/hanger) +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base) "Br" = ( /obj/structure/bed/chair/comfy/black{ dir = 8 @@ -2144,32 +2072,50 @@ }, /area/mainship/patrol_base/command) "Bv" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 +/obj/machinery/camera/autoname/mainship{ + dir = 4 }, -/turf/open/floor/mainship/black{ - dir = 1 +/turf/open/floor/mainship/red{ + dir = 8 }, -/area/mainship/patrol_base/hanger) +/area/mainship/patrol_base/prep) "Bx" = ( /obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 + dir = 9 }, -/turf/open/floor/mainship/black/corner{ +/turf/open/floor/mainship/black{ dir = 1 }, -/area/mainship/patrol_base) +/area/mainship/patrol_base/hanger) "By" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/warning_stripes/box/arrow{ +/obj/structure/table/mainship/nometal, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/turf/open/floor/mainship/black{ - dir = 1 +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 4 }, -/area/mainship/patrol_base) +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/prep) "BA" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -2177,34 +2123,69 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base) "BJ" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 +/obj/structure/bed/chair/nometal{ + dir = 4 }, -/turf/open/floor/mainship/black/corner{ +/obj/structure/bed/chair/nometal{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/prep) +"BN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/structure/table/mainship/nometal, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/prep) +"BO" = ( +/turf/open/floor/mainship/stripesquare, /area/mainship/patrol_base) -"BN" = ( +"BR" = ( /obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 - }, -/turf/open/floor/mainship/black{ dir = 1 }, -/area/mainship/patrol_base) -"BO" = ( -/turf/open/floor/mainship/stripesquare, -/area/mainship/patrol_base) -"Ck" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 1 }, /turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/hanger) +"Ck" = ( +/obj/effect/turf_decal/warning_stripes/box/arrow{ + dir = 1 + }, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base) "Cl" = ( +/obj/structure/sign/pods{ + dir = 1 + }, /turf/open/floor/mainship/black{ - dir = 5 + dir = 1 }, /area/mainship/patrol_base) "Cn" = ( @@ -2232,6 +2213,30 @@ dir = 9 }, /area/mainship/patrol_base/command) +"Cx" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 6 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/hanger) +"CA" = ( +/obj/machinery/door/poddoor/mainship/open{ + dir = 2; + id = "minidropship_podlock" + }, +/obj/structure/reagent_dispensers/fueltank/barrel, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/hanger) +"CB" = ( +/obj/structure/ship_ammo/cas/rocket/widowmaker, +/turf/open/floor/mainship/orange, +/area/mainship/patrol_base) "CJ" = ( /turf/open/floor/mainship/terragov/west{ dir = 1 @@ -2262,16 +2267,17 @@ }, /area/mainship/patrol_base) "Dm" = ( -/turf/open/floor/mainship/green{ +/obj/structure/sign/directions/supply{ dir = 1 }, -/area/mainship/patrol_base) +/turf/closed/wall/mainship/outer/reinforced, +/area/mainship/patrol_base/prep) "Dn" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 + dir = 10 }, /turf/open/floor/prison/plate, /area/mainship/patrol_base) @@ -2292,8 +2298,9 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base) "Dw" = ( -/turf/open/floor/mainship/green, -/area/mainship/patrol_base) +/obj/structure/sign/directions/supply, +/turf/closed/wall/mainship/outer/reinforced, +/area/mainship/patrol_base/prep) "Dy" = ( /obj/machinery/vending/marineFood, /obj/item/reagent_containers/food/snacks/protein_pack, @@ -2323,13 +2330,30 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/barracks) "DC" = ( -/obj/effect/landmark/campaign/mech_spawner/light, -/obj/effect/turf_decal/warning_stripes/box/empty, -/obj/machinery/light{ - dir = 8 +/obj/structure/table/mainship/nometal, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 4 }, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/prep) "DD" = ( /obj/machinery/computer/camera_advanced/overwatch/alpha, /turf/open/floor/mainship/blue{ @@ -2359,22 +2383,46 @@ /turf/open/floor/mainship/research, /area/mainship/patrol_base/prep) "DX" = ( -/obj/structure/window/framed/mainship/hull, -/turf/open/floor/prison/plate, +/turf/open/floor/mainship/green{ + dir = 1 + }, /area/mainship/patrol_base) "DY" = ( -/obj/machinery/door/poddoor/campaign, -/turf/open/floor/mainship/mono, +/obj/effect/turf_decal/warning_stripes/thin, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base) +"Ec" = ( +/obj/effect/landmark/campaign/mech_spawner, +/obj/effect/turf_decal/warning_stripes/box/empty, +/obj/machinery/camera/autoname/mainship{ + dir = 1 + }, +/obj/machinery/camera/autoname/mainship{ + dir = 1 + }, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base) +"Eq" = ( +/obj/structure/dropship_piece/tadpole/tadpole_nose/left{ + pixel_y = -32 + }, +/obj/structure/dropship_piece/tadpole/cockpit/left, +/turf/open/floor/plating, /area/mainship/patrol_base/hanger) "Er" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base/hanger) -"Es" = ( -/turf/open/floor/mainship/black{ - dir = 4 +/obj/structure/table/mainship/nometal, +/obj/machinery/computer/emails, +/turf/open/floor/mainship/blue{ + dir = 10 }, /area/mainship/patrol_base) +"Es" = ( +/obj/machinery/cic_maptable, +/turf/open/floor/mainship/blue, +/area/mainship/patrol_base) "Ex" = ( /obj/structure/table/mainship/nometal, /obj/machinery/prop/computer{ @@ -2406,6 +2454,12 @@ }, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) +"EQ" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 6 + }, +/turf/open/floor/prison/bright_clean, +/area/mainship/patrol_base/hanger) "EZ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -2495,6 +2549,36 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/barracks) +"FU" = ( +/obj/structure/bed/chair/dropship/pilot, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/hanger) +"FV" = ( +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/structure/table/mainship/nometal, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/prep) "FX" = ( /obj/structure/platform{ dir = 8 @@ -2537,9 +2621,22 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/barracks) "Gp" = ( -/obj/machinery/light, -/turf/open/floor/mainship/black, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/obj/structure/prop/mainship/prop_so{ + dir = 4 + }, +/turf/open/floor/mainship/blue, /area/mainship/patrol_base) +"Gw" = ( +/obj/machinery/camera/autoname/mainship{ + dir = 4 + }, +/turf/open/floor/mainship/orange{ + dir = 8 + }, +/area/mainship/patrol_base/prep) "Gz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -2556,6 +2653,14 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/prep) +"GE" = ( +/obj/structure/droppod, +/obj/structure/drop_pod_launcher, +/obj/machinery/light/mainship{ + dir = 4 + }, +/turf/open/floor/prison/cleanmarked, +/area/mainship/patrol_base/hanger) "GF" = ( /turf/open/floor/mainship/terragov/north{ dir = 8 @@ -2571,67 +2676,68 @@ dir = 4 }, /area/mainship/patrol_base/prep) -"GK" = ( -/obj/effect/turf_decal/warning_stripes/box/arrow{ - dir = 1 - }, -/turf/open/floor/mainship/mono, +"GN" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/prison/plate, /area/mainship/patrol_base) "GR" = ( /obj/effect/landmark/start/job/fieldcommander/campaign, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/prep) "GV" = ( -/turf/open/floor/mainship/ntlogo, -/area/mainship/patrol_base/prep) +/obj/machinery/light{ + dir = 4 + }, +/obj/vehicle/ridden/powerloader, +/turf/open/floor/mainship/orange{ + dir = 4 + }, +/area/mainship/patrol_base) "GY" = ( -/turf/open/floor/mainship/ntlogo/nt2, +/turf/open/floor/mainship/ntlogo, /area/mainship/patrol_base/prep) "Ha" = ( -/turf/open/floor/mainship/ntlogo/nt3, +/turf/open/floor/mainship/ntlogo/nt2, /area/mainship/patrol_base/prep) "Hb" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/mainship/ntlogo/nt3, /area/mainship/patrol_base/prep) "Ht" = ( -/obj/effect/landmark/campaign/mech_spawner/light, +/obj/effect/landmark/reward_spawn_location, /obj/effect/turf_decal/warning_stripes/box/empty, +/obj/structure/closet/crate, /turf/open/floor/prison/plate, /area/mainship/patrol_base) "Hz" = ( -/obj/structure/prop/mainship/mapping_computer, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base) +/turf/open/floor/prison/bright_clean, +/area/mainship/patrol_base/hanger) "HD" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base) +/obj/structure/rack, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/tool/crowbar/red, +/obj/item/weapon/claymore/mercsword/machete, +/obj/item/weapon/claymore/mercsword/machete, +/obj/item/weapon/claymore/mercsword/machete, +/obj/item/weapon/claymore/mercsword/machete, +/obj/item/weapon/claymore/mercsword/machete, +/turf/open/floor/prison/bright_clean, +/area/mainship/patrol_base/hanger) "HJ" = ( -/obj/machinery/cic_maptable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 4 }, +/obj/machinery/cic_maptable/drawable/big{ + pixel_x = -3 + }, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base) "HK" = ( @@ -2642,13 +2748,10 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/barracks) "HP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 + dir = 1 }, -/obj/machinery/door/poddoor/campaign, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) "HQ" = ( @@ -2661,41 +2764,35 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) "Id" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2, -/turf/open/floor/plating/plating_catwalk, +/obj/structure/table/mainship/nometal, +/turf/open/floor/prison/bright_clean, /area/mainship/patrol_base/hanger) "Ig" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 1 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 }, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/prison/bright_clean, /area/mainship/patrol_base/hanger) "Ii" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating/plating_catwalk, +/obj/machinery/fuelcell_recycler, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base) "Im" = ( -/obj/structure/window/framed/mainship/hull, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 +/obj/machinery/power/fusion_engine{ + name = "\improper S-52 fusion reactor #4" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ +/turf/open/floor/mainship/orange{ dir = 4 }, -/turf/open/floor/mainship/mono, /area/mainship/patrol_base) "Ip" = ( -/turf/open/floor/mainship_hull/gray/dir{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, -/area/space) +/turf/open/floor/mainship/black{ + dir = 1 + }, +/area/mainship/patrol_base/prep) "Is" = ( /turf/open/floor/mainship_hull/gray/dir{ dir = 10 @@ -2733,7 +2830,7 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, -/obj/effect/turf_decal/warning_stripes/thin, +/obj/effect/turf_decal/warning_stripes/box/arrow, /turf/open/floor/prison/plate, /area/mainship/patrol_base) "IO" = ( @@ -2744,6 +2841,20 @@ dir = 6 }, /area/mainship/patrol_base/command) +"IQ" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/machinery/light/mainship{ + light_color = "#da2f1b" + }, +/turf/open/floor/prison/arrow/clean{ + dir = 4 + }, +/area/mainship/patrol_base/hanger) "IT" = ( /turf/open/floor/mainship/blue{ dir = 10 @@ -2769,6 +2880,9 @@ }, /turf/open/floor/mainship/black, /area/mainship/patrol_base) +"Jj" = ( +/turf/closed/shuttle/dropship2/glassone, +/area/mainship/patrol_base/hanger) "Jm" = ( /obj/structure/platform{ dir = 8 @@ -2779,6 +2893,21 @@ }, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) +"Jn" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/machinery/vending/nanomed, +/obj/machinery/light/mainship{ + light_color = "#da2f1b" + }, +/turf/open/floor/prison/arrow/clean{ + dir = 8 + }, +/area/mainship/patrol_base/hanger) "Jp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -2786,7 +2915,7 @@ /area/mainship/patrol_base) "JB" = ( /obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 + dir = 8 }, /turf/open/floor/prison/plate, /area/mainship/patrol_base) @@ -2796,6 +2925,12 @@ }, /turf/open/floor/mainship/black, /area/mainship/patrol_base) +"JE" = ( +/obj/structure/bed/chair/nometal{ + dir = 8 + }, +/turf/open/floor/mainship/orange, +/area/mainship/patrol_base/prep) "JG" = ( /turf/open/floor/mainship/black/corner{ dir = 8 @@ -2821,17 +2956,19 @@ }, /area/mainship/patrol_base/prep) "JX" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 4 }, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base/hanger) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/prep) "JY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 1 +/turf/open/floor/mainship/black/corner{ + dir = 4 }, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base) +/area/mainship/patrol_base/prep) "Ka" = ( /obj/machinery/power/monitor{ name = "Core Power Monitoring" @@ -2861,10 +2998,14 @@ /obj/structure/stairs/seamless, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) +"Ky" = ( +/obj/structure/ship_ammo/cas/minirocket, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base) "KB" = ( /obj/effect/turf_decal/warning_stripes/thin, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 + dir = 5 }, /turf/open/floor/prison/plate, /area/mainship/patrol_base) @@ -2886,7 +3027,6 @@ /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) "KR" = ( -/obj/structure/bed/chair/nometal, /turf/open/floor/mainship/black{ dir = 8 }, @@ -2895,57 +3035,77 @@ /obj/effect/turf_decal/warning_stripes/box/arrow{ dir = 4 }, -/turf/open/floor/mainship/black/corner, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base/barracks) "KW" = ( -/obj/machinery/light, -/turf/open/floor/mainship/black, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/prep) "Lh" = ( -/obj/machinery/light, -/obj/machinery/door/poddoor/campaign, -/turf/open/floor/mainship/black, -/area/mainship/patrol_base/hanger) +/turf/open/floor/mainship/black/corner{ + dir = 4 + }, +/area/mainship/patrol_base) "Ln" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 +/obj/effect/turf_decal/warning_stripes/box/arrow{ + dir = 4 }, /turf/open/floor/mainship/black, -/area/mainship/patrol_base/hanger) +/area/mainship/patrol_base) "LC" = ( /obj/effect/turf_decal/warning_stripes/thin, /turf/open/floor/mainship/black, /area/mainship/patrol_base/hanger) "LE" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/mainship/black{ + dir = 1 + }, +/area/mainship/patrol_base) +"LF" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 10 }, /turf/open/floor/mainship/black, /area/mainship/patrol_base/hanger) -"LF" = ( +"LK" = ( /obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/mainship/black/corner{ +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base) +"LM" = ( +/obj/machinery/light{ dir = 8 }, -/area/mainship/patrol_base) -"LK" = ( +/turf/open/floor/mainship/orange{ + dir = 8 + }, +/area/mainship/patrol_base/prep) +"LP" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, /obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/mainship/mono, +/turf/open/floor/prison/plate, /area/mainship/patrol_base) "LR" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/mainship/black/corner, +/turf/open/floor/mainship/black{ + dir = 5 + }, /area/mainship/patrol_base) "LV" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, -/turf/open/floor/mainship/black, +/obj/structure/prop/mainship/doorblocker/patrol_base, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base) "LZ" = ( -/turf/open/floor/mainship/black{ - dir = 6 - }, +/obj/structure/sign/pods, +/turf/open/floor/mainship/black, /area/mainship/patrol_base) "Mm" = ( /obj/structure/bed/bunkbed, @@ -2964,6 +3124,11 @@ /obj/structure/table/mainship/nometal, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) +"Mu" = ( +/turf/open/floor/mainship/blue{ + dir = 6 + }, +/area/mainship/patrol_base/prep) "MA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -2975,6 +3140,10 @@ }, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) +"MC" = ( +/obj/structure/dropship_piece/two/weapon/leftleft, +/turf/open/floor/plating, +/area/mainship/patrol_base/hanger) "MM" = ( /obj/machinery/bioprinter/stocked, /turf/open/floor/prison/sterilewhite, @@ -3002,35 +3171,16 @@ /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) "Nb" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 - }, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/facepaint/green, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, -/obj/item/tool/hand_labeler, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 + dir = 1 + }, +/obj/machinery/door/poddoor/mainship/open{ + dir = 2; + id = "minidropship_podlock" }, -/obj/machinery/camera/autoname/mainship, /turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/prep) +/area/mainship/patrol_base/hanger) "Nd" = ( /obj/machinery/camera/autoname/mainship{ dir = 1 @@ -3044,9 +3194,11 @@ /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) "Nj" = ( -/obj/structure/table/mainship/nometal, -/turf/open/floor/prison/bright_clean, -/area/mainship/patrol_base/hanger) +/obj/effect/turf_decal/warning_stripes/box/arrow{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/prep) "Nm" = ( /obj/structure/table/mainship/nometal, /obj/item/roller, @@ -3054,15 +3206,15 @@ /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) "Np" = ( -/obj/structure/closet/crate/alpha, -/obj/structure/closet/crate/alpha, -/obj/structure/closet/crate/alpha, -/obj/structure/closet/crate/alpha, -/obj/structure/closet/crate/alpha, -/obj/structure/closet/crate/alpha, -/obj/structure/closet/crate/alpha, -/obj/structure/closet/crate/alpha, -/turf/open/floor/prison/plate, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/warning_stripes/box/arrow{ + dir = 4 + }, +/turf/open/floor/mainship/black{ + dir = 1 + }, /area/mainship/patrol_base) "Nt" = ( /obj/structure/table/mainship/nometal, @@ -3076,16 +3228,22 @@ /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) "Nx" = ( -/obj/structure/table/mainship/nometal, +/obj/machinery/vending/coffee, /turf/open/floor/mainship/black{ dir = 10 }, /area/mainship/patrol_base/barracks) "NJ" = ( -/obj/structure/table/mainship/nometal, /obj/machinery/light, +/obj/machinery/vending/cigarette, /turf/open/floor/mainship/black, /area/mainship/patrol_base/barracks) +"NO" = ( +/obj/structure/bed/chair/nometal{ + dir = 8 + }, +/turf/open/floor/mainship/blue, +/area/mainship/patrol_base/prep) "Ob" = ( /obj/effect/landmark/start/job/squadsmartgunner, /turf/open/floor/mainship/black/corner{ @@ -3094,54 +3252,28 @@ /area/mainship/patrol_base/barracks) "Oj" = ( /obj/machinery/light{ - dir = 4 + dir = 1 }, -/obj/vehicle/ridden/powerloader, -/turf/open/floor/mainship/orange{ - dir = 4 +/obj/machinery/door/poddoor/campaign, +/turf/open/floor/mainship/black{ + dir = 1 }, -/area/mainship/patrol_base) -"Ok" = ( -/obj/machinery/vending/cigarette, +/area/mainship/patrol_base/hanger) +"On" = ( /turf/open/floor/mainship/black, /area/mainship/patrol_base/barracks) -"On" = ( -/obj/machinery/vending/tool, +"Op" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 + }, /turf/open/floor/mainship/black{ - dir = 6 + dir = 1 }, -/area/mainship/patrol_base/barracks) -"Op" = ( -/obj/structure/closet/crate/delta, -/obj/structure/closet/crate/delta, -/obj/structure/closet/crate/delta, -/obj/structure/closet/crate/delta, -/obj/structure/closet/crate/delta, -/obj/structure/closet/crate/delta, -/obj/structure/closet/crate/delta, -/obj/structure/closet/crate/delta, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base) +/area/mainship/patrol_base/hanger) "Oq" = ( -/obj/structure/table/mainship/nometal, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 5 }, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 5 }, @@ -3166,44 +3298,27 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) "Ox" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ +/obj/effect/turf_decal/warning_stripes/box/arrow{ dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/prep) -"OA" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 9 +/turf/open/floor/mainship/black{ + dir = 1 }, -/obj/structure/table/mainship/nometal, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/item/attachable/magnetic_harness, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 9 +/area/mainship/patrol_base/hanger) +"OA" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/prep) -"OD" = ( /turf/open/floor/mainship/black/corner{ - dir = 8 + dir = 1 }, /area/mainship/patrol_base) +"OD" = ( +/turf/open/floor/mainship/black/corner, +/area/mainship/patrol_base/prep) "OF" = ( /obj/structure/bed/chair/nometal{ dir = 1 @@ -3217,23 +3332,33 @@ /turf/open/floor/mainship/blue/full, /area/mainship/patrol_base) "OL" = ( -/obj/structure/bed/chair/nometal{ +/obj/effect/turf_decal/warning_stripes/thin{ dir = 1 }, -/obj/machinery/camera/autoname/mainship{ - dir = 8 +/turf/open/floor/mainship/black/corner{ + dir = 4 }, -/turf/open/floor/mainship/blue/full, /area/mainship/patrol_base) "OP" = ( -/obj/structure/ship_ammo/cas/minirocket, -/turf/open/floor/mainship/orange{ +/obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/area/mainship/patrol_base) -"OX" = ( -/obj/structure/ship_ammo/cas/minirocket, +/obj/structure/sign/pods{ + dir = 4 + }, /turf/open/floor/prison/plate, +/area/mainship/patrol_base/hanger) +"OX" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 + }, +/turf/open/floor/mainship/black{ + dir = 1 + }, +/area/mainship/patrol_base) +"Pc" = ( +/obj/machinery/vending/tool, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base) "Pp" = ( /obj/machinery/cic_maptable/drawable/big{ @@ -3282,136 +3407,161 @@ /turf/open/floor/mainship/black, /area/mainship/patrol_base/barracks) "Qq" = ( +/obj/machinery/vending/tool, /turf/open/floor/mainship/black, /area/mainship/patrol_base/barracks) "Qt" = ( -/obj/structure/closet/crate/charlie, -/obj/structure/closet/crate/charlie, -/obj/structure/closet/crate/charlie, -/obj/structure/closet/crate/charlie, -/obj/structure/closet/crate/charlie, -/obj/structure/closet/crate/charlie, -/obj/structure/closet/crate/charlie, -/obj/structure/closet/crate/charlie, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base) -"QJ" = ( -/turf/open/floor/mainship/orange{ - dir = 8 - }, -/area/mainship/patrol_base/prep) +/obj/machinery/door/poddoor/campaign, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/hanger) "QP" = ( +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, +/obj/structure/table/mainship/nometal, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/prep) "QR" = ( -/turf/open/floor/mainship/orange{ - dir = 4 - }, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/item/attachable/magnetic_harness, +/obj/structure/table/mainship/nometal, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base/prep) "QV" = ( /turf/open/floor/mainship/blue{ dir = 8 }, /area/mainship/patrol_base/prep) -"QW" = ( +"Rb" = ( +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/facepaint/green, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, +/obj/item/tool/hand_labeler, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, +/obj/item/facepaint/green, +/obj/structure/table/mainship/nometal, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/prep) -"Rb" = ( -/turf/open/floor/mainship/blue{ - dir = 4 - }, -/area/mainship/patrol_base/prep) "Rd" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 +/obj/structure/bed/chair/nometal{ + dir = 1 }, -/obj/machinery/light{ +/obj/machinery/camera/autoname/mainship{ dir = 8 }, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base/hanger) +/turf/open/floor/mainship/blue/full, +/area/mainship/patrol_base) "Rj" = ( /obj/machinery/camera/autoname/mainship{ + dir = 8 + }, +/turf/open/floor/mainship/blue{ dir = 4 }, -/turf/open/floor/mainship/green{ +/area/mainship/patrol_base/prep) +"Rq" = ( +/turf/open/floor/mainship/orange{ dir = 10 }, -/area/mainship/patrol_base) -"Rr" = ( -/obj/structure/dropship_piece/tadpole/rearleft{ - dir = 4 - }, -/obj/structure/dropship_piece/tadpole/engine{ - pixel_x = -23 +/area/mainship/patrol_base/prep) +"Rt" = ( +/obj/machinery/door/poddoor/mainship/open{ + dir = 2; + id = "minidropship_podlock" }, -/turf/open/floor/plating, +/turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) -"Rt" = ( +"Rw" = ( /obj/structure/dropship_piece/tadpole/rearleft, /obj/structure/dropship_piece/tadpole/engine{ pixel_x = 23 }, /turf/open/floor/plating, /area/mainship/patrol_base/hanger) -"Rw" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base/hanger) "Ry" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 - }, -/obj/machinery/camera/autoname/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/black, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base/hanger) -"RJ" = ( -/obj/structure/ship_ammo/cas/minirocket, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/mainship/orange{ - dir = 8 - }, -/area/mainship/patrol_base) "RO" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base) -"RQ" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/machinery/light{ +/obj/effect/turf_decal/warning_stripes/box/arrow{ dir = 4 }, -/turf/open/floor/mainship/orange{ +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/hanger) +"RQ" = ( +/obj/effect/turf_decal/warning_stripes/box/arrow{ dir = 4 }, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base) "RV" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 +/turf/open/floor/mainship/black{ + dir = 4 }, -/turf/open/floor/prison/bright_clean, -/area/mainship/patrol_base/hanger) +/area/mainship/patrol_base) "Sb" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 8 }, -/turf/open/floor/prison/bright_clean, -/area/mainship/patrol_base/hanger) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/prep) "Sf" = ( /obj/machinery/cic_maptable, /turf/open/floor/mainship/blue, @@ -3427,6 +3577,12 @@ dir = 6 }, /area/mainship/patrol_base/command) +"Sn" = ( +/obj/structure/bed/chair/nometal{ + dir = 4 + }, +/turf/open/floor/mainship/orange, +/area/mainship/patrol_base/prep) "Sq" = ( /obj/structure/table/reinforced, /obj/machinery/computer/operating, @@ -3438,21 +3594,28 @@ /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) "SB" = ( -/obj/structure/sign/pods{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, -/turf/open/floor/mainship/black{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 4 }, -/area/mainship/patrol_base) +/obj/machinery/door/poddoor/campaign, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/hanger) "SF" = ( -/obj/machinery/vending/mech_vendor, -/obj/effect/turf_decal/warning_stripes/thin, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 +/obj/machinery/camera/autoname/mainship{ + dir = 8 + }, +/turf/open/floor/mainship/green{ + dir = 5 }, -/turf/open/floor/prison/plate, /area/mainship/patrol_base) +"SH" = ( +/turf/open/floor/mainship/blue{ + dir = 4 + }, +/area/mainship/patrol_base/prep) "SI" = ( /obj/machinery/door/airlock/mainship/medical/or/or1{ dir = 1 @@ -3466,12 +3629,12 @@ /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) "SR" = ( -/obj/machinery/light, -/obj/effect/turf_decal/warning_stripes/box/arrow{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/turf/open/floor/mainship/black, -/area/mainship/patrol_base) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/hanger) "SY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 4 @@ -3479,8 +3642,13 @@ /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) "SZ" = ( -/obj/structure/prop/mainship/hangar_stencil/two, -/turf/open/floor/mainship/mono, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) "Td" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -3506,55 +3674,37 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/barracks) "Tq" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/mainship/orange{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base) "Tr" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 + dir = 8 + }, +/turf/open/floor/prison/arrow/clean{ + dir = 8 }, -/turf/open/floor/prison/bright_clean, /area/mainship/patrol_base/hanger) "TA" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/window/framed/mainship/hull, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 1 + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/hanger) -"TD" = ( -/obj/machinery/door/poddoor/mainship/open{ - dir = 2; - id = "minidropship_podlock" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, -/obj/structure/reagent_dispensers/fueltank/barrel, /turf/open/floor/mainship/mono, -/area/mainship/patrol_base/hanger) +/area/mainship/patrol_base) "TF" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 - }, -/turf/open/floor/prison/bright_clean, -/area/mainship/patrol_base/hanger) -"TH" = ( -/obj/effect/landmark/campaign/mech_spawner/heavy, -/obj/effect/turf_decal/warning_stripes/box/empty, -/obj/machinery/light{ +/turf/open/floor/mainship_hull/gray/dir{ dir = 4 }, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base) +/area/space) +"TH" = ( +/obj/structure/prop/mainship/hangar_stencil, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/hanger) "TO" = ( /obj/structure/bed/chair/sofa/right{ dir = 8 @@ -3565,11 +3715,8 @@ /turf/open/floor/mainship/mono, /area/mainship/patrol_base/command) "TQ" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 8 - }, /turf/open/floor/mainship/green{ - dir = 5 + dir = 9 }, /area/mainship/patrol_base) "Ug" = ( @@ -3593,24 +3740,27 @@ }, /turf/open/floor/mainship/purple/full, /area/mainship/patrol_base) -"UE" = ( -/obj/effect/attach_point/crew_weapon/minidropship, -/obj/machinery/door/poddoor/mainship/open{ - id = "minidropship_podlock" - }, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base/hanger) -"UG" = ( -/obj/structure/ship_ammo/cas/rocket/napalm, +"Uo" = ( +/obj/structure/ship_ammo/cas/minirocket, /turf/open/floor/mainship/orange{ dir = 8 }, /area/mainship/patrol_base) -"UL" = ( -/obj/structure/ship_ammo/cas/rocket/widowmaker, -/turf/open/floor/prison/plate, +"UH" = ( +/obj/machinery/light, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base) +"UL" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/hanger) "UM" = ( +/obj/structure/prop/mainship/hangar_stencil/two, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/hanger) +"UP" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, @@ -3621,13 +3771,6 @@ dir = 8 }, /area/mainship/patrol_base/hanger) -"UP" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/prison/bright_clean, -/area/mainship/patrol_base/hanger) "UQ" = ( /obj/machinery/camera/autoname/mainship, /turf/open/floor/mainship/black{ @@ -3635,31 +3778,30 @@ }, /area/mainship/patrol_base) "UR" = ( -/obj/effect/turf_decal/warning_stripes/box/arrow{ - dir = 4 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ + dir = 1 }, -/turf/open/floor/mainship/black, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base) "UV" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ +/obj/effect/turf_decal/warning_stripes/box/arrow, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base) +"UZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, +/obj/effect/turf_decal/warning_stripes/thin, +/turf/open/floor/prison/bright_clean, /area/mainship/patrol_base/hanger) -"UZ" = ( +"Vo" = ( /obj/effect/turf_decal/warning_stripes/thin, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) -"Vm" = ( +"Vq" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 6 }, @@ -3674,27 +3816,7 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) -"Vo" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/hanger) -"Vq" = ( -/obj/machinery/holopad{ - active_power_usage = 130; - desc = "It's a floor-mounted device for projecting holographic images. This one appears to have a larger lense."; - holo_range = 7; - name = "modfied holopad" - }, -/obj/effect/turf_decal/warning_stripes/thin, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/hanger) -"VB" = ( +"VL" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 6 }, @@ -3706,23 +3828,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) -"VL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/prison/bright_clean, -/area/mainship/patrol_base/hanger) "VM" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, -/turf/open/floor/prison/arrow/clean{ +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 4 }, +/turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) "VN" = ( /obj/structure/bed/chair/sofa/right{ @@ -3749,9 +3860,7 @@ /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) "VX" = ( -/obj/effect/landmark/campaign/mech_spawner, -/obj/effect/turf_decal/warning_stripes/box/empty, -/turf/open/floor/prison/plate, +/turf/open/floor/mainship/black/corner, /area/mainship/patrol_base) "Wd" = ( /obj/machinery/door_control{ @@ -3763,6 +3872,13 @@ }, /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) +"Wk" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/machinery/light, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base) "Wl" = ( /obj/machinery/bodyscanner, /obj/machinery/light/mainship{ @@ -3771,8 +3887,11 @@ /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) "Wn" = ( +/obj/machinery/camera/autoname/mainship{ + dir = 4 + }, /turf/open/floor/mainship/green{ - dir = 6 + dir = 10 }, /area/mainship/patrol_base) "Wu" = ( @@ -3796,21 +3915,37 @@ }, /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) +"WQ" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/obj/machinery/light/mainship{ + light_color = "#da2f1b" + }, +/turf/open/floor/prison/arrow/clean{ + dir = 8 + }, +/area/mainship/patrol_base/hanger) "WU" = ( -/obj/structure/bed/chair/nometal, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base/barracks) +/obj/machinery/light, +/obj/effect/turf_decal/warning_stripes/box/arrow{ + dir = 4 + }, +/turf/open/floor/mainship/black, +/area/mainship/patrol_base) "WV" = ( /obj/structure/table/mainship/nometal, /obj/item/reagent_containers/glass/beaker/cryomix, /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) "WX" = ( -/obj/structure/bed/chair/nometal{ - dir = 1 - }, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base/barracks) +/obj/machinery/light, +/obj/machinery/door/poddoor/campaign, +/turf/open/floor/mainship/black, +/area/mainship/patrol_base/hanger) "WY" = ( /obj/machinery/light/mainship{ light_color = "#da2f1b" @@ -3820,68 +3955,68 @@ }, /turf/open/floor/prison/sterilewhite, /area/mainship/patrol_base) -"Xc" = ( -/turf/open/floor/mainship/orange{ - dir = 10 - }, -/area/mainship/patrol_base/prep) -"Xf" = ( -/turf/open/floor/mainship/orange, -/area/mainship/patrol_base/prep) -"Xg" = ( +"Xl" = ( /turf/open/floor/mainship/orange{ - dir = 6 + dir = 4 }, /area/mainship/patrol_base/prep) -"Xl" = ( -/obj/structure/prop/brokenvendor/brokenuniformvendor, -/obj/machinery/light/mainship, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base/prep) "Xm" = ( -/turf/open/floor/mainship/blue{ - dir = 10 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 6 }, -/area/mainship/patrol_base/prep) +/turf/open/floor/mainship/black, +/area/mainship/patrol_base/hanger) "Xn" = ( -/turf/open/floor/mainship/blue, +/obj/structure/bed/chair/nometal{ + dir = 4 + }, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base/prep) "Xo" = ( -/turf/open/floor/mainship/blue{ - dir = 6 - }, +/obj/structure/table/mainship/nometal, +/turf/open/floor/mainship/mono, /area/mainship/patrol_base/prep) "Xt" = ( -/obj/machinery/light, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base) +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 6 + }, +/obj/machinery/camera/autoname/mainship{ + dir = 1 + }, +/turf/open/floor/mainship/black, +/area/mainship/patrol_base/hanger) "Xy" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/machinery/camera/autoname/mainship{ + dir = 4 + }, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base/hanger) +"XD" = ( /obj/machinery/door/poddoor/mainship/open{ id = "minidropship_podlock" }, /obj/machinery/light, /turf/open/floor/mainship/mono, /area/mainship/patrol_base/hanger) -"XD" = ( -/obj/structure/bed/chair/dropship/pilot, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/hanger) "XJ" = ( -/obj/structure/droppod, -/obj/structure/drop_pod_launcher, -/obj/machinery/light/mainship{ - dir = 8 +/turf/open/floor/mainship/orange{ + dir = 4 }, -/turf/open/floor/prison/cleanmarked, -/area/mainship/patrol_base/hanger) +/area/mainship/patrol_base) "XN" = ( -/obj/structure/droppod, -/obj/structure/drop_pod_launcher, -/obj/machinery/light/mainship{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thin, +/turf/open/floor/mainship/black/corner{ + dir = 8 }, -/turf/open/floor/prison/cleanmarked, -/area/mainship/patrol_base/hanger) +/area/mainship/patrol_base) +"XQ" = ( +/turf/open/floor/mainship/orange{ + dir = 10 + }, +/area/mainship/patrol_base) "XT" = ( /obj/machinery/holosign_switch{ id = "or1sign"; @@ -3895,7 +4030,10 @@ /area/space) "XY" = ( /obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 + dir = 4 + }, +/obj/machinery/light{ + dir = 1 }, /turf/open/floor/prison/plate, /area/mainship/patrol_base) @@ -3914,187 +4052,157 @@ /turf/open/floor/mainship/blue, /area/mainship/patrol_base/command) "Yh" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base/hanger) +"Yn" = ( /obj/structure/dropship_piece/tadpole/engine{ pixel_x = -23 }, /turf/closed/shuttle/dropship2/rearcorner, /area/mainship/patrol_base/hanger) -"Yn" = ( -/obj/machinery/prop/computer/tadpole{ +"Ys" = ( +/turf/closed/shuttle/dropship2/glassone{ dir = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/patrol_base/hanger) -"Ys" = ( -/turf/closed/shuttle/dropship2/glassone, /area/mainship/patrol_base/hanger) "Yw" = ( -/obj/structure/dropship_piece/tadpole/engine{ - pixel_x = 23 +/obj/machinery/prop/computer/tadpole{ + dir = 1 }, -/turf/closed/shuttle/dropship2/rearcorner/alt, +/turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base/hanger) "YB" = ( -/obj/structure/ship_ammo/cas/rocket/banshee, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/mainship/orange{ +/obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/area/mainship/patrol_base) +/turf/open/floor/prison/plate, +/area/mainship/patrol_base/hanger) +"YC" = ( +/obj/structure/largecrate/random/case/double, +/turf/open/floor/mainship/mono, +/area/mainship/patrol_base/hanger) "YD" = ( /obj/structure/ship_rail_gun, /turf/open/space/basic, /area/space) "YG" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base/hanger) +"YX" = ( /obj/structure/dropship_piece/two/weapon/rightright, /turf/open/floor/plating, /area/mainship/patrol_base/hanger) -"YM" = ( +"Za" = ( /obj/structure/dropship_piece/tadpole/tadpole_nose/right{ pixel_y = -32 }, /obj/structure/dropship_piece/tadpole/cockpit/right, /turf/open/floor/plating, /area/mainship/patrol_base/hanger) -"YX" = ( +"Zb" = ( /obj/structure/dropship_piece/tadpole/tadpole_nose{ pixel_y = -32 }, /turf/closed/shuttle/dropship2/singlewindow, /area/mainship/patrol_base/hanger) -"Za" = ( -/obj/structure/dropship_piece/tadpole/tadpole_nose/left{ - pixel_y = -32 - }, -/obj/structure/dropship_piece/tadpole/cockpit/left, -/turf/open/floor/plating, -/area/mainship/patrol_base/hanger) -"Zb" = ( -/obj/structure/dropship_piece/two/weapon/leftleft, -/turf/open/floor/plating, -/area/mainship/patrol_base/hanger) "Zc" = ( -/obj/structure/reagent_dispensers/fueltank/barrel, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, /turf/open/floor/plating, /area/mainship/patrol_base/hanger) "Zf" = ( -/obj/structure/ship_ammo/cas/rocket/banshee, -/turf/open/floor/mainship/orange{ - dir = 10 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 }, -/area/mainship/patrol_base) +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/prison/plate, +/area/mainship/patrol_base/hanger) "Zm" = ( -/obj/effect/turf_decal/warning_stripes/box/arrow, -/turf/open/floor/mainship/mono, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, /area/mainship/patrol_base) "Zp" = ( -/turf/open/floor/mainship/orange, +/obj/structure/ship_ammo/cas/rocket/banshee, +/turf/open/floor/mainship/orange{ + dir = 10 + }, /area/mainship/patrol_base) "Zr" = ( -/obj/structure/ship_ammo/cas/rocket/widowmaker, /turf/open/floor/mainship/orange, /area/mainship/patrol_base) "Zx" = ( -/turf/open/floor/mainship/orange{ - dir = 6 +/obj/machinery/camera/autoname/mainship{ + dir = 1 }, +/turf/open/floor/mainship/orange, /area/mainship/patrol_base) "Zy" = ( -/turf/open/floor/mainship/orange{ - dir = 10 - }, +/obj/effect/turf_decal/warning_stripes/thin, +/turf/open/floor/mainship/black/corner, /area/mainship/patrol_base) "ZA" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 +/obj/structure/bed/chair/office/dark, +/obj/machinery/computer/security/marinemainship{ + pixel_y = 18 }, -/obj/machinery/camera/autoname/mainship{ - dir = 4 +/turf/open/floor/mainship/blue{ + dir = 5 }, -/turf/open/floor/prison/plate, -/area/mainship/patrol_base/hanger) +/area/mainship/patrol_base) "ZD" = ( /obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/machinery/light/mainship{ - light_color = "#da2f1b" - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/prison/arrow/clean{ - dir = 8 + dir = 10 }, -/area/mainship/patrol_base/hanger) +/turf/open/floor/mainship/black, +/area/mainship/patrol_base) "ZG" = ( -/obj/machinery/door/poddoor/mainship/open{ - dir = 2; - id = "minidropship_podlock" +/turf/open/floor/mainship/black{ + dir = 6 }, -/obj/structure/largecrate/packed, -/turf/open/floor/mainship/mono, -/area/mainship/patrol_base/hanger) +/area/mainship/patrol_base) "ZH" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/machinery/light/mainship{ - light_color = "#da2f1b" - }, -/turf/open/floor/prison/arrow/clean{ - dir = 8 - }, -/area/mainship/patrol_base/hanger) +/obj/machinery/light, +/turf/open/floor/mainship/black, +/area/mainship/patrol_base/prep) "ZJ" = ( -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/machinery/vending/nanomed, -/obj/machinery/light/mainship{ - light_color = "#da2f1b" - }, -/turf/open/floor/prison/arrow/clean{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ + dir = 1 }, -/area/mainship/patrol_base/hanger) +/turf/open/floor/plating/plating_catwalk, +/area/mainship/patrol_base/prep) "ZM" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/item/radio/intercom/general, -/obj/machinery/light/mainship{ - light_color = "#da2f1b" - }, -/turf/open/floor/prison/arrow/clean{ - dir = 4 - }, -/area/mainship/patrol_base/hanger) +/obj/machinery/light, +/turf/open/floor/mainship/black, +/area/mainship/patrol_base) "ZN" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/machinery/light/mainship{ - light_color = "#da2f1b" - }, -/turf/open/floor/prison/arrow/clean{ - dir = 4 +/obj/structure/droppod, +/obj/structure/drop_pod_launcher, +/obj/machinery/camera/autoname/mainship{ + dir = 1 }, +/turf/open/floor/prison/cleanmarked, /area/mainship/patrol_base/hanger) +"ZT" = ( +/turf/open/floor/mainship/green, +/area/mainship/patrol_base) "ZU" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -26482,11 +26590,11 @@ cn cn cn xm -WX +xt xt FS xt -WU +xt NJ cn cn @@ -28417,13 +28525,13 @@ ci ci cn cn -xO +xU xt xt FS xt xt -Ok +On cn cn ci @@ -28660,7 +28768,7 @@ ci ci cn xU -Af +KU xt FS xt @@ -28895,25 +29003,25 @@ ef ef ef ef -aQ eK eK eK eK eK eK -yC +Ip +kP kP yg kP -KW +kP +ZH eK eK eK eK eK eK -XV ef ef ef @@ -29137,12 +29245,12 @@ ef ef ef ef -aQ eK +fP hP hP qk -hP +Bv xZ Am Am @@ -29150,12 +29258,12 @@ GA Am Am Oq -hP -qk -hP -hP +Gw +LM +ii +ii +Rq eK -XV ef ef ef @@ -29379,25 +29487,25 @@ ef ef ef ef -aQ +cG eN -hZ -kN -kN -kN -yc +Xn +Xn +Xn +Xn +yg kP DO GF JJ kP -yc -QJ -QJ -QJ -Xc -eN -XV +yg +Xn +Xn +Xn +Xn +Sn +cG ef ef ef @@ -29621,11 +29729,11 @@ ef ef ef ef -aQ -eN -if -kP -kP +cG +gb +Xo +Xo +Xo tJ ye kP @@ -29635,11 +29743,11 @@ JV kP Ot QP -kP -kP -Xf -eN -XV +Xo +Xo +Xo +ja +cG ef ef ef @@ -29863,12 +29971,12 @@ ef ef ef ef -aQ -eN -ik -kV -kV -kV +cG +gb +Xo +Xo +Xo +By yg kP DR @@ -29877,11 +29985,11 @@ JW kP yg QR -QR -QR -Xg -eN -XV +Xo +Xo +Xo +ja +cG ef ef ef @@ -30105,25 +30213,25 @@ ef ef ef ef -aQ -eK -hP -hP -hP -hP -yr +cG +gc +mI +mI +mI +mI +yg kP kP GR kP kP -ia -hP -hP -hP -hP -eK -XV +yg +mI +mI +mI +mI +JE +cG ef ef ef @@ -30347,25 +30455,25 @@ ef ef ef ef -aQ eK +ia il -hP -hP -hP -Nb +il +il +il +yg kP kP kP kP kP -yr -hP -hP -hP +yg +Xl +Xl Xl +Xl +qM eK -XV ef ef ef @@ -30589,25 +30697,25 @@ ef ef ef ef -aQ -eN +eK im la la -tR -yt +la +la +yg +kP +kP +kP kP -DT -GV -DT kP yg QV QV QV -Xm -eN -XV +QV +iM +eK ef ef ef @@ -30831,25 +30939,25 @@ ef ef ef ef -aQ -eN -in -kP -kP -kP -yg +cG +iv +Xn +Xn +Xn +BJ +JX kP DT GY DT kP -Ox -QW -kP -kP +yg Xn -eN -XV +Xn +Xn +Xn +aX +cG ef ef ef @@ -31073,25 +31181,25 @@ ef ef ef ef -aQ -eN -ir -lh -lh -lh +cG +iy +Xo +Xo +Xo +BN yu kP DT Ha DT kP -yu -Rb -Rb +ZJ Rb Xo -eN -XV +Xo +Xo +mZ +cG ef ef ef @@ -31315,25 +31423,25 @@ ef ef ef ef -aQ -eK -hP -hP -qq -hP -yy -Aq -Aq +cG +iy +Xo +Xo +Xo +DC +yg +kP +DT Hb -Aq -Aq -OA -hP -qq -hP -hP -eK -XV +DT +kP +yg +FV +Xo +Xo +Xo +mZ +cG ef ef ef @@ -31557,25 +31665,25 @@ ef ef ef ef -aQ -eK -eK -eK -eK -dw +cG +jq +mI +mI +mI +mI yC vd -kP -yg -kP +vd +Sb +vd vd KW mI -eK -eK -eK -eK -XV +mI +mI +mI +NO +cG ef ef ef @@ -31799,53 +31907,53 @@ ef ef ef ef -aQ -ci -ci -bu -dc -wC -Dt -fV -fV -Ff -fV -fV -OD -Rj -dc -bu -ci -ci -XV -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef +eK +jU +nt +nt +dc +wC +JY +kP +kP +yg +kP +kP +OD +Rj +tZ +SH +SH +Mu +eK +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef +ef ef ef ef @@ -32041,25 +32149,25 @@ ef ef ef ef -aQ -ci -ci -cc -dc +eK +eK +eK +eK +eK Dm -fV -fV -fV -Ff -fV -fV -fV +Ip +Nj +kP +yg +kP +Nj +ZH Dw -dc -cc -ci -ci -XV +eK +eK +eK +eK +eK ef ef ef @@ -32287,9 +32395,9 @@ aQ ci ci bu -dc +Ht TQ -Bb +Dt fV fV Ff @@ -32297,7 +32405,7 @@ fV fV hA Wn -dc +Ht bu ci ci @@ -32526,23 +32634,23 @@ ef ef ef aQ -bu -bu -bu -bu -bu -pm +ci +ci +cc +Ht +DX +fV fV fV Ff fV fV -Gp -bu -bu -bu -bu -bu +fV +ZT +Ht +cc +ci +ci XV ef ef @@ -32768,23 +32876,23 @@ ef ef ef aQ +ci +ci bu Ht -DC -Ht SF -zS +Lh fV fV Ff fV fV -Jc +VX dL Ht -DC -Ht bu +ci +ci XV ef ef @@ -33011,21 +33119,21 @@ ef ef aQ bu -XY -XY -XY -KB -zS +bu +bu +bu +bu +LE fV fV Ff fV fV -Jc -aC -XY -XY -XY +ZM +bu +bu +bu +bu bu XV ef @@ -33252,10 +33360,10 @@ ef ef ef aQ -DX -fH -fH -fH +bu +nB +rb +nB oe zS fV @@ -33265,10 +33373,10 @@ fV fV Jc ui -fH -fH -fH -DX +nB +rb +nB +bu XV ef ef @@ -33736,10 +33844,10 @@ ef ef ef aQ -bu -zA -VX -VX +kb +fH +fH +fH fA zS fV @@ -33749,10 +33857,10 @@ fV fV Jc IK -VX -VX -pj -bu +fH +fH +fH +kb XV ef ef @@ -33980,8 +34088,8 @@ ef aQ bu XY -XY -XY +oU +oU KB zS fV @@ -33991,9 +34099,9 @@ fV fV Jc aC -XY -XY -XY +oU +oU +Bd bu XV ef @@ -34220,11 +34328,11 @@ ef ef ef aQ -DX -fH -fH -fH -oe +bu +oj +rJ +rJ +DY zS fV fV @@ -34232,11 +34340,11 @@ Ff fV fV Jc -ui -fH -fH -fH -DX +LP +rJ +rJ +Ec +bu XV ef ef @@ -34463,7 +34571,7 @@ ef ef aQ bu -JB +oA JB JB mU @@ -34477,7 +34585,7 @@ Jc Dn JB JB -JB +Wk bu XV ef @@ -34704,11 +34812,11 @@ ef ef ef aQ -bu -hm -TH -hm -SF +kb +fH +fH +fH +fA zS fV fV @@ -34716,11 +34824,11 @@ Ff fV fV Jc -dL -hm -TH +IK +fH +fH hm -bu +kb XV ef ef @@ -34947,21 +35055,21 @@ ef ef aQ bu -bu -bu -bu -bu -pm +oU +oU +oU +KB +zS fV fV Ff fV fV -Gp -bu -bu -bu -bu +Jc +aC +oU +oU +oU bu XV ef @@ -35188,23 +35296,23 @@ ef ef ef aQ -ci -ci -ci bu -mt -Cl -Bb +pj +rU +pj +oe +zS +fV fV Ff fV -hA -LZ -mt +fV +Jc +ui +pj +rU +pj bu -ci -ci -ci XV ef ef @@ -35435,13 +35543,13 @@ bu bu bu bu -bu -By +LE +fV fV Ff fV -SR -bu +fV +ZM bu bu bu @@ -35672,23 +35780,23 @@ ef ef ef aQ +ci +ci +ci bu -iv -ln -qr ua -cc -zS +LR +Lh fV Ff fV -Jc -OF -OF -fV -Uj -Uj +VX +ZG +Pc bu +ci +ci +ci XV ef ef @@ -35914,23 +36022,23 @@ ef ef ef aQ -cc -iy -fV -fV -um -cc -zS +bu +bu +bu +bu +bu +bu +Np fV Ff fV -Jc -OF -OF -fV -Uj -Uj -cc +WU +bu +bu +bu +bu +bu +bu XV ef ef @@ -36156,15 +36264,15 @@ ef ef ef aQ -cc +bu iF lu -fV -ur -ta +yc +Er +cc zS fV -Hz +Ff fV Jc OF @@ -36172,7 +36280,7 @@ OF fV Uj Uj -cc +bu XV ef ef @@ -36398,23 +36506,23 @@ ef ef ef aQ -bu +cc iG -lI -qv -us -yF -zS fV -HD -fV -Jc fV +Es +cc +zS fV +Ff fV +Jc +OF +OF fV -Xt -bu +Uj +Uj +cc XV ef ef @@ -36642,8 +36750,8 @@ ef aQ cc iI +rV fV -qB ur ta zS @@ -36651,11 +36759,11 @@ fV HJ fV Jc -OJ -OJ +OF +OF fV -Un -Un +Uj +Uj cc XV ef @@ -36882,23 +36990,23 @@ ef ef ef aQ -cc -iJ -fV -fV -uw -cc +bu +pm +se +yr +us +LV zS fV Ff fV Jc -OJ -OJ fV -Un -Un -cc +fV +fV +fV +UH +bu XV ef ef @@ -37124,23 +37232,23 @@ ef ef ef aQ -bu +cc iN -lN +fV qJ -ux -cc -dU +ur +ta +zS fV Ff fV -UR +Jc +OJ OJ -OL fV Un Un -bu +cc XV ef ef @@ -37363,29 +37471,29 @@ ef ef ef ef -ab -ab -ab -ab -ab -lX -lX -ab -ab -Bh -DY -HP -DY -Lh -ab -ab -lX -lX -ab -ab -ab -ab -ab +ef +ef +aQ +cc +iJ +fV +fV +Gp +cc +zS +fV +Ff +fV +Jc +OJ +OJ +fV +Un +Un +cc +XV +ef +ef ef ef ef @@ -37604,31 +37712,31 @@ ef ef ef ef -ab -ab -aU -ct -aU +ef +ef +ef +aQ +bu ZA aU -aU +yt ct -aU +cc Bl -iX -HQ -iX +fV +Ff +fV Ln -aU -Rd -aU -aU -ZA -aU +OJ Rd -aU -ab -ab +fV +Un +Un +bu +XV +ef +ef +ef ef ef ef @@ -37846,31 +37954,31 @@ ef ef ef ef -ak -ao -ba -ba -ba -ba -ba -ba -ba -ba -Bn -iX -HQ -iX -LC -ba -ba -ba -ba -ba -ba -ba -ba -ZU -ak +ef +ab +ab +ab +ab +ab +sr +sr +ab +ab +Oj +Qt +SB +Qt +WX +ab +ab +sr +sr +ab +ab +ab +ab +ab +ef ef ef ef @@ -38088,31 +38196,31 @@ ef ef ef ef -ak -ap -ba -ba -eP -iV -mn -qS +ab +ab +Yh uN -ba -Bn +Yh +Xy +Yh +Yh +uN +Yh +Op iX HQ iX -LC -ba -Rr -iV -UE +Xm +Yh +YG +Yh +Yh Xy Yh YG -ba -ZU -ak +Yh +ab +ab ef ef ef @@ -38331,27 +38439,27 @@ ef ef ef ak -ap +ao +ba +ba +ba +ba +ba +ba ba -cF -eW -iX -mq -ra -uQ ba Bn iX HQ -zY +iX LC ba -ZG -qy -iX -iX -eW -YM +ba +ba +ba +ba +ba +ba ba ZU ak @@ -38575,22 +38683,22 @@ ef ak ap ba -cG +ba ff iY mr rf uS ba -Bp +Bn iX HQ iX LC ba -uS -rf -rf +jP +iY +cQ XD Yn YX @@ -38818,7 +38926,7 @@ ak ap ba cI -fj +Ys iX mw rp @@ -38827,11 +38935,11 @@ ba Bn iX HQ -iX +TH LC ba -uQ -iX +tv +YC iX iX Ys @@ -39059,23 +39167,23 @@ ef ak ap ba -ba +dP fk -iV -mn +qr +tR rq -uU +Rt ba -Bn -Er -Id +Ox +iX +HQ iX LC -se +ba Rt -iV -UE -Xy +rq +rq +FU Yw Zb ba @@ -39299,28 +39407,28 @@ ef ef ef ak -aq -bi -bi -bi -bi -bi -bi -bi +ap +ba bi +kM +iX +uf +yy +uQ +ba Bn iX HQ iX LC -bi -bi -bi -bi -bi -bi -bi -bi +ba +uQ +iX +iX +iX +Jj +Eq +ba ZU ak ef @@ -39541,28 +39649,28 @@ ef ef ef ak -aq -bm -bm -bm -bm -bm -bm -bm -bm +ap +ba +ba +bo +iY +mr +yF +da +ba Bn -iX -HQ +Ry +SR iX LC -bm -bm -bm -bm -bm -bm -bm -bm +oK +Rw +iY +cQ +XD +Ao +MC +ba ZU ak ef @@ -39783,28 +39891,28 @@ ef ef ef ak -ap -ba -ba -eP -iV -mn -qS -uN -ba +aq +bH +bH +bH +bH +bH +bH +bH +bH Bn iX -Ig -JX +HQ +iX LC -ba -Rr -iV -UE -Xy -Yh -YG -ba +bH +bH +bH +bH +bH +bH +bH +bH ZU ak ef @@ -40025,28 +40133,28 @@ ef ef ef ak -ap -ba -cF -eW -iX -mA -rs -uQ -ba +aq +Zc +Zc +Zc +Zc +Zc +Zc +Zc +Zc Bn iX HQ -SZ +iX LC Zc -TD -iX -iX -iX -eW -YM -ba +Zc +Zc +Zc +Zc +Zc +Zc +Zc ZU ak ef @@ -40269,22 +40377,22 @@ ef ak ap ba -cG +ba ff iY mr rf uS ba -Bp -iX -HQ +Bn iX +SZ +UL LC ba -uS -rf -rf +jP +iY +cQ XD Yn YX @@ -40512,7 +40620,7 @@ ak ap ba cI -fj +Ys iX mL rB @@ -40521,10 +40629,10 @@ ba Bn iX HQ -iX +UM LC -ba -uQ +an +CA iX iX iX @@ -40753,23 +40861,23 @@ ef ak ap ba -ba +dP fk -iV -mn +qr +tR rq -uU +Rt ba -Bn +Ox iX HQ iX LC ba Rt -iV -UE -Xy +rq +rq +FU Yw Zb ba @@ -40993,14 +41101,14 @@ ef ef ef ak -aL -ba -ba -ba -ba -ba -ba +ap ba +bi +kM +iX +um +yH +uQ ba Bn iX @@ -41008,12 +41116,12 @@ HQ iX LC ba -ba -ba -ba -ba -ba -ba +uQ +iX +iX +iX +Jj +Eq ba ZU ak @@ -41234,31 +41342,31 @@ ef ef ef ef -ab -ab -bo -da -bo -ey -bo +ak +ap +ba +ba bo +iY +mr +yF da -uf -Bv +ba +Bn iX HQ iX -LE -uf -Rw -bo -bo -ey -bo +LC +ba Rw -bo -ab -ab +iY +cQ +XD +Ao +MC +ba +ZU +ak ef ef ef @@ -41476,31 +41584,31 @@ ef ef ef ef -ef -ab -ab -ab -ab -ab -ab -ab -ab -ab -Bl -kM +ak +aL +ba +ba +ba +ba +ba +ba +ba +ba +Bn +iX HQ -kM -Ry -ab -ab -ab -ab -ab -ab -ab -ab -ab -ef +iX +LC +ba +ba +ba +ba +ba +ba +ba +ba +ZU +ak ef ef ef @@ -41718,31 +41826,31 @@ ef ef ef ef -ef -ef -bu -db -fq +ab +ab +YB +na +YB iZ -nl -rF +YB +YB na -fT +OP Bx -fV -Fx -fV +iX +HQ +iX LF OP -RJ -OP -UG -UG +Zf +YB +YB +iZ YB Zf -bu -ef -ef +YB +ab +ab ef ef ef @@ -41961,29 +42069,29 @@ ef ef ef ef -ef -bu -do -fz -jk -Np -bH -fH -fH -BA -Dv -Fu -fV -LK -OX -OX -OX -fH -fH -fH -Zp -bu -ef +ab +ab +ab +ab +ab +ab +ab +ab +ab +Op +RO +HQ +RO +Xt +ab +ab +ab +ab +ab +ab +ab +ab +ab ef ef ef @@ -42206,23 +42314,23 @@ ef ef bu jK -fH +ln jk -fH -fH -fH -fH -BA +uw +yM +qB +vB +OA fV Fx fV -LK -fH -fH -fH -fH -fH -fH +XN +Uo +jr +Uo +gl +gl +zT Zp bu ef @@ -42447,25 +42555,25 @@ ef ef ef bu -du -fH -fH -fH -fH +dX +lI +jn +ux +zA fH fH BA -fV -Fx +Dv +Fu fV LK +Ky +Ky +Ky fH fH fH -fH -fH -fH -aJ +Zr bu ef ef @@ -42689,24 +42797,24 @@ ef ef ef bu -du -fL +dU +fH jn -Qt -Op +fH +fH fH fH BA fV -FL -JY +Fx +fV LK fH -RO -RO -UL -UL -UL +fH +fH +fH +fH +fH Zr bu ef @@ -42932,23 +43040,23 @@ ef ef bu dC -fP -jq -nt -nt -Oj -yH -BJ -AF +fH +fH +fH +fH +fH +fH +BA +fV Fx -AF -LR -yH -RQ -Tq -yH -yH -vb +fV +LK +fH +fH +fH +fH +fH +fH Zx bu ef @@ -43171,29 +43279,29 @@ ef ef ef ef -ab -ab -ab -ab -ab -ab -ab -ab -ab -BN -fV -Fx +ef +bu +dC +fH +qv +vb +zY +fH +fH +BA fV -LV -ab -ab -ab -ab -ab -ab -ab -ab -ab +FL +UR +LK +fH +GN +GN +tC +tC +tC +CB +bu +ef ef ef ef @@ -43413,29 +43521,29 @@ ef ef ef ef -ab -bG -bG +ef +bu bG +lN js nz nz -nL -ab -UQ -fV +GV +XJ +OL +RQ Fx -fV -Jc -ab -rR -bJ -bJ +RQ +Zy XJ -bJ -bJ -bJ -ab +AL +nA +XJ +XJ +wh +oD +bu +ef ef ef ef @@ -43656,28 +43764,28 @@ ef ef ef ab -bI -dE -dE -dE -nB -rJ -ve ab -zU +ab +ab +ab +ab +ab +ab +ab +OX fV Fx fV -Ji -ab -RV -rJ -UM -dE -dE -dE ZD ab +ab +ab +ab +ab +ab +ab +ab +ab ef ef ef @@ -43898,25 +44006,25 @@ ef ef ef ab -bJ -bJ -bJ -bJ -nL +fT +fT +fT +qy rK -rb +rK +nL ab -SB +UQ fV Fx fV -fI +Jc ab -rb -rK rR bJ bJ +qw +bJ bJ bJ ab @@ -44141,25 +44249,25 @@ ef ef ab xJ -bJ -bJ +jy +jy jy nZ -rP -ab +Tr +Hz ab -zS +zU fV Fx fV -Jc -ab +Ji ab +ke Tr UP jy -bJ -bJ +jy +jy uA ab ef @@ -44382,27 +44490,27 @@ ef ef ef ab -bP -dE -dE -dE -oj -rR -vp -yJ -BO +bJ +bJ +bJ +bJ +nL +Aq +HD +ab +Cl fV Fx fV -BO -yJ -vp -nL -UV -dE -dE -dE -ZH +LZ +ab +HD +Aq +rR +bJ +bJ +bJ +bJ ab ef ef @@ -44624,27 +44732,27 @@ ef ef ef ab -bJ +bZ bJ bJ jL om -rR -vp -yJ -BO -GK +AF +ab +ab +zS +fV Fx -Zm -BO -yJ -vp -nL +fV +Jc +ab +ab +ku UZ +jL bJ bJ -bJ -bJ +ZN ab ef ef @@ -44866,11 +44974,11 @@ ef ef ef ab -bJ -bJ -bJ -jI -om +bI +jy +jy +jy +ve rR vp yJ @@ -44882,11 +44990,11 @@ BO yJ vp nL -UZ -jI -bJ -bJ -bJ +Cx +jy +jy +jy +WQ ab ef ef @@ -45108,27 +45216,27 @@ ef ef ef ab -bQ -dE -dE +bJ +bJ +bJ dE or -rU -vr -yM -Ck -Ck -Ii -Ck +rR +vp +yJ +BO Ck -yM -vr -TA -Vm -dE -dE -dE -ZJ +Fx +UV +BO +yJ +vp +nL +Vo +bJ +bJ +bJ +bJ ab ef ef @@ -45354,7 +45462,7 @@ bJ bJ bJ jI -ov +or rR vp yJ @@ -45592,27 +45700,27 @@ ef ef ef ab -bJ -bJ -bJ -jL -ov -rR -vp -yJ -BO -GK -Fx +bP +jy +jy +jy +vr +Bb +HP +Nb Zm -BO -yJ -vp -nL +Zm +Tq +Zm +Zm +Nb +HP +BR Vq -bJ -bJ -bJ -bJ +jy +jy +jy +Jn ab ef ef @@ -45834,11 +45942,11 @@ ef ef ef ab -bX -dP -dP -dP -oA +bJ +bJ +bJ +jI +ov rR vp yJ @@ -45850,11 +45958,11 @@ BO yJ vp nL -VB -dP -dP -dP -ZM +VM +jI +bJ +bJ +bJ ab ef ef @@ -46076,27 +46184,27 @@ ef ef ef ab -xJ bJ bJ -jy +bJ +dE ov -rV -ab -ab -zS -fV +rR +vp +yJ +BO +Ck Fx -fV -Ct -ab -ab -TF -Vo -jy +UV +BO +yJ +vp +nL +gP +bJ +bJ bJ bJ -uA ab ef ef @@ -46318,27 +46426,27 @@ ef ef ef ab -bJ -bJ -bJ -bJ +bQ +ec +ec +ec oL -rK -Nj -ab -SB +rR +vp +yJ +BO fV Fx fV -fI -ab -Nj -rK +BO +yJ +vp +nL VL -bJ -bJ -bJ -bJ +ec +ec +ec +lU ab ef ef @@ -46561,25 +46669,25 @@ ef ef ab bZ -dT -dT -dT -oU +bJ +bJ +jL +ov sk -vx ab -zU +ab +zS fV Fx fV -Ji +Ct ab -Sb -sk +ab +hR VM -dT -dT -dT +jL +bJ +bJ ZN ab ef @@ -46802,24 +46910,24 @@ ef ef ef ab -bG -bG -bG -jU -nz -nz -nL +bJ +bJ +bJ +bJ +vx +Aq +Id ab Cl -Es +fV Fx -Es +fV LZ ab -rR -bJ +Id +Aq +yn bJ -XN bJ bJ bJ @@ -47044,27 +47152,27 @@ ef ef ef ab +bX +eo +eo +eo +vC +Bh +Ig ab +zU +fV +Fx +fV +Ji ab -ab -ab -ab -ab -ab -ab -bu -sr -Im -sr -bu -ab -ab -ab -ab -ab -ab -ab -ab +EQ +Bh +iL +eo +eo +eo +IQ ab ef ef @@ -47285,29 +47393,29 @@ ef ef ef ef -aQ -bu -dW -fT -ka -fT -bu -fT -fT -ka -fT -fT -fT -ka +ab fT fT -bu fT ka -fT -Zy -bu -XV +rK +rK +nL +ab +LR +RV +Fx +RV +ZG +ab +rR +bJ +bJ +GE +bJ +bJ +bJ +ab ef ef ef @@ -47527,29 +47635,29 @@ ef ef ef ef -aQ -cc -do -fV -fV -fV -sr -fV -fV -fV -fV -fV -fV -fV -fV -fV -sr -fV -fV -fV -Zp -cc -XV +ab +ab +ab +ab +ab +ab +ab +ab +ab +bu +Bp +TA +Bp +bu +ab +ab +ab +ab +ab +ab +ab +ab +ab ef ef ef @@ -47770,27 +47878,27 @@ ef ef ef aQ -cc +bu do -fV -fV -fV -cc vB -fV -fV -fV -fV -fV -fV -fV +qB vB -cc -fV -fV -fV -Zp -cc +bu +vB +vB +qB +vB +vB +vB +qB +vB +vB +bu +vB +qB +vB +XQ +bu XV ef ef @@ -48012,27 +48120,27 @@ ef ef ef aQ -bu +cc dX -gb -gb -gb -bu -vC -vC -vC -vC -bu -vC -vC -vC -vC -bu -gb -gb -gb -Zx -bu +fV +fV +fV +Bp +fV +fV +fV +fV +fV +fV +fV +fV +fV +Bp +fV +fV +fV +Zr +cc XV ef ef @@ -48254,27 +48362,27 @@ ef ef ef aQ -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu -bu +cc +dX +fV +fV +fV +cc +Ii +fV +fV +fV +fV +fV +fV +fV +Ii +cc +fV +fV +fV +Zr +cc XV ef ef @@ -48496,27 +48604,27 @@ ef ef ef aQ -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci -ci +bu +fz +lX +lX +lX +bu +Im +Im +Im +Im +bu +Im +Im +Im +Im +bu +lX +lX +lX +oD +bu XV ef ef @@ -48738,27 +48846,27 @@ ef ef ef aQ -ci -ec -ec -ec -ci -ci -ec -ec -ec -ci -ci -ci -ec -ec -ec -ci -ci -ec -ec -ec -ci +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu +bu XV ef ef @@ -48979,29 +49087,29 @@ ef ef ef ef -aT -cl -eo -gc -kb -aT -cl -eo -gc -kb -aT -Ip -cl -eo -gc -kb -aT -cl -eo -gc -kb -aT -cl +aQ +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +ci +XV ef ef ef @@ -49221,29 +49329,29 @@ ef ef ef ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef +aQ +ci +fI +fI +fI +ci +ci +fI +fI +fI +ci +ci +ci +fI +fI +fI +ci +ci +fI +fI +fI +ci +XV ef ef ef @@ -49463,29 +49571,29 @@ ef ef ef ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef -ef +aT +cl +fL +mq +ra +aT +cl +fL +mq +ra +aT +TF +cl +fL +mq +ra +aT +cl +fL +mq +ra +aT +cl ef ef ef diff --git a/_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm b/_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm index f09bec5d417b4..1020cd6d08dc1 100644 --- a/_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm +++ b/_maps/map_files/Magmoor_Digsite_IV/Magmoor_Digsite_IV.dmm @@ -187,6 +187,12 @@ dir = 1 }, /area/magmoor/cave/north) +"age" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/tile/arrival{ + dir = 8 + }, +/area/magmoor/civilian/pool) "agO" = ( /obj/structure/largecrate/random, /obj/effect/decal/cleanable/blood/oil, @@ -1119,6 +1125,13 @@ dir = 4 }, /area/magmoor/compound) +"aPR" = ( +/obj/structure/bed/chair/wood/wings{ + dir = 4 + }, +/obj/effect/landmark/weed_node, +/turf/open/floor/wood, +/area/magmoor/civilian/gambling) "aQh" = ( /obj/structure/closet/walllocker/hydrant/extinguisher{ dir = 1 @@ -1149,6 +1162,7 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/mono, /area/magmoor/civilian/arrival/east) "aRq" = ( @@ -1383,6 +1397,19 @@ /obj/structure/fence, /turf/open/floor/plating/ground/concrete, /area/magmoor/medical/morgue) +"aYz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/green{ + dir = 1 + }, +/area/magmoor/civilian/rnr) "aYH" = ( /obj/machinery/power/apc/drained{ dir = 1 @@ -1741,6 +1768,7 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/landmark/weed_node, /turf/open/floor/tile/arrival/corner{ dir = 4 }, @@ -2264,6 +2292,15 @@ dir = 6 }, /area/magmoor/compound/east) +"bCw" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/green{ + dir = 8 + }, +/area/magmoor/civilian/rnr) "bCK" = ( /obj/machinery/shower{ dir = 1 @@ -2443,6 +2480,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 10 }, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/mono, /area/magmoor/civilian/arrival/east) "bJd" = ( @@ -2680,6 +2718,10 @@ dir = 9 }, /area/magmoor/research) +"bOU" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete/lines, +/area/magmoor/compound/southwest) "bPS" = ( /obj/structure/rock/basalt/alt, /turf/open/floor/plating/ground/mars/random/dirt, @@ -3336,6 +3378,12 @@ /obj/effect/ai_node, /turf/open/floor/plating/ground/concrete/lines, /area/magmoor/cave/north) +"cqe" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/dirttosand{ + dir = 6 + }, +/area/magmoor/compound/southeast) "cqk" = ( /obj/effect/landmark/patrol_point/som/som_12, /turf/open/floor/plating/ground/mars/random/cave, @@ -3785,6 +3833,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/effect/ai_node, /obj/structure/cable, +/obj/effect/landmark/weed_node, /turf/open/floor/plating/ground/concrete/edge{ dir = 4 }, @@ -4184,6 +4233,7 @@ /turf/open/floor/wood, /area/magmoor/civilian/basket) "cXM" = ( +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/red, /area/magmoor/civilian/arrival) "cYL" = ( @@ -4348,6 +4398,7 @@ dir = 4; on = 1 }, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/mono, /area/magmoor/civilian/cryostasis) "der" = ( @@ -4833,6 +4884,7 @@ /obj/structure/bed/chair/sofa/corsat/verticaltop{ name = "bench" }, +/obj/effect/landmark/weed_node, /turf/open/floor/tile/white, /area/magmoor/civilian/pool) "duC" = ( @@ -5205,6 +5257,7 @@ }, /area/magmoor/mining) "dGv" = ( +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/blue{ dir = 8 }, @@ -5360,6 +5413,11 @@ /obj/item/storage/firstaid/adv, /turf/open/floor/mainship/sterile/side, /area/magmoor/medical/storage) +"dKY" = ( +/obj/effect/ai_node, +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete/lines, +/area/magmoor/compound/east) "dLi" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ dir = 8; @@ -5434,6 +5492,10 @@ /obj/structure/cable, /turf/open/floor/plating/plating_catwalk, /area/magmoor/mining/storage) +"dOZ" = ( +/obj/effect/landmark/weed_node, +/turf/open/lavaland/basalt/dirt/autosmoothing, +/area/magmoor/compound/southwest) "dPd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -5552,6 +5614,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/green{ dir = 6 }, @@ -6146,6 +6209,10 @@ dir = 1 }, /area/magmoor/civilian/jani) +"etA" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/floor, +/area/magmoor/civilian/cryostasis) "etJ" = ( /obj/machinery/door/airlock/mainship/security{ dir = 8; @@ -6591,6 +6658,10 @@ "eFL" = ( /turf/open/floor/plating/ground/concrete/lines, /area/magmoor/compound/southeast) +"eFT" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete/edge, +/area/magmoor/compound/southwest) "eFU" = ( /obj/structure/window/framed/colony/reinforced, /obj/structure/platform{ @@ -6862,6 +6933,11 @@ dir = 8 }, /area/magmoor/medical/storage) +"eMg" = ( +/obj/structure/bed/chair/office/light, +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/red, +/area/magmoor/security/arrivals/south) "eMj" = ( /obj/structure/cable, /turf/open/floor/mainship/mono, @@ -7872,6 +7948,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ dir = 1 }, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/mono, /area/magmoor/civilian/arrival/east) "fCc" = ( @@ -8154,6 +8231,13 @@ dir = 8 }, /area/magmoor/cargo/processing/south) +"fKV" = ( +/obj/effect/turf_decal/sandedge{ + dir = 8 + }, +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/random/dirt, +/area/magmoor/compound/southeast) "fLe" = ( /obj/effect/landmark/start/job/survivor, /obj/effect/ai_node, @@ -8215,6 +8299,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/green, /area/magmoor/civilian/rnr) +"fMs" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/landmark/weed_node, +/turf/open/floor/wood, +/area/magmoor/civilian/gambling) "fMt" = ( /turf/open/floor/wood, /area/magmoor/command/conference) @@ -8386,6 +8478,14 @@ dir = 8 }, /area/magmoor/engi/storage) +"fTY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/mono, +/area/magmoor/security/arrivals/south) "fUi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 9 @@ -8530,6 +8630,7 @@ }, /area/magmoor/hydroponics/north) "fZr" = ( +/obj/effect/landmark/weed_node, /turf/open/floor/tile/arrival/corner{ dir = 8 }, @@ -8842,6 +8943,12 @@ }, /turf/open/floor/mainship/sterile/dark, /area/magmoor/medical/treatment) +"glK" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete/lines{ + dir = 9 + }, +/area/magmoor/compound/east) "gmb" = ( /turf/open/floor/tile/blue/whitebluecorner, /area/magmoor/civilian/clean) @@ -9254,6 +9361,10 @@ }, /turf/open/floor/plating, /area/magmoor/compound/north) +"gBE" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/green, +/area/magmoor/civilian/rnr) "gBM" = ( /obj/structure/rack, /obj/machinery/light{ @@ -9779,6 +9890,13 @@ /obj/structure/cable, /turf/open/floor/prison/kitchen, /area/magmoor/civilian/cook) +"gXK" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/mono, +/area/magmoor/civilian/rnr) "gXO" = ( /obj/effect/landmark/patrol_point/som/som_23, /turf/open/floor/plating/ground/mars/random/cave, @@ -9849,6 +9967,12 @@ dir = 1 }, /area/magmoor/civilian/pool) +"hcp" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete/lines{ + dir = 8 + }, +/area/magmoor/compound/southeast) "hcR" = ( /obj/structure/barricade/wooden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -10212,6 +10336,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/cable, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/green/corner{ dir = 8 }, @@ -10308,6 +10433,10 @@ }, /turf/open/floor/wood, /area/magmoor/civilian/mosque) +"hvR" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/mono, +/area/magmoor/civilian/rnr) "hwn" = ( /obj/structure/table/mainship, /obj/item/tool/surgery/hemostat, @@ -10634,6 +10763,16 @@ dir = 10 }, /area/magmoor/engi/power) +"hKg" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/landmark/weed_node, +/turf/open/floor/tile/white, +/area/magmoor/civilian/pool) "hKM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -11084,6 +11223,14 @@ /obj/effect/landmark/weed_node, /turf/open/floor/plating/ground/mars/random/dirt, /area/magmoor/compound/west) +"ice" = ( +/obj/effect/landmark/weed_node, +/turf/open/lavaland/basalt/dirt/autosmoothing, +/area/magmoor/compound/east) +"icu" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/dirttosand, +/area/magmoor/compound/southwest) "icI" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -11127,6 +11274,10 @@ dir = 1 }, /area/magmoor/landing/two) +"idQ" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/random/cave, +/area/magmoor/cave/southwest) "iec" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -11436,6 +11587,12 @@ dir = 8 }, /area/magmoor/compound) +"ipl" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/tile/neutral{ + dir = 8 + }, +/area/magmoor/civilian/pool) "ipm" = ( /turf/open/floor/plating/ground/concrete, /area/magmoor/compound/southeast) @@ -12045,6 +12202,14 @@ "iOa" = ( /turf/open/liquid/water/river, /area/magmoor/civilian/pool) +"iOc" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/platform/metalplatform{ + dir = 7 + }, +/obj/effect/landmark/weed_node, +/turf/open/floor/grass, +/area/magmoor/civilian/rnr) "iOh" = ( /turf/open/floor/mainship/floor, /area/magmoor/hydroponics/north) @@ -12436,6 +12601,7 @@ dir = 1 }, /obj/structure/cable, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/floor, /area/magmoor/civilian/cryostasis) "jdR" = ( @@ -12497,6 +12663,12 @@ dir = 8 }, /area/magmoor/cargo/storage/secure/south) +"jfx" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete/lines{ + dir = 4 + }, +/area/magmoor/compound/east) "jfI" = ( /obj/machinery/door/airlock/mainship/security{ dir = 1; @@ -12656,6 +12828,10 @@ dir = 4 }, /area/magmoor/mining) +"jkw" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete/lines, +/area/magmoor/compound/southeast) "jkz" = ( /obj/effect/attach_point/weapon/dropship1, /turf/open/floor/plating, @@ -12714,6 +12890,12 @@ dir = 4 }, /area/magmoor/medical/treatment) +"jmw" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete/edge{ + dir = 4 + }, +/area/magmoor/compound/east) "jmX" = ( /obj/effect/ai_node, /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ @@ -12960,6 +13142,7 @@ "jtI" = ( /obj/structure/bed/chair/wood/normal, /obj/structure/closet/walllocker/hydrant/extinguisher, +/obj/effect/landmark/weed_node, /turf/open/floor/tile/neutral{ dir = 1 }, @@ -12979,6 +13162,13 @@ }, /turf/open/floor/plating/ground/concrete/lines, /area/magmoor/compound/east) +"jux" = ( +/obj/structure/bed/chair/wood/normal{ + dir = 1 + }, +/obj/effect/landmark/weed_node, +/turf/open/floor/tile/neutral, +/area/magmoor/civilian/pool) "jvl" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, @@ -13635,6 +13825,7 @@ "jRN" = ( /obj/structure/flora/pottedplant/ten, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/mono, /area/magmoor/civilian/arrival/east) "jRU" = ( @@ -14102,6 +14293,14 @@ }, /turf/open/floor/mainship/floor, /area/magmoor/landing/two) +"kjk" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/random/sand, +/area/magmoor/compound/southwest) +"kjA" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/dirttosand, +/area/magmoor/compound/east) "kke" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 5 @@ -14746,6 +14945,12 @@ }, /turf/open/floor/plating, /area/magmoor/engi/atmos) +"kGL" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/dirttosand{ + dir = 1 + }, +/area/magmoor/compound/southwest) "kGP" = ( /obj/effect/ai_node, /turf/open/floor/plating/ground/concrete/lines{ @@ -14753,6 +14958,7 @@ }, /area/magmoor/compound/east) "kHq" = ( +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/silver{ dir = 8 }, @@ -15179,6 +15385,7 @@ /turf/open/floor/mainship/mono, /area/magmoor/civilian/arrival/east) "kWW" = ( +/obj/effect/landmark/weed_node, /turf/open/floor/plating/ground/concrete/lines{ dir = 5 }, @@ -15223,6 +15430,12 @@ }, /turf/open/floor/freezer, /area/magmoor/civilian/clean/toilet) +"kYE" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/dirttosand{ + dir = 10 + }, +/area/magmoor/compound/southwest) "kZC" = ( /turf/open/floor/mainship/black{ dir = 10 @@ -15518,6 +15731,13 @@ }, /turf/open/floor/mainship/floor, /area/magmoor/hydroponics/north) +"lkg" = ( +/obj/structure/bed/chair/wood/wings{ + dir = 8 + }, +/obj/effect/landmark/weed_node, +/turf/open/floor/wood, +/area/magmoor/civilian/gambling) "lkh" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 10 @@ -15747,6 +15967,12 @@ dir = 4 }, /area/magmoor/engi/thermal) +"lto" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete/lines{ + dir = 4 + }, +/area/magmoor/compound/southwest) "ltu" = ( /obj/effect/ai_node, /turf/open/floor/plating/ground/mars/random/dirt, @@ -16248,6 +16474,11 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/mainship/cargo, /area/magmoor/engi/storage) +"lPo" = ( +/obj/effect/ai_node, +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/mono, +/area/magmoor/civilian/arrival) "lPH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -16832,6 +17063,12 @@ dir = 1 }, /area/magmoor/compound/north) +"mkw" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/green{ + dir = 4 + }, +/area/magmoor/civilian/rnr) "mkE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -16870,6 +17107,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/landmark/weed_node, /turf/open/floor/wood, /area/magmoor/civilian/gambling) "mlB" = ( @@ -17004,6 +17242,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/mono, /area/magmoor/civilian/arrival/east) "msd" = ( @@ -17489,6 +17728,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/cable, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/green{ dir = 8 }, @@ -17908,6 +18148,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/floor, /area/magmoor/civilian/arrival/east) "ncw" = ( @@ -18287,6 +18528,10 @@ }, /turf/open/floor/mainship/mono, /area/magmoor/civilian/basket) +"nsr" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/silver, +/area/magmoor/civilian/arrival/east) "nsA" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -18312,6 +18557,11 @@ /obj/effect/landmark/weed_node, /turf/open/floor/mainship/mono, /area/magmoor/medical/morgue) +"nsK" = ( +/obj/effect/ai_node, +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/random/cave, +/area/magmoor/cave/southwest) "nsX" = ( /obj/structure/cable, /obj/structure/stairs/seamless{ @@ -18378,6 +18628,10 @@ /obj/structure/cable, /turf/open/floor/tile/white, /area/magmoor/civilian/pool) +"nvo" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete, +/area/magmoor/compound/southeast) "nvu" = ( /obj/structure/table/reinforced, /turf/open/floor/plating, @@ -18461,6 +18715,10 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/magmoor/engi/power) +"nBa" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/mono, +/area/magmoor/civilian/arrival/east) "nBm" = ( /obj/structure/bed/chair{ dir = 8 @@ -19414,6 +19672,11 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/tile/white, /area/magmoor/civilian/pool) +"opd" = ( +/obj/machinery/light, +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/mono, +/area/magmoor/civilian/rnr) "oqh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -23269,6 +23532,10 @@ }, /turf/open/floor/freezer, /area/magmoor/civilian/clean/toilet) +"qZC" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/wood, +/area/magmoor/civilian/gambling) "rah" = ( /obj/effect/ai_node, /turf/open/floor/plating/ground/mars/random/dirt, @@ -24221,6 +24488,10 @@ /obj/effect/landmark/corpsespawner/colonist, /turf/open/floor/mainship/mono, /area/magmoor/civilian/arrival/east) +"rMk" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete, +/area/magmoor/medical/morgue) "rMr" = ( /turf/open/floor/plating/ground/concrete/lines{ dir = 10 @@ -24430,6 +24701,12 @@ }, /turf/open/floor/mainship/mono, /area/magmoor/command/lobby/east) +"rUw" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete/lines{ + dir = 1 + }, +/area/magmoor/compound/southwest) "rUC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4 @@ -24518,6 +24795,13 @@ }, /turf/open/floor/plating, /area/magmoor/compound) +"rXy" = ( +/obj/effect/turf_decal/sandedge/corner2{ + dir = 1 + }, +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/random/dirt, +/area/magmoor/compound/east) "rXL" = ( /turf/open/floor/mainship/black{ dir = 8 @@ -24828,6 +25112,10 @@ /obj/effect/ai_node, /turf/open/floor/plating/ground/concrete/lines, /area/magmoor/compound) +"skV" = ( +/obj/effect/landmark/weed_node, +/turf/open/lavaland/basalt/dirt/autosmoothing, +/area/magmoor/compound/southeast) "sle" = ( /obj/structure/bed/chair{ dir = 1 @@ -25484,6 +25772,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/mono, /area/magmoor/civilian/arrival/east) "sIM" = ( @@ -25516,6 +25805,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, +/obj/effect/landmark/weed_node, /turf/open/floor/mainship/mono, /area/magmoor/civilian/arrival/east) "sKS" = ( @@ -25644,6 +25934,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/mainship/mono, /area/magmoor/engi/atmos) +"sQv" = ( +/obj/structure/cable, +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/floor, +/area/magmoor/civilian/cryostasis) "sQB" = ( /obj/machinery/prop/r_n_d/server, /turf/open/floor/bcircuit/off, @@ -25671,6 +25966,16 @@ "sRa" = ( /turf/closed/wall, /area/magmoor/medical/morgue) +"sRq" = ( +/obj/effect/turf_decal/tile/pink{ + dir = 4 + }, +/obj/effect/turf_decal/tile/pink{ + dir = 1 + }, +/obj/effect/landmark/weed_node, +/turf/open/floor/tile/white, +/area/magmoor/civilian/pool) "sRD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -26180,6 +26485,19 @@ }, /turf/open/lavaland/basalt/dirt/autosmoothing, /area/magmoor/compound/north) +"tkt" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/green{ + dir = 1 + }, +/area/magmoor/civilian/rnr) "tky" = ( /turf/open/floor/plating/ground/mars/dirttosand, /area/magmoor/compound/west) @@ -27670,6 +27988,12 @@ /obj/effect/ai_node, /turf/open/floor/plating/ground/mars/random/sand, /area/magmoor/compound/north) +"uly" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/dirttosand{ + dir = 4 + }, +/area/magmoor/compound/southwest) "ulA" = ( /obj/structure/closet/crate/internals, /turf/open/floor/mainship/floor, @@ -27679,6 +28003,12 @@ /obj/item/shard, /turf/open/floor/plating, /area/magmoor/mining) +"ulN" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete/lines{ + dir = 8 + }, +/area/magmoor/compound/southwest) "umc" = ( /turf/open/floor/freezer, /area/magmoor/civilian/cook) @@ -28836,6 +29166,13 @@ /obj/structure/cable, /turf/open/floor/freezer, /area/magmoor/cargo/freezer) +"vaa" = ( +/obj/structure/cable, +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete/lines{ + dir = 1 + }, +/area/magmoor/compound/southwest) "vaD" = ( /turf/closed/wall/r_wall, /area/magmoor/medical/storage) @@ -29523,6 +29860,12 @@ /obj/effect/ai_node, /turf/open/floor/plating/ground/mars/random/dirt, /area/magmoor/compound) +"vIb" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/concrete/edge{ + dir = 1 + }, +/area/magmoor/compound/southeast) "vIc" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -29622,6 +29965,11 @@ dir = 10 }, /area/magmoor/compound) +"vMp" = ( +/obj/structure/cable, +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/random/sand, +/area/magmoor/compound/east) "vMK" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -30815,6 +31163,7 @@ /area/magmoor/civilian/pool) "wDs" = ( /obj/effect/ai_node, +/obj/effect/landmark/weed_node, /turf/open/floor/plating/ground/concrete, /area/magmoor/compound/southwest) "wDR" = ( @@ -30982,6 +31331,22 @@ /obj/structure/closet/crate/trashcart, /turf/open/floor/plating/ground/concrete, /area/magmoor/civilian/jani) +"wIX" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/landmark/weed_node, +/turf/open/floor/tile/white, +/area/magmoor/civilian/pool) "wJj" = ( /obj/structure/bed/chair, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -31387,6 +31752,12 @@ "wXM" = ( /turf/open/lavaland/basalt/dirt/autosmoothing, /area/magmoor/compound/southwest) +"wXO" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/dirttosand{ + dir = 1 + }, +/area/magmoor/compound/southeast) "wXX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -31619,6 +31990,12 @@ "xep" = ( /turf/open/floor/tile/bar, /area/magmoor/civilian/clean/shower) +"xer" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/dirttosand{ + dir = 4 + }, +/area/magmoor/compound/southeast) "xeB" = ( /obj/structure/window/framed/colony, /turf/open/floor/plating, @@ -32397,6 +32774,11 @@ }, /turf/open/floor/mainship/blue, /area/magmoor/civilian/arrival/east) +"xBS" = ( +/obj/structure/rack, +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/silver/full, +/area/magmoor/civilian/arrival/east) "xBX" = ( /obj/machinery/door/airlock/multi_tile/mainship/generic/rnr{ name = "\improper Basketball Arena" @@ -32672,6 +33054,12 @@ dir = 1 }, /area/magmoor/compound/northwest) +"xMA" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/plating/ground/mars/dirttosand{ + dir = 5 + }, +/area/magmoor/compound/east) "xMO" = ( /turf/open/liquid/lava/autosmoothing, /area/magmoor/compound/southwest) @@ -33101,6 +33489,14 @@ }, /turf/open/floor/plating, /area/magmoor/cargo/processing/south) +"ybn" = ( +/obj/structure/flora/ausbushes/grassybush, +/obj/structure/platform/metalplatform{ + dir = 11 + }, +/obj/effect/landmark/weed_node, +/turf/open/floor/grass, +/area/magmoor/civilian/rnr) "ybx" = ( /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, @@ -33340,6 +33736,12 @@ /obj/structure/cable, /turf/open/floor/mainship/mono, /area/magmoor/mining) +"ykt" = ( +/obj/effect/landmark/weed_node, +/turf/open/floor/mainship/silver{ + dir = 8 + }, +/area/magmoor/civilian/arrival) "ykC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -36617,7 +37019,7 @@ dwS dwS dwS dwS -dwS +idQ dwS dwS dwS @@ -36855,12 +37257,12 @@ dwS dwS dwS dwS +idQ dwS dwS dwS dwS -dwS -lAc +nsK rxl rxl rxl @@ -37079,7 +37481,7 @@ rxl dwS dwS dwS -dwS +idQ dwS dwS dwS @@ -37540,7 +37942,7 @@ rxl rxl rxl dwS -dwS +idQ dwS dwS dwS @@ -37777,7 +38179,7 @@ dwS dwS dwS dwS -dwS +idQ dwS dwS dwS @@ -37791,11 +38193,11 @@ rxl rxl rxl rxl +idQ dwS dwS dwS -dwS -dwS +idQ dwS dwS rxl @@ -38015,7 +38417,7 @@ dwS dwS lAc dwS -dwS +idQ dwS dwS rxl @@ -38450,7 +38852,7 @@ xMO xMO wXM rgm -rgm +xmU rxl rxl rxl @@ -38477,7 +38879,7 @@ dwS dwS dwS dwS -dwS +idQ dwS dwS rxl @@ -38496,7 +38898,7 @@ dwS dwS dwS dwS -dwS +idQ dwS rxl rxl @@ -38705,7 +39107,7 @@ rxl dwS dwS dwS -dwS +idQ dwS dwS dwS @@ -38724,7 +39126,7 @@ dwS dwS dwS dwS -dwS +idQ dwS dwS dwS @@ -38918,7 +39320,7 @@ wXM rgm rgm rgm -rgm +xmU rgm rxl rxl @@ -38947,7 +39349,7 @@ dwS dwS lAc dwS -dwS +idQ dwS dwS dwS @@ -39167,7 +39569,7 @@ rxl rxl rxl rxl -dwS +idQ dwS dwS dwS @@ -39185,7 +39587,7 @@ dwS dwS dwS dwS -dwS +idQ dwS dwS rxl @@ -39388,7 +39790,7 @@ rgm rgm rgm rgm -rgm +xmU rxl rxl rxl @@ -39425,7 +39827,7 @@ rxl rxl rxl rxl -dwS +idQ dwS dwS dwS @@ -39662,7 +40064,7 @@ rxl dwS dwS dwS -dwS +idQ dwS dwS dwS @@ -40082,6 +40484,7 @@ wXM rgm rgm rgm +xmU rgm rgm rgm @@ -40090,13 +40493,12 @@ rgm rgm rgm rgm -rgm -rgm +xmU ltu rgm lQY vcB -dwS +idQ lAc rxl rxl @@ -40132,7 +40534,7 @@ dwS dwS dwS dwS -dwS +idQ dwS dwS rxl @@ -40312,7 +40714,7 @@ xMO xMO wXM wXM -lWM +uly lWM rgm rgm @@ -40320,7 +40722,7 @@ rgm rgm rgm rgm -rgm +xmU rgm rgm rgm @@ -40783,6 +41185,7 @@ wMk wMk eCB rgm +xmU rgm rgm rgm @@ -40793,8 +41196,7 @@ rgm rgm rgm rgm -rgm -rgm +xmU rgm rgm rgm @@ -41032,7 +41434,7 @@ rgm rgm rgm rgm -rgm +xmU rgm rxl rxl @@ -41063,12 +41465,12 @@ rxl rxl dwS dwS -dwS +idQ dwS lAc dwS dwS -dwS +idQ dwS rxl rxl @@ -41251,12 +41653,12 @@ mQq eCB wSW hxc -sgM +bOU hxc sbg wSW rgm -rgm +xmU rgm rgm rgm @@ -41463,7 +41865,7 @@ xQq bVz lCK lCK -ebH +ybn lCK fgC oOH @@ -41494,7 +41896,7 @@ rgm rgm rgm rgm -rgm +xmU rgm rgm rgm @@ -41701,7 +42103,7 @@ lCK fgC oOH lCK -bpb +iOc lCK lCK bVz @@ -41947,13 +42349,13 @@ dep tSL wMk mQq -eCB +kGL wSW hxc hon cnx hon -pMh +ulN pMh pMh pMh @@ -42197,7 +42599,7 @@ rgm rgm rgm rgm -rgm +xmU kCQ iLH bss @@ -42407,7 +42809,7 @@ lCK vlF vlF aAZ -sWI +sQv qhp vlF vlF @@ -42416,7 +42818,7 @@ avf eCB wSW hxc -gdG +eFT dXq gdG naZ @@ -42627,7 +43029,7 @@ xTu qDY bVz lCK -lCK +hvR gsA lCK ovG @@ -42659,7 +43061,7 @@ hxc sgM jyA rgm -rgm +xmU rgm rgm rgm @@ -42867,7 +43269,7 @@ ovG oOH lCK lCK -lCK +hvR lCK aWz tyH @@ -43096,7 +43498,7 @@ sPr lCK ebH lCK -ovG +tkt oOH lCK ebH @@ -43111,7 +43513,7 @@ tyH pwX jdI wMk -mQq +kjk eCB wSW hxc @@ -43120,7 +43522,7 @@ hxc sgM wSW rgm -kVV +icu hxc sgM mQq @@ -43337,7 +43739,7 @@ lCK lCK aWz tyH -tyH +etA tyH tyH tyH @@ -43362,7 +43764,7 @@ rgm rgm rgm rgm -rgm +xmU xJL rxl bss @@ -43581,7 +43983,7 @@ mQq eCB rgm rgm -rgm +xmU rgm rgm rgm @@ -43791,7 +44193,7 @@ gbk eXi eXi bVz -lCK +hvR lCK lCK lCK @@ -43800,7 +44202,7 @@ ezm lCK lCK lCK -amd +opd bVz fBc fBc @@ -43823,7 +44225,7 @@ bOC hxc sgM mQq -mQq +kjk mQq mQq mQq @@ -44029,7 +44431,7 @@ lCK jxj nHJ dio -oOH +gBE sOy nTk lCK @@ -44275,17 +44677,17 @@ wuH xRt saX kfI -roE +qZC iba mQq -eCB +kGL rgm rgm rgm rgm rgm kVV -mQq +kjk ojK mcS mcS @@ -44514,7 +44916,7 @@ mQq eCB rgm rgm -rgm +xmU rgm rgm kVV @@ -44525,7 +44927,7 @@ naZ naZ naZ naZ -naZ +lto naZ fMN kvj @@ -44725,7 +45127,7 @@ xBX ruF klI aAb -aAb +bCw ffk dCy ewW @@ -44955,7 +45357,7 @@ eNz wCU wIH wCU -lCK +hvR hyz xOp xOp @@ -44964,7 +45366,7 @@ qHg beH ciK xOp -xOp +mkw uqV lCK ssf @@ -44987,7 +45389,7 @@ kVV mQq hxc hon -pMh +ulN pMh pMh pMh @@ -45435,21 +45837,21 @@ lCK lCK sac roE -uXF +aPR roE uXF roE -ucS +fMs roE sZv mQq eCB +xmU rgm rgm rgm rgm -rgm -kVV +icu mQq tLs gdG @@ -45691,7 +46093,7 @@ mQq mQq mQq mQq -mQq +kjk hxc kvj nio @@ -46121,7 +46523,7 @@ nrP wIH nSr bVz -aRq +gXK lCK lCK lCK @@ -46129,12 +46531,12 @@ ceu oOH lCK lCK -lCK +hvR lCK bVz tmz roE -agS +lkg agS roE roE @@ -46145,7 +46547,7 @@ mQq eCB rgm rgm -rgm +xmU rgm rgm rgm @@ -46153,7 +46555,7 @@ obs tLs sgM mQq -eCB +kGL rgm rgm kVV @@ -46357,7 +46759,7 @@ bVz lCK lCK ebH -lCK +hvR ceu oOH lCK @@ -46372,7 +46774,7 @@ qxc qxc roE csn -roE +qZC sZv mQq eCB @@ -46382,7 +46784,7 @@ rgm rgm rgm rgm -kVV +icu tLs sgM mQq @@ -46609,7 +47011,7 @@ roE sZv mQq eCB -rgm +xmU rgm rgm rgm @@ -46856,7 +47258,7 @@ eCB rgm rgm kVV -mQq +kjk hxc kvj rxl @@ -47287,13 +47689,13 @@ wph xmr jTF lCK -lCK +hvR ebH lCK ceu oOH lCK -ebH +ybn lCK lCK bVz @@ -47302,7 +47704,7 @@ gio kpz pRU wJw -rgm +xmU lWM rgm rgm @@ -47310,7 +47712,7 @@ rgm rgm rgm rgm -rgm +xmU rgm ltu kVV @@ -47318,7 +47720,7 @@ mQq iaF sgM mQq -eCB +kGL rgm rgm kVV @@ -47523,7 +47925,7 @@ kyy dJw bpb lCK -ceu +aYz ovJ lCK bpb @@ -47546,7 +47948,7 @@ rgm rgm rgm rgm -kVV +icu mQq tLs sgM @@ -47771,7 +48173,7 @@ wJw rgm rMC rgm -rgm +xmU rgm rgm rgm @@ -48022,7 +48424,7 @@ rgm rgm kVV mQq -hxc +rUw tpI ibo ibo @@ -48242,7 +48644,7 @@ wXM wXM rgm rgm -rgm +xmU rgm rgm oTk @@ -48270,7 +48672,7 @@ dyu naZ naZ naZ -naZ +lto qNu mQq eCB @@ -48479,12 +48881,12 @@ wXM wXM rgm rgm -obs +kYE tLs sgM eCB rgm -rgm +xmU rgm rgm obs @@ -48498,7 +48900,7 @@ rMC rMC rMC obs -mQq +kjk mQq mQq mQq @@ -48726,7 +49128,7 @@ rMC rMC rgm rgm -rgm +xmU rgm rgm rgm @@ -48741,7 +49143,7 @@ rMC rMC rgm rgm -rgm +xmU rgm rxl rxl @@ -48955,7 +49357,7 @@ wXM wXM wXM wXM -rgm +xmU rgm rgm rgm @@ -49203,7 +49605,7 @@ rgm rgm rgm rgm -rgm +xmU rgm rgm rgm @@ -49412,7 +49814,7 @@ xMO wXM rgm kVV -tLs +vaa sgM eCB wXM @@ -49426,12 +49828,12 @@ wXM wXM wXM wXM -wXM +dOZ wXM rgm rgm rgm -rgm +xmU rgm rgm rgm @@ -49642,7 +50044,7 @@ wXM wXM xMO xMO -wXM +dOZ rgm bOC tLs @@ -49650,7 +50052,7 @@ sgM xlX rgm rgm -rgm +xmU wXM wXM wXM @@ -49905,7 +50307,7 @@ rgm rgm rgm rgm -rgm +xmU rgm rxl rxl @@ -50116,12 +50518,12 @@ qne cIl tdT qrQ -qrQ +ykt aKM fmw aKM qrQ -qrQ +ykt ylX cIl wXM @@ -50133,7 +50535,7 @@ xMO xMO wXM wXM -rgm +xmU rgm rgm rgm @@ -50578,7 +50980,7 @@ xaK gHV pbC ugT -qne +fok nUm fcG pzo @@ -50808,18 +51210,18 @@ pUx nHH iFF bLE -gHV +eMg pbC ugT qne nUm fcG -rHt +lPo pzo eao rLV eao -pzo +jVi rHt lrw pSu @@ -51506,7 +51908,7 @@ pUx eTo fhx ilk -rNx +fTY lGj aAH cCY @@ -51752,7 +52154,7 @@ dCD mMM dCD eAh -pzo +jVi vDp eAh xCd @@ -60788,7 +61190,7 @@ qfV cjH rBF cdr -cdr +nBa jPJ oeB mBs @@ -61257,7 +61659,7 @@ xup qXD ilS akM -amV +nsr bRC bso bso @@ -61479,7 +61881,7 @@ vqD bRC ama cQf -mQM +xBS mQM rBF jnk @@ -63132,7 +63534,7 @@ ays tQU rUH xHW -xHW +ipl rOa xHW xHW @@ -63377,7 +63779,7 @@ adW enL oMC enL -enL +hKg gET xEx yeD @@ -63614,7 +64016,7 @@ cJe cJe doZ pWk -enL +hKg lEj pSY wBN @@ -63840,7 +64242,7 @@ hcl cQo tQU oDp -vOo +wIX wCZ enL sea @@ -64303,7 +64705,7 @@ iOa iOa iOa hcl -bJd +jux tQU yip kxY @@ -64544,7 +64946,7 @@ duz xTY tQU otd -goi +sRq nXU xTY tQU @@ -64796,7 +65198,7 @@ xwh xwh xUd xUd -xUd +skV xUd xUd xwh @@ -65000,7 +65402,7 @@ wpg wpg wpg wpg -wpg +age jRU aWT tQU @@ -65482,7 +65884,7 @@ xwh xUd xUd uwv -eFL +jkw xUd xUd xUd @@ -65492,7 +65894,7 @@ jRL jRL jRL jRL -jRL +kua jRL jRL jRL @@ -65720,6 +66122,7 @@ jRL jRL jRL jRL +kua jRL jRL jRL @@ -65729,8 +66132,7 @@ jRL jRL jRL jRL -jRL -xUd +skV xUd xwh xUd @@ -66161,10 +66563,9 @@ otK nRk nRk nRk +ice nRk nRk -nRk -cOx cOx cOx cOx @@ -66172,11 +66573,12 @@ cOx cOx cOx cOx +hrp cOx cOx cOx cOx -jRL +kua jRL jRL vGi @@ -66189,11 +66591,11 @@ jRL jRL jRL jRL +kua jRL jRL jRL -jRL -jRL +kua jRL jRL jRL @@ -66384,12 +66786,12 @@ nRk nRk nRk cOx -cOx +hrp cOx cVH jCp hYy -vjP +dKY hSF cOx cOx @@ -66399,7 +66801,7 @@ cOx cOx cOx cOx -cOx +hrp cOx cOx cOx @@ -66415,7 +66817,7 @@ jRL vGi uwv eFL -cpt +wXO jRL jRL ggZ @@ -66645,7 +67047,7 @@ cOx jRL jRL jRL -hjA +cqe uwv eFL cpt @@ -66845,7 +67247,7 @@ rxl cOx cOx cOx -cOx +hrp cOx cOx cOx @@ -66885,7 +67287,7 @@ rBD jRL jRL pnC -jRL +kua kOZ uwv eFL @@ -66894,7 +67296,7 @@ eFL kOZ jRL jRL -jRL +kua jRL xUd xwh @@ -67074,8 +67476,7 @@ joR fet aXr rxl -hSF -cOx +ubr cOx cOx cOx @@ -67083,6 +67484,7 @@ cOx cOx cOx cOx +hrp rxl rxl cVH @@ -67090,11 +67492,12 @@ jCp hYy xyC hSF -cOx +hrp cOx iPD cOx cOx +hrp cOx cOx cOx @@ -67103,8 +67506,7 @@ cOx cOx cOx cOx -cOx -cOx +hrp cOx tzT tzT @@ -67333,7 +67735,7 @@ cOx cOx cOx cOx -cOx +hrp cOx cOx cOx @@ -67341,7 +67743,7 @@ cOx cVH eDy kGP -qKm +hcp qKm qKm qKm @@ -67355,7 +67757,7 @@ kTJ qKm ljO aeO -ljO +vIb eFL kOZ jRL @@ -67542,6 +67944,7 @@ aXr vqD hSF cOx +hrp cOx cOx cOx @@ -67550,8 +67953,7 @@ cOx cOx cOx cOx -cOx -cVH +kjA jCp hYy xyC @@ -67578,12 +67980,12 @@ ipm ipm ipm ipm +nvo ipm ipm ipm ipm -ipm -ipm +nvo ipm ipm ipm @@ -67780,7 +68182,7 @@ tzT tzT tzT tzT -tzT +wQq tzT tzT tzT @@ -67796,7 +68198,7 @@ tzT tzT tzT tzT -tzT +wQq tzT tzT tzT @@ -67824,7 +68226,7 @@ iOL htR eFL kOZ -jRL +kua jRL jRL jRL @@ -67996,7 +68398,7 @@ nIV sRa iIT hJL -hJL +rMk hmc aYw rxl @@ -68005,7 +68407,7 @@ kik kik kik kik -eDy +glK oGV oGV oGV @@ -68025,6 +68427,7 @@ oGV oGV oGV oGV +fCQ oGV oGV oGV @@ -68034,8 +68437,7 @@ oGV oGV oGV oGV -oGV -oGV +fCQ oGV oGV qNE @@ -68053,14 +68455,14 @@ pnC pnC wGL uwv -eFL +jkw uwv eFL kOZ jRL jRL jRL -jRL +kua xUd xwh xUd @@ -68233,7 +68635,7 @@ hJL cGh aYw vqD -eiA +xMA cOx cOx cOx @@ -68243,7 +68645,7 @@ ijc wOl wOl wOl -wOl +jfx wOl wOl wOl @@ -68253,7 +68655,7 @@ wOl wOl wOl eIW -wOl +jfx wOl wOl wOl @@ -68271,7 +68673,7 @@ ijc wOl wOl wOl -mcV +jmw vjP cpt jRL @@ -68481,7 +68883,7 @@ nfy mTX mTX mTX -mTX +vMp mTX hgM mTX @@ -68496,7 +68898,7 @@ mTX mTX mTX mTX -mTX +vMp mTX mTX bRd @@ -68507,7 +68909,7 @@ vqD jCp xyC rBD -ggZ +xer jRL jRL jRL @@ -68516,12 +68918,12 @@ jRL jRL vGi fJa -cpt +wXO kOZ uwv eFL uwv -eFL +jkw kOZ jRL jRL @@ -68706,7 +69108,7 @@ lHh tJg cjw der -vqD +ays xnL xnL xnL @@ -68745,7 +69147,7 @@ xnL xnL ugO uVv -jRL +kua jRL jRL pnC @@ -68935,7 +69337,7 @@ wOl wOl wOl wOl -wOl +jfx mcV ijc osT @@ -68995,7 +69397,7 @@ jRL jRL jRL jRL -xUd +skV rxl rxl xWF @@ -69161,11 +69563,11 @@ vqD vqD vqD vqD -gmf -kik +pjC kik kik kik +wIA kik kik lbq @@ -69224,7 +69626,7 @@ jRL jRL jRL jRL -jRL +kua jRL jRL jRL @@ -69452,7 +69854,7 @@ jRL jRL jRL jRL -jRL +kua jRL jRL jRL @@ -69680,7 +70082,7 @@ rxl rxl rxl uVv -jRL +kua jRL jRL jRL @@ -69856,14 +70258,14 @@ rxl rxl rxl rxl +hrp cOx cOx cOx cOx cOx cOx -cOx -cOx +hrp cOx cOx cOx @@ -70092,7 +70494,7 @@ rxl cOx cOx cOx -cOx +hrp cOx cOx cOx @@ -70101,7 +70503,7 @@ cOx cOx cOx cVH -jCp +iOV jtY rxl qGn @@ -70382,12 +70784,12 @@ thq jRL jRL jRL -jRL +kua jRL xqq eFY eFY -eFY +fKV rxl rxl rxl @@ -70564,7 +70966,7 @@ cOx cOx cOx cOx -cOx +hrp cOx cVH jCp @@ -70789,11 +71191,11 @@ rxl rxl rxl rxl +hrp cOx cOx cOx -cOx -cOx +hrp cOx cOx cOx @@ -70845,7 +71247,7 @@ vAK qGn rxl thq -eFY +fKV eFY mPu crp @@ -71265,7 +71667,7 @@ cOx cOx cOx cOx -cVH +kjA kBs tmw rtZ @@ -71727,7 +72129,7 @@ cOx cOx cOx cOx -cOx +hrp cOx cOx cOx @@ -71956,7 +72358,7 @@ rxl rxl cOx cOx -cOx +hrp cOx cOx cOx @@ -72431,7 +72833,7 @@ cOx cOx cOx cVH -jCp +iOV tmw rtZ qJU @@ -72660,7 +73062,7 @@ cOx cOx cOx cOx -cOx +hrp cOx cOx cVH @@ -73120,10 +73522,10 @@ rxl rxl rxl rxl +hrp cOx cOx -cOx -cOx +hrp cOx cOx cOx @@ -73595,7 +73997,7 @@ cOx cOx cOx cOx -cOx +hrp cOx hZJ rxl @@ -73821,10 +74223,10 @@ rxl rxl vew sWL -vNi -cOx +rXy cOx cOx +hrp cOx cOx cOx @@ -74051,7 +74453,7 @@ rxl rxl rxl rxl -pet +kbo pet pet sWL @@ -74520,7 +74922,7 @@ pet pet pet pet -pet +kbo pet rxl rxl diff --git a/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm b/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm index 6b79a7cb1559f..3bb2b4364c1a2 100644 --- a/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm +++ b/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm @@ -87,7 +87,10 @@ /obj/machinery/door_control/mainship/ammo{ dir = 8 }, -/turf/open/floor/mainship/floor, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/turf/open/floor/mainship/cargo/arrow, /area/mainship/hallways/hangar) "aha" = ( /obj/structure/disposalpipe/segment, @@ -668,11 +671,8 @@ /turf/open/floor/wood, /area/mainship/living/numbertwobunks) "aPM" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/structure/ship_ammo/cas/bomb/fourhundred, -/turf/open/floor/mainship/mono, +/obj/structure/ship_ammo/cas/rocket/keeper, +/turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) "aQj" = ( /obj/effect/turf_decal/warning_stripes/thin{ @@ -1315,9 +1315,8 @@ }, /area/mainship/squads/general) "bDi" = ( -/turf/open/floor/mainship/cargo/arrow{ - dir = 8 - }, +/obj/structure/ship_ammo/cas/rocket/banshee, +/turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) "bDn" = ( /obj/machinery/telecomms/bus/preset_three, @@ -2401,7 +2400,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/turf/open/floor/mainship/mono, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/turf/open/floor/mainship/cargo/arrow, /area/mainship/hallways/hangar) "cYi" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -3602,7 +3604,6 @@ /obj/structure/ob_ammo/ob_fuel, /obj/structure/ob_ammo/ob_fuel, /obj/structure/ob_ammo/ob_fuel, -/obj/structure/rack, /obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -4590,7 +4591,9 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/obj/structure/ship_ammo/cas/rocket/widowmaker, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "fJI" = ( @@ -4835,6 +4838,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 5 + }, /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) "gbJ" = ( @@ -5157,7 +5163,9 @@ }, /area/mainship/command/cic) "gvv" = ( -/obj/effect/ai_node, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, /turf/open/floor/mainship/cargo/arrow, /area/mainship/hallways/hangar) "gwK" = ( @@ -5335,7 +5343,10 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/lower_hull) "gPw" = ( -/obj/structure/ship_ammo/cas/rocket/keeper, +/obj/structure/ship_ammo/cas/bomblet, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "gPQ" = ( @@ -5653,10 +5664,10 @@ /turf/open/floor/mainship/office, /area/mainship/hallways/hangar) "hiO" = ( -/obj/structure/ship_ammo/cas/minirocket, /obj/machinery/light/mainship{ dir = 1 }, +/obj/structure/ship_ammo/cas/rocket/widowmaker, /turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) "hjG" = ( @@ -6165,7 +6176,9 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/obj/structure/ship_ammo/cas/rocket/banshee, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "hSQ" = ( @@ -6422,9 +6435,13 @@ /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/port_umbilical) "ilf" = ( -/turf/open/floor/mainship/cargo/arrow{ - dir = 4 +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 }, +/turf/open/floor/mainship/cargo/arrow, /area/mainship/hallways/hangar) "ilH" = ( /obj/structure/table/mainship/nometal, @@ -8325,7 +8342,10 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 5 }, -/turf/open/floor/mainship/cargo, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 6 + }, +/turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "kPH" = ( /obj/structure/table/fancywoodentable, @@ -8645,9 +8665,6 @@ /area/mainship/squads/general) "lgM" = ( /obj/machinery/photocopier, -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - on = 1 - }, /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) "lgN" = ( @@ -9108,7 +9125,10 @@ /turf/open/floor/wood, /area/mainship/living/chapel) "lET" = ( -/obj/structure/ship_ammo/cas/rocket/keeper, +/obj/structure/ship_ammo/cas/bomb/fourhundred, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, /turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) "lFg" = ( @@ -9117,12 +9137,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) "lFo" = ( @@ -10451,7 +10471,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mainship/mono, +/obj/effect/ai_node, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/turf/open/floor/mainship/cargo/arrow, /area/mainship/hallways/hangar) "niH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -10955,6 +10979,11 @@ dir = 4 }, /area/mainship/medical/upper_medical) +"nNY" = ( +/obj/machinery/camera/autoname/mainship, +/obj/structure/ship_ammo/cas/heavygun, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "nOv" = ( /obj/structure/table/mainship/nometal, /obj/item/tool/wrench, @@ -11498,9 +11527,7 @@ /obj/structure/sign/poster{ dir = 1 }, -/turf/open/floor/mainship/cargo/arrow{ - dir = 4 - }, +/turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) "oDx" = ( /obj/effect/soundplayer, @@ -11887,6 +11914,7 @@ /obj/machinery/camera/autoname/mainship{ dir = 1 }, +/obj/structure/dropship_equipment/cas/weapon/bomblet_pod, /turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) "pbe" = ( @@ -12024,8 +12052,13 @@ /turf/open/floor/grass, /area/mainship/living/starboard_garden) "pha" = ( -/obj/structure/ship_ammo/cas/bomblet, -/turf/open/floor/mainship/mono, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/turf/open/floor/mainship/cargo/arrow, /area/mainship/hallways/hangar) "phr" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -12384,6 +12417,7 @@ /obj/machinery/camera/autoname/mainship{ dir = 8 }, +/obj/item/stack/sandbags_empty/half, /turf/open/floor/mainship/mono, /area/mainship/command/cic) "pEN" = ( @@ -12716,9 +12750,14 @@ /area/mainship/squads/general) "pVY" = ( /obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 + dir = 5 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 10 }, -/obj/structure/ship_ammo/cas/rocket/banshee, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "pWo" = ( @@ -13334,11 +13373,11 @@ /turf/open/floor/wood, /area/mainship/living/numbertwobunks) "qKp" = ( -/obj/structure/ship_ammo/cas/heavygun, /obj/effect/decal/cleanable/blood/writing{ desc = "It looks like a writing in blood. It says, 'We live as we dream, alone.'"; dir = 4 }, +/obj/structure/ship_ammo/cas/minirocket, /turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) "qKw" = ( @@ -13903,6 +13942,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 + }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "rxx" = ( @@ -14927,9 +14969,8 @@ /area/mainship/hull/lower_hull) "sPc" = ( /obj/item/radio/intercom/general, -/turf/open/floor/mainship/cargo/arrow{ - dir = 8 - }, +/obj/structure/ship_ammo/cas/rocket/widowmaker, +/turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) "sQz" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ @@ -15104,7 +15145,7 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, -/obj/structure/dropship_equipment/cas/weapon/bomblet_pod, +/obj/effect/spawner/random/misc/gnome, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "tbT" = ( @@ -16475,7 +16516,6 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/port_hallway) "uDq" = ( -/obj/structure/ship_ammo/cas/minirocket/illumination, /obj/machinery/light/mainship{ dir = 1 }, @@ -16718,6 +16758,9 @@ dir = 1 }, /obj/effect/ai_node, +/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ + on = 1 + }, /turf/open/floor/mainship/mono, /area/mainship/engineering/upper_engineering) "uTv" = ( @@ -17822,7 +17865,9 @@ /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 }, -/obj/structure/ship_ammo/cas/rocket/widowmaker, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, /turf/open/floor/mainship/floor, /area/mainship/hallways/hangar) "wtq" = ( @@ -18646,6 +18691,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 + }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "xvv" = ( @@ -49844,7 +49892,7 @@ dpY dpY eAd mVM -kOe +mVM dpY dkX dpY @@ -50101,7 +50149,7 @@ fwq fwq fwq fwq -dpY +gRV dKF feK dKF @@ -52910,8 +52958,8 @@ qzs hoB fwq kcJ +kOe fwq -dpY sZZ tyN wEZ @@ -53165,9 +53213,9 @@ esN pkN tyN hiO -leF -leF -leF +bDi +aPM +gvv pbx tyN tyN @@ -53422,9 +53470,9 @@ esN wPV tyN oDl -ilf -ilf -dpY +mVM +mVM +pha rwK mQH tXB @@ -53678,10 +53726,10 @@ hRh esN wPV tyN -mEj -mEj +leF +leF qKp -cjU +leF cXd tTm kiP @@ -53935,10 +53983,10 @@ hRh esN wPV tyN -mEj -mEj -mEj -gvv +kZz +kZz +kZz +kZz niE mQH tlj @@ -54194,8 +54242,8 @@ wPV jAX sPc bDi -bDi -dpY +aPM +ilf xuA mQH egI @@ -54450,9 +54498,9 @@ esN wPV tyN uDq -kZz -kZz -kZz +mVM +mVM +gvv dgE tyN tyN @@ -54715,7 +54763,7 @@ lET tyN rYr tyN -aPM +fwq fwq skU fmN @@ -54963,10 +55011,10 @@ hRh esN wPV tyN -qtz -hcF -dpY -dpY +nNY +mEj +mEj +gvv dpY paT tyN @@ -55220,9 +55268,9 @@ hRh esN pkN tyN -hcF -hcF -hcF +mEj +mEj +mEj agP hcF jhO @@ -55235,7 +55283,7 @@ bFX fPH hEa uzm -pha +dpY dpY dpY lue diff --git a/_maps/map_files/Sulaco/TGS_Sulaco.dmm b/_maps/map_files/Sulaco/TGS_Sulaco.dmm index e361ad7f85da9..6a390c54ae688 100644 --- a/_maps/map_files/Sulaco/TGS_Sulaco.dmm +++ b/_maps/map_files/Sulaco/TGS_Sulaco.dmm @@ -13071,6 +13071,10 @@ }, /turf/open/floor/prison, /area/mainship/shipboard/weapon_room) +"gcZ" = ( +/obj/structure/ship_ammo/cas/heavygun, +/turf/open/floor/plating, +/area/sulaco/hangar/cas) "gdq" = ( /obj/machinery/camera/autoname{ dir = 4 @@ -13729,6 +13733,15 @@ }, /turf/open/floor/plating, /area/sulaco/maintenance/upperdeck_AIcore_maint) +"gWz" = ( +/obj/structure/table/mainship/nometal, +/obj/effect/spawner/random/engineering/tech_supply, +/obj/effect/spawner/random/engineering/tech_supply, +/obj/effect/spawner/random/engineering/tech_supply, +/obj/effect/spawner/random/engineering/tech_supply, +/obj/item/clothing/gloves/insulated, +/turf/open/floor/prison, +/area/sulaco/bridge/office) "gWF" = ( /obj/machinery/vending/weapon, /turf/open/floor/prison, @@ -14040,6 +14053,7 @@ pixel_x = 3; pixel_y = 3 }, +/obj/item/clothing/gloves/insulated, /turf/open/floor/prison/darkyellow{ dir = 8 }, @@ -20563,6 +20577,7 @@ }, /obj/structure/rack, /obj/item/uav_turret/droid, +/obj/item/uav_turret/droid, /turf/open/floor/prison/bright_clean, /area/sulaco/hangar) "pum" = ( @@ -22146,7 +22161,7 @@ /area/sulaco/hallway/lower_foreship) "ryR" = ( /obj/effect/decal/cleanable/dirt, -/obj/vehicle/unmanned/droid/scout, +/obj/vehicle/unmanned/droid, /turf/open/floor/prison/bright_clean, /area/sulaco/hangar) "rzi" = ( @@ -54205,7 +54220,7 @@ arc avr atF ecX -uif +gWz avr awI rhM @@ -59182,7 +59197,7 @@ kwh bhA ddK pwv -pwv +gcZ pwv qct pwv @@ -59439,7 +59454,7 @@ kwh bhA ddK pwv -pwv +gcZ pwv qct pwv diff --git a/_maps/map_files/Theseus/TGS_Theseus.dmm b/_maps/map_files/Theseus/TGS_Theseus.dmm index e0121855dfe0e..9c5f83be7de06 100644 --- a/_maps/map_files/Theseus/TGS_Theseus.dmm +++ b/_maps/map_files/Theseus/TGS_Theseus.dmm @@ -529,10 +529,6 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/starboard_hull) "abZ" = ( -/obj/machinery/power/apc/mainship{ - dir = 4 - }, -/obj/structure/cable, /turf/open/floor/mainship/tcomms, /area/mainship/command/telecomms) "aca" = ( @@ -1208,6 +1204,13 @@ /obj/effect/ai_node, /turf/open/floor/mainship/floor, /area/mainship/shipboard/firing_range) +"aex" = ( +/obj/docking_port/stationary/marine_dropship/crash_target, +/obj/machinery/landinglight/alamo{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "aey" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -1225,8 +1228,14 @@ /turf/open/floor/mainship/sterile/side, /area/mainship/medical/operating_room_one) "aeI" = ( -/turf/closed/wall/mainship, -/area/mainship/living/officer_study) +/obj/machinery/door/airlock/mainship/maint{ + dir = 2 + }, +/obj/machinery/door/firedoor/mainship{ + dir = 2 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/bridgebunks) "aft" = ( /obj/structure/cable, /obj/effect/turf_decal/warning_stripes/thin{ @@ -1306,13 +1315,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/living/starboard_emb) -"akH" = ( -/obj/machinery/door/firedoor/mainship{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/mainship/stripesquare, -/area/mainship/hallways/hangar) "alj" = ( /obj/docking_port/stationary/escape_pod, /turf/open/floor/plating, @@ -1352,11 +1354,6 @@ /obj/structure/ship_ammo/cas/rocket/banshee, /turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) -"anQ" = ( -/obj/structure/ship_ammo/cas/heavygun, -/obj/machinery/camera/autoname/mainship, -/turf/open/floor/mainship/cargo, -/area/mainship/hallways/hangar) "aop" = ( /obj/structure/sink{ dir = 4 @@ -1394,11 +1391,6 @@ /obj/effect/ai_node, /turf/open/floor/mainship/mono, /area/mainship/hull/starboard_hull) -"apj" = ( -/turf/open/floor/mainship/cargo/arrow{ - dir = 8 - }, -/area/mainship/hallways/hangar) "aqz" = ( /obj/structure/bed/chair/nometal, /obj/machinery/light/mainship{ @@ -1417,6 +1409,12 @@ }, /turf/open/floor/mainship/tcomms, /area/mainship/command/self_destruct) +"aqR" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/mainship/living/officer_rnr) "ars" = ( /obj/machinery/robotic_fabricator, /turf/open/floor/mainship/sterile/side{ @@ -1449,29 +1447,13 @@ dir = 5 }, /area/mainship/living/pilotbunks) -"arP" = ( -/obj/structure/toilet{ - dir = 4 - }, -/obj/structure/mirror{ - dir = 4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/living/numbertwobunks) "arQ" = ( /turf/closed/wall/mainship/research/containment/wall/north, /area/mainship/medical/medical_science) "arR" = ( -/obj/structure/bed/chair/wood/wings{ - dir = 4 - }, -/obj/machinery/light/mainship{ - dir = 8 - }, -/turf/open/floor/carpet/side{ - dir = 9 - }, -/area/mainship/living/numbertwobunks) +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plating, +/area/mainship/hallways/hangar) "arU" = ( /obj/machinery/light/mainship{ dir = 1 @@ -1813,12 +1795,6 @@ dir = 4 }, /area/mainship/living/port_emb) -"aAN" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 - }, -/turf/open/floor/mainship/orange/corner, -/area/mainship/hallways/hangar) "aAP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -1860,13 +1836,6 @@ }, /turf/open/floor/mainship/tcomms, /area/mainship/command/self_destruct) -"aCh" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/mono, -/area/mainship/living/officer_study) "aCq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1893,16 +1862,6 @@ /obj/machinery/camera/autoname/mainship, /turf/open/floor/mainship/mono, /area/mainship/squads/alpha) -"aDa" = ( -/obj/structure/table/woodentable, -/obj/item/reagent_containers/food/drinks/flask/barflask, -/obj/item/reagent_containers/food/drinks/bottle/davenport, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/flashlight/lamp/green, -/turf/open/floor/carpet/side{ - dir = 1 - }, -/area/mainship/living/numbertwobunks) "aDh" = ( /obj/structure/window/framed/mainship, /turf/open/floor/plating, @@ -2120,6 +2079,12 @@ /obj/structure/cable, /turf/open/floor/mainship/mono, /area/mainship/engineering/lower_engineering) +"aLP" = ( +/obj/vehicle/ridden/powerloader, +/turf/open/floor/mainship/orange{ + dir = 8 + }, +/area/mainship/hallways/hangar) "aLX" = ( /obj/machinery/camera/autoname/mainship, /turf/open/floor/mainship/mono, @@ -2170,16 +2135,6 @@ }, /turf/open/floor/mainship/orange, /area/mainship/engineering/lower_engine_monitoring) -"aOx" = ( -/obj/machinery/shower{ - dir = 4 - }, -/obj/structure/window/reinforced/tinted/frosted{ - dir = 1 - }, -/obj/machinery/door/window, -/turf/open/floor/plating/plating_catwalk, -/area/mainship/living/numbertwobunks) "aPe" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/mainship/floor, @@ -2395,12 +2350,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/squads/alpha) -"aWX" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 4 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hull/starboard_hull) "aWY" = ( /obj/structure/window/framed/mainship, /obj/machinery/door/firedoor/mainship, @@ -2478,6 +2427,19 @@ dir = 1 }, /area/mainship/living/starboard_emb) +"aYJ" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark_blue/corner{ + dir = 8 + }, +/turf/open/floor/wood, +/area/mainship/living/officer_rnr) "aZd" = ( /obj/structure/table/mainship/nometal, /obj/effect/spawner/random/misc/table_lighting, @@ -2761,10 +2723,6 @@ /obj/effect/ai_node, /turf/open/floor/mainship/mono, /area/mainship/hull/starboard_hull) -"bdc" = ( -/obj/structure/cable, -/turf/open/floor/mainship/tcomms, -/area/mainship/command/telecomms) "bdh" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -2865,12 +2823,6 @@ }, /turf/open/floor/mainship/ai, /area/mainship/command/airoom) -"bdU" = ( -/obj/machinery/door/airlock/mainship/command/FCDRquarters{ - dir = 2 - }, -/turf/open/floor/mainship/mono, -/area/mainship/living/numbertwobunks) "bdW" = ( /obj/structure/ship_ammo/cas/rocket/widowmaker, /turf/open/floor/mainship/cargo, @@ -2883,20 +2835,13 @@ dir = 8 }, /area/mainship/living/basketball) -"bdZ" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, +"bea" = ( +/obj/structure/ship_ammo/cas/heavygun, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 + dir = 8 }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) -"bea" = ( -/turf/open/floor/mainship/cargo/arrow{ - dir = 4 - }, -/area/mainship/hallways/hangar) "bed" = ( /obj/structure/table/mainship/nometal, /obj/machinery/door/window{ @@ -3003,7 +2948,7 @@ dir = 4 }, /turf/open/floor/wood, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "bfU" = ( /obj/structure/window/framed/mainship/hull, /turf/open/floor/plating, @@ -3081,61 +3026,24 @@ /obj/machinery/door/poddoor/shutters/mainship/selfdestruct, /turf/open/floor/mainship/stripesquare, /area/mainship/engineering/engine_core) -"bhd" = ( +"bhg" = ( /obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 + dir = 1; + pixel_y = 1 }, /obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 + dir = 4 }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) -"bhg" = ( -/obj/machinery/light/mainship, -/turf/open/floor/mainship/cargo/arrow{ - dir = 8 - }, -/area/mainship/hallways/hangar) "bhh" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 5 - }, -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) -"bhi" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar/droppod) -"bhj" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, -/turf/open/floor/mainship/mono, +/obj/effect/ai_node, +/turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) -"bhl" = ( -/obj/structure/cable, -/obj/machinery/power/apc/mainship, -/turf/open/floor/mainship/green{ - dir = 9 - }, -/area/mainship/living/numbertwobunks) "bhm" = ( /obj/structure/cable, /turf/open/floor/mainship/silver/corner, /area/mainship/command/cic) -"bhp" = ( -/obj/machinery/light/mainship{ - dir = 8 - }, -/obj/structure/closet/toolcloset, -/turf/open/floor/mainship/mono, -/area/mainship/hull/starboard_hull) "bhr" = ( /obj/machinery/holopad, /turf/open/floor/mainship/floor, @@ -3184,25 +3092,6 @@ }, /turf/open/floor/wood, /area/mainship/living/basketball) -"bif" = ( -/obj/structure/table/mainship/nometal, -/obj/effect/spawner/random/misc/paperbin, -/obj/item/tool/pen/blue, -/obj/item/storage/box/ids, -/obj/item/storage/briefcase, -/obj/item/clipboard{ - pixel_x = 4 - }, -/obj/item/taperecorder, -/turf/open/floor/mainship/floor, -/area/mainship/living/numbertwobunks) -"bii" = ( -/obj/structure/table/mainship/nometal, -/obj/item/whistle, -/obj/item/megaphone, -/obj/item/ammo_magazine/packet/acp, -/turf/open/floor/mainship/floor, -/area/mainship/living/numbertwobunks) "bij" = ( /obj/structure/window/framed/mainship, /obj/machinery/door/firedoor/mainship{ @@ -3210,10 +3099,6 @@ }, /turf/open/floor/plating, /area/mainship/living/cafeteria_starboard) -"bip" = ( -/obj/machinery/holopad, -/turf/open/floor/mainship/floor, -/area/mainship/living/numbertwobunks) "biq" = ( /obj/effect/turf_decal/warning_stripes/nscenter, /obj/effect/turf_decal/warning_stripes, @@ -3627,16 +3512,6 @@ }, /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/hangar) -"bkP" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/computer/marine_card, -/obj/machinery/camera/autoname/mainship{ - dir = 4 - }, -/turf/open/floor/mainship/green{ - dir = 8 - }, -/area/mainship/living/numbertwobunks) "bkR" = ( /obj/machinery/firealarm{ dir = 4 @@ -3645,13 +3520,6 @@ /obj/structure/drop_pod_launcher, /turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar/droppod) -"bkT" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1 - }, -/obj/machinery/cic_maptable/droppod_maptable, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar/droppod) "bkU" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 9 @@ -3688,10 +3556,6 @@ /obj/structure/cable, /turf/open/floor/mainship/silver, /area/mainship/command/cic) -"bla" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/mainship/mono, -/area/mainship/hull/starboard_hull) "blb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -3743,21 +3607,16 @@ /turf/open/floor/mainship/floor, /area/mainship/engineering/ce_room) "blm" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 8 +/obj/effect/turf_decal/siding/purple/corner{ + dir = 1 }, -/obj/effect/landmark/start/job/staffofficer, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "bln" = ( /obj/structure/table/mainship/nometal, /obj/item/storage/donut_box, /turf/open/floor/mainship/floor, /area/mainship/living/cafeteria_port) -"blo" = ( -/obj/structure/dropship_equipment/cas/weapon/rocket_pod, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "blq" = ( /obj/structure/largecrate/supply/supplies/water, /turf/open/floor/mainship/orange, @@ -3797,14 +3656,6 @@ }, /turf/open/floor/mainship/floor, /area/mainship/shipboard/firing_range) -"blL" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/power/apc/mainship{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) "blO" = ( /obj/machinery/vending/hydroseeds, /turf/open/floor/mainship/mono, @@ -3855,14 +3706,6 @@ dir = 8 }, /area/mainship/command/cic) -"bmF" = ( -/obj/machinery/air_alarm{ - dir = 8 - }, -/turf/open/floor/mainship/green{ - dir = 4 - }, -/area/mainship/living/numbertwobunks) "bne" = ( /obj/machinery/air_alarm{ dir = 1 @@ -3879,10 +3722,12 @@ dir = 1 }, /area/mainship/medical/operating_room_one) -"bnu" = ( -/obj/structure/cable, -/turf/open/floor/prison/kitchen, -/area/mainship/living/officer_rnr) +"bnr" = ( +/obj/machinery/camera/autoname/mainship{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "bnx" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -4194,14 +4039,9 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "bqC" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/open/floor/mainship/green{ - dir = 10 - }, -/area/mainship/living/numbertwobunks) +/obj/structure/dropship_equipment/cas/weapon/rocket_pod, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "bqK" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 @@ -4211,12 +4051,6 @@ dir = 8 }, /area/mainship/hallways/hangar/droppod) -"bqL" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar/droppod) "bqN" = ( /obj/structure/cable, /turf/open/floor/mainship/sterile/dark, @@ -4413,10 +4247,6 @@ "brS" = ( /turf/open/floor/mainship/floor, /area/mainship/hallways/aft_hallway) -"brW" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/mainship/mono, -/area/mainship/hull/starboard_hull) "brX" = ( /obj/effect/turf_decal/warning_stripes/thin, /turf/open/floor/mainship/mono, @@ -4546,7 +4376,7 @@ /area/mainship/engineering/lower_engineering) "btv" = ( /turf/open/floor/wood, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "btF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -4560,12 +4390,6 @@ dir = 10 }, /area/mainship/shipboard/firing_range) -"btY" = ( -/obj/machinery/firealarm{ - dir = 8 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "buj" = ( /obj/docking_port/stationary/marine_dropship/crash_target, /turf/open/floor/mainship/red, @@ -4603,7 +4427,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/turf/open/floor/mainship/floor, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "buD" = ( /obj/effect/landmark/start/job/medicalofficer, @@ -4868,19 +4692,6 @@ /obj/machinery/power/fusion_engine/preset, /turf/open/floor/mainship/stripesquare, /area/mainship/engineering/engine_core) -"bxT" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/mainship/command/FCDRoffice{ - dir = 2 - }, -/obj/structure/cable, -/obj/machinery/door/firedoor/mainship{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/mainship/mono, -/area/mainship/living/numbertwobunks) "bxX" = ( /obj/effect/ai_node, /turf/open/floor/mainship/green{ @@ -5087,9 +4898,13 @@ /turf/closed/wall/mainship, /area/mainship/squads/alpha) "bAh" = ( -/obj/machinery/holopad, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar) +/obj/structure/cable, +/obj/machinery/firealarm{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "bAr" = ( /obj/machinery/vending/weapon, /turf/open/floor/mainship/mono, @@ -5951,11 +5766,6 @@ /obj/item/toy/plush/carp, /turf/open/floor/mainship/mono, /area/mainship/living/port_emb) -"bLs" = ( -/obj/structure/cable, -/obj/machinery/power/apc/mainship, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "bLt" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -6204,12 +6014,14 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/hangar) "bPC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, -/obj/structure/disposalpipe/junction/flipped{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "bPG" = ( @@ -6330,8 +6142,10 @@ /obj/machinery/camera/autoname/mainship{ dir = 4 }, +/obj/structure/table/mainship/nometal, +/obj/item/storage/box/donkpockets, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "bQt" = ( /obj/machinery/vending/nanomed, /obj/structure/window/reinforced{ @@ -6542,13 +6356,11 @@ /turf/open/floor/mainship/floor, /area/mainship/living/grunt_rnr) "bRN" = ( -/obj/structure/table/mainship/nometal, -/obj/effect/spawner/random/misc/cigarettes, -/obj/machinery/light/mainship{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/mainship/mono, -/area/mainship/living/officer_study) +/turf/open/floor/wood, +/area/mainship/living/officer_rnr) "bRO" = ( /obj/effect/ai_node, /turf/open/floor/mainship/orange/corner{ @@ -6595,7 +6407,7 @@ /obj/machinery/light/mainship/small{ dir = 8 }, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "bSf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -6633,9 +6445,12 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "bSD" = ( -/obj/structure/closet/secure_closet/staff_officer, -/turf/open/floor/mainship/mono, -/area/mainship/living/officer_study) +/obj/structure/table/mainship/nometal, +/obj/machinery/light/mainship/small{ + dir = 1 + }, +/turf/open/floor/wood, +/area/mainship/living/bridgebunks) "bSG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -6645,7 +6460,7 @@ dir = 4 }, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "bSO" = ( /turf/closed/wall/mainship, /area/mainship/living/port_emb) @@ -6813,14 +6628,21 @@ /obj/structure/bed/chair/wood/wings{ dir = 8 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/landmark/start/job/staffofficer, /turf/open/floor/carpet/side{ dir = 5 }, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "bUi" = ( /obj/machinery/holopad, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, /turf/open/floor/wood, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "bUj" = ( /turf/open/floor/mainship_hull/dir{ dir = 9 @@ -6920,23 +6742,26 @@ "bVF" = ( /obj/structure/table/woodentable, /obj/item/storage/donut_box, +/obj/item/binoculars, /turf/open/floor/carpet, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "bVG" = ( /obj/structure/bed/chair/wood/wings{ dir = 8 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/carpet/side{ dir = 4 }, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "bVH" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/wood, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "bVJ" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -6978,10 +6803,16 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/port_hallway) "bWH" = ( -/obj/structure/table/mainship/nometal, -/obj/item/binoculars, +/obj/machinery/door/airlock/mainship/generic{ + dir = 2; + name = "\improper Officer's Bunk" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "bWI" = ( /obj/effect/spawner/random/misc/structure/flavorvending/coffeeweighted, /turf/open/floor/mainship/mono, @@ -6990,20 +6821,23 @@ /obj/structure/bed/chair/wood/wings{ dir = 8 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/landmark/start/job/staffofficer, /turf/open/floor/carpet/side{ dir = 6 }, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "bWK" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/light/mainship{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, /turf/open/floor/wood, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "bWL" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -7117,7 +6951,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/stripesquare, -/area/mainship/hallways/hangar) +/area/mainship/living/numbertwobunks) "bYz" = ( /turf/open/floor/mainship/orange{ dir = 4 @@ -7144,7 +6978,7 @@ dir = 6 }, /obj/machinery/vending/nanomed, -/turf/open/floor/mainship/floor, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "bYW" = ( /obj/structure/cable, @@ -7152,16 +6986,22 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark_blue, +/turf/open/floor/wood, +/area/mainship/living/officer_rnr) "bYY" = ( /obj/machinery/light/mainship/small, /turf/open/floor/mainship/mono, /area/mainship/hull/starboard_hull) "bZa" = ( -/obj/structure/table/mainship/nometal, +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "bZb" = ( /obj/structure/bed/chair/wood/normal{ dir = 8 @@ -7280,12 +7120,12 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "cbi" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/camera/autoname/mainship{ - dir = 8 +/obj/machinery/door/airlock/mainship/generic{ + dir = 8; + name = "\improper Officer's Bunk" }, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "cbj" = ( /turf/open/floor/mainship/blue{ dir = 8 @@ -7334,13 +7174,13 @@ "cbT" = ( /obj/machinery/power/apc/mainship, /obj/structure/cable, -/turf/open/floor/mainship/floor, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "cbU" = ( /obj/structure/sink{ dir = 1 }, -/turf/open/floor/mainship/floor, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "cbW" = ( /obj/structure/closet/secure_closet/personal/cabinet, @@ -7372,12 +7212,6 @@ /obj/structure/closet/crate/freezer, /turf/open/floor/mainship/mono, /area/mainship/living/grunt_rnr) -"ccd" = ( -/obj/machinery/light/mainship{ - dir = 8 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "ccf" = ( /obj/structure/closet, /obj/item/radio/intercom/general, @@ -7505,6 +7339,20 @@ /obj/effect/turf_decal/warning_stripes/thick, /turf/open/floor/plating, /area/mainship/hallways/hangar) +"ceW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/effect/ai_node, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "cfd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -7671,17 +7519,11 @@ /turf/open/floor/mainship/mono, /area/mainship/medical/surgery_hallway) "coU" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/mainship/orange{ - dir = 4 - }, -/area/mainship/hallways/hangar) +/obj/structure/table/mainship/nometal, +/obj/structure/bedsheetbin, +/obj/effect/spawner/random/misc/soap, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "cqq" = ( /obj/structure/bed, /obj/item/bedsheet/medical, @@ -7824,13 +7666,12 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hull/port_hull) "cyf" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/turf/open/floor/mainship/orange{ - dir = 4 +/obj/effect/landmark/start/job/synthetic, +/obj/machinery/camera/autoname/mainship{ + dir = 1 }, -/area/mainship/hallways/hangar) +/turf/open/floor/mainship/cargo, +/area/mainship/living/numbertwobunks) "cyg" = ( /obj/structure/table/mainship/nometal, /obj/item/storage/box/pillbottles, @@ -8157,15 +7998,6 @@ /obj/machinery/door/airlock/mainship/generic/bathroom, /turf/open/floor/mainship/mono, /area/mainship/engineering/ce_room) -"dcq" = ( -/obj/machinery/marine_selector/clothes/commander, -/obj/machinery/light/mainship{ - dir = 1 - }, -/turf/open/floor/carpet/side{ - dir = 5 - }, -/area/mainship/living/numbertwobunks) "dcT" = ( /turf/open/floor/plating/mainship, /area/mainship/shipboard/port_point_defense) @@ -8203,13 +8035,11 @@ }, /turf/open/space/basic, /area/space) -"dhn" = ( -/obj/structure/flora/pottedplant/twentytwo, -/obj/machinery/firealarm, -/turf/open/floor/mainship/green{ - dir = 1 - }, -/area/mainship/living/numbertwobunks) +"dhl" = ( +/obj/machinery/light/mainship, +/obj/effect/turf_decal/warning_stripes/thin, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "dhF" = ( /obj/structure/table/reinforced, /obj/structure/sink{ @@ -8277,6 +8107,12 @@ /obj/structure/cable, /turf/open/floor/mainship/floor, /area/mainship/squads/req) +"doo" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "dop" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -8324,10 +8160,11 @@ /obj/structure/bed/chair/wood/wings{ dir = 4 }, +/obj/effect/landmark/start/job/staffofficer, /turf/open/floor/carpet/side{ dir = 9 }, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "dus" = ( /obj/machinery/computer/cloning_console/vats, /turf/open/floor/mainship/sterile/side{ @@ -8373,6 +8210,13 @@ /obj/item/stack/sheet/metal/medium_stack, /turf/open/floor/mainship/orange/full, /area/mainship/command/cic) +"dwy" = ( +/obj/machinery/light/mainship{ + dir = 1 + }, +/obj/machinery/vending/tool, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar) "dxe" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -8434,11 +8278,9 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/squads/req) "dDZ" = ( -/obj/machinery/door/airlock/mainship/maint{ - name = "Tool Closet" - }, -/turf/open/floor/mainship/mono, -/area/mainship/living/officer_rnr) +/obj/structure/closet/secure_closet/staff_officer, +/turf/open/floor/wood, +/area/mainship/living/bridgebunks) "dEc" = ( /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/surgery_hallway) @@ -8567,10 +8409,6 @@ }, /turf/open/floor/mainship/floor, /area/mainship/shipboard/port_point_defense) -"dMy" = ( -/obj/structure/table/mainship/nometal, -/turf/open/floor/wood, -/area/mainship/living/bridgebunks) "dMS" = ( /obj/machinery/light/mainship{ dir = 4 @@ -8860,6 +8698,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/floor, /area/mainship/hallways/bow_hallway) +"ekU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "elP" = ( /obj/structure/table/reinforced, /obj/item/clothing/under/rank/roboticist, @@ -9158,6 +9001,17 @@ dir = 1 }, /area/mainship/medical/lower_medical) +"eOF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner, +/turf/open/floor/wood, +/area/mainship/living/officer_rnr) "ePc" = ( /obj/structure/bed/chair/nometal{ dir = 4 @@ -9241,7 +9095,7 @@ /area/mainship/medical/lower_medical) "eWR" = ( /obj/structure/bed, -/obj/item/bedsheet/brown, +/obj/item/bedsheet/red, /turf/open/floor/wood, /area/mainship/living/bridgebunks) "eXl" = ( @@ -9270,24 +9124,11 @@ "far" = ( /turf/open/floor/mainship/mono, /area/mainship/command/cic) -"fbp" = ( -/turf/open/floor/mainship/orange{ - dir = 8 - }, -/area/mainship/hallways/hangar) "fbJ" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 8 - }, +/obj/structure/dropship_equipment/shuttle/sentry_holder, /turf/open/floor/mainship/orange{ - dir = 4 - }, -/area/mainship/hallways/hangar) -"feY" = ( -/obj/machinery/camera/autoname/mainship{ - dir = 4 + dir = 1 }, -/turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "fgc" = ( /obj/effect/turf_decal/warning_stripes/thick{ @@ -9305,8 +9146,9 @@ /area/mainship/squads/alpha) "fgj" = ( /obj/structure/table/woodentable, +/obj/item/toy/deck, /turf/open/floor/carpet/side, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "fgF" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 @@ -9360,14 +9202,6 @@ }, /turf/open/floor/wood, /area/mainship/command/corporateliaison) -"fme" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/orange{ - dir = 1 - }, -/area/mainship/hallways/hangar) "fmj" = ( /obj/machinery/door/airlock/mainship/generic/bathroom, /turf/open/floor/mainship/mono, @@ -9396,6 +9230,11 @@ }, /turf/open/floor/mainship/floor, /area/mainship/living/pilotbunks) +"fno" = ( +/obj/structure/dropship_equipment/cas/weapon/minirocket_pod, +/obj/machinery/light/mainship, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "fnC" = ( /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/operating_room_three) @@ -9467,11 +9306,14 @@ /turf/open/floor/prison/kitchen, /area/mainship/living/grunt_rnr) "fsM" = ( -/obj/structure/bed/chair/nometal{ +/obj/machinery/light/mainship{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/mainship/mono, -/area/mainship/living/officer_study) +/turf/open/floor/wood, +/area/mainship/living/officer_rnr) "fsQ" = ( /obj/effect/soundplayer, /turf/closed/wall/mainship, @@ -9532,6 +9374,13 @@ }, /turf/open/floor/prison/kitchen, /area/mainship/living/officer_rnr) +"fvw" = ( +/obj/structure/dropship_equipment/cas/weapon/heavygun, +/obj/machinery/camera/autoname/mainship{ + dir = 1 + }, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "fvx" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -9549,8 +9398,14 @@ /turf/open/floor/mainship/mono, /area/mainship/hull/port_hull) "fwZ" = ( -/turf/open/floor/mainship/mono, -/area/mainship/living/officer_study) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, +/turf/open/floor/wood, +/area/mainship/living/officer_rnr) "fxh" = ( /obj/structure/table/mainship/nometal, /obj/effect/spawner/random/misc/table_lighting, @@ -9691,19 +9546,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/starboard_hallway) -"fHe" = ( -/obj/structure/table/mainship/nometal, -/obj/item/flashlight/combat, -/obj/item/clothing/suit/storage/hazardvest, -/obj/item/clothing/suit/storage/hazardvest/lime, -/obj/item/clothing/suit/storage/hazardvest/blue, -/obj/item/tool/shovel/etool, -/obj/item/storage/pouch/medkit/firstaid, -/obj/item/tool/taperoll/engineering, -/obj/effect/spawner/random/engineering/extinguisher/miniweighted, -/obj/item/storage/toolbox/mechanical, -/turf/open/floor/mainship/mono, -/area/mainship/living/officer_rnr) "fHk" = ( /obj/structure/table/mainship/nometal, /obj/machinery/door_control/old/cic{ @@ -9861,6 +9703,12 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) +"fWN" = ( +/obj/machinery/door/airlock/mainship/command/FCDRoffice{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "fYx" = ( /obj/effect/turf_decal/warning_stripes/thin, /obj/machinery/power/terminal{ @@ -9951,6 +9799,29 @@ dir = 8 }, /area/mainship/engineering/ce_room) +"gby" = ( +/obj/machinery/landinglight/cas{ + dir = 8 + }, +/obj/machinery/camera/autoname/mainship{ + dir = 8 + }, +/obj/machinery/landinglight/alamo{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) +"gbA" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark_red, +/turf/open/floor/mainship/floor, +/area/mainship/living/bridgebunks) "gbG" = ( /obj/machinery/bot/roomba, /turf/open/floor/mainship/orange, @@ -9987,7 +9858,7 @@ /turf/open/floor/carpet/side{ dir = 8 }, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "geJ" = ( /obj/effect/landmark/start/latejoin, /obj/effect/landmark/start/job/squadleader, @@ -10037,6 +9908,10 @@ /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) +"gfu" = ( +/obj/structure/ship_ammo/cas/bomb/fourhundred, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "ggd" = ( /obj/effect/spawner/random/misc/structure/flavorvending/snackweighted, /turf/open/floor/mainship/mono, @@ -10053,6 +9928,10 @@ /obj/structure/cable, /turf/open/floor/mainship/floor, /area/mainship/engineering/ce_room) +"ggG" = ( +/obj/structure/dropship_equipment/cas/weapon/bomblet_pod, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "ghz" = ( /obj/structure/bed/chair/nometal{ dir = 4 @@ -10081,11 +9960,9 @@ /turf/open/floor/wood, /area/mainship/living/basketball) "gjK" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/mainship/orange{ - dir = 9 - }, -/area/mainship/hallways/hangar) +/obj/machinery/vending/weapon, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "gli" = ( /obj/machinery/door/airlock/multi_tile/mainship/comdoor/free_access{ dir = 2 @@ -10174,10 +10051,11 @@ /obj/structure/bed/chair/wood/wings{ dir = 4 }, +/obj/effect/landmark/start/job/staffofficer, /turf/open/floor/carpet/side{ dir = 10 }, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "gxh" = ( /obj/structure/table/mainship/nometal, /obj/item/radio/intercom/general, @@ -10309,12 +10187,8 @@ /turf/open/floor/mainship/sterile/corner, /area/mainship/medical/upper_medical) "gGw" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 - }, -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/mainship/orange, -/area/mainship/hallways/hangar) +/turf/open/floor/plating/plating_catwalk, +/area/mainship/living/numbertwobunks) "gGE" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -10357,10 +10231,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) -"gJS" = ( -/obj/structure/dropship_equipment/cas/weapon/bomb_pod, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar) "gLI" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced/windowstake{ @@ -10501,6 +10371,13 @@ /obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) +"gWC" = ( +/obj/machinery/power/apc/mainship{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "gXv" = ( /obj/structure/bed, /obj/item/bedsheet/brown, @@ -10545,9 +10422,6 @@ "haf" = ( /turf/open/floor/mainship/green/full, /area/mainship/squads/req) -"haz" = ( -/turf/open/floor/mainship/floor, -/area/mainship/living/numbertwobunks) "haI" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -10594,27 +10468,30 @@ /turf/open/floor/wood, /area/mainship/living/basketball) "hey" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/mono, -/area/mainship/living/officer_study) +/obj/machinery/light/mainship{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/mainship/living/officer_rnr) "hfD" = ( /obj/machinery/vending/MarineMed, /turf/open/floor/mainship/mono, /area/mainship/squads/req) "hgk" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 6 - }, -/turf/open/floor/mainship/orange{ - dir = 8 +/obj/structure/table/woodentable, +/obj/item/reagent_containers/food/drinks/flask/barflask, +/obj/item/reagent_containers/food/drinks/bottle/davenport, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/flashlight/lamp/green, +/obj/item/megaphone, +/obj/item/whistle, +/turf/open/floor/carpet/side{ + dir = 1 }, -/area/mainship/hallways/hangar) +/area/mainship/living/numbertwobunks) "hgY" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -10624,7 +10501,7 @@ /area/mainship/living/grunt_rnr) "hhA" = ( /obj/structure/ship_ammo/cas/heavygun, -/turf/open/floor/mainship/cargo, +/turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "hiF" = ( /obj/structure/bed/chair/office/dark{ @@ -10679,6 +10556,11 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/starboard_hallway) +"hjO" = ( +/obj/effect/landmark/start/job/fieldcommander, +/obj/effect/ai_node, +/turf/open/floor/wood, +/area/mainship/living/numbertwobunks) "hjX" = ( /obj/structure/table/mainship/nometal, /obj/item/storage/firstaid/rad{ @@ -10760,11 +10642,9 @@ /turf/open/floor/mainship/floor, /area/mainship/engineering/lower_engineering) "hnY" = ( -/obj/machinery/vending/engivend, -/turf/open/floor/mainship/orange{ - dir = 5 - }, -/area/mainship/hallways/hangar) +/obj/machinery/marine_selector/clothes/synth, +/turf/open/floor/mainship/cargo, +/area/mainship/living/numbertwobunks) "hol" = ( /obj/machinery/light/mainship, /obj/machinery/disposal, @@ -10804,6 +10684,10 @@ dir = 1 }, /area/mainship/command/cic) +"hrn" = ( +/obj/structure/dropship_equipment/shuttle/flare_launcher, +/turf/open/floor/mainship/orange, +/area/mainship/hallways/hangar) "hru" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -10863,6 +10747,15 @@ dir = 8 }, /area/mainship/hallways/repair_bay) +"hxY" = ( +/obj/machinery/camera/autoname/mainship{ + dir = 4 + }, +/obj/machinery/landinglight/alamo{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "hyf" = ( /obj/machinery/camera/autoname/mainship{ dir = 8 @@ -10957,12 +10850,9 @@ /turf/open/floor/mainship/mono, /area/mainship/command/bridge) "hHj" = ( -/obj/machinery/camera/autoname/mainship, -/obj/effect/spawner/random/machinery/machine_frame, -/turf/open/floor/mainship/orange{ - dir = 1 - }, -/area/mainship/hallways/hangar) +/obj/machinery/recharge_station, +/turf/open/floor/mainship/cargo, +/area/mainship/living/numbertwobunks) "hHM" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 1 @@ -10982,6 +10872,17 @@ }, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) +"hIC" = ( +/obj/structure/displaycase/destroyed, +/obj/item/toy/plush/rouny, +/obj/machinery/light/mainship{ + dir = 8 + }, +/obj/machinery/light/mainship{ + dir = 1 + }, +/turf/open/floor/wood, +/area/mainship/living/numbertwobunks) "hJa" = ( /obj/structure/table/mainship/nometal, /obj/machinery/air_alarm, @@ -11002,6 +10903,20 @@ dir = 8 }, /area/mainship/living/cryo_cells) +"hKR" = ( +/obj/structure/table/mainship/nometal, +/obj/item/flashlight/combat, +/obj/item/clothing/suit/storage/hazardvest, +/obj/item/clothing/suit/storage/hazardvest/lime, +/obj/item/clothing/suit/storage/hazardvest/blue, +/obj/item/tool/shovel/etool, +/obj/item/storage/pouch/medkit/firstaid, +/obj/item/tool/taperoll/engineering, +/obj/effect/spawner/random/engineering/extinguisher/miniweighted, +/obj/item/storage/toolbox/mechanical, +/obj/item/stack/sandbags_empty/half, +/turf/open/floor/mainship/cargo, +/area/mainship/living/numbertwobunks) "hNl" = ( /obj/structure/bed/chair/comfy/black{ dir = 8 @@ -11029,6 +10944,15 @@ /obj/machinery/vending/weapon, /turf/open/floor/mainship/mono, /area/mainship/squads/alpha) +"hOA" = ( +/obj/effect/turf_decal/warning_stripes/thick/corner{ + dir = 4 + }, +/obj/machinery/landinglight/alamo{ + dir = 8 + }, +/turf/open/floor/plating, +/area/mainship/hallways/hangar) "hPY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -11054,12 +10978,6 @@ dir = 1 }, /area/mainship/engineering/lower_engineering) -"hSG" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/mainship/orange{ - dir = 10 - }, -/area/mainship/hallways/hangar) "hTN" = ( /turf/open/floor/plating/icefloor/warnplate{ dir = 1 @@ -11087,14 +11005,13 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/aft_umbilical) "hVR" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/structure/ship_ammo/cas/bomb/fourhundred, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 1; - pixel_y = 1 - }, +/obj/item/reagent_containers/jerrycan, +/obj/item/reagent_containers/jerrycan, +/obj/item/reagent_containers/jerrycan, +/obj/item/reagent_containers/jerrycan, +/obj/item/reagent_containers/jerrycan, +/obj/item/reagent_containers/jerrycan, +/obj/structure/rack, /turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) "hVU" = ( @@ -11110,8 +11027,12 @@ /obj/machinery/firealarm{ dir = 4 }, -/turf/open/floor/mainship/mono, -/area/mainship/living/officer_study) +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/wood, +/area/mainship/living/officer_rnr) "hWJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -11171,6 +11092,12 @@ /obj/machinery/optable, /turf/open/floor/mainship/mono, /area/mainship/medical/surgery_hallway) +"ifv" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "igT" = ( /obj/structure/bed/stool, /turf/open/floor/mainship/mono, @@ -11195,12 +11122,6 @@ /obj/structure/cable, /turf/open/floor/plating/plating_catwalk, /area/mainship/squads/delta) -"iiH" = ( -/obj/structure/disposalpipe/segment/corner{ - dir = 8 - }, -/turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) "ijh" = ( /obj/structure/cable, /obj/machinery/light/mainship/small{ @@ -11285,10 +11206,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/effect/spawner/random/misc/structure/flavorvending/snackweighted, +/obj/effect/turf_decal/siding/dark_blue/corner, +/obj/effect/turf_decal/siding/dark_red/corner{ + dir = 8 + }, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "ipy" = ( -/obj/structure/cable, /obj/machinery/camera/autoname/mainship{ dir = 1 }, @@ -11325,14 +11250,29 @@ /obj/docking_port/stationary/supply, /turf/open/floor/mainship/empty, /area/mainship/squads/req) +"itC" = ( +/obj/machinery/light/mainship{ + dir = 1 + }, +/obj/structure/bed, +/obj/item/bedsheet/red, +/turf/open/floor/carpet/side{ + dir = 5 + }, +/area/mainship/living/numbertwobunks) +"itV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "iug" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/power/apc/mainship{ + dir = 8 + }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/ai_node, /turf/open/floor/wood, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "ivC" = ( /obj/structure/cable, /obj/machinery/door/airlock/mainship/maint{ @@ -11359,7 +11299,7 @@ /obj/machinery/light/mainship{ dir = 8 }, -/turf/open/floor/mainship/floor, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "ixR" = ( /obj/docking_port/stationary/marine_dropship/crash_target, @@ -11508,11 +11448,10 @@ /turf/open/floor/mainship/orange, /area/mainship/engineering/lower_engineering) "iIi" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/effect/ai_node, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "iIm" = ( @@ -11616,10 +11555,8 @@ }, /area/mainship/engineering/lower_engineering) "iUW" = ( -/obj/structure/table/mainship/nometal, -/obj/item/storage/box/donkpockets, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "iVz" = ( /obj/machinery/landinglight/alamo{ dir = 8 @@ -11640,6 +11577,11 @@ "iWe" = ( /turf/open/floor/mainship/floor, /area/mainship/squads/req) +"iWI" = ( +/obj/machinery/camera/autoname/mainship, +/obj/structure/closet/firecloset/full, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "iXa" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -11655,6 +11597,7 @@ /obj/machinery/light/mainship{ dir = 4 }, +/obj/item/clothing/gloves/insulated, /turf/open/floor/mainship/orange{ dir = 4 }, @@ -11752,9 +11695,11 @@ }, /area/mainship/medical/lower_medical) "jeI" = ( -/obj/effect/spawner/random/misc/structure/flavorvending/snackweighted, +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "jeN" = ( /obj/structure/closet, /obj/item/toy/plush/snake, @@ -11916,10 +11861,10 @@ }, /turf/open/floor/plating, /area/mainship/hallways/hangar) -"juB" = ( -/obj/machinery/light/mainship, -/turf/open/floor/mainship/cargo/arrow{ - dir = 4 +"jul" = ( +/obj/structure/dropship_equipment/shuttle/flare_launcher, +/turf/open/floor/mainship/orange{ + dir = 10 }, /area/mainship/hallways/hangar) "jvm" = ( @@ -11996,6 +11941,21 @@ /obj/effect/ai_node, /turf/open/floor/mainship/mono, /area/mainship/hull/port_hull) +"jCH" = ( +/obj/effect/ai_node, +/turf/open/floor/plating, +/area/mainship/hallways/hangar) +"jDf" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/mainship/living/officer_rnr) +"jDv" = ( +/obj/effect/turf_decal/warning_stripes/thin, +/obj/machinery/light/mainship, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "jEn" = ( /obj/effect/landmark/start/job/researcher, /turf/open/floor/mainship/sterile/dark, @@ -12107,16 +12067,6 @@ "jNc" = ( /turf/closed/wall/mainship, /area/mainship/living/bridgebunks) -"jOq" = ( -/obj/structure/bed/chair/office/dark, -/obj/structure/cable, -/obj/machinery/keycard_auth{ - pixel_y = 25 - }, -/turf/open/floor/mainship/green{ - dir = 1 - }, -/area/mainship/living/numbertwobunks) "jPG" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/mainship/blue, @@ -12141,10 +12091,6 @@ }, /turf/closed/wall/mainship/white, /area/mainship/medical/surgery_hallway) -"jRe" = ( -/obj/structure/cable, -/turf/open/floor/mainship/floor, -/area/mainship/living/numbertwobunks) "jSi" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -12242,14 +12188,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/command/cic) -"kaw" = ( -/obj/machinery/light/mainship, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, -/obj/structure/dropship_equipment/cas/weapon/bomblet_pod, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar) "kbP" = ( /obj/machinery/processor{ pixel_y = 5 @@ -12267,7 +12205,7 @@ /area/mainship/hull/port_hull) "kce" = ( /obj/machinery/door/airlock/mainship/generic/bathroom/toilet, -/turf/open/floor/mainship/mono, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "kfp" = ( /obj/structure/window/framed/mainship, @@ -12361,6 +12299,17 @@ dir = 9 }, /area/mainship/command/cic) +"kpt" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/mainship/living/officer_rnr) "kpy" = ( /turf/open/floor/mainship/sterile/side{ dir = 6 @@ -12478,11 +12427,12 @@ }, /area/mainship/squads/req) "kxg" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/light/mainship{ + dir = 4 }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar) +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "kxA" = ( /obj/machinery/camera/autoname/mainship{ dir = 1 @@ -12588,6 +12538,12 @@ /obj/machinery/light/mainship/small, /turf/open/floor/mainship/floor, /area/mainship/living/tankerbunks) +"kFM" = ( +/obj/machinery/light/mainship/small{ + dir = 1 + }, +/turf/open/floor/wood, +/area/mainship/living/bridgebunks) "kFZ" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 @@ -12629,10 +12585,6 @@ }, /turf/open/floor/wood, /area/mainship/command/corporateliaison) -"kLp" = ( -/obj/effect/landmark/start/job/fieldcommander, -/turf/open/floor/carpet/side, -/area/mainship/living/numbertwobunks) "kLr" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -12681,14 +12633,13 @@ }, /area/mainship/medical/lower_medical) "kMC" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment/corner, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 +/obj/structure/computer3frame, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/turf/open/floor/mainship/floor, -/area/mainship/living/numbertwobunks) +/obj/effect/turf_decal/warning_stripes/thin, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "kMY" = ( /turf/open/floor/mainship/orange, /area/mainship/squads/alpha) @@ -12752,6 +12703,7 @@ /obj/machinery/landinglight/tadpole{ dir = 1 }, +/obj/effect/ai_node, /turf/open/floor/mainship/cargo/arrow{ dir = 1 }, @@ -12788,15 +12740,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/mainship/cargo, /area/mainship/hallways/port_hallway) -"kVl" = ( -/obj/structure/rack, -/obj/item/reagent_containers/jerrycan, -/obj/item/reagent_containers/jerrycan, -/obj/item/reagent_containers/jerrycan, -/obj/item/reagent_containers/jerrycan, -/obj/item/reagent_containers/jerrycan, -/turf/open/floor/mainship/orange, -/area/mainship/hallways/hangar) "kWq" = ( /obj/structure/disposalpipe/segment, /obj/effect/ai_node, @@ -12808,12 +12751,6 @@ }, /turf/open/floor/mainship/floor, /area/mainship/command/cic) -"kXm" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/mainship/orange{ - dir = 6 - }, -/area/mainship/hallways/hangar) "kYt" = ( /obj/machinery/power/apc/mainship{ dir = 8 @@ -12986,6 +12923,10 @@ "lob" = ( /turf/open/floor/plating/plating_catwalk, /area/mainship/living/port_emb) +"lol" = ( +/obj/structure/dropship_equipment/electronics/spotlights, +/turf/open/floor/mainship/orange, +/area/mainship/hallways/hangar) "loE" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ dir = 8; @@ -13072,6 +13013,17 @@ "lvI" = ( /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) +"lwr" = ( +/obj/effect/ai_node, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "lxe" = ( /turf/open/floor/mainship/orange{ dir = 5 @@ -13090,14 +13042,10 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "lyr" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/bed/chair/nometal{ - dir = 4 - }, -/turf/open/floor/mainship/green, -/area/mainship/living/numbertwobunks) +/obj/structure/dropship_equipment/cas/weapon/bomb_pod, +/obj/machinery/light/mainship, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "lyB" = ( /obj/machinery/door/firedoor/mainship{ dir = 2 @@ -13105,6 +13053,10 @@ /obj/structure/window/framed/mainship/requisitions, /turf/open/floor/plating, /area/mainship/command/bridge) +"lyC" = ( +/obj/structure/dropship_equipment/cas/weapon/minirocket_pod, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "lyK" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -13158,14 +13110,6 @@ /obj/effect/landmark/start/latejoin_gateway, /turf/open/floor/mainship/floor, /area/mainship/living/cryo_cells) -"lBZ" = ( -/obj/machinery/landinglight/cas{ - dir = 8 - }, -/turf/open/floor/mainship/cargo/arrow{ - dir = 8 - }, -/area/mainship/hallways/hangar) "lCl" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ dir = 4; @@ -13177,6 +13121,10 @@ /obj/structure/window/framed/mainship, /turf/open/floor/plating, /area/mainship/hallways/aft_hallway) +"lDd" = ( +/obj/machinery/camera/autoname/mainship, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "lDM" = ( /obj/docking_port/stationary/marine_dropship/crash_target, /obj/machinery/light/mainship{ @@ -13236,12 +13184,6 @@ /obj/machinery/door/firedoor/mainship, /turf/open/floor/mainship/mono, /area/mainship/command/bridge) -"lGH" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar) "lHe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -13266,8 +13208,11 @@ /area/mainship/command/cic) "lHu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer1, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/open/floor/wood, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "lHP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -13423,6 +13368,12 @@ /obj/machinery/door/poddoor/mainship/mech, /turf/open/floor/mainship/floor, /area/mainship/living/tankerbunks) +"lRg" = ( +/obj/structure/dropship_equipment/shuttle/operatingtable, +/turf/open/floor/mainship/orange{ + dir = 1 + }, +/area/mainship/hallways/hangar) "lRq" = ( /obj/machinery/light/mainship, /obj/machinery/portable_atmospherics/canister/oxygen, @@ -13485,10 +13436,6 @@ }, /area/mainship/hallways/aft_hallway) "lYN" = ( -/obj/structure/cable, -/obj/machinery/power/apc/mainship{ - dir = 4 - }, /turf/open/floor/mainship/mono, /area/mainship/living/officer_rnr) "lZN" = ( @@ -13511,13 +13458,6 @@ dir = 4 }, /area/mainship/hallways/hangar) -"mdp" = ( -/obj/effect/landmark/start/job/synthetic, -/obj/machinery/camera/autoname/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/cargo, -/area/mainship/living/officer_rnr) "mds" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -13548,6 +13488,13 @@ dir = 4 }, /area/mainship/living/cryo_cells) +"mft" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/port_hallway) "mfu" = ( /obj/structure/cable, /obj/effect/ai_node, @@ -13557,10 +13504,15 @@ /obj/structure/closet/emcloset, /turf/open/floor/mainship/cargo, /area/mainship/hallways/port_hallway) -"mhn" = ( -/obj/effect/soundplayer, -/turf/closed/wall/mainship, -/area/mainship/living/numbertwobunks) +"mhO" = ( +/obj/machinery/camera/autoname/mainship{ + dir = 8 + }, +/obj/structure/dropship_equipment/shuttle/sentry_holder, +/turf/open/floor/mainship/orange{ + dir = 4 + }, +/area/mainship/hallways/hangar) "mjo" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 4 @@ -13570,6 +13522,17 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) +"mjF" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark_red/corner, +/turf/open/floor/mainship/floor, +/area/mainship/living/bridgebunks) "mjJ" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 10 @@ -13598,12 +13561,14 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) "mlV" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ +/obj/machinery/light/mainship/small{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow/corner{ dir = 4 }, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "mlZ" = ( /obj/machinery/landinglight/alamo{ dir = 1 @@ -13679,14 +13644,17 @@ /turf/open/floor/mainship/sterile, /area/mainship/medical/surgery_hallway) "mqI" = ( -/obj/effect/turf_decal/warning_stripes/thin, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, /obj/machinery/light/mainship{ dir = 8 }, -/turf/open/floor/mainship/orange{ - dir = 10 - }, -/area/mainship/hallways/hangar) +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "mra" = ( /obj/structure/table/mainship/nometal, /turf/open/floor/mainship/green{ @@ -13766,9 +13734,9 @@ }, /area/mainship/command/cic) "myv" = ( -/obj/structure/dropship_equipment/cas/weapon/heavygun, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/obj/machinery/marine_selector/clothes/commander, +/turf/open/floor/wood, +/area/mainship/living/numbertwobunks) "mzi" = ( /obj/machinery/light/mainship{ dir = 4 @@ -13911,6 +13879,13 @@ /obj/effect/ai_node, /turf/open/floor/mainship/mono, /area/mainship/living/cryo_cells) +"mIY" = ( +/obj/machinery/cic_maptable/droppod_maptable, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 6 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar/droppod) "mJs" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -14022,17 +13997,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/surgery_hallway) -"mQL" = ( -/obj/machinery/vending/weapon, -/turf/open/floor/mainship/green{ - dir = 1 - }, -/area/mainship/living/numbertwobunks) "mQZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/turf/open/floor/mainship/floor, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "mRy" = ( /obj/docking_port/stationary/marine_dropship/crash_target, @@ -14144,7 +14113,7 @@ dir = 1; on = 1 }, -/turf/open/floor/mainship/floor, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "mZl" = ( /obj/structure/cable, @@ -14194,22 +14163,27 @@ /turf/open/floor/mainship/sterile/side, /area/mainship/medical/lower_medical) "ndz" = ( -/obj/machinery/marine_selector/clothes/synth, -/turf/open/floor/mainship/mono, -/area/mainship/living/officer_rnr) +/obj/structure/bed, +/obj/item/bedsheet/yellow, +/turf/open/floor/wood, +/area/mainship/living/bridgebunks) "neh" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/power/apc/mainship{ + dir = 1 + }, +/obj/structure/cable, /turf/open/floor/mainship/mono, /area/mainship/command/telecomms) "neJ" = ( -/obj/machinery/door/airlock/multi_tile/mainship/comdoor{ - name = "\improper Officer's Study" - }, -/obj/machinery/door/firedoor/multi_tile, -/turf/open/floor/mainship/mono, -/area/mainship/living/officer_study) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/space/basic, +/area/mainship/living/officer_rnr) "neQ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, @@ -14240,12 +14214,6 @@ /obj/effect/spawner/random/engineering/extinguisher/regularweighted, /turf/open/floor/mainship/orange, /area/mainship/engineering/lower_engineering) -"ngN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/mainship/green, -/area/mainship/living/numbertwobunks) "ngO" = ( /obj/machinery/suit_storage_unit/carbon_unit, /turf/open/floor/mainship/orange{ @@ -14334,13 +14302,6 @@ dir = 8 }, /area/mainship/medical/lower_medical) -"npA" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 9 - }, -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "nqG" = ( /obj/structure/table/mainship/nometal, /obj/item/storage/firstaid/regular{ @@ -14365,6 +14326,10 @@ dir = 1 }, /area/mainship/medical/surgery_hallway) +"nsk" = ( +/obj/structure/dropship_equipment/shuttle/weapon_holder/machinegun, +/turf/open/floor/mainship/orange, +/area/mainship/hallways/hangar) "nsv" = ( /obj/machinery/light/mainship{ dir = 1 @@ -14545,8 +14510,11 @@ /turf/open/floor/mainship/sterile, /area/mainship/medical/surgery_hallway) "nJN" = ( +/obj/structure/bed/chair/nometal{ + dir = 8 + }, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "nKf" = ( /obj/machinery/camera/autoname/mainship{ dir = 4 @@ -14646,17 +14614,16 @@ }, /area/mainship/living/pilotbunks) "nQl" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/structure/cable, -/obj/structure/disposalpipe/junction/flipped{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 }, -/obj/effect/ai_node, /turf/open/floor/plating/plating_catwalk, /area/mainship/hallways/port_hallway) "nQq" = ( @@ -14746,6 +14713,10 @@ dir = 8 }, /area/mainship/medical/lower_medical) +"nWY" = ( +/obj/structure/dropship_equipment/cas/weapon/heavygun, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "nXn" = ( /obj/structure/cable, /obj/machinery/power/apc/mainship{ @@ -14775,14 +14746,6 @@ dir = 1 }, /area/mainship/squads/req) -"nZu" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/obj/effect/turf_decal/warning_stripes/thin, -/obj/machinery/light/mainship, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "nZA" = ( /obj/structure/disposalpipe/segment/corner{ dir = 8 @@ -14805,21 +14768,9 @@ }, /area/mainship/medical/surgery_hallway) "oam" = ( -/obj/machinery/light/mainship/small{ - dir = 1 - }, -/obj/machinery/recharge_station, -/turf/open/floor/mainship/mono, -/area/mainship/living/officer_rnr) -"oaQ" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thin, -/obj/structure/prop/mainship/hangar_stencil, -/obj/machinery/light/mainship, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/obj/structure/mirror, +/turf/open/floor/wood, +/area/mainship/living/bridgebunks) "oaW" = ( /obj/machinery/marine_selector/clothes, /obj/structure/window/reinforced{ @@ -14872,13 +14823,16 @@ }, /area/mainship/command/cic) "ofY" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 10 - }, -/turf/open/floor/mainship/orange/corner{ +/obj/structure/cable, +/obj/machinery/door/airlock/mainship/command/FCDRoffice, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 8 }, -/area/mainship/hallways/hangar) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "ogn" = ( /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/medical_science) @@ -14960,6 +14914,13 @@ dir = 5 }, /area/mainship/command/cic) +"olO" = ( +/obj/effect/turf_decal/warning_stripes/thin, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "oms" = ( /obj/machinery/light/mainship, /obj/effect/turf_decal/warning_stripes/thin{ @@ -15199,11 +15160,10 @@ }, /area/mainship/engineering/ce_room) "oLl" = ( -/obj/machinery/light/mainship{ - dir = 8 - }, -/turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/obj/structure/bed, +/obj/item/bedsheet/purple, +/turf/open/floor/wood, +/area/mainship/living/bridgebunks) "oLJ" = ( /obj/machinery/vending/nanomed, /obj/structure/table/mainship/nometal, @@ -15225,6 +15185,11 @@ /obj/machinery/door/firedoor/mainship, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/surgery_hallway) +"oPC" = ( +/obj/structure/ship_ammo/cas/heavygun, +/obj/machinery/camera/autoname/mainship, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "oPN" = ( /obj/machinery/door/firedoor/mainship, /obj/structure/table/reinforced, @@ -15357,6 +15322,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) +"paZ" = ( +/obj/machinery/door/firedoor/mainship{ + dir = 2 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "pbV" = ( /turf/open/floor/mainship/green/corner, /area/mainship/squads/req) @@ -15777,10 +15748,9 @@ /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/starboard_hallway) "pNB" = ( -/obj/effect/turf_decal/warning_stripes/thin{ +/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass{ dir = 1 }, -/obj/effect/turf_decal/warning_stripes/thin, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "pNG" = ( @@ -15794,16 +15764,25 @@ }, /area/mainship/living/basketball) "pOE" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, +/obj/structure/table/mainship/nometal, +/obj/effect/spawner/random/misc/cigarettes, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "pPG" = ( /obj/structure/bed/stool{ pixel_y = 8 }, /turf/open/floor/grass, /area/mainship/living/starboard_garden) +"pPS" = ( +/obj/machinery/light/mainship{ + dir = 1 + }, +/obj/structure/dropship_equipment/shuttle/sentry_holder, +/turf/open/floor/mainship/orange{ + dir = 5 + }, +/area/mainship/hallways/hangar) "pQL" = ( /obj/machinery/conveyor{ id = "lower_garbage" @@ -15897,8 +15876,10 @@ /obj/machinery/door/firedoor/mainship{ dir = 2 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/structure/cable, /turf/open/floor/mainship/stripesquare, -/area/mainship/hallways/hangar) +/area/mainship/living/numbertwobunks) "pWJ" = ( /obj/machinery/power/apc/mainship{ dir = 4 @@ -15926,6 +15907,11 @@ /obj/effect/spawner/random/engineering/structure/tank/waterweighted, /turf/open/floor/mainship/floor, /area/mainship/hallways/repair_bay) +"pXz" = ( +/obj/structure/toilet, +/obj/structure/mirror, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "pXO" = ( /turf/open/floor/mainship/silver/corner{ dir = 8 @@ -15944,12 +15930,6 @@ /obj/machinery/light/mainship/small, /turf/open/floor/mainship/mono, /area/mainship/hallways/port_umbilical) -"pYL" = ( -/obj/machinery/vending/armor_supply, -/turf/open/floor/mainship/green{ - dir = 5 - }, -/area/mainship/living/numbertwobunks) "pZA" = ( /obj/structure/cable, /turf/open/floor/mainship/mono, @@ -16018,6 +15998,14 @@ /obj/machinery/camera/autoname/mainship, /turf/open/floor/mainship/floor, /area/mainship/engineering/lower_engine_monitoring) +"qgD" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/mainship/living/officer_rnr) "qgE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/structure/cable, @@ -16026,6 +16014,15 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hallways/aft_umbilical) +"qhh" = ( +/obj/machinery/keycard_auth{ + pixel_y = -30 + }, +/obj/machinery/camera/autoname/mainship{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "qhN" = ( /obj/machinery/vending/nanomed, /turf/open/floor/mainship/mono, @@ -16067,9 +16064,16 @@ /turf/open/floor/mainship/cargo, /area/mainship/squads/req) "qiO" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar) +/obj/structure/bed/chair/wood/wings{ + dir = 8 + }, +/obj/machinery/camera/autoname/mainship{ + dir = 4 + }, +/turf/open/floor/carpet/side{ + dir = 1 + }, +/area/mainship/living/numbertwobunks) "qjs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light/mainship{ @@ -16098,6 +16102,14 @@ dir = 4 }, /area/mainship/living/commandbunks) +"qmA" = ( +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 1 + }, +/obj/machinery/vending/tool, +/obj/effect/turf_decal/warning_stripes/thin, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "qnS" = ( /obj/machinery/camera/autoname/mainship{ dir = 4 @@ -16258,10 +16270,15 @@ }, /area/mainship/hallways/repair_bay) "qwP" = ( -/obj/structure/table/mainship/nometal, -/obj/machinery/microwave, +/obj/machinery/camera/autoname/mainship{ + dir = 8 + }, +/obj/machinery/light/mainship/small{ + dir = 8 + }, +/obj/effect/turf_decal/siding/yellow/corner, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "qxm" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 1 @@ -16273,18 +16290,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/lower_medical) -"qxG" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/cable, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/port_hallway) "qys" = ( /obj/structure/bed, /obj/item/bedsheet/medical, /turf/open/floor/mainship/sterile/side, /area/mainship/medical/lower_medical) +"qyD" = ( +/obj/machinery/light/mainship{ + dir = 1 + }, +/obj/machinery/vending/engivend, +/turf/open/floor/mainship/floor, +/area/mainship/hallways/hangar) "qza" = ( /obj/structure/table/mainship/nometal, /obj/item/storage/firstaid/toxin{ @@ -16591,12 +16608,10 @@ /turf/open/floor/mainship/floor, /area/mainship/living/tankerbunks) "qSA" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 - }, -/obj/effect/landmark/start/job/staffofficer, +/obj/structure/table/mainship/nometal, +/obj/machinery/microwave, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "qTt" = ( /obj/machinery/telecomms/bus/preset_two, /turf/open/floor/mainship/tcomms, @@ -16629,9 +16644,10 @@ /turf/open/floor/mainship/mono, /area/mainship/command/corporateliaison) "qYe" = ( -/obj/structure/dropship_equipment/shuttle/flare_launcher, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/turf/open/floor/carpet/side{ + dir = 6 + }, +/area/mainship/living/numbertwobunks) "qZy" = ( /turf/open/floor/mainship/blue, /area/mainship/living/port_emb) @@ -16677,6 +16693,18 @@ dir = 8 }, /area/mainship/command/cic) +"raA" = ( +/obj/machinery/shower{ + dir = 4 + }, +/obj/structure/window/reinforced/tinted/frosted{ + dir = 1 + }, +/obj/machinery/door/window{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/living/numbertwobunks) "rbv" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16783,7 +16811,7 @@ /turf/open/floor/carpet/side{ dir = 1 }, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "rkB" = ( /obj/machinery/camera/autoname/mainship{ dir = 4 @@ -16795,27 +16823,11 @@ /obj/machinery/holopad, /turf/open/floor/mainship/ai, /area/mainship/command/airoom) -"rkD" = ( -/obj/structure/window/framed/mainship, -/obj/machinery/door/firedoor/mainship{ - dir = 2 - }, -/turf/open/floor/plating, -/area/mainship/living/officer_study) "rne" = ( /turf/open/floor/mainship/red{ dir = 8 }, /area/mainship/shipboard/port_point_defense) -"rnz" = ( -/obj/machinery/door/airlock/mainship/maint{ - dir = 2 - }, -/obj/machinery/door/firedoor/mainship{ - dir = 2 - }, -/turf/open/floor/mainship/mono, -/area/mainship/living/officer_study) "rnS" = ( /obj/structure/bed/chair/nometal{ dir = 1 @@ -16871,6 +16883,12 @@ /obj/effect/ai_node, /turf/open/floor/mainship/floor, /area/mainship/squads/req) +"rtt" = ( +/obj/structure/dropship_equipment/electronics/spotlights, +/turf/open/floor/mainship/orange{ + dir = 6 + }, +/area/mainship/hallways/hangar) "rtD" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -17045,15 +17063,6 @@ /obj/structure/bed/chair/comfy/black, /turf/open/floor/mainship/silver/full, /area/mainship/hallways/hangar) -"rNF" = ( -/obj/vehicle/ridden/powerloader, -/obj/machinery/light/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/orange{ - dir = 5 - }, -/area/mainship/hallways/hangar) "rNO" = ( /obj/structure/table/mainship/nometal, /obj/item/camera, @@ -17217,6 +17226,15 @@ dir = 4 }, /area/mainship/engineering/ce_room) +"sbF" = ( +/obj/machinery/landinglight/cas{ + dir = 8 + }, +/obj/machinery/firealarm{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "scY" = ( /obj/structure/table/mainship/nometal, /obj/item/tool/crowbar, @@ -17233,6 +17251,13 @@ }, /turf/open/floor/mainship/mono, /area/mainship/living/tankerbunks) +"sem" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1; + pixel_y = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "seG" = ( /turf/open/floor/mainship/mono, /area/mainship/squads/req) @@ -17304,13 +17329,19 @@ "sjM" = ( /turf/open/floor/plating, /area/mainship/living/tankerbunks) -"sjV" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - on = 1 - }, +"sjN" = ( /obj/structure/cable, -/turf/open/floor/mainship/floor, -/area/mainship/living/numbertwobunks) +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/obj/structure/disposalpipe/junction/flipped{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/port_hallway) "skf" = ( /obj/structure/table/mainship/nometal, /obj/item/storage/box/drinkingglasses, @@ -17414,10 +17445,14 @@ }, /area/mainship/medical/surgery_hallway) "soQ" = ( -/obj/structure/table/mainship/nometal, -/obj/item/toy/deck, +/obj/structure/bed/chair/nometal{ + dir = 8 + }, +/obj/effect/turf_decal/siding/purple/corner{ + dir = 4 + }, /turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/area/mainship/living/bridgebunks) "spa" = ( /obj/machinery/door/firedoor/mainship, /obj/structure/window/framed/mainship, @@ -17471,12 +17506,13 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/living/grunt_rnr) "ssC" = ( -/obj/machinery/light/mainship, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 +/obj/effect/turf_decal/warning_stripes/thin, +/obj/item/clothing/head/warning_cone, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 1 }, -/turf/open/floor/mainship/green, -/area/mainship/living/numbertwobunks) +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "stM" = ( /obj/structure/bed, /obj/effect/landmark/start/job/pilotofficer, @@ -17620,6 +17656,16 @@ /obj/item/toy/plush/moth, /turf/open/floor/mainship/mono, /area/mainship/living/starboard_emb) +"sMo" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "sMD" = ( /obj/structure/closet/secure_closet/freezer, /obj/item/reagent_containers/food/snacks/sandwiches/sandwich, @@ -17663,12 +17709,28 @@ dir = 1 }, /area/mainship/hallways/repair_bay) +"sOr" = ( +/obj/machinery/light/mainship{ + dir = 1 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 9 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "sOM" = ( /obj/machinery/optable, /obj/item/tank/anesthetic, /obj/item/clothing/mask/breath/medical, /turf/open/floor/mainship/sterile/dark, /area/mainship/medical/operating_room_four) +"sPk" = ( +/obj/docking_port/stationary/marine_dropship/crash_target, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 5 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "sPP" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment/corner{ @@ -17737,9 +17799,6 @@ /turf/open/floor/mainship/floor, /area/mainship/living/cafeteria_starboard) "sTv" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, /obj/structure/ship_ammo/cas/bomblet, /turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) @@ -17828,6 +17887,11 @@ /obj/structure/bed/bunkbed, /turf/open/floor/mainship/mono, /area/mainship/living/port_emb) +"ten" = ( +/obj/structure/bed, +/obj/item/bedsheet/blue, +/turf/open/floor/wood, +/area/mainship/living/bridgebunks) "tfu" = ( /turf/closed/wall/mainship/outer, /area/mainship/hallways/port_umbilical) @@ -17841,9 +17905,6 @@ /turf/open/floor/mainship/ai, /area/mainship/command/airoom) "tgH" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -17851,6 +17912,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 4 + }, /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "tgK" = ( @@ -17872,6 +17936,7 @@ /obj/machinery/light/mainship{ dir = 4 }, +/obj/item/clothing/gloves/insulated, /turf/open/floor/mainship/orange{ dir = 4 }, @@ -17922,6 +17987,13 @@ "tmp" = ( /turf/open/floor/mainship/floor, /area/mainship/command/cic) +"tmP" = ( +/obj/machinery/door/airlock/multi_tile/mainship/comdoor{ + name = "\improper Officer's Study" + }, +/obj/machinery/door/firedoor/multi_tile, +/turf/open/floor/mainship/mono, +/area/mainship/living/officer_rnr) "tnj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -18190,7 +18262,6 @@ dir = 2; name = "Freezer" }, -/obj/structure/cable, /turf/open/floor/mainship/mono, /area/mainship/living/officer_rnr) "tIQ" = ( @@ -18449,6 +18520,13 @@ /obj/structure/prop/mainship/ship_memorial, /turf/open/floor/mainship/mono, /area/mainship/living/starboard_garden) +"ubJ" = ( +/obj/structure/ship_ammo/cas/heavygun, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 4 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "udB" = ( /obj/machinery/telecomms/hub/preset, /turf/open/floor/mainship/tcomms, @@ -18475,6 +18553,10 @@ dir = 1 }, /area/mainship/hallways/hangar) +"ugr" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar) "ugw" = ( /obj/machinery/vending/armor_supply, /turf/open/floor/mainship/mono, @@ -18632,6 +18714,10 @@ dir = 10 }, /area/space) +"uym" = ( +/obj/machinery/door/airlock/command, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "uyz" = ( /turf/open/floor/wood, /area/mainship/living/tankerbunks) @@ -18671,6 +18757,12 @@ /obj/machinery/computer/autodoc_console, /turf/open/floor/mainship/sterile, /area/mainship/medical/lower_medical) +"uCr" = ( +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "uDw" = ( /obj/structure/table/mainship/nometal, /obj/item/explosive/grenade/training, @@ -18679,6 +18771,15 @@ /obj/structure/sign/securearea/firingrange, /turf/open/floor/mainship/mono, /area/mainship/shipboard/firing_range) +"uDz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ + on = 1 + }, +/obj/effect/turf_decal/warning_stripes/thin{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "uEg" = ( /obj/structure/table/reinforced, /obj/item/storage/firstaid/adv, @@ -18879,7 +18980,7 @@ dir = 4 }, /turf/open/floor/wood, -/area/mainship/living/officer_study) +/area/mainship/living/officer_rnr) "uSC" = ( /obj/effect/spawner/random/misc/structure/flavorvending/cigaretteweighted, /turf/open/floor/mainship/silver{ @@ -18914,15 +19015,6 @@ /obj/effect/spawner/random/misc/soap/regularweighted, /turf/open/floor/mainship/mono, /area/mainship/hull/port_hull) -"uUO" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/mainship/green{ - dir = 1 - }, -/area/mainship/living/numbertwobunks) "uVR" = ( /turf/open/floor/mainship/mono, /area/mainship/living/grunt_rnr) @@ -19021,20 +19113,18 @@ /turf/open/floor/plating/plating_catwalk, /area/mainship/living/tankerbunks) "vcZ" = ( -/obj/machinery/loadout_vendor, -/turf/open/floor/mainship/green, -/area/mainship/living/numbertwobunks) -"veY" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ - dir = 9 +/obj/effect/turf_decal/warning_stripes/thin, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 1 }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) +"veY" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 - }, -/turf/open/floor/mainship/floor, -/area/mainship/living/officer_study) +/obj/structure/bed/chair/nometal, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood, +/area/mainship/living/officer_rnr) "vfD" = ( /obj/vehicle/ridden/wheelchair, /turf/open/floor/mainship/sterile/corner{ @@ -19161,6 +19251,13 @@ dir = 4 }, /area/mainship/living/commandbunks) +"vtz" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ + dir = 1; + on = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "vtE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -19273,7 +19370,7 @@ "vBI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/mainship/floor, +/turf/open/floor/mainship/sterile/white, /area/mainship/living/bridgebunks) "vCC" = ( /obj/structure/cable, @@ -19645,13 +19742,16 @@ /obj/structure/cable, /turf/open/floor/mainship/mono, /area/mainship/hull/port_hull) -"wmE" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/machinery/firealarm, -/turf/open/floor/mainship/orange{ +"wmi" = ( +/obj/machinery/light/mainship{ dir = 1 }, +/turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) +"wmE" = ( +/obj/machinery/vending/armor_supply, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "wou" = ( /obj/machinery/door/airlock/multi_tile/mainship/generic/canteen, /obj/machinery/door/firedoor/multi_tile, @@ -19746,6 +19846,19 @@ /obj/machinery/computer/camera_advanced/remote_fob, /turf/open/floor/mainship/mono, /area/mainship/hallways/repair_bay) +"wAm" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/mainship/hallways/hangar) "wBE" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -19761,9 +19874,9 @@ /turf/open/floor/mainship/stripesquare, /area/mainship/hallways/port_hallway) "wCq" = ( -/obj/structure/dropship_equipment/cas/weapon/minirocket_pod, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/obj/machinery/marine_selector/gear/commander, +/turf/open/floor/wood, +/area/mainship/living/numbertwobunks) "wDA" = ( /obj/machinery/light{ dir = 4 @@ -19830,11 +19943,13 @@ /turf/open/floor/plating, /area/mainship/hallways/bow_hallway) "wJA" = ( -/obj/machinery/vending/uniform_supply, -/turf/open/floor/mainship/green{ - dir = 6 +/obj/effect/turf_decal/warning_stripes/thin, +/obj/effect/turf_decal/warning_stripes/thick{ + dir = 1 }, -/area/mainship/living/numbertwobunks) +/obj/item/clothing/head/warning_cone, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/hangar) "wKi" = ( /obj/structure/cable, /turf/open/floor/mainship/silver{ @@ -19974,6 +20089,17 @@ /obj/structure/table/mainship/nometal, /turf/open/floor/mainship/mono, /area/mainship/command/cic) +"wVB" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 1 + }, +/turf/open/floor/mainship/mono, +/area/mainship/hallways/port_hallway) "wVN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20054,14 +20180,6 @@ /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/mainship/orange/full, /area/mainship/command/cic) -"xgM" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/mainship/orange{ - dir = 8 - }, -/area/mainship/hallways/hangar) "xgX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -20109,10 +20227,6 @@ }, /turf/open/floor/mainship/purple/full, /area/mainship/hallways/hangar) -"xjo" = ( -/obj/structure/dropship_equipment/shuttle/weapon_holder/machinegun, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "xjw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -20186,11 +20300,9 @@ /turf/open/floor/mainship/mono, /area/mainship/squads/delta) "xqY" = ( -/obj/machinery/marine_selector/gear/commander, -/turf/open/floor/carpet/side{ - dir = 1 - }, -/area/mainship/living/numbertwobunks) +/obj/machinery/camera/autoname/mainship, +/turf/open/floor/plating, +/area/mainship/hallways/hangar) "xsH" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 5 @@ -20198,6 +20310,12 @@ /obj/effect/turf_decal/warning_stripes/thin, /turf/open/floor/mainship/floor, /area/mainship/command/cic) +"xsM" = ( +/obj/structure/droppod, +/obj/structure/drop_pod_launcher, +/obj/machinery/camera/autoname/mainship, +/turf/open/floor/mainship/cargo, +/area/mainship/hallways/hangar/droppod) "xsU" = ( /obj/structure/cable, /obj/machinery/camera/autoname/mainship{ @@ -20219,15 +20337,15 @@ }, /turf/open/floor/mainship/mono, /area/mainship/squads/alpha) -"xwJ" = ( -/obj/vehicle/ridden/powerloader, -/obj/machinery/light/mainship{ - dir = 1 - }, -/turf/open/floor/mainship/orange{ - dir = 1 +"xwr" = ( +/turf/open/floor/carpet/side{ + dir = 9 }, -/area/mainship/hallways/hangar) +/area/mainship/living/numbertwobunks) +"xwJ" = ( +/obj/machinery/vending/uniform_supply, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "xxs" = ( /obj/item/robot_parts/robot_suit, /obj/item/clothing/under/wedding/bride_white, @@ -20266,6 +20384,12 @@ dir = 1 }, /area/mainship/medical/lower_medical) +"xBW" = ( +/obj/machinery/light/mainship{ + dir = 8 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "xCa" = ( /obj/item/radio/intercom/general, /turf/open/floor/mainship/mono, @@ -20286,9 +20410,9 @@ /turf/open/floor/mainship/floor, /area/mainship/command/cic) "xCC" = ( -/obj/structure/dropship_equipment/shuttle/operatingtable, +/obj/machinery/vending/tool, /turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/area/mainship/living/numbertwobunks) "xCV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ dir = 4 @@ -20337,15 +20461,6 @@ dir = 8 }, /area/mainship/living/basketball) -"xGY" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/mainship/living/officer_study) "xHa" = ( /turf/closed/wall/mainship, /area/mainship/shipboard/port_point_defense) @@ -20379,13 +20494,6 @@ dir = 4 }, /area/mainship/living/cafeteria_starboard) -"xKj" = ( -/obj/structure/bed, -/obj/item/bedsheet/red, -/turf/open/floor/carpet/side{ - dir = 6 - }, -/area/mainship/living/numbertwobunks) "xKX" = ( /obj/machinery/door/window, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ @@ -20456,15 +20564,6 @@ }, /turf/open/floor/mainship/mono, /area/mainship/hull/starboard_hull) -"xQX" = ( -/obj/machinery/light/mainship{ - dir = 1 - }, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) "xRs" = ( /obj/machinery/atmospherics/components/unary/vent_pump/layer1{ dir = 1; @@ -20485,13 +20584,6 @@ dir = 1 }, /area/mainship/hallways/aft_hallway) -"xSH" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/layer1{ - dir = 1; - on = 1 - }, -/turf/open/floor/mainship/floor, -/area/mainship/hallways/hangar) "xSI" = ( /obj/structure/closet, /obj/item/toy/plush/farwa, @@ -20613,9 +20705,8 @@ /turf/open/floor/mainship/mono, /area/mainship/hallways/hangar) "ybO" = ( -/obj/structure/dropship_equipment/electronics/spotlights, /turf/open/floor/mainship/mono, -/area/mainship/hallways/hangar) +/area/mainship/living/numbertwobunks) "ycd" = ( /obj/machinery/door/window/secure/bridge/aidoor{ dir = 8 @@ -20652,24 +20743,10 @@ }, /area/mainship/medical/lower_medical) "yes" = ( -/obj/item/radio/intercom/general, -/obj/machinery/vending/tool, -/turf/open/floor/mainship/orange{ - dir = 1 - }, -/area/mainship/hallways/hangar) -"yet" = ( -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 8 - }, -/obj/machinery/light/mainship, -/obj/effect/turf_decal/warning_stripes/thin{ - dir = 4 - }, -/turf/open/floor/mainship/orange{ - dir = 10 - }, -/area/mainship/hallways/hangar) +/obj/machinery/camera/autoname/mainship, +/obj/machinery/vending/engivend, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "yeD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20751,19 +20828,32 @@ dir = 9 }, /area/mainship/medical/medical_science) -"yji" = ( -/obj/effect/turf_decal/warning_stripes/thin, -/turf/open/floor/mainship/orange, +"yiQ" = ( +/obj/vehicle/ridden/powerloader, +/turf/open/floor/mainship/cargo, /area/mainship/hallways/hangar) +"yji" = ( +/obj/effect/ai_node, +/obj/structure/table/mainship/nometal, +/obj/machinery/computer/marine_card, +/obj/item/storage/box/ids, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{ + dir = 6 + }, +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "yjZ" = ( -/obj/effect/turf_decal/warning_stripes/thin, +/obj/structure/bed/chair/nometal{ + dir = 8 + }, /obj/machinery/light/mainship{ dir = 4 }, -/turf/open/floor/mainship/orange{ - dir = 6 - }, -/area/mainship/hallways/hangar) +/turf/open/floor/mainship/mono, +/area/mainship/living/numbertwobunks) "ykh" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 8 @@ -41274,7 +41364,7 @@ aap aap aap aap -lvI +bgb bbR bSC mjo @@ -41524,14 +41614,14 @@ aac aac adQ bgb -ann -ann -bdj -bhd +bCK +bCK +bCK +bCK hVR sTv +gfu bgb -bOy bbR dXn blA @@ -41558,14 +41648,14 @@ blA vDT lOP lvI -bgb +abR gjK mqI -lvI -wCq -lvI +qhh +abR +hIC wCq -bgb +abR adZ aeb aeb @@ -41781,14 +41871,14 @@ aaa aai tDH bgb -oer -oer -oer -pNB -bCK -bCK +ann +ann +bdj +mJs +olO +yiQ +ugr bgb -lvI bbR dXn blA @@ -41815,14 +41905,14 @@ blA vDT lOP uJT -bgb +abR wmE yji -lvI +vtz +fWN +hjO myv -lvI -myv -bgb +abR wem aVk aaa @@ -42038,14 +42128,14 @@ aaa aai tDH bgb -xQX -gfg -gfg -npA -bCK -bCK +oer +oer +oer +bja +jDv +bgb +bgb bgb -lyh bbR dXn blA @@ -42072,14 +42162,14 @@ htp vDT lOP lvI -bgb +abR xwJ -yji -lvI -blo -lvI -blo -bgb +sMo +gWC +abR +xwr +jYi +abR wem aVk aaa @@ -42297,15 +42387,15 @@ rbR bgb bea bea -bea -juB -bgb -bgb -bgb -lvI -bbR +gfg +bGr +ifv +beU +bgd +aTs +ceW dXn -blA +jCH blA blA blA @@ -42328,15 +42418,15 @@ blA hHM vDT tgH -qPs -akH -xSH +lvI +abR +abR ofY -xgM -xgM +abR +abR hgk -yet -bgb +uIz +abR fZA aVk aaa @@ -42552,14 +42642,14 @@ aaa aai aak bgb +oPC hhA -hhA +lvI lvI bLH beU bgd aTs -lvI bbR dXn car @@ -42584,16 +42674,16 @@ blA blA hHM kST -wxQ -lvI +wAm +ekU pWE bAh -uns -uns -uns +lwr +xBW +abR qiO -qYe -bgb +uIz +abR sao aVk aaa @@ -42809,14 +42899,14 @@ aaa aai rbR bgb -anQ -hhA -bqA -bLH -beU +ubJ +ubJ +aMR +pqz +uCr +bkO bgd -aTs -lvI +bxM bbR dXn qNu @@ -42845,12 +42935,12 @@ ikx paD bYm kxg -uns -uns -uns -qiO +itV +bnr +abR +itC qYe -bgb +abR fZA aVk aaa @@ -43066,14 +43156,14 @@ aaa aai aaj bgb -hhA -hhA -lvI -bLH -bkO -bgd -bxM -lvI +bdW +bdW +bdj +sem +dhl +bgb +bgb +bgb bbR dXn caJ @@ -43100,14 +43190,14 @@ hHM sim lOP uJT -bgb -fme -uns -uns -uns -qiO -gJS -bgb +abR +abR +uym +abR +abR +abR +llf +abR qae aVk aaa @@ -43323,14 +43413,14 @@ aaa aai tDH bgb -apj -apj -apj +oer +oer +oer bhg +kCI +dZK +dZK bgb -bgb -bgb -bGr bbR dXn blA @@ -43357,14 +43447,14 @@ hHM vDT lOP lvI -bgb +abR hHj -aAN -cyf +ybO cyf +abR coU -kaw -bgb +vlF +abR wem aVk aaa @@ -43580,14 +43670,14 @@ aaa aai tDH bgb -bdZ -aMR -aMR +ugr +ugr +oer bhh +oer dZK dZK bgb -lyh xQe dXn blA @@ -43614,14 +43704,14 @@ ppE vDT lOP lvI -bgb +abR yes gGw xCC -xjo -ybO +abR +pXz ybO -bgb +abR wem aVk aaa @@ -43837,14 +43927,14 @@ aaa aai rbR bgb -bdW -bdW -bdj +bgb +bgb +bgb pNB -dZK -dZK bgb -bLs +bgb +bgb +bgb wxQ dXn blA @@ -43871,14 +43961,14 @@ blA vDT qij lvI -bgb +abR hnY yjZ -vNA -vNA -vNA -vNA -bgb +hKR +abR +aop +raA +abR fZA aVk aaa @@ -44094,21 +44184,21 @@ aaa aai aak bgb +wmi +lyC +bja +cuH oer -oer -oer -bhj -gfg -gfg +fno bgb -bOy +iWI bPB dXn blA blA blA blA -caJ +hOA fgc blA hHM @@ -44350,26 +44440,26 @@ aaa aaa aai rbR -abR -abR -abR -abR -abR -abR -abR -abR +bgb +lDd +nWY +bja +cuH +oer +fvw +bgb eaL bVJ bbo jJt jJt -jvP -lBZ -jJt -jJt +lvI jJt +iVz +gby +iVz +sbF jJt -lBZ jJt jvP jJt @@ -44607,33 +44697,33 @@ aaa aaa aai tDH -abR -arP -aOx -abR -bhl -bkP +bgb +oer bqC -abR +bja +cuH +oer +bqC +bgb lvI xQe mJs gfg caY -qbG -lvI -eXl lvI -btY -qbG -oer +bgb +yay +bgb +gJa +bgb +bgb bjF uns uns uns +lvI umS umS -uns xir xir uGh @@ -44864,33 +44954,33 @@ aaa aaa aai tDH -abR -aop -vlF -abR -jOq -bif +bgb +wmi +ggG +bja +yaR +oer lyr -abR +bgb lvI xQe pcr lvI bYN -bgb +lvI +yay +ftB +aLP +lvI +jul yay -bgb -gJa -bgb -bgb kQP uns rMK sMI -uns +lvI umS umS -uns xir tqL bgb @@ -45121,33 +45211,33 @@ aaa aaa aai aaj -abR -abR -llf -abR -uUO -bii -ngN -abR -bqA +bgb +bgb +bgb +bgb +bgb +bgb +bgb +bgb +sPk xQe aTB aMR -nZu +kCI +uJT bgb -ftB -fbp +ugh +oer lvI -hSG +hrn bgb -lGH +dwy uns rMK sMI -uns +lvI umS umS -uns xir xir uGA @@ -45378,33 +45468,33 @@ aaa aaa aai rbR -abR +bgb arR -jYi -bdU -jRe -sjV +blA +blA +blA +blA kMC -bxT +paZ iIi bPC lvI bWx +lvI bUE bgb -ugh -oer +lRg lvI -kVl +lvI +nsk bgb lsl uns rMK sMI -uns +bWx umS unW -bAh xir xjj uns @@ -45635,33 +45725,33 @@ aaa aaa aai aak -abR -aDa -uIz -abR -dhn -bip +bgb +blA +blA +blA +blA +blA ssC -abR -lvI +paZ +sem xQe mJs gfg -oaQ +ykh +uJT bgb -rNF fbJ +vNA lvI -kXm +lol bgb -lGH +qyD uns rMK sMI -uns +lvI unW unW -uns xjj xjj uGh @@ -45892,33 +45982,33 @@ aaa aaa aai rbR -abR +bgb xqY -kLp -abR -mQL -haz +blA +blA +blA +blA vcZ -abR -lvI +paZ +sem xQe pcr lvI bYN -bgb +lvI +yay +pPS +mhO +lvI +rtt yay -bgb -gJa -bgb -bgb lcy uns rMK sMI -uns +lvI unW unW -uns xjj txr bgb @@ -46149,33 +46239,33 @@ aaa aaa aai tDH -abR -dcq -xKj -abR -pYL -bmF +bgb +blA +blA +blA +blA +blA wJA -mhn -lvI +paZ +sem xQe aTB aMR bPn -ccd -bqA -feY lvI -lvI -ccd +bgb +yay +bgb +gJa +bgb +bgb oer oer uns uns -uns +lvI unW unW -uns xjj xjj uGA @@ -46406,25 +46496,26 @@ aaa aaa aai tDH -abR -abR -abR -abR -abR -abR -abR -abR -bGF +bgb +blA +blA +blA +blA +blA +qmA +paZ +uDz bPG bbo gBG gBG gBG -gBG -gBG +aex +hxY gBG gBG fVz +gBG mbQ mbQ gBG @@ -46437,7 +46528,6 @@ gBG gBG gBG gBG -gBG bGF bPG bbo @@ -46664,14 +46754,14 @@ aaa aai tDH blt -byG -byG -byG -byG -bkR -byG blt -lyh +blt +blt +blt +blt +blt +blt +sOr wxQ uGB blA @@ -46921,12 +47011,12 @@ aaa aai aal blt -arU -aUC -aUC -aUC -adm -bqK +byG +byG +byG +byG +bkR +byG blt bHc wxQ @@ -47178,12 +47268,12 @@ aaa aai aak blt -byG -byG -byG -byG -adp -bhi +arU +aUC +aUC +aUC +adm +bqK blt brp wxQ @@ -47435,12 +47525,12 @@ aaa aai rbR blt +xsM byG byG byG -fLr adp -brX +mIY iZq bja wxQ @@ -47692,11 +47782,11 @@ aaa aai tDH blt -asu -aVl -aVl -aVl -bkU +byG +byG +byG +fLr +adp brX iZq bja @@ -47949,12 +48039,12 @@ aaa aai tDH blt -byG -byG -byG -byG -bkT -bqL +asu +aVl +aVl +aVl +bkU +brX byf bHp bPH @@ -48206,11 +48296,11 @@ aaa aai tDH blt -asF -aVn -aVn -aVn -bok +byG +byG +byG +byG +doo vuE iZq bja @@ -48463,11 +48553,11 @@ aaa aai rbR blt -byG -byG -byG -fLr -adp +asF +aVn +aVn +aVn +bok vuE iZq bja @@ -48723,9 +48813,9 @@ blt byG byG byG -byG +fLr adp -bqW +vuE blt bIy wxQ @@ -48977,12 +49067,12 @@ aaa aai aal blt -axZ -aVG -aVG -aVG -bkW -bCL +xsM +byG +byG +byG +adp +bqW blt lvI wxQ @@ -49234,12 +49324,12 @@ aaa aai tDH blt -byG -byG -byG -byG -byG -byG +axZ +aVG +aVG +aVG +bkW +bCL blt lvI wxQ @@ -49491,12 +49581,12 @@ aaa aai tDH blt -blt -blt -blt -blt -blt -blt +byG +byG +byG +byG +byG +byG blt lyh wxQ @@ -49508,6 +49598,7 @@ iVz iVz iVz iVz +iVz tJn jbL jbL @@ -49519,7 +49610,6 @@ iVz iVz iVz iVz -iVz hky unF ykh @@ -49748,12 +49838,12 @@ aai aai tDH aap -acg -aWX -acg -bhp -bla -brW +aap +aap +aap +aap +aap +aap aap bOy wxQ @@ -49766,9 +49856,9 @@ lvI lvI lvI lvI +lvI oer oer -lvI bqA lvI lvI @@ -50773,7 +50863,7 @@ aai aak aoJ aas -bdc +abZ aXq aoJ pOi @@ -51030,7 +51120,7 @@ aai rbR aoJ iCp -bdc +abZ oQm aoJ bQt @@ -51287,7 +51377,7 @@ aai tDH aoJ adD -bdc +abZ oVL aoJ wLR @@ -51544,7 +51634,7 @@ aai tDH aoJ auj -bdc +abZ pLG aoJ wav @@ -51801,7 +51891,7 @@ aai tDH aoJ aHj -bdc +abZ qTt aoJ bdh @@ -51838,10 +51928,10 @@ qhN dzn ruj mgQ -aeI -bSD +jNc +dDZ oLl -qSA +jNc qSA bQs bSG @@ -52058,7 +52148,7 @@ aai rbR aoJ aXw -bdc +abZ sGK aoJ wav @@ -52095,15 +52185,15 @@ rbP rMd eeo kVk -aeI +jNc bSD -nJN -bZa +rsG +jNc soQ nJN -bSG +mjF jNc -rsG +dDZ obX pMP jNc @@ -52315,7 +52405,7 @@ aai aak aoJ pvn -bdc +abZ rjQ aoJ spV @@ -52352,13 +52442,13 @@ ruj nNJ cTD fIS -aeI -bSD -nJN +jNc +cbW +caD bWH bZa -nJN -bSG +iUW +gbA pWo caD eWR @@ -52572,7 +52662,7 @@ aai aal aoJ suh -bdc +abZ udB aoJ cli @@ -52608,13 +52698,13 @@ lyK xGb kNl jVY -aeI -aeI -bSD -nJN -blm +ahO +jNc +jNc +jNc +jNc blm -nJN +iUW ioN jNc jNc @@ -52829,7 +52919,7 @@ aai tDH aoJ aJn -bdc +abZ bas aoJ spV @@ -52865,18 +52955,18 @@ nga ruj bQh ruj -rkD +gyu hWb uSm btv bUi -btv +jDf lHu bYW pWo dKN obX -dsp +cbW jNc wem aVk @@ -53086,7 +53176,7 @@ aai tDH aoJ baN -bdc +abZ bav aoJ wav @@ -53122,18 +53212,18 @@ nSl nsv bQh ruj -rkD +ahO fsM bfO dtg geq gwq btv -bSG +aYJ jNc -cbW -eWR -dMy +dDZ +ten +pMP jNc wem aVk @@ -53343,7 +53433,7 @@ aai tDH aoJ bcl -bdc +abZ baw aoJ aCs @@ -53379,14 +53469,14 @@ nSl ruj bQh bWC -aeI +tmP bRN bfO rkt bVF fgj btv -bSG +eOF jNc jNc jNc @@ -53634,16 +53724,16 @@ iGu qys nSl ruj -bQh -ruj +sjN +mft neJ fwZ -bfO +qgD bUg bVG bWJ -btv -bSG +aqR +kpt iUW qwP jeI @@ -53892,20 +53982,20 @@ bMp nSl ruj nQl -qxG -aCh +ruj +ahO hey -xGY +bVH bVH bVH bWK iug veY pOE -blL +jNc cbi -iiH -rnz +jNc +jNc uNe aVk aaa @@ -54148,7 +54238,7 @@ avl qys nSl rbP -rMd +wVB eeo gyu seL @@ -54160,9 +54250,9 @@ ahO ahO ahO ahO -ahO +kFM dDZ -ahO +jNc fZA aVk aaa @@ -54411,15 +54501,15 @@ gyu mTD mCY mCY -bnu +mCY tHR lYN aVa pmz ahO oam -mdp -ahO +dsp +jNc wem aVk aaa @@ -54675,8 +54765,8 @@ oYC ert ahO ndz -fHe -ahO +cbW +jNc wem aVk aaa @@ -54931,9 +55021,9 @@ ahO ahO ahO ahO -ahO -ahO -ahO +jNc +jNc +jNc fZA aVk aaa diff --git a/_maps/map_files/generic/Admin_Level.dmm b/_maps/map_files/generic/Admin_Level.dmm index 9c519c6f3c16b..1d14ba3e93e4a 100644 --- a/_maps/map_files/generic/Admin_Level.dmm +++ b/_maps/map_files/generic/Admin_Level.dmm @@ -1156,9 +1156,6 @@ "box" = ( /turf/closed/wall/r_wall/unmeltable, /area/centcom/valhalla) -"boB" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "boC" = ( /turf/closed/mineral/smooth, /area/centcom/valhalla/xenocave) @@ -1170,9 +1167,6 @@ /obj/machinery/marine_selector/gear/medic/valhalla, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"brs" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "bsX" = ( /obj/machinery/firealarm{ dir = 4 @@ -1238,9 +1232,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"bAx" = ( -/turf/closed/wall, -/area/centcom/valhalla) "bAZ" = ( /obj/structure/noticeboard{ dir = 1; @@ -1652,25 +1643,6 @@ /obj/effect/ai_node, /turf/open/floor/mainship/sterile/side, /area/centcom/valhalla) -"cdQ" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/shower{ - pixel_y = 16 - }, -/obj/structure/curtain, -/obj/machinery/door/window{ - name = "Shower" - }, -/obj/effect/spawner/random/misc/soap/regularweighted, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/mainship/sterile/white, -/area/centcom/valhalla) -"ceH" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/tile/dark, -/area/centcom/valhalla) "cfQ" = ( /obj/machinery/status_display/ai, /turf/closed/wall, @@ -1717,10 +1689,6 @@ /obj/effect/turf_decal/warning_stripes/box/empty, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"ckK" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/dark, -/area/centcom/valhalla) "ckN" = ( /turf/open/floor/tile/vault{ dir = 5 @@ -2013,11 +1981,6 @@ dir = 5 }, /area/centcom/valhalla) -"cBF" = ( -/turf/open/floor/carpet/side{ - dir = 5 - }, -/area/centcom/valhalla) "cCa" = ( /obj/item/radio/intercom{ dir = 8; @@ -2049,12 +2012,6 @@ dir = 5 }, /area/centcom/valhalla) -"cDn" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "cDG" = ( /obj/machinery/status_display/ai, /turf/closed/wall/r_wall, @@ -2106,9 +2063,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"cGB" = ( -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "cHk" = ( /obj/structure/bed, /obj/machinery/atmospherics/components/unary/vent_pump/on, @@ -2188,12 +2142,6 @@ }, /turf/open/floor/tile/neutral/full, /area/centcom/valhalla) -"cKo" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "cMM" = ( /obj/structure/mirror{ dir = 4; @@ -2236,9 +2184,6 @@ /obj/structure/sign/nosmoking_1, /turf/closed/wall, /area/centcom/valhalla) -"cPT" = ( -/turf/open/floor/grimy, -/area/centcom/valhalla) "cQa" = ( /obj/effect/ai_node, /turf/open/floor/grimy, @@ -2428,10 +2373,6 @@ dir = 5 }, /area/centcom/valhalla) -"dbM" = ( -/obj/effect/ai_node, -/turf/open/floor/wood, -/area/centcom/valhalla) "dcs" = ( /obj/structure/mirror{ dir = 8; @@ -2498,12 +2439,6 @@ /obj/effect/ai_node, /turf/open/floor/tile/neutral/full, /area/centcom/valhalla) -"diX" = ( -/obj/item/storage/secure/safe{ - pixel_y = -6 - }, -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "dkn" = ( /obj/item/radio/intercom{ broadcasting = 1; @@ -2537,10 +2472,6 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/centcom/valhalla) -"dnH" = ( -/obj/machinery/door/airlock/mainship/generic/bathroom, -/turf/open/floor/mainship/sterile/white, -/area/centcom/valhalla) "dnY" = ( /turf/open/floor/carpet/side, /area/centcom/valhalla) @@ -2550,18 +2481,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"doK" = ( -/obj/structure/mirror{ - dir = 8; - pixel_x = 26 - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 12 - }, -/obj/effect/ai_node, -/turf/open/floor/mainship/sterile/white, -/area/centcom/valhalla) "doS" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/warning_stripes/thick{ @@ -2644,16 +2563,13 @@ }, /turf/open/floor/mainship/sterile/white, /area/centcom/valhalla) -"dtV" = ( -/turf/closed/wall, -/area/centcom/valhalla) "duo" = ( /obj/structure/window/reinforced/extratoughened{ dir = 1 }, /obj/machinery/chem_master/nopower/valhalla, /turf/open/floor/tile/dark/gray, -/area/centcom/valhalla/exterior) +/area/centcom/valhalla) "dur" = ( /obj/effect/turf_decal/warning_stripes/thick, /obj/machinery/button/valhalla/marine_button{ @@ -2661,9 +2577,6 @@ }, /turf/open/floor/mainship/stripesquare, /area/centcom/valhalla) -"dve" = ( -/turf/closed/wall, -/area/centcom/valhalla) "dwX" = ( /obj/structure/filingcabinet, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -2677,13 +2590,6 @@ }, /turf/open/floor/wood, /area/centcom/valhalla) -"dxV" = ( -/turf/open/floor/wood, -/area/centcom/valhalla) -"dxX" = ( -/obj/machinery/status_display/ai, -/turf/closed/wall, -/area/centcom/valhalla) "dxY" = ( /obj/structure/bedsheetbin, /turf/open/floor/wood, @@ -2819,12 +2725,6 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/centcom/valhalla) -"dEO" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 10 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "dFm" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -2874,10 +2774,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"dGD" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "dHm" = ( /obj/structure/table, /obj/structure/mirror{ @@ -2912,10 +2808,6 @@ /obj/item/storage/fancy/cigar, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"dHZ" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "dIg" = ( /obj/machinery/light_switch{ pixel_x = -8; @@ -3000,14 +2892,6 @@ dir = 5 }, /area/centcom/valhalla) -"dJw" = ( -/obj/machinery/status_display/ai, -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) -"dLi" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "dMC" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -3274,10 +3158,6 @@ /obj/item/restraints/handcuffs, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"dXp" = ( -/obj/effect/ai_node, -/turf/open/floor/wood, -/area/centcom/valhalla) "dXq" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -3287,12 +3167,6 @@ }, /turf/open/floor/mainship/sterile/dark, /area/centcom/valhalla) -"dYw" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/wood, -/area/centcom/valhalla) "dZC" = ( /obj/effect/ai_node, /turf/open/floor/tile/neutral{ @@ -3332,11 +3206,6 @@ /obj/item/tool/kitchen/rollingpin, /turf/open/floor/mainship/sterile/white, /area/centcom/valhalla) -"ecT" = ( -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "ecW" = ( /obj/machinery/door_control/unmeltable{ dir = 4; @@ -3481,10 +3350,6 @@ dir = 1 }, /area/centcom/valhalla) -"ete" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "etk" = ( /obj/structure/table, /obj/item/storage/box/pillbottles{ @@ -3535,11 +3400,6 @@ dir = 4 }, /area/centcom/valhalla) -"evv" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 4 - }, -/area/centcom/valhalla) "evE" = ( /obj/machinery/camera/autoname/thunderdome/hidden, /turf/open/floor/tile/blue/taupeblue{ @@ -3661,9 +3521,6 @@ }, /turf/open/floor/grimy, /area/centcom/valhalla) -"eHe" = ( -/turf/open/floor/grimy, -/area/centcom/valhalla) "eIy" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/green{ @@ -3690,9 +3547,6 @@ }, /turf/open/floor/tile/red/yellowfull, /area/tdome/tdomeadmin) -"eMT" = ( -/turf/open/floor/plating/dmg1, -/area/centcom/valhalla) "eNk" = ( /obj/machinery/computer/med_data{ dir = 8 @@ -3711,21 +3565,6 @@ /obj/effect/ai_node, /turf/open/floor/plating, /area/centcom/valhalla) -"eNS" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/shower{ - pixel_y = 16 - }, -/obj/structure/curtain, -/obj/machinery/door/window{ - name = "Shower" - }, -/obj/effect/spawner/random/misc/soap/regularweighted, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/mainship/sterile/white, -/area/centcom/valhalla) "eOJ" = ( /obj/machinery/hydroponics, /obj/effect/turf_decal/warning_stripes/thick{ @@ -3733,9 +3572,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"ePj" = ( -/turf/open/floor/tile/dark, -/area/centcom/valhalla) "ePE" = ( /obj/structure/bed/stool, /turf/open/floor/wood, @@ -3759,11 +3595,6 @@ /obj/effect/turf_decal/warning_stripes/thick, /turf/open/floor/tile/lightred, /area/centcom/valhalla) -"eQI" = ( -/turf/open/floor/carpet/side{ - dir = 1 - }, -/area/centcom/valhalla) "eRd" = ( /obj/structure/table, /obj/item/flashlight/lamp/green, @@ -3933,9 +3764,6 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"fbp" = ( -/turf/open/floor/plating, -/area/centcom/valhalla) "fbQ" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/warning_stripes/thick{ @@ -4121,18 +3949,6 @@ /obj/machinery/camera/autoname/thunderdome/hidden, /turf/open/floor/plating, /area/tdome/tdome1) -"fqV" = ( -/obj/machinery/door/airlock/external{ - name = "External Docking Port" - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "frZ" = ( /obj/machinery/door/airlock/mainship/marine/general/sl{ dir = 3 @@ -4188,15 +4004,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"fvU" = ( -/turf/open/floor/plating/dmg2, -/area/centcom/valhalla) -"fwP" = ( -/obj/structure/sign/securearea{ - dir = 1 - }, -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "fwS" = ( /obj/structure/table, /obj/effect/spawner/random/misc/paperbin, @@ -4274,10 +4081,6 @@ dir = 5 }, /area/centcom/valhalla) -"fDX" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "fEt" = ( /obj/effect/turf_decal/warning_stripes/thick/corner{ dir = 8 @@ -4309,15 +4112,6 @@ /obj/effect/turf_decal/warning_stripes/box/empty, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"fHH" = ( -/obj/effect/turf_decal/warning_stripes/box, -/obj/machinery/vending/snack/nopower, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"fHO" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) "fIC" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/warning_stripes/thick{ @@ -4325,17 +4119,6 @@ }, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"fIF" = ( -/obj/machinery/newscaster{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/centcom/valhalla) -"fJY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/ai_node, -/turf/open/floor/plating, -/area/centcom/valhalla) "fKz" = ( /obj/structure/bedsheetbin, /obj/structure/extinguisher_cabinet, @@ -4360,10 +4143,6 @@ /obj/machinery/vending/cola/nopower, /turf/open/floor/tile/cafe, /area/centcom/valhalla) -"fKS" = ( -/obj/effect/turf_decal/warning_stripes/box/empty, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "fKX" = ( /obj/structure/closet/cabinet, /turf/open/floor/wood/broken, @@ -4374,10 +4153,6 @@ }, /turf/open/floor/tile/neutral/full, /area/centcom/valhalla) -"fLm" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) "fLA" = ( /obj/structure/closet/secure_closet/freezer/meat, /turf/open/floor/tile/white, @@ -4477,9 +4252,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor, /area/tdome) -"fPe" = ( -/turf/closed/wall, -/area/centcom/valhalla) "fPm" = ( /obj/item/stack/cable_coil, /obj/effect/turf_decal/tile/red{ @@ -4515,10 +4287,6 @@ /obj/effect/spawner/random/clothing/sunglasses, /turf/open/floor/grimy, /area/centcom/valhalla) -"fSc" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) "fSA" = ( /obj/structure/bed/chair/office/dark, /obj/machinery/light_switch{ @@ -4617,10 +4385,6 @@ /obj/structure/bedsheetbin, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"fZE" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) "fZG" = ( /obj/machinery/newscaster{ dir = 4 @@ -4680,10 +4444,6 @@ /obj/effect/spawner/random/weaponry/melee, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"ger" = ( -/obj/structure/sign/nosmoking_1, -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "geA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -4860,12 +4620,6 @@ dir = 8 }, /area/centcom/valhalla) -"gnR" = ( -/obj/effect/turf_decal/warning_stripes/thick/corner{ - dir = 8 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "god" = ( /turf/open/floor/carpet/side{ dir = 9 @@ -4884,15 +4638,6 @@ dir = 6 }, /area/centcom/valhalla) -"gpt" = ( -/turf/closed/wall/r_wall, -/area/centcom/valhalla) -"gqM" = ( -/obj/machinery/newscaster{ - dir = 4 - }, -/turf/closed/wall, -/area/centcom/valhalla) "gri" = ( /obj/machinery/firealarm{ dir = 1 @@ -4930,9 +4675,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"gtc" = ( -/turf/open/floor/tile/dark, -/area/centcom/valhalla) "gtN" = ( /obj/machinery/firealarm{ dir = 1 @@ -5008,14 +4750,6 @@ /obj/machinery/quick_vendor/beginner, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"gAA" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "gAL" = ( /obj/effect/turf_decal/warning_stripes/thick, /turf/open/floor/tile/lightred, @@ -5030,9 +4764,6 @@ /obj/effect/landmark/thunderdome/two, /turf/open/floor/plating, /area/tdome/tdome2) -"gCo" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "gCr" = ( /obj/structure/sign/securearea/firingrange, /turf/open/floor/plating, @@ -5207,13 +4938,6 @@ /obj/effect/ai_node, /turf/open/floor/freezer, /area/centcom/valhalla) -"gKo" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) -"gKR" = ( -/turf/open/floor/tile/neutral/full, -/area/centcom/valhalla) "gMd" = ( /obj/structure/closet/crate, /obj/machinery/status_display{ @@ -5292,9 +5016,6 @@ /obj/effect/turf_decal/warning_stripes/box/empty, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"gQL" = ( -/turf/closed/wall, -/area/centcom/valhalla) "gUo" = ( /obj/structure/bed/chair{ dir = 8 @@ -5344,15 +5065,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"hag" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "haq" = ( /obj/structure/table, /obj/machinery/firealarm{ @@ -5403,15 +5115,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/scorched, /area/centcom/valhalla) -"hdP" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"hec" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "heB" = ( /obj/machinery/button/valhalla/xeno_button{ link = "marineleft" @@ -5487,9 +5190,6 @@ dir = 5 }, /area/centcom/valhalla) -"hiF" = ( -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "hjG" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/insulated, @@ -5879,10 +5579,6 @@ /obj/item/tool/pen, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"hNt" = ( -/obj/effect/turf_decal/warning_stripes/box, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "hNU" = ( /obj/machinery/air_alarm{ dir = 4 @@ -5894,10 +5590,6 @@ dir = 8 }, /area/centcom/valhalla) -"hOc" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "hOK" = ( /obj/item/radio/intercom{ name = "Station Intercom" @@ -5935,29 +5627,13 @@ dir = 5 }, /area/centcom/valhalla) -"hOX" = ( -/obj/effect/turf_decal/warning_stripes/thick/corner{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "hPu" = ( /obj/machinery/firealarm, /turf/open/floor/tile/neutral/corner{ dir = 1 }, /area/centcom/valhalla) -"hQT" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"hRa" = ( +"hRa" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 4 }, @@ -5993,9 +5669,6 @@ /obj/item/reagent_containers/food/snacks/chips, /turf/open/floor/grimy, /area/centcom/valhalla) -"hTv" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "hTO" = ( /obj/effect/turf_decal/tile/brown{ dir = 8 @@ -6105,18 +5778,6 @@ /obj/item/book/manual/orbital_cannon_manual, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"icr" = ( -/turf/open/floor/grimy, -/area/centcom/valhalla) -"ics" = ( -/obj/structure/sign/securearea{ - dir = 1 - }, -/turf/closed/wall, -/area/centcom/valhalla) -"icW" = ( -/turf/open/floor/plating/dmg1, -/area/centcom/valhalla) "idh" = ( /obj/machinery/hydroponics, /obj/machinery/firealarm{ @@ -6205,19 +5866,6 @@ }, /turf/open/floor/mainship/sterile, /area/centcom/valhalla) -"ior" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/obj/machinery/door/airlock/mainship/security/free_access{ - dir = 1 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "ioO" = ( /obj/structure/table/reinforced, /obj/item/folder/red, @@ -6238,11 +5886,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"ipc" = ( -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "ipl" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, @@ -6282,14 +5925,6 @@ /obj/effect/ai_node, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"irn" = ( -/obj/structure/sign/doors{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - name = "WARNING: EXTERNAL AIRLOCK" - }, -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) "isj" = ( /obj/structure/table/reinforced, /obj/machinery/recharger/nopower, @@ -6354,11 +5989,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"ivQ" = ( -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "iwk" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ @@ -6489,12 +6119,6 @@ dir = 6 }, /area/centcom/valhalla) -"iHu" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) "iHX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/effect/turf_decal/tile/pink{ @@ -6544,16 +6168,6 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/tile/dark2, /area/centcom/valhalla) -"iKO" = ( -/obj/effect/turf_decal/warning_stripes/thick/corner{ - dir = 8 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"iKV" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "iMw" = ( /obj/structure/rack, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, @@ -6584,12 +6198,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"iPn" = ( -/obj/effect/turf_decal/warning_stripes/thick/corner{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "iQN" = ( /obj/structure/closet, /obj/effect/turf_decal/warning_stripes/thick{ @@ -6651,10 +6259,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"iVx" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/dark, -/area/centcom/valhalla) "iWr" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -6681,12 +6285,6 @@ /obj/effect/ai_node, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"iZc" = ( -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"iZD" = ( -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "iZT" = ( /obj/machinery/computer/security/telescreen, /obj/structure/table, @@ -6775,10 +6373,6 @@ /obj/machinery/bot/roomba/valhalla, /turf/open/floor/tile/neutral/full, /area/centcom/valhalla) -"jdQ" = ( -/obj/machinery/status_display/ai, -/turf/closed/wall, -/area/centcom/valhalla) "jdS" = ( /obj/structure/bed/chair{ dir = 8 @@ -6799,21 +6393,12 @@ /obj/machinery/door/airlock/prison/horizontal, /turf/open/floor/plating, /area/centcom/valhalla) -"jeH" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 4 - }, -/area/centcom/valhalla) "jfk" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/insulated, /obj/item/storage/box/lights/mixed, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"jgQ" = ( -/obj/structure/plasticflaps, -/turf/open/floor/plating, -/area/centcom/valhalla) "jhC" = ( /obj/machinery/status_display{ pixel_y = -32 @@ -6832,13 +6417,6 @@ /obj/machinery/gibber/nopower, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"jiU" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "jkk" = ( /obj/structure/window/reinforced{ dir = 8 @@ -6866,16 +6444,6 @@ }, /turf/open/floor/tile/red/redblue/full, /area/tdome/tdomeobserve) -"jlC" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"jlF" = ( -/obj/effect/turf_decal/warning_stripes/box, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "jnb" = ( /obj/structure/extinguisher_cabinet{ dir = 4 @@ -6894,19 +6462,6 @@ }, /turf/closed/wall, /area/centcom/valhalla) -"jow" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/obj/machinery/door/airlock/mainship/command/free_access{ - dir = 2 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "joH" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -7000,14 +6555,6 @@ /obj/item/stack/medical/heal_pack/ointment, /turf/open/floor/tile/red/yellowfull, /area/tdome/tdomeadmin) -"jrN" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/scorched, -/area/centcom/valhalla) -"jrR" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "jsn" = ( /obj/machinery/computer/atmoscontrol{ dir = 1 @@ -7031,10 +6578,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"jtw" = ( -/obj/structure/girder, -/turf/open/floor/plating, -/area/centcom/valhalla) "jtz" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/green{ @@ -7078,17 +6621,6 @@ }, /turf/open/floor/mainship/stripesquare, /area/centcom/valhalla) -"jwi" = ( -/obj/effect/turf_decal/tile/red, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"jxj" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/effect/turf_decal/warning_stripes/box/empty, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "jxN" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -7181,10 +6713,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"jAQ" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/turf/open/floor/plating, -/area/centcom/valhalla) "jBW" = ( /obj/vehicle/ridden/wheelchair{ dir = 4 @@ -7284,9 +6812,6 @@ dir = 1 }, /area/centcom/valhalla) -"jID" = ( -/turf/closed/wall, -/area/centcom/valhalla) "jJz" = ( /obj/structure/extinguisher_cabinet{ dir = 8 @@ -7298,10 +6823,6 @@ dir = 4 }, /area/centcom/valhalla) -"jJC" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "jKc" = ( /obj/structure/rack, /obj/effect/turf_decal/warning_stripes/thick{ @@ -7398,22 +6919,6 @@ }, /turf/open/floor/freezer, /area/centcom/valhalla) -"jRm" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"jRW" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/obj/machinery/door/airlock/mainship/maint/free_access{ - dir = 1 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "jTw" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 8 @@ -7427,10 +6932,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"jTH" = ( -/obj/machinery/status_display, -/turf/closed/wall, -/area/centcom/valhalla) "jUa" = ( /obj/structure/table/reinforced, /obj/machinery/smartfridge/chemistry/nopower, @@ -7444,10 +6945,6 @@ }, /turf/open/floor/mainship/sterile, /area/centcom/valhalla) -"jVB" = ( -/obj/effect/turf_decal/warning_stripes/box/empty, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "jWe" = ( /obj/machinery/vending/dinnerware, /obj/machinery/door_control/unmeltable{ @@ -7531,16 +7028,9 @@ dir = 1 }, /area/centcom/valhalla) -"jYh" = ( -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "jYG" = ( /turf/closed/mineral/smooth, /area/space) -"jYM" = ( -/turf/closed/wall, -/area/centcom/valhalla) "jYN" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/soup/ricepudding, @@ -7726,10 +7216,6 @@ dir = 4 }, /area/centcom/valhalla) -"kgI" = ( -/obj/structure/sign/vacuum, -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "kgL" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/cleanable/blood/oil, @@ -7770,12 +7256,6 @@ dir = 5 }, /area/centcom/valhalla) -"klg" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "kmb" = ( /obj/item/toy/plush/rouny, /turf/open/floor/plating/ground/mars/random/cave, @@ -7879,10 +7359,6 @@ /obj/structure/table/reinforced, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"krz" = ( -/obj/machinery/status_display, -/turf/closed/wall, -/area/centcom/valhalla) "krG" = ( /obj/effect/turf_decal/tile/gray{ dir = 1 @@ -7905,30 +7381,12 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"krR" = ( -/turf/open/floor/freezer, -/area/centcom/valhalla) -"ksv" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "ksY" = ( /obj/machinery/air_alarm{ dir = 1 }, /turf/open/floor/freezer, /area/centcom/valhalla) -"kuc" = ( -/obj/effect/turf_decal/tile/black{ - dir = 4 - }, -/obj/effect/turf_decal/tile/black{ - dir = 8 - }, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "kuq" = ( /obj/effect/decal/cleanable/blood/oil, /obj/structure/closet/crate, @@ -7973,15 +7431,6 @@ }, /turf/open/floor/tile/white/hall/full, /area/centcom/valhalla) -"kyR" = ( -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/white{ - dir = 1 - }, -/turf/open/floor/tile/neutral{ - dir = 1 - }, -/area/centcom/valhalla) "kyU" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil, @@ -8001,12 +7450,6 @@ dir = 5 }, /area/centcom/valhalla) -"kBQ" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "kCa" = ( /obj/machinery/teleport/hub, /obj/effect/turf_decal/tile/black{ @@ -8019,9 +7462,6 @@ dir = 5 }, /area/centcom/valhalla) -"kCb" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "kCL" = ( /obj/machinery/vending/snack, /obj/structure/sign/securearea{ @@ -8040,10 +7480,6 @@ /obj/structure/bed/stool, /turf/open/floor/plating, /area/centcom/valhalla) -"kDw" = ( -/obj/structure/sign/electricshock, -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "kDS" = ( /obj/structure/sink{ dir = 8; @@ -8098,16 +7534,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"kGn" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/obj/machinery/door/airlock/mainship/maint/free_access{ - dir = 1 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "kGq" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -8148,12 +7574,6 @@ /obj/item/tool/stamp/qm, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"kJK" = ( -/obj/machinery/newscaster{ - dir = 4 - }, -/turf/closed/wall, -/area/centcom/valhalla) "kKa" = ( /obj/machinery/vending/valhalla_req, /obj/structure/window/reinforced{ @@ -8172,16 +7592,6 @@ /obj/structure/window, /turf/open/floor/grass, /area/centcom/valhalla) -"kLu" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/full, -/area/centcom/valhalla) -"kLI" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "kME" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/warning_stripes/thick{ @@ -8214,10 +7624,6 @@ /obj/effect/landmark/weed_node, /turf/open/floor/plating/ground/mars/random/cave, /area/centcom/valhalla/xenocave) -"kPi" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "kPj" = ( /obj/effect/turf_decal/sandytile/sandyplating, /turf/open/floor/plating/ironsand, @@ -8260,10 +7666,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"kQR" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "kRr" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 4 @@ -8292,10 +7694,6 @@ /obj/item/ammo_magazine/revolver/mateba, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"kWn" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "kWX" = ( /obj/effect/turf_decal/warning_stripes/thick, /obj/machinery/hydroponics, @@ -8346,10 +7744,6 @@ /obj/effect/spawner/random/misc/trash, /turf/open/floor/plating, /area/centcom/valhalla) -"lce" = ( -/obj/effect/ai_node, -/turf/open/floor/plating, -/area/centcom/valhalla) "lcR" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 @@ -8409,9 +7803,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/dmg1, /area/centcom/valhalla) -"lgU" = ( -/turf/closed/wall, -/area/centcom/valhalla) "lhE" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -8443,11 +7834,6 @@ dir = 1 }, /area/centcom/valhalla) -"ljc" = ( -/turf/open/floor/tile/brown{ - dir = 4 - }, -/area/centcom/valhalla) "ljt" = ( /obj/structure/sign/fixedinplace/command{ dir = 1; @@ -8461,44 +7847,15 @@ }, /turf/closed/wall, /area/centcom/valhalla) -"lkM" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/white{ +"llS" = ( +/obj/structure/table, +/obj/item/storage/pill_bottle/dice, +/obj/machinery/firealarm{ dir = 4 }, -/turf/open/floor/tile/neutral, -/area/centcom/valhalla) -"llp" = ( -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/tile/dark/gray, +/turf/open/floor/marking/bot, /area/centcom/valhalla) -"llJ" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"llS" = ( -/obj/structure/table, -/obj/item/storage/pill_bottle/dice, -/obj/machinery/firealarm{ - dir = 4 - }, -/turf/open/floor/marking/bot, -/area/centcom/valhalla) -"llU" = ( -/obj/effect/turf_decal/warning_stripes/box/empty, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"lmc" = ( +"lmc" = ( /obj/machinery/door/firedoor{ dir = 2 }, @@ -8590,9 +7947,6 @@ /obj/structure/closet/secure_closet/bar, /turf/open/floor/tile/white, /area/tdome/tdomeobserve) -"loD" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "lpv" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/warning_stripes/thick{ @@ -8606,10 +7960,6 @@ }, /turf/open/floor/mainship/sterile/dark, /area/centcom/valhalla) -"lqk" = ( -/obj/effect/turf_decal/warning_stripes/box/empty, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "lqn" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/green{ @@ -8617,9 +7967,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"lqw" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "lri" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/black{ @@ -8728,10 +8075,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"lAU" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "lDM" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -8762,10 +8105,6 @@ /obj/effect/turf_decal/sandytile/sandyplating, /turf/open/floor/plating, /area/space) -"lEZ" = ( -/obj/machinery/status_display/ai, -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "lFj" = ( /obj/machinery/door/airlock/mainship/maint{ dir = 3; @@ -8778,16 +8117,6 @@ /obj/item/storage/donut_box, /turf/open/floor/grimy, /area/centcom/valhalla) -"lGH" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) -"lIl" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 9 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "lIC" = ( /turf/closed/wall/mainship, /area/tdome) @@ -8837,26 +8166,6 @@ /obj/item/flashlight, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"lMh" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/obj/machinery/door/airlock/mainship/command/free_access{ - dir = 2 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) -"lMJ" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 10 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "lMV" = ( /obj/effect/turf_decal/warning_stripes/thick/corner{ dir = 4 @@ -8936,10 +8245,6 @@ /obj/effect/turf_decal/warning_stripes/box/empty, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"lSb" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "lTP" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/radiation, @@ -9020,10 +8325,6 @@ /obj/machinery/vending/cola/nopower, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"mbn" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/centcom/valhalla) "mbs" = ( /obj/structure/table, /obj/item/folder/white, @@ -9033,14 +8334,6 @@ /obj/item/tweezers, /turf/open/floor/mainship/sterile/side, /area/centcom/valhalla) -"mbJ" = ( -/obj/machinery/status_display, -/turf/closed/wall, -/area/centcom/valhalla) -"mbY" = ( -/obj/structure/sign/nosmoking_1, -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "mcf" = ( /obj/effect/turf_decal/warning_stripes/box/small{ dir = 1 @@ -9160,11 +8453,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"mhC" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 1 - }, -/area/centcom/valhalla) "mhD" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -9184,19 +8472,6 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"mhM" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 5 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"mhP" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/full, -/area/centcom/valhalla) -"mid" = ( -/turf/open/floor/plating/dmg2, -/area/centcom/valhalla) "mjv" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -9207,14 +8482,6 @@ /obj/effect/turf_decal/warning_stripes/box/empty, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"mjw" = ( -/turf/closed/wall, -/area/centcom/valhalla) -"mjI" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 4 - }, -/area/centcom/valhalla) "mln" = ( /obj/structure/window/reinforced{ dir = 4 @@ -9246,22 +8513,6 @@ }, /turf/open/floor/tile/red/yellowfull, /area/tdome/tdomeadmin) -"mnp" = ( -/obj/item/tank/oxygen/red, -/obj/structure/dispenser, -/obj/effect/turf_decal/warning_stripes/box, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"moJ" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/obj/machinery/door/airlock/mainship/maint/free_access{ - dir = 1 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "moR" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 4 @@ -9319,18 +8570,6 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"muO" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) -"mvm" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) -"mvn" = ( -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "mwU" = ( /obj/structure/bookcase, /obj/item/book/manual/supermatter_engine, @@ -9347,10 +8586,6 @@ /obj/machinery/recharger/nopower, /turf/open/floor/mainship/sterile/side, /area/centcom/valhalla) -"mxn" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "mxw" = ( /obj/machinery/nuclearbomb{ dir = 8 @@ -9399,9 +8634,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"mCH" = ( -/turf/open/floor/plating, -/area/centcom/valhalla) "mCI" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 8 @@ -9424,9 +8656,6 @@ dir = 1 }, /area/centcom/valhalla) -"mDO" = ( -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "mEa" = ( /obj/structure/extinguisher_cabinet{ dir = 1 @@ -9459,26 +8688,10 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/grass, /area/centcom/valhalla) -"mEV" = ( -/obj/machinery/newscaster{ - dir = 4 - }, -/turf/closed/wall, -/area/centcom/valhalla) "mEY" = ( /obj/effect/ai_node, /turf/open/floor/mainship/sterile/dark, /area/centcom/valhalla) -"mFm" = ( -/obj/structure/sign/electricshock, -/turf/closed/wall/r_wall, -/area/centcom/valhalla) -"mFU" = ( -/obj/machinery/newscaster{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "mGe" = ( /obj/effect/turf_decal/tile/black{ dir = 1 @@ -9518,12 +8731,6 @@ /obj/machinery/power/port_gen/pacman, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"mHP" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "mHX" = ( /obj/item/radio/intercom{ dir = 8; @@ -9546,12 +8753,6 @@ }, /turf/open/floor, /area/tdome) -"mJJ" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 5 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "mKq" = ( /obj/structure/table/woodentable, /obj/item/flashlight/lamp/green{ @@ -9580,16 +8781,6 @@ dir = 5 }, /area/centcom/valhalla) -"mLC" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "mLF" = ( /obj/structure/table/mainship, /obj/item/reagent_containers/spray/cleaner, @@ -9618,10 +8809,6 @@ }, /turf/open/floor/engine, /area/centcom/valhalla) -"mNv" = ( -/obj/machinery/marine_selector/clothes/smartgun/valhalla, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "mOd" = ( /obj/structure/sign/nosmoking_1, /obj/machinery/newscaster{ @@ -9689,15 +8876,6 @@ /obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/centcom/valhalla) -"mSV" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) -"mTe" = ( -/turf/open/floor/tile/neutral/full, -/area/centcom/valhalla) "mUA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -9757,12 +8935,6 @@ /obj/effect/turf_decal/warning_stripes/box/empty, /turf/open/floor/tile/lightred, /area/centcom/valhalla) -"mXi" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "mXt" = ( /obj/machinery/computer/teleporter{ dir = 8 @@ -9813,17 +8985,10 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating, /area/centcom/valhalla) -"naH" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "naJ" = ( /obj/effect/turf_decal/sandytile/sandyplating, /turf/open/floor/plating/airless, /area/centcom/valhalla/exterior) -"nbd" = ( -/turf/open/floor/plating/scorched, -/area/centcom/valhalla) "nbQ" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, @@ -9881,17 +9046,11 @@ }, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"ndm" = ( -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "ndu" = ( /obj/effect/landmark/thunderdome/two, /obj/machinery/camera/autoname/thunderdome/hidden, /turf/open/floor/plating, /area/tdome/tdome2) -"ndy" = ( -/turf/open/floor/plating/dmg3, -/area/centcom/valhalla) "ndM" = ( /obj/structure/table, /obj/item/storage/box/bodybags{ @@ -9947,13 +9106,6 @@ /obj/item/explosive/grenade/chem_grenade/antiweed, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"ngU" = ( -/obj/structure/girder, -/turf/open/floor/plating, -/area/centcom/valhalla) -"nhm" = ( -/turf/closed/wall, -/area/centcom/valhalla) "njt" = ( /obj/structure/table, /obj/item/folder, @@ -9969,12 +9121,6 @@ /obj/structure/sign/safety/high_radiation, /turf/closed/wall/r_wall/unmeltable, /area/centcom/valhalla) -"njU" = ( -/obj/machinery/newscaster{ - dir = 8 - }, -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "nkB" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 5 @@ -10012,10 +9158,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/centcom/valhalla) -"nnW" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "noc" = ( /obj/machinery/newscaster{ dir = 4 @@ -10043,10 +9185,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"nrq" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "nsa" = ( /obj/structure/closet/crate, /obj/item/tool/crowbar/red, @@ -10143,12 +9281,6 @@ /obj/effect/ai_node, /turf/open/floor/plating, /area/centcom/valhalla) -"ntL" = ( -/obj/machinery/newscaster{ - dir = 4 - }, -/turf/closed/wall, -/area/centcom/valhalla) "num" = ( /obj/structure/sign/securearea{ dir = 1 @@ -10171,12 +9303,6 @@ /obj/effect/turf_decal/warning_stripes/thick, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"nvO" = ( -/obj/machinery/newscaster{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "nvQ" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/electrical, @@ -10202,9 +9328,6 @@ dir = 1 }, /area/centcom/valhalla) -"nyE" = ( -/turf/closed/wall, -/area/centcom/valhalla) "nzE" = ( /obj/machinery/door/airlock/mainship/generic{ name = "Bedroom" @@ -10241,21 +9364,12 @@ /obj/item/storage/box/handcuffs, /turf/open/floor/tile/red/yellowfull, /area/tdome/tdomeadmin) -"nBt" = ( -/turf/open/floor/carpet/side{ - dir = 5 - }, -/area/centcom/valhalla) "nCA" = ( /obj/structure/bed/chair/office/dark{ dir = 8 }, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"nCB" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) "nDm" = ( /obj/structure/sign/doors{ desc = "A sign that shows there are doors here. There are doors everywhere!"; @@ -10277,9 +9391,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"nDI" = ( -/turf/closed/wall, -/area/centcom/valhalla) "nDL" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -10313,9 +9424,6 @@ /obj/item/storage/box/pillbottles, /turf/open/floor/plating, /area/centcom/valhalla) -"nFq" = ( -/turf/open/floor/wood, -/area/centcom/valhalla) "nFA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/pink, @@ -10373,10 +9481,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"nGT" = ( -/obj/structure/girder, -/turf/open/floor/plating, -/area/centcom/valhalla) "nHk" = ( /obj/structure/extinguisher_cabinet{ dir = 4 @@ -10385,12 +9489,6 @@ dir = 8 }, /area/centcom/valhalla) -"nHZ" = ( -/obj/machinery/newscaster{ - dir = 4 - }, -/turf/closed/wall, -/area/centcom/valhalla) "nIR" = ( /obj/structure/table, /obj/machinery/computer/guestpass, @@ -10422,12 +9520,6 @@ }, /turf/open/floor/mainship/sterile, /area/centcom/valhalla) -"nMc" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "nMn" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 1 @@ -10530,17 +9622,6 @@ /obj/effect/spawner/random/engineering/tool, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"nVv" = ( -/obj/machinery/newscaster{ - dir = 4 - }, -/turf/closed/wall, -/area/centcom/valhalla) -"nVP" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 4 - }, -/area/centcom/valhalla) "nWJ" = ( /obj/structure/table, /obj/item/newspaper, @@ -10566,23 +9647,12 @@ }, /turf/open/floor/gcircuit, /area/centcom/valhalla) -"nYA" = ( -/turf/closed/wall/r_wall, -/area/centcom/valhalla) -"nZy" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "obe" = ( /obj/machinery/computer/body_scanconsole, /turf/open/floor/mainship/sterile/corner{ dir = 8 }, /area/centcom/valhalla) -"obJ" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "obY" = ( /obj/structure/table, /obj/item/storage/fancy/candle_box{ @@ -10592,10 +9662,6 @@ /obj/item/storage/fancy/candle_box, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"oce" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "ocf" = ( /obj/structure/sign/electricshock, /obj/structure/window/framed/colony/reinforced/hull, @@ -10623,10 +9689,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"odc" = ( -/obj/machinery/status_display, -/turf/closed/wall, -/area/centcom/valhalla) "odj" = ( /obj/structure/rack, /obj/effect/turf_decal/warning_stripes/thick{ @@ -10684,16 +9746,6 @@ }, /turf/open/floor/engine, /area/centcom/valhalla) -"ofK" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) -"ogI" = ( -/obj/effect/turf_decal/warning_stripes/box, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "ogJ" = ( /obj/effect/turf_decal/warning_stripes/thick, /obj/structure/sign/safety/high_radiation, @@ -10788,9 +9840,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"ojA" = ( -/turf/open/floor/plating/dmg3, -/area/centcom/valhalla) "ojF" = ( /obj/structure/table, /obj/machinery/light_switch{ @@ -10815,9 +9864,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"olK" = ( -/turf/closed/wall, -/area/centcom/valhalla) "omN" = ( /obj/effect/turf_decal/warning_stripes/thick/corner{ dir = 4 @@ -10875,22 +9921,12 @@ dir = 4 }, /area/centcom/valhalla) -"ots" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 8 - }, -/turf/open/floor/grimy, -/area/centcom/valhalla) "otD" = ( /obj/machinery/air_alarm{ dir = 1 }, /turf/open/floor/tile/neutral/corner, /area/centcom/valhalla) -"otM" = ( -/obj/effect/ai_node, -/turf/open/floor/plating/scorched, -/area/centcom/valhalla) "oul" = ( /mob/living/simple_animal/hostile/retaliate/goat{ name = "Pete" @@ -10930,16 +9966,6 @@ dir = 5 }, /area/centcom/valhalla) -"ovg" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/obj/machinery/door/airlock/mainship/maint/free_access, -/turf/open/floor/plating, -/area/centcom/valhalla) "ovl" = ( /obj/machinery/vending/cola/nopower, /turf/open/floor/tile/dark, @@ -10975,9 +10001,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"oCv" = ( -/turf/open/floor/plating, -/area/centcom/valhalla) "oCB" = ( /turf/open/floor/tile/vault{ dir = 4 @@ -10989,12 +10012,6 @@ /obj/effect/ai_node, /turf/open/floor/plating, /area/centcom/valhalla) -"oEt" = ( -/obj/machinery/firealarm{ - dir = 1 - }, -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) "oFX" = ( /obj/structure/window/reinforced{ dir = 8 @@ -11015,19 +10032,6 @@ dir = 1 }, /area/centcom/valhalla) -"oHV" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"oIv" = ( -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "oIG" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -11111,10 +10115,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"oOW" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "oPa" = ( /obj/structure/bed/chair/wood/wings{ dir = 4 @@ -11184,20 +10184,6 @@ dir = 5 }, /area/centcom/valhalla) -"oUp" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/obj/machinery/door/airlock/mainship/maint/free_access, -/turf/open/floor/plating, -/area/centcom/valhalla) -"oUq" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) "oUK" = ( /obj/machinery/firealarm, /obj/structure/extinguisher_cabinet, @@ -11207,11 +10193,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"oVG" = ( -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "oVR" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 1 @@ -11248,11 +10229,6 @@ "oXf" = ( /turf/open/floor/plating/ground/mars/random/cave, /area/centcom/valhalla/xenocave) -"oXu" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) "oXK" = ( /obj/effect/decal/cleanable/cobweb2, /obj/machinery/power/smes{ @@ -11263,10 +10239,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"oXS" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "oYg" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 8 @@ -11362,13 +10334,6 @@ dir = 5 }, /area/centcom/valhalla) -"pbm" = ( -/obj/structure/bedsheetbin, -/turf/open/floor/tile/dark, -/area/centcom/valhalla) -"pcb" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "pcv" = ( /obj/structure/window/framed/colony/reinforced, /obj/machinery/door/poddoor/shutters/mainship/open{ @@ -11382,11 +10347,6 @@ /obj/structure/prop/mainship/pipeprop, /turf/closed/wall/r_wall/unmeltable, /area/centcom/valhalla) -"pdE" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) "pdK" = ( /obj/machinery/computer/atmoscontrol{ dir = 8 @@ -11416,9 +10376,6 @@ /obj/structure/sign/vacuum, /turf/open/floor/marking/delivery, /area/centcom/valhalla) -"pfh" = ( -/turf/open/floor/plating/scorched, -/area/centcom/valhalla) "pfu" = ( /obj/structure/prop/mainship/pipeprop/pump/on{ dir = 1; @@ -11434,12 +10391,6 @@ /obj/structure/prop/mainship/pipeprop, /turf/open/floor/engine, /area/centcom/valhalla) -"pgP" = ( -/obj/machinery/newscaster{ - dir = 4 - }, -/turf/closed/wall, -/area/centcom/valhalla) "pgQ" = ( /obj/effect/turf_decal/warning_stripes/box/empty, /obj/effect/turf_decal/tile/yellow{ @@ -11472,16 +10423,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/dmg2, /area/centcom/valhalla) -"pjm" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/mainship/sterile/dark, -/area/centcom/valhalla) -"pjR" = ( -/obj/effect/turf_decal/warning_stripes/box, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "pjX" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 8 @@ -11516,10 +10457,6 @@ dir = 8 }, /area/centcom/valhalla) -"pnn" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) "pon" = ( /obj/machinery/light_switch{ pixel_x = 38; @@ -11539,9 +10476,6 @@ /obj/machinery/vending/armor_supply/valhalla, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"pps" = ( -/turf/open/floor/tile/neutral/full, -/area/centcom/valhalla) "ppW" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/warning_stripes/thick{ @@ -11555,9 +10489,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"pqq" = ( -/turf/open/floor/plating/scorched, -/area/centcom/valhalla) "pqM" = ( /obj/machinery/marine_selector/clothes/valhalla, /turf/open/floor/plating, @@ -11629,13 +10560,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/centcom/valhalla) -"pwb" = ( -/turf/open/floor/tile/dark, -/area/centcom/valhalla) -"pww" = ( -/obj/machinery/newscaster, -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "pwR" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/warning_stripes/thick{ @@ -11669,16 +10593,6 @@ dir = 8 }, /area/tdome) -"pBQ" = ( -/obj/effect/turf_decal/warning_stripes/box, -/obj/machinery/vending/cola/nopower, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"pCQ" = ( -/turf/open/floor/carpet/side{ - dir = 9 - }, -/area/centcom/valhalla) "pEk" = ( /turf/open/floor/tile/chapel{ dir = 8 @@ -11694,12 +10608,6 @@ dir = 8 }, /area/centcom/valhalla) -"pGk" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "pGN" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -11778,16 +10686,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"pOy" = ( -/obj/effect/ai_node, -/turf/open/floor/grimy, -/area/centcom/valhalla) -"pOU" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/corner{ - dir = 4 - }, -/area/centcom/valhalla) "pPo" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/warning_stripes/thick{ @@ -11799,12 +10697,6 @@ /obj/machinery/door/airlock/mainship/engineering/free_access, /turf/open/floor/plating, /area/centcom/valhalla) -"pQh" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "pSb" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -11900,9 +10792,6 @@ }, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"pYY" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "pZI" = ( /obj/machinery/door_control/unmeltable{ id = "engsm"; @@ -11975,12 +10864,6 @@ /obj/structure/closet/secure_closet/engineering_personal, /turf/open/floor/engine, /area/centcom/valhalla) -"qbM" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "qcq" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/effect/turf_decal/warning_stripes/box/empty, @@ -12077,10 +10960,6 @@ }, /turf/open/space/basic, /area/space) -"qiO" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "qjg" = ( /obj/effect/turf_decal/tile/white{ dir = 4 @@ -12094,10 +10973,6 @@ /obj/structure/bookcase, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"qlF" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "qlP" = ( /obj/machinery/vending/tool/nopower/valhalla, /obj/effect/turf_decal/warning_stripes/thick{ @@ -12136,13 +11011,6 @@ dir = 5 }, /area/centcom/valhalla) -"qmw" = ( -/turf/closed/wall/r_wall, -/area/centcom/valhalla) -"qnk" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "qnO" = ( /obj/machinery/door/airlock/mainship/generic{ dir = 1 @@ -12189,11 +11057,6 @@ /obj/structure/device/piano/full, /turf/open/floor/wood, /area/centcom/valhalla) -"qrx" = ( -/turf/open/floor/tile/brown{ - dir = 1 - }, -/area/centcom/valhalla) "qsK" = ( /obj/structure/prop/mainship/toolboxforacause2020, /turf/open/floor/tile/red/redblue/full, @@ -12208,10 +11071,6 @@ dir = 5 }, /area/centcom/valhalla) -"quQ" = ( -/obj/effect/turf_decal/warning_stripes/box/empty, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "qvl" = ( /obj/structure/table, /obj/item/storage/box/drinkingglasses, @@ -12241,21 +11100,6 @@ dir = 5 }, /area/centcom/valhalla) -"qyU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/tile/dark, -/area/centcom/valhalla) -"qyX" = ( -/obj/machinery/status_display/ai, -/turf/closed/wall, -/area/centcom/valhalla) -"qzu" = ( -/obj/machinery/status_display/ai, -/turf/closed/wall, -/area/centcom/valhalla) -"qzG" = ( -/turf/closed/wall, -/area/centcom/valhalla) "qzU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/warning_stripes/thick{ @@ -12273,16 +11117,6 @@ }, /turf/open/floor/tile/red/yellowfull, /area/tdome/tdomeadmin) -"qAn" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/obj/machinery/door/airlock/mainship/maint/free_access, -/turf/open/floor/plating, -/area/centcom/valhalla) "qAy" = ( /obj/structure/table, /obj/structure/reagent_dispensers/beerkeg, @@ -12327,22 +11161,6 @@ /obj/item/bedsheet/blue, /turf/open/floor/grimy, /area/centcom/valhalla) -"qCr" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/obj/machinery/door/airlock/mainship/maint/free_access, -/turf/open/floor/plating, -/area/centcom/valhalla) -"qCJ" = ( -/obj/machinery/air_alarm{ - dir = 8 - }, -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) "qCX" = ( /obj/machinery/power/port_gen/pacman, /obj/effect/turf_decal/warning_stripes/thick{ @@ -12350,11 +11168,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"qDL" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) "qDW" = ( /obj/machinery/vending/snack/nopower, /turf/open/floor/tile/black{ @@ -12379,10 +11192,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"qFr" = ( -/obj/effect/ai_node, -/turf/open/floor/wood, -/area/centcom/valhalla) "qFx" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 8 @@ -12408,9 +11217,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"qFW" = ( -/turf/open/floor/plating, -/area/centcom/valhalla) "qGp" = ( /obj/structure/table, /obj/item/clothing/gloves/black, @@ -12427,10 +11233,6 @@ dir = 10 }, /area/centcom/valhalla) -"qHx" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "qHA" = ( /obj/machinery/light_switch{ pixel_x = -24; @@ -12441,16 +11243,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"qHG" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"qIk" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 6 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "qIJ" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -12477,25 +11269,12 @@ /obj/structure/window/framed/colony/reinforced, /turf/open/floor/plating, /area/centcom/valhalla) -"qKJ" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/obj/machinery/door/airlock/mainship/generic{ - dir = 1 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "qLa" = ( /obj/machinery/power/geothermal{ corrupted = "fallen_hive" }, /turf/open/floor/plating/ground/mars/random/cave, /area/centcom/valhalla/xenocave) -"qLl" = ( -/turf/open/floor/plating, -/area/centcom/valhalla) "qLI" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 8 @@ -12517,16 +11296,6 @@ }, /turf/open/floor/engine, /area/centcom/valhalla) -"qMD" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) -"qML" = ( -/obj/machinery/status_display/ai, -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "qMW" = ( /obj/machinery/computer/arcade{ dir = 4 @@ -12542,9 +11311,6 @@ }, /turf/closed/wall/r_wall/unmeltable, /area/centcom/valhalla) -"qNs" = ( -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "qOf" = ( /obj/structure/prop/mainship/meterprop/random, /obj/structure/prop/mainship/pipeprop{ @@ -12592,10 +11358,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"qPi" = ( -/obj/machinery/status_display/ai, -/turf/closed/wall, -/area/centcom/valhalla) "qPq" = ( /obj/effect/turf_decal/tile/black{ dir = 8 @@ -12614,10 +11376,6 @@ }, /turf/open/floor/wood, /area/centcom/valhalla) -"qQJ" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "qQT" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 4 @@ -12637,10 +11395,6 @@ }, /turf/open/floor/tile/cafe, /area/centcom/valhalla) -"qRd" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/turf/open/floor/plating, -/area/centcom/valhalla) "qRf" = ( /obj/item/reagent_containers/food/drinks/britcup, /obj/structure/table/woodentable, @@ -12728,9 +11482,6 @@ }, /turf/open/floor/tile/red/yellowfull, /area/tdome/tdomeadmin) -"qUU" = ( -/turf/open/floor/plating/dmg2, -/area/centcom/valhalla) "qVp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -12754,11 +11505,6 @@ dir = 5 }, /area/centcom/valhalla) -"qWW" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) "qXz" = ( /obj/structure/table/mainship, /turf/open/floor/tile/red/yellowfull, @@ -12889,21 +11635,9 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"rgb" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, +"rgf" = ( /obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/obj/structure/prop/mainship/doorblocker/external{ - dir = 4 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) -"rgf" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 5 + dir = 5 }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/tile/dark/gray, @@ -12936,34 +11670,10 @@ /obj/machinery/newscaster, /turf/closed/wall/r_wall/unmeltable, /area/centcom/valhalla) -"rhB" = ( -/obj/machinery/newscaster{ - dir = 4 - }, -/turf/closed/wall, -/area/centcom/valhalla) "rhC" = ( /obj/machinery/marine_selector/gear/smartgun/valhalla, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"rib" = ( -/turf/open/floor/tile/brown{ - dir = 8 - }, -/area/centcom/valhalla) -"riU" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/obj/machinery/door/airlock/mainship/command/free_access{ - dir = 2 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "rjI" = ( /obj/effect/turf_decal/warning_stripes/thick/corner, /obj/effect/turf_decal/tile/black, @@ -12987,13 +11697,6 @@ /obj/effect/landmark/itemspawner/cutewitch, /turf/open/floor/plating, /area/centcom/valhalla) -"rnw" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) -"rnE" = ( -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "rnH" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/warning_stripes/thick{ @@ -13030,18 +11733,6 @@ dir = 5 }, /area/centcom/valhalla) -"roF" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/obj/structure/prop/mainship/doorblocker/external{ - dir = 4 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "roM" = ( /turf/open/floor/tile/neutral{ dir = 8 @@ -13084,10 +11775,6 @@ /obj/item/taperecorder, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"rsu" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "rsX" = ( /obj/structure/table, /obj/effect/spawner/random/misc/plushie/nospawnninetyfive, @@ -13109,17 +11796,6 @@ /obj/machinery/smartfridge/chemistry/nopower, /turf/open/floor/tile/white, /area/centcom/valhalla) -"rvz" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/obj/machinery/door/airlock/mainship/security/free_access, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "rvU" = ( /obj/effect/turf_decal/sandedge/corner2{ dir = 4 @@ -13127,9 +11803,6 @@ /obj/item/target/alien, /turf/open/floor/plating, /area/centcom/valhalla) -"rvV" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "rwm" = ( /obj/structure/table, /obj/item/storage/box/drinkingglasses, @@ -13202,12 +11875,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"rzX" = ( -/obj/machinery/newscaster{ - dir = 8 - }, -/turf/closed/wall, -/area/centcom/valhalla) "rAT" = ( /obj/structure/window{ dir = 4 @@ -13245,10 +11912,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"rCR" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/tile/dark, -/area/centcom/valhalla) "rDY" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/misc/paperbin, @@ -13291,17 +11954,6 @@ }, /turf/open/floor/engine, /area/centcom/valhalla) -"rIB" = ( -/obj/effect/turf_decal/tile/black{ - dir = 8 - }, -/obj/effect/turf_decal/tile/black{ - dir = 4 - }, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "rJl" = ( /obj/structure/bed/chair/wood/wings{ dir = 8 @@ -13401,13 +12053,6 @@ dir = 5 }, /area/centcom/valhalla) -"rQk" = ( -/obj/item/explosive/grenade/flare/on, -/turf/open/floor/plating, -/area/centcom/valhalla) -"rQF" = ( -/turf/open/floor/plating/dmg2, -/area/centcom/valhalla) "rRM" = ( /obj/machinery/firealarm{ dir = 8 @@ -13423,20 +12068,11 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"rSv" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "rSA" = ( /obj/structure/girder, /obj/structure/sign/atmosplaque, /turf/open/floor/plating, /area/centcom/valhalla) -"rSR" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 1 - }, -/area/centcom/valhalla) "rTp" = ( /obj/effect/turf_decal/tile/black, /obj/effect/turf_decal/tile/black{ @@ -13446,10 +12082,6 @@ dir = 5 }, /area/centcom/valhalla) -"rTu" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "rVD" = ( /obj/effect/turf_decal/warning_stripes/box/arrow, /obj/effect/turf_decal/warning_stripes/box/small{ @@ -13458,15 +12090,6 @@ /obj/effect/turf_decal/warning_stripes/synth, /turf/open/floor/plating, /area/centcom/valhalla) -"rVI" = ( -/obj/effect/turf_decal/warning_stripes/box, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"rVK" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 1 - }, -/area/centcom/valhalla) "rXh" = ( /obj/structure/barricade/wooden, /turf/open/floor/plating, @@ -13478,9 +12101,6 @@ /obj/effect/ai_node, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"rXP" = ( -/turf/open/floor/plating, -/area/centcom/valhalla) "rYj" = ( /obj/machinery/firealarm{ dir = 8 @@ -13510,10 +12130,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"rYF" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "rYK" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/metal{ @@ -13552,13 +12168,6 @@ dir = 5 }, /area/centcom/valhalla) -"scd" = ( -/turf/open/floor/wood/broken, -/area/centcom/valhalla) -"sch" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/dmg2, -/area/centcom/valhalla) "scz" = ( /obj/machinery/light_switch, /turf/closed/wall/r_wall/unmeltable, @@ -13598,11 +12207,6 @@ }, /turf/open/floor/tile/lightred/full, /area/centcom/valhalla) -"shy" = ( -/turf/open/floor/carpet/side{ - dir = 8 - }, -/area/centcom/valhalla) "sis" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/air_alarm{ @@ -13634,13 +12238,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"sjM" = ( -/obj/effect/ai_node, -/turf/open/floor/plating/scorched, -/area/centcom/valhalla) -"sjT" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "sjU" = ( /obj/structure/bed/chair/wood/wings{ dir = 8 @@ -13664,15 +12261,6 @@ }, /turf/open/floor/plating/ground/mars/random/cave, /area/space) -"skN" = ( -/obj/item/radio/intercom{ - dir = 4; - name = "Station Intercom" - }, -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) "sld" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 8 @@ -13684,10 +12272,6 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/plating, /area/centcom/valhalla) -"slg" = ( -/obj/machinery/status_display/ai, -/turf/closed/wall, -/area/centcom/valhalla) "slv" = ( /turf/open/floor/tile/blue/taupeblue{ dir = 4 @@ -13698,9 +12282,6 @@ /obj/effect/turf_decal/warning_stripes/box/empty, /turf/open/floor/tile/dark2, /area/centcom/valhalla) -"smd" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "smh" = ( /obj/effect/turf_decal/sandedge{ dir = 1 @@ -13826,9 +12407,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"spM" = ( -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "sqp" = ( /obj/machinery/chem_dispenser/soda{ dir = 4; @@ -13847,9 +12425,6 @@ }, /turf/closed/mineral/smooth, /area/centcom/valhalla/exterior) -"srV" = ( -/turf/closed/wall, -/area/centcom/valhalla) "ssd" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -13866,12 +12441,6 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating/ground/mars/random/cave, /area/centcom/valhalla/exterior) -"ssX" = ( -/obj/machinery/newscaster{ - dir = 8 - }, -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "sto" = ( /obj/machinery/status_display/ai{ pixel_x = -32 @@ -13897,9 +12466,6 @@ /obj/machinery/air_alarm, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"suW" = ( -/turf/open/floor/grimy, -/area/centcom/valhalla) "svr" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -13933,9 +12499,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/centcom/valhalla) -"syo" = ( -/turf/closed/wall, -/area/centcom/valhalla) "syY" = ( /obj/machinery/computer/telecomms/monitor{ dir = 8 @@ -13956,10 +12519,6 @@ /obj/structure/prop/mainship/pipeprop, /turf/open/floor/engine, /area/centcom/valhalla) -"szJ" = ( -/obj/effect/turf_decal/warning_stripes/box, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "sAb" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/tile/neutral/full, @@ -13994,10 +12553,6 @@ /obj/structure/prop/mainship/supermatter, /turf/open/floor/engine, /area/centcom/valhalla) -"sDZ" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "sEd" = ( /obj/effect/landmark/thunderdome/observe, /obj/structure/bed/chair/sofa/left, @@ -14044,12 +12599,6 @@ }, /turf/open/floor/engine, /area/centcom/valhalla) -"sFR" = ( -/obj/structure/sign/securearea{ - dir = 1 - }, -/turf/closed/wall, -/area/centcom/valhalla) "sGf" = ( /obj/structure/table, /obj/item/tool/soap/nanotrasen, @@ -14106,9 +12655,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"sKi" = ( -/turf/closed/wall, -/area/centcom/valhalla) "sKX" = ( /obj/machinery/computer/station_alert{ dir = 8 @@ -14146,14 +12692,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"sMN" = ( -/turf/closed/wall, -/area/centcom/valhalla) -"sNw" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 4 - }, -/area/centcom/valhalla) "sNQ" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/warning_stripes/thick{ @@ -14166,13 +12704,6 @@ dir = 1 }, /area/centcom/valhalla) -"sOJ" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass, -/area/centcom/valhalla) "sPt" = ( /obj/structure/bedsheetbin, /obj/machinery/air_alarm{ @@ -14181,11 +12712,6 @@ }, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"sPV" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 1 - }, -/area/centcom/valhalla) "sQs" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/drinkingglass, @@ -14217,11 +12743,6 @@ /obj/item/tool/lighter/random, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"sSb" = ( -/turf/open/floor/tile/brown{ - dir = 5 - }, -/area/centcom/valhalla) "sSz" = ( /obj/structure/closet/secure_closet/bar, /obj/machinery/light_switch{ @@ -14288,10 +12809,6 @@ dir = 5 }, /area/centcom/valhalla) -"sWH" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/turf/open/floor/mainship/stripesquare, -/area/centcom/valhalla) "sWR" = ( /turf/open/floor/tile/escape, /area/centcom/valhalla) @@ -14302,10 +12819,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"sYg" = ( -/obj/machinery/status_display, -/turf/closed/wall, -/area/centcom/valhalla) "sYo" = ( /turf/open/floor/tile/dark/red2{ dir = 4 @@ -14351,21 +12864,10 @@ }, /turf/open/floor/grimy, /area/centcom/valhalla) -"sZY" = ( -/obj/machinery/newscaster{ - dir = 8 - }, -/turf/closed/wall, -/area/centcom/valhalla) "tbL" = ( /obj/machinery/air_alarm, /turf/open/floor/tile/neutral, /area/centcom/valhalla) -"tbW" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 4 - }, -/area/centcom/valhalla) "tcA" = ( /obj/structure/window/reinforced{ dir = 1; @@ -14412,13 +12914,6 @@ /obj/effect/turf_decal/warning_stripes/box/empty, /turf/open/floor/tile/lightred, /area/centcom/valhalla) -"tgW" = ( -/turf/open/floor/plating/scorched, -/area/centcom/valhalla) -"tgY" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "thx" = ( /obj/machinery/computer/security{ dir = 4 @@ -14557,16 +13052,6 @@ }, /turf/open/floor/engine, /area/centcom/valhalla) -"toj" = ( -/obj/structure/sign/securearea{ - dir = 1 - }, -/turf/closed/wall, -/area/centcom/valhalla) -"top" = ( -/obj/structure/sign/nosmoking_1, -/turf/closed/wall, -/area/centcom/valhalla) "tpj" = ( /obj/structure/window/reinforced{ dir = 4 @@ -14621,12 +13106,6 @@ /obj/structure/table/woodentable, /turf/open/floor/wood, /area/tdome/tdomeobserve) -"tsS" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "ttc" = ( /obj/item/tool/surgery/circular_saw, /obj/item/tool/surgery/surgicaldrill{ @@ -14642,10 +13121,6 @@ /obj/item/tool/surgery/cautery, /turf/open/floor/tile/dark2, /area/centcom/valhalla) -"ttg" = ( -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "ttw" = ( /obj/structure/table, /obj/item/stack/cable_coil, @@ -14661,13 +13136,6 @@ /obj/structure/bedsheetbin, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"tuD" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/flora/ausbushes/ppflowers, -/turf/open/floor/grass, -/area/centcom/valhalla) "tvb" = ( /obj/effect/landmark/ai_multicam_room, /turf/open/ai_visible, @@ -14751,10 +13219,6 @@ /obj/item/clothing/shoes/slippers_worn, /turf/open/floor/tile/dark2, /area/centcom/valhalla) -"tzf" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "tzz" = ( /obj/structure/closet/wardrobe/black, /obj/effect/turf_decal/warning_stripes/box/empty, @@ -14806,10 +13270,6 @@ dir = 5 }, /area/centcom/valhalla) -"tBa" = ( -/obj/structure/girder, -/turf/open/floor/plating, -/area/centcom/valhalla) "tCf" = ( /obj/structure/bed/chair/comfy/brown{ dir = 1 @@ -14818,25 +13278,6 @@ dir = 4 }, /area/centcom/valhalla) -"tCS" = ( -/turf/open/floor/tile/dark, -/area/centcom/valhalla) -"tDD" = ( -/obj/effect/turf_decal/tile/green, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"tDN" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/tile/dark, -/area/centcom/valhalla) -"tDO" = ( -/obj/item/radio/intercom{ - name = "Station Intercom" - }, -/turf/open/floor/tile/neutral/corner{ - dir = 4 - }, -/area/centcom/valhalla) "tDV" = ( /obj/machinery/door/window{ dir = 8; @@ -14902,18 +13343,6 @@ "tGL" = ( /turf/open/floor/podhatch/floor, /area/tdome) -"tHw" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) -"tIS" = ( -/obj/machinery/air_alarm{ - dir = 4 - }, -/turf/open/floor/tile/neutral/corner{ - dir = 1 - }, -/area/centcom/valhalla) "tJb" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -14926,18 +13355,8 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"tJM" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) -"tKb" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) -"tKu" = ( -/obj/effect/turf_decal/warning_stripes/thick{ +"tKu" = ( +/obj/effect/turf_decal/warning_stripes/thick{ dir = 8 }, /obj/structure/prop/mainship/pipeprop{ @@ -14952,10 +13371,6 @@ /obj/machinery/biogenerator, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"tMS" = ( -/obj/machinery/newscaster, -/turf/closed/wall, -/area/centcom/valhalla) "tNc" = ( /obj/structure/noticeboard{ dir = 4; @@ -15012,18 +13427,6 @@ /obj/effect/turf_decal/warning_stripes/box, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"tQw" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/obj/structure/prop/mainship/doorblocker/external{ - dir = 4 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "tRh" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/turf_decal/warning_stripes/box, @@ -15047,13 +13450,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"tRV" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/flora/ausbushes/fullgrass, -/turf/open/floor/grass, -/area/centcom/valhalla) "tSq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/job/fallen, @@ -15064,9 +13460,6 @@ /obj/effect/turf_decal/warning_stripes/box, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"tSI" = ( -/turf/open/floor/tile/neutral/full, -/area/centcom/valhalla) "tSZ" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 4 @@ -15094,18 +13487,6 @@ dir = 5 }, /area/centcom/valhalla) -"tVp" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"tVB" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/corner{ - dir = 4 - }, -/area/centcom/valhalla) "tVS" = ( /obj/structure/table/reinforced, /obj/item/storage/belt/utility, @@ -15118,28 +13499,12 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"tWP" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "tXL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/tile/neutral/corner{ dir = 4 }, /area/centcom/valhalla) -"tYL" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/obj/machinery/door/airlock/mainship/maint/free_access, -/turf/open/floor/plating, -/area/centcom/valhalla) "tZl" = ( /obj/machinery/air_alarm{ dir = 8 @@ -15149,26 +13514,6 @@ dir = 4 }, /area/centcom/valhalla) -"tZA" = ( -/obj/effect/ai_node, -/turf/open/floor/grimy, -/area/centcom/valhalla) -"tZJ" = ( -/turf/open/floor/plating/dmg3, -/area/centcom/valhalla) -"tZZ" = ( -/turf/open/floor/tile/dark, -/area/centcom/valhalla) -"uah" = ( -/turf/open/floor/tile/dark, -/area/centcom/valhalla) -"uai" = ( -/obj/structure/sign/nosmoking_1, -/obj/machinery/newscaster{ - dir = 4 - }, -/turf/closed/wall, -/area/centcom/valhalla) "uax" = ( /obj/structure/morgue/crematorium{ id = "cremawheat" @@ -15211,9 +13556,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"uaU" = ( -/turf/open/floor/tile/neutral, -/area/centcom/valhalla) "uaW" = ( /obj/structure/window/reinforced{ dir = 4 @@ -15248,28 +13590,11 @@ dir = 6 }, /area/centcom/valhalla) -"ucT" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) -"udp" = ( -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) "uez" = ( /obj/structure/disposalpipe/trunk, /obj/structure/disposaloutlet, /turf/open/floor/tile/red/redblue/full, /area/tdome/tdomeobserve) -"ufo" = ( -/obj/machinery/newscaster{ - dir = 4 - }, -/turf/closed/wall, -/area/centcom/valhalla) "uft" = ( /obj/machinery/conveyor{ dir = 8; @@ -15287,10 +13612,6 @@ /obj/machinery/loadout_vendor/valhalla, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"ufF" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) "ufQ" = ( /obj/structure/bed/chair/comfy/brown{ buildstackamount = 0; @@ -15301,9 +13622,6 @@ }, /turf/open/floor/grimy, /area/centcom/valhalla) -"ugl" = ( -/turf/open/floor/tile/neutral/full, -/area/centcom/valhalla) "ugp" = ( /obj/structure/table/reinforced, /obj/item/stack/rods{ @@ -15344,20 +13662,6 @@ dir = 5 }, /area/centcom/valhalla) -"uko" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/centcom/valhalla) -"ukD" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/obj/machinery/door/airlock/mainship/maint/free_access, -/turf/open/floor/plating, -/area/centcom/valhalla) "ukJ" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 1 @@ -15420,18 +13724,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"uqg" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) -"usm" = ( -/turf/open/floor/wood/broken, -/area/centcom/valhalla) -"usE" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/effect/ai_node, -/turf/open/floor/plating, -/area/centcom/valhalla) "usY" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -15496,12 +13788,6 @@ /obj/effect/landmark/thunderdome/one, /turf/open/floor/plating, /area/tdome/tdome1) -"uxN" = ( -/turf/open/floor/wood, -/area/centcom/valhalla) -"uyh" = ( -/turf/closed/wall, -/area/centcom/valhalla) "uze" = ( /obj/structure/closet/wardrobe/mixed, /obj/structure/extinguisher_cabinet{ @@ -15528,9 +13814,6 @@ dir = 9 }, /area/centcom/valhalla) -"uzL" = ( -/turf/open/floor/wood, -/area/centcom/valhalla) "uAf" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -15562,12 +13845,6 @@ }, /turf/open/floor/tile/cafe, /area/centcom/valhalla) -"uDy" = ( -/obj/machinery/newscaster{ - dir = 8 - }, -/turf/closed/wall, -/area/centcom/valhalla) "uEe" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/yellow{ @@ -15575,10 +13852,6 @@ }, /turf/open/floor/mainship/sterile/dark, /area/centcom/valhalla) -"uEj" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "uEH" = ( /obj/structure/girder, /obj/effect/turf_decal/warning_stripes/box, @@ -15627,15 +13900,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"uHm" = ( -/turf/open/floor/carpet/side{ - dir = 1 - }, -/area/centcom/valhalla) -"uHB" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "uHR" = ( /obj/machinery/conveyor{ dir = 8; @@ -15655,21 +13919,11 @@ }, /turf/open/floor/mainship/sterile/white, /area/centcom/valhalla) -"uIP" = ( -/turf/closed/wall, -/area/centcom/valhalla) "uKg" = ( /turf/open/floor/tile/chapel{ dir = 4 }, /area/centcom/valhalla) -"uKQ" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) -"uMd" = ( -/turf/closed/wall, -/area/centcom/valhalla) "uOe" = ( /obj/machinery/teleport/station, /obj/effect/turf_decal/tile/black{ @@ -15722,10 +13976,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"uRH" = ( -/obj/effect/turf_decal/tile/red, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "uRW" = ( /obj/structure/table/woodentable, /obj/item/reagent_containers/food/snacks/hotdog, @@ -15756,9 +14006,6 @@ /obj/machinery/computer/pod, /turf/open/floor/tile/red/yellowfull, /area/tdome/tdomeadmin) -"uTg" = ( -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) "uTH" = ( /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/effect/turf_decal/warning_stripes/thick{ @@ -15837,15 +14084,6 @@ }, /turf/open/floor/grimy, /area/centcom/valhalla) -"uXC" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 4 - }, -/area/centcom/valhalla) -"uXI" = ( -/obj/effect/turf_decal/warning_stripes/box, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "uYl" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 5 @@ -15864,9 +14102,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"uZp" = ( -/turf/open/floor/tile/dark, -/area/centcom/valhalla) "vaS" = ( /obj/effect/ai_node, /obj/structure/prop/mainship/pipeprop{ @@ -15917,10 +14152,6 @@ /obj/effect/turf_decal/sandedge, /turf/open/floor/plating, /area/centcom/valhalla) -"vff" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "vgc" = ( /obj/structure/table, /obj/effect/spawner/random/misc/paperbin, @@ -15939,11 +14170,6 @@ }, /turf/open/floor/tile/lightred, /area/centcom/valhalla) -"vgK" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) "vgS" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 1 @@ -15996,16 +14222,6 @@ }, /turf/open/floor/tile/cafe, /area/centcom/valhalla) -"vjb" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 - }, -/turf/open/floor/tile/dark, -/area/centcom/valhalla) -"vjO" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "vka" = ( /obj/effect/turf_decal/warning_stripes/box/small{ dir = 1 @@ -16028,14 +14244,6 @@ /obj/effect/turf_decal/warning_stripes/thick, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"vlt" = ( -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"vmi" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/ai_node, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "vmJ" = ( /obj/machinery/computer/atmos_alert{ dir = 8 @@ -16049,11 +14257,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"vmM" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/warning_stripes/thick, -/turf/open/floor/tile/lightred, -/area/centcom/valhalla) "vmU" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/effect/turf_decal/tile/yellow{ @@ -16077,16 +14280,6 @@ }, /turf/open/floor/tile/red/yellowfull, /area/tdome/tdomeadmin) -"vnN" = ( -/turf/open/floor/wood, -/area/centcom/valhalla) -"voa" = ( -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"voF" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "voO" = ( /obj/machinery/light_switch{ pixel_y = 24 @@ -16127,40 +14320,6 @@ dir = 1 }, /area/centcom/valhalla) -"vsE" = ( -/obj/effect/turf_decal/tile/black{ - dir = 1 - }, -/obj/effect/turf_decal/tile/black{ - dir = 8 - }, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) -"vsK" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/obj/machinery/door/airlock/mainship/maint/free_access, -/obj/effect/ai_node, -/turf/open/floor/plating, -/area/centcom/valhalla) -"vsS" = ( -/turf/open/floor/carpet/side{ - dir = 6 - }, -/area/centcom/valhalla) -"vsV" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger/nopower, -/turf/open/floor/tile/dark/red2{ - dir = 8 - }, -/area/centcom/valhalla) "vtf" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/warning_stripes/thick{ @@ -16188,12 +14347,6 @@ /obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/tile/red/redblue/full, /area/tdome/tdomeobserve) -"vuv" = ( -/obj/structure/sign/securearea{ - dir = 1 - }, -/turf/closed/wall, -/area/centcom/valhalla) "vvm" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 8 @@ -16220,20 +14373,6 @@ dir = 8 }, /area/centcom/valhalla) -"vxo" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/dark, -/area/centcom/valhalla) -"vxC" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/obj/machinery/door/airlock/mainship/maint/free_access{ - dir = 1 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "vyq" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/warning_stripes/thick{ @@ -16278,10 +14417,6 @@ }, /turf/open/floor/tile/cafe, /area/centcom/valhalla) -"vAV" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) "vBB" = ( /obj/effect/landmark/thunderdome/observe, /obj/structure/disposalpipe/segment/corner{ @@ -16333,9 +14468,6 @@ }, /turf/open/floor/engine, /area/centcom/valhalla) -"vFL" = ( -/turf/open/floor/gcircuit, -/area/centcom/valhalla) "vFU" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/warning_stripes/thick{ @@ -16377,18 +14509,12 @@ }, /turf/open/floor/marking/delivery, /area/centcom/valhalla) -"vGB" = ( -/turf/open/floor/plating/dmg1, -/area/centcom/valhalla) "vGG" = ( /obj/structure/prop/mainship/pipeprop{ dir = 5 }, /turf/open/floor/engine, /area/centcom/valhalla) -"vGP" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "vGZ" = ( /obj/structure/window/framed/colony/reinforced, /obj/machinery/door/poddoor/shutters/mainship/open{ @@ -16465,9 +14591,6 @@ /obj/item/clothing/under/suit_jacket/detective/alt, /turf/open/floor/plating, /area/centcom/valhalla) -"vLH" = ( -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "vLP" = ( /obj/machinery/conveyor{ dir = 8; @@ -16587,9 +14710,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"vSy" = ( -/turf/closed/wall, -/area/centcom/valhalla) "vSS" = ( /obj/structure/closet/secure_closet/medical3, /obj/item/radio/intercom{ @@ -16731,43 +14851,16 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"vVa" = ( -/obj/effect/turf_decal/tile/pink{ - dir = 8 - }, -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) -"vVy" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/obj/machinery/door/airlock/mainship/engineering/free_access, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"vVU" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) -"vVY" = ( -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/ai_node, -/turf/open/floor/plating, +"vVY" = ( +/obj/effect/turf_decal/warning_stripes/thick, +/obj/effect/ai_node, +/turf/open/floor/plating, /area/centcom/valhalla) "vWm" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"vXl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/wood, -/area/centcom/valhalla) "vXr" = ( /obj/structure/closet/cabinet, /obj/item/clothing/suit/wizrobe/red, @@ -16784,9 +14877,6 @@ dir = 5 }, /area/centcom/valhalla) -"vXK" = ( -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "vXO" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -16833,13 +14923,6 @@ }, /turf/closed/wall, /area/centcom/valhalla) -"vZJ" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/ai_node, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "vZO" = ( /obj/item/tank/oxygen/red, /obj/item/clothing/mask/gas, @@ -16906,9 +14989,6 @@ }, /turf/open/floor/tile/cafe, /area/centcom/valhalla) -"wcJ" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "wdt" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/turf_decal/warning_stripes/thick{ @@ -16922,12 +15002,6 @@ }, /turf/open/floor/tile/red/yellowfull, /area/tdome/tdomeadmin) -"weH" = ( -/turf/open/floor/tile/neutral/full, -/area/centcom/valhalla) -"wff" = ( -/turf/closed/wall, -/area/centcom/valhalla) "wfk" = ( /obj/machinery/door/firedoor{ dir = 2 @@ -16992,25 +15066,6 @@ dir = 5 }, /area/centcom/valhalla) -"wgK" = ( -/obj/machinery/firealarm{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/turf_decal/tile/black{ - dir = 1 - }, -/obj/effect/turf_decal/tile/black, -/obj/structure/table/mainship, -/obj/structure/window/reinforced/windowstake{ - dir = 4 - }, -/obj/item/clothing/glasses/hud/xenohud, -/obj/item/clothing/glasses/hud/xenohud, -/turf/open/floor/mainship/stripesquare, -/area/centcom/valhalla) "wiL" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -17094,19 +15149,6 @@ dir = 5 }, /area/centcom/valhalla) -"wly" = ( -/obj/effect/turf_decal/tile/black{ - dir = 4 - }, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) -"wlI" = ( -/obj/structure/sign/vacuum, -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) "wnL" = ( /obj/effect/ai_node, /turf/open/floor/tile/neutral, @@ -17138,12 +15180,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"wnZ" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 10 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "woP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/warning_stripes/thick/corner{ @@ -17156,47 +15192,10 @@ dir = 9 }, /area/centcom/valhalla) -"woQ" = ( -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) -"woU" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 10 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"woV" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) -"woW" = ( -/obj/machinery/status_display, -/turf/closed/wall, -/area/centcom/valhalla) -"wpm" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"wpn" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/full, -/area/centcom/valhalla) -"wpP" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) "wqU" = ( /obj/effect/landmark/start/job/fallen, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"wqZ" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "wrn" = ( /turf/open/floor/tile/red/redblue/full, /area/tdome/tdomeobserve) @@ -17223,19 +15222,6 @@ /obj/structure/closet/wardrobe/atmospherics_yellow, /turf/open/floor/plating, /area/centcom/valhalla) -"wsD" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"wtb" = ( -/turf/open/floor/plating/dmg2, -/area/centcom/valhalla) "wtu" = ( /turf/open/floor/marking/delivery, /area/centcom/valhalla) @@ -17272,37 +15258,11 @@ /obj/machinery/computer/forensic_scanning, /turf/open/floor/tile/dark/red2, /area/centcom/valhalla) -"wuY" = ( -/turf/open/floor/tile/dark/red2, -/area/centcom/valhalla) -"wuZ" = ( -/turf/closed/wall, -/area/centcom/valhalla) -"wva" = ( -/obj/machinery/status_display/ai, -/turf/closed/wall, -/area/centcom/valhalla) "wwD" = ( /obj/structure/lattice, /obj/structure/cable, /turf/open/space/basic, /area/space) -"wxd" = ( -/obj/machinery/door/airlock/external{ - name = "External Airlock" - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) -"wxi" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) "wxr" = ( /obj/effect/turf_decal/warning_stripes/thick, /obj/effect/turf_decal/warning_stripes/thick{ @@ -17383,9 +15343,6 @@ }, /turf/open/floor/tile/dark2, /area/centcom/valhalla) -"wFc" = ( -/turf/open/floor/tile/dark, -/area/centcom/valhalla) "wFe" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ dir = 1 @@ -17416,24 +15373,10 @@ }, /turf/open/floor/tile/red/yellowfull, /area/tdome/tdomeadmin) -"wGV" = ( -/turf/closed/wall, -/area/centcom/valhalla) "wHz" = ( /obj/machinery/marine_selector/clothes/synth/valhalla, /turf/open/floor/plating/dmg3, /area/centcom/valhalla) -"wIl" = ( -/obj/effect/turf_decal/tile/black{ - dir = 4 - }, -/obj/effect/turf_decal/tile/black{ - dir = 8 - }, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "wIw" = ( /obj/structure/extinguisher_cabinet{ dir = 4 @@ -17477,15 +15420,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"wJG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"wJL" = ( -/turf/closed/wall, -/area/centcom/valhalla) "wJN" = ( /obj/structure/table, /obj/effect/spawner/random/misc/paperbin, @@ -17493,9 +15427,6 @@ /obj/item/tool/stamp/hop, /turf/open/floor/wood/broken, /area/centcom/valhalla) -"wKu" = ( -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "wLk" = ( /obj/structure/table/reinforced, /turf/open/floor/tile/dark/gray, @@ -17539,11 +15470,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"wOu" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 1 - }, -/area/centcom/valhalla) "wOD" = ( /obj/structure/sign/fixedinplace/medical, /obj/structure/sign/fixedinplace/engineering{ @@ -17572,12 +15498,6 @@ }, /turf/open/floor/plating/ground/mars/random/cave, /area/centcom/valhalla/xenocave) -"wPC" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "wQi" = ( /obj/structure/prop/mainship/propcarp, /turf/open/space/basic, @@ -17591,9 +15511,6 @@ dir = 5 }, /area/centcom/valhalla) -"wQm" = ( -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) "wQr" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/broken, @@ -17642,31 +15559,12 @@ }, /turf/open/floor/grass, /area/centcom/valhalla) -"wSe" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) -"wSF" = ( -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) "wSO" = ( /obj/effect/turf_decal/warning_stripes/thin{ dir = 4 }, /turf/open/floor, /area/tdome) -"wTe" = ( -/obj/effect/turf_decal/tile/black{ - dir = 1 - }, -/obj/effect/turf_decal/tile/black{ - dir = 8 - }, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "wTz" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp, @@ -17714,21 +15612,6 @@ }, /turf/open/floor/tile/neutral, /area/centcom/valhalla) -"wVi" = ( -/turf/open/floor/tile/neutral/corner{ - dir = 8 - }, -/area/centcom/valhalla) -"wVl" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "wVM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/yellow, @@ -17750,9 +15633,6 @@ /obj/item/tool/crowbar/red, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"wXk" = ( -/turf/open/floor/plating/dmg1, -/area/centcom/valhalla) "wXW" = ( /turf/open/floor/mainship/sterile/side{ dir = 9 @@ -17775,9 +15655,6 @@ /obj/machinery/vending/weapon/valhalla, /turf/open/floor/plating, /area/centcom/valhalla) -"wZp" = ( -/turf/open/floor/tile/neutral/full, -/area/centcom/valhalla) "wZJ" = ( /obj/structure/sign/botany, /mob/living/simple_animal/cow, @@ -17803,17 +15680,6 @@ dir = 5 }, /area/centcom/valhalla) -"xbj" = ( -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) -"xbI" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "xcd" = ( /obj/structure/bed, /obj/item/disk/nuclear{ @@ -17823,21 +15689,12 @@ /obj/item/bedsheet/red, /turf/open/floor/plating, /area/centcom/valhalla) -"xco" = ( -/turf/closed/wall, -/area/centcom/valhalla) "xdq" = ( /obj/structure/bed/chair/wood/wings{ dir = 8 }, /turf/open/floor/wood, /area/tdome/tdomeobserve) -"xdz" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 - }, -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) "xeQ" = ( /obj/effect/turf_decal/warning_stripes/box/small{ dir = 4 @@ -17847,16 +15704,6 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"xeT" = ( -/turf/open/floor/tile/neutral, -/area/centcom/valhalla) -"xfa" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) -"xfB" = ( -/obj/machinery/status_display/ai, -/turf/closed/wall, -/area/centcom/valhalla) "xfO" = ( /obj/structure/sign/securearea{ pixel_x = 32; @@ -17907,17 +15754,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"xgy" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) -"xgK" = ( -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"xgQ" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "xgS" = ( /obj/structure/bed, /obj/item/bedsheet/brown, @@ -17959,9 +15795,6 @@ dir = 8 }, /area/centcom/valhalla) -"xil" = ( -/turf/open/floor/plating/dmg3, -/area/centcom/valhalla) "xiF" = ( /obj/effect/ai_node, /turf/open/floor/wood/broken, @@ -17987,10 +15820,6 @@ dir = 5 }, /area/centcom/valhalla) -"xjT" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/dmg1, -/area/centcom/valhalla) "xjX" = ( /obj/effect/turf_decal/warning_stripes/thick{ dir = 4 @@ -18016,10 +15845,6 @@ dir = 5 }, /area/centcom/valhalla) -"xky" = ( -/obj/machinery/status_display, -/turf/closed/wall, -/area/centcom/valhalla) "xkI" = ( /obj/structure/bed/chair{ dir = 4 @@ -18029,12 +15854,6 @@ }, /turf/open/floor/wood/broken, /area/centcom/valhalla) -"xlK" = ( -/obj/machinery/air_alarm{ - dir = 1 - }, -/turf/open/floor/freezer, -/area/centcom/valhalla) "xlM" = ( /obj/machinery/conveyor{ dir = 8; @@ -18048,9 +15867,6 @@ /obj/effect/turf_decal/warning_stripes/thick, /turf/open/floor/mainship/tcomms, /area/centcom/valhalla) -"xmq" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "xmt" = ( /obj/effect/turf_decal/warning_stripes/thick/corner{ dir = 8 @@ -18080,24 +15896,12 @@ /obj/effect/ai_node, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"xnt" = ( -/turf/open/floor/tile/neutral{ - dir = 4 - }, -/area/centcom/valhalla) -"xnM" = ( -/turf/open/floor/plating, -/area/centcom/valhalla) "xom" = ( /turf/open/floor/mainship/sterile/white, /area/centcom/valhalla) "xoR" = ( /turf/open/floor/tile/lightred/full, /area/centcom/valhalla) -"xoW" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "xpm" = ( /obj/item/target/alien, /turf/open/floor/plating/dmg3, @@ -18159,13 +15963,6 @@ }, /turf/open/floor/plating/ground/mars/random/cave, /area/centcom/valhalla/xenocave) -"xtw" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/flora/ausbushes/grassybush, -/turf/open/floor/grass, -/area/centcom/valhalla) "xtx" = ( /obj/machinery/hydroponics, /obj/effect/turf_decal/warning_stripes/thick{ @@ -18176,10 +15973,6 @@ "xtI" = ( /turf/open/floor/plating, /area/tdome) -"xux" = ( -/obj/effect/turf_decal/warning_stripes/box, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "xvP" = ( /obj/structure/table, /obj/item/storage/secure/briefcase, @@ -18205,9 +15998,6 @@ }, /turf/open/floor/tile/neutral/full, /area/centcom/valhalla) -"xyI" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "xzr" = ( /obj/machinery/hydroponics, /obj/item/radio/intercom{ @@ -18218,41 +16008,12 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"xzt" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) -"xzG" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/scorched, -/area/centcom/valhalla) -"xzU" = ( -/turf/open/floor/plating, -/area/centcom/valhalla) "xAJ" = ( /obj/structure/sign/securearea{ dir = 1 }, /turf/closed/mineral/smooth, /area/centcom/valhalla/exterior) -"xAL" = ( -/turf/open/floor/wood, -/area/centcom/valhalla) -"xAT" = ( -/turf/open/floor/grimy, -/area/centcom/valhalla) -"xBe" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/obj/machinery/door/airlock/mainship/engineering/free_access{ - dir = 1 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "xBx" = ( /obj/structure/window/framed/colony/reinforced/hull, /obj/machinery/door/poddoor/shutters/mainship{ @@ -18262,31 +16023,11 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"xCO" = ( -/obj/structure/plasticflaps, -/turf/open/floor/plating, -/area/centcom/valhalla) "xDj" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/ai_node, /turf/open/floor/wood, /area/centcom/valhalla) -"xDl" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) -"xEy" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/obj/machinery/door/airlock/mainship/generic{ - dir = 1 - }, -/turf/open/floor/tile/neutral/full, -/area/centcom/valhalla) "xEJ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/tile/neutral/full, @@ -18315,14 +16056,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"xES" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/corner, -/area/centcom/valhalla) -"xFa" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "xFH" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical{ @@ -18391,28 +16124,6 @@ /obj/structure/bed/stool, /turf/open/floor/tile/cafe, /area/centcom/valhalla) -"xJf" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) -"xJg" = ( -/turf/closed/wall, -/area/centcom/valhalla) -"xJj" = ( -/turf/closed/wall, -/area/centcom/valhalla) -"xJq" = ( -/turf/closed/wall/r_wall, -/area/centcom/valhalla) -"xJv" = ( -/obj/effect/turf_decal/tile/black{ - dir = 1 - }, -/obj/effect/turf_decal/tile/black, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "xKl" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/storage/box/donkpockets, @@ -18428,14 +16139,6 @@ dir = 5 }, /area/centcom/valhalla) -"xKO" = ( -/obj/effect/ai_node, -/turf/open/floor/plating, -/area/centcom/valhalla) -"xKR" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "xKU" = ( /obj/structure/sign/fixedinplace/engineering{ pixel_y = 10 @@ -18481,25 +16184,6 @@ dir = 5 }, /area/centcom/valhalla) -"xLY" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"xLZ" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/dmg2, -/area/centcom/valhalla) -"xMI" = ( -/turf/open/floor/tile/neutral{ - dir = 1 - }, -/area/centcom/valhalla) "xMP" = ( /obj/structure/table, /obj/item/book/manual/barman_recipes, @@ -18508,14 +16192,6 @@ /obj/item/reagent_containers/food/drinks/drinkingglass, /turf/open/floor/tile/dark, /area/centcom/valhalla) -"xNS" = ( -/obj/effect/ai_node, -/turf/open/floor/tile/neutral/full, -/area/centcom/valhalla) -"xOi" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "xOF" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red{ @@ -18562,10 +16238,6 @@ dir = 5 }, /area/centcom/valhalla) -"xPu" = ( -/obj/structure/window/framed/colony/reinforced, -/turf/open/floor/plating, -/area/centcom/valhalla) "xPv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -18595,15 +16267,6 @@ /obj/item/tool/pen, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"xQq" = ( -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) -"xQP" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) "xQU" = ( /obj/machinery/telecomms/relay, /turf/open/floor/gcircuit, @@ -18620,10 +16283,6 @@ /obj/effect/turf_decal/warning_stripes/box/empty, /turf/closed/wall/r_wall/unmeltable, /area/centcom/valhalla) -"xSv" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) "xSK" = ( /obj/machinery/door/poddoor{ id = "engstorage"; @@ -18631,43 +16290,6 @@ }, /turf/open/floor/plating, /area/centcom/valhalla) -"xTa" = ( -/obj/machinery/door/firedoor{ - dir = 2 - }, -/obj/effect/turf_decal/warning_stripes/thick, -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 1 - }, -/obj/machinery/door/airlock/mainship/security/free_access{ - dir = 1 - }, -/turf/open/floor/plating, -/area/centcom/valhalla) -"xTc" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) -"xTn" = ( -/obj/effect/turf_decal/tile/black{ - dir = 8 - }, -/obj/effect/turf_decal/tile/black{ - dir = 1 - }, -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) -"xTw" = ( -/obj/effect/ai_node, -/turf/open/floor/plating, -/area/centcom/valhalla) -"xTH" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "xTN" = ( /obj/structure/table/reinforced, /obj/item/book/manual/chef_recipes, @@ -18678,49 +16300,16 @@ }, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"xTR" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/obj/structure/sign/doors{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - name = "WARNING: EXTERNAL AIRLOCK" - }, -/turf/open/floor/plating, -/area/centcom/valhalla) "xTZ" = ( /obj/structure/window/framed/colony/reinforced/hull, /turf/open/floor/engine, /area/centcom/valhalla) -"xUc" = ( -/turf/open/floor/plating, -/area/centcom/valhalla) "xUk" = ( /obj/machinery/firealarm, /obj/structure/bedsheetbin, /obj/effect/turf_decal/warning_stripes/box/empty, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"xUt" = ( -/turf/open/floor/plating/dmg1, -/area/centcom/valhalla) -"xUy" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/shower{ - pixel_y = 16 - }, -/obj/structure/curtain, -/obj/machinery/door/window{ - name = "Shower" - }, -/obj/effect/spawner/random/misc/soap/regularweighted, -/obj/machinery/atmospherics/components/unary/vent_pump/on, -/turf/open/floor/mainship/sterile/white, -/area/centcom/valhalla) -"xUS" = ( -/obj/structure/sign/vacuum, -/turf/closed/wall, -/area/centcom/valhalla) "xUV" = ( /obj/machinery/firealarm{ dir = 8 @@ -18730,10 +16319,6 @@ }, /turf/open/floor/gcircuit, /area/centcom/valhalla) -"xVt" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) "xVz" = ( /obj/effect/turf_decal/sandytile/sandyplating, /turf/closed/wall/r_wall/unmeltable, @@ -18753,15 +16338,6 @@ }, /turf/closed/wall/r_wall/unmeltable, /area/centcom/valhalla) -"xWB" = ( -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) -"xWF" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "xWH" = ( /obj/machinery/firealarm{ dir = 4 @@ -18776,9 +16352,6 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"xWW" = ( -/turf/open/floor/plating/scorched, -/area/centcom/valhalla) "xXb" = ( /obj/effect/turf_decal/tile/black, /obj/effect/turf_decal/tile/yellow{ @@ -18852,15 +16425,6 @@ /obj/effect/turf_decal/warning_stripes/box, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"xYy" = ( -/obj/effect/ai_node, -/turf/open/floor/wood, -/area/centcom/valhalla) -"xYR" = ( -/turf/open/floor/tile/vault{ - dir = 5 - }, -/area/centcom/valhalla) "xYZ" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/warning_stripes/thick{ @@ -18898,30 +16462,11 @@ /obj/item/circuitboard/airlock, /turf/open/floor/wood, /area/centcom/valhalla) -"ybm" = ( -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"ybs" = ( -/obj/structure/window/framed/colony/reinforced/hull, -/turf/open/floor/plating, -/area/centcom/valhalla) "ybu" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/ai_node, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"ybT" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"ybY" = ( -/obj/effect/turf_decal/warning_stripes/thick{ - dir = 8 - }, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "ycL" = ( /obj/effect/ai_node, /turf/open/floor/tile/lightred/full, @@ -18933,18 +16478,12 @@ }, /turf/open/floor/tile/lightred/full, /area/centcom/valhalla) -"ycV" = ( -/turf/closed/wall, -/area/centcom/valhalla) "ydu" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, /obj/effect/turf_decal/warning_stripes/box/empty, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"ydT" = ( -/turf/closed/wall, -/area/centcom/valhalla) "yec" = ( /obj/structure/extinguisher_cabinet{ dir = 1 @@ -18958,12 +16497,6 @@ /obj/item/tool/wrench, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"yew" = ( -/obj/structure/toilet{ - dir = 4 - }, -/turf/open/floor/mainship/sterile/white, -/area/centcom/valhalla) "yeH" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -18988,12 +16521,6 @@ /obj/effect/ai_node, /turf/open/floor/tile/dark/gray, /area/centcom/valhalla) -"yfy" = ( -/obj/structure/sign/securearea{ - dir = 1 - }, -/turf/closed/wall/r_wall/unmeltable, -/area/centcom/valhalla) "yfz" = ( /turf/open/floor/tile/cafe, /area/centcom/valhalla) @@ -19010,9 +16537,6 @@ }, /turf/open/floor/tile/dark2, /area/centcom/valhalla) -"yfE" = ( -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) "yga" = ( /obj/effect/turf_decal/warning_stripes/box/small{ dir = 1 @@ -19031,9 +16555,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/scorched, /area/centcom/valhalla) -"ygB" = ( -/turf/open/floor/tile/dark, -/area/centcom/valhalla) "yhb" = ( /turf/open/floor/plating/ground/mars/random/cave, /area/space) @@ -19043,9 +16564,6 @@ }, /turf/open/floor/tile/neutral/full, /area/centcom/valhalla) -"yhA" = ( -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "yhB" = ( /turf/open/floor/tile/escape{ dir = 4 @@ -19055,9 +16573,6 @@ /obj/machinery/telecomms/allinone, /turf/open/floor/gcircuit, /area/centcom/valhalla) -"yhG" = ( -/turf/closed/wall/r_wall, -/area/centcom/valhalla) "yhP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -19142,10 +16657,6 @@ dir = 5 }, /area/centcom/valhalla) -"yjA" = ( -/obj/effect/ai_node, -/turf/open/floor/plating, -/area/centcom/valhalla) "ykJ" = ( /obj/structure/table, /obj/item/toy/dice, @@ -19177,14 +16688,6 @@ }, /turf/open/floor/engine, /area/centcom/valhalla) -"ylG" = ( -/obj/effect/turf_decal/warning_stripes/box/empty, -/turf/open/floor/tile/dark/gray, -/area/centcom/valhalla) -"ylM" = ( -/obj/machinery/status_display, -/turf/closed/wall, -/area/centcom/valhalla) (1,1,1) = {" xrI @@ -22148,15 +19651,15 @@ xrI xrI jYG jYG -hTv -hTv -hTv -hTv -hTv -hTv -hTv -hTv -hTv +box +box +box +box +box +box +box +box +box jYG jYG jYG @@ -22286,7 +19789,7 @@ xrI jYG jYG jYG -hTv +box nKg jWH gzS @@ -22294,15 +19797,15 @@ bCd nKg fvw wZg -hTv +box jYG -muO +box njR -muO -muO -muO -muO -muO +box +box +box +box +box aMY fWu fWu @@ -22424,7 +19927,7 @@ xrI xrI jYG jYG -hTv +box foh jWH pqM @@ -22432,15 +19935,15 @@ sWX foh fvw eCf -hTv +box jYG -muO +box nmD nXU oCB ptt qCX -muO +box sqE fmR fmR @@ -22562,7 +20065,7 @@ vQc vQc jYG jYG -hTv +box lPX oNZ wkQ @@ -22570,15 +20073,15 @@ dFm wkQ mzH lPX -hTv +box fmR -muO +box nmD nXU oHc -pwb +acu qEL -muO +box ssF sTI ssF @@ -22700,7 +20203,7 @@ fmR fmR fmR jYG -hTv +box nKg jWH wZg @@ -22708,27 +20211,27 @@ fvw nKg fvw wZg -hTv -hTv -hTv -hTv -hTv +box +box +box +box +box oHK -pwb +acu qFF -rvV -rnE -ssX -rnE -rnE -rnE -rvV -rvV -rvV -rvV -rvV -rvV -rvV +box +bka +fCn +bka +bka +bka +box +box +box +box +box +box +box fmR fmR fmR @@ -22838,7 +20341,7 @@ fmR fmR vQc fmR -hTv +box foh jWH pqM @@ -22850,23 +20353,23 @@ duo uOI ble etk -hTv -oUq +box +bSp pwR -oUq -rvV +bSp +box sto sVb -suW -uEj +ctr +cXT vtZ -wxi +bSp xmh xPe yhE bcJ bWc -rvV +box fWu fmR fmR @@ -22976,35 +20479,35 @@ fWu fWu fWu fWu -hTv +box bgz rBJ -tVp +mCI lMV xgU lMV -tVp +mCI gMl gJS myT noL -hTv +box oUK -pGk +mCI qHA -uEj +cXT suy sZE -suW -uEj +ctr +cXT vvm -wxi +bSp xmt mhk yhP mhk sad -rvV +box fmR fmR fmR @@ -23105,44 +20608,44 @@ fmR fWu fWu fmR -ngU +cYa fmR fmR fmR -ics -lgU +aEn +bcm fmR fmR bjQ -hTv +box bog -ndm -ndm -ndm -ndm -ndm -ndm +ivs +ivs +ivs +ivs +ivs +ivs gNi -ndm +ivs cdt gCD -hTv +box oVR pJE -qHG -riU -suW -suW -suW +cHJ +bWt +ctr +ctr +ctr uEJ -vxo +bve wxr xmh xQU yip gzl ukJ -rvV +box fmR fmR fmR @@ -23255,24 +20758,24 @@ boq boq wfL xVT -llp -ndm -gnR +jcx +ivs +aqy gzY lEp lEp lEp lEp -hTv -hTv +box +box oXa pNT -qIk -uEj +bGv +cXT svr tiz -suW -uEj +ctr +cXT vyL wxE xqi @@ -23280,7 +20783,7 @@ hXf yiC hXf ygh -rvV +box fWu fmR fmR @@ -23379,46 +20882,46 @@ xrI fmR fWu fmR -lgU +bcm aMq bqF aSD aMq bbR -icW +drS rvU bPK jvi boq boq qhT -sWH -llp -ndm -nZy +hdk +jcx +ivs +cHJ rei lEp wHz dyS mLF -muO -nYA +box +bka oXK -mCH +boq qKb -rnE +bka syY tiF -suW -uEj +ctr +cXT vzV -wxi +bSp xmh xRl yiP rJG bWc -rvV +box fWu fmR vQc @@ -23530,33 +21033,33 @@ dhA boq boq mGD -sWH -llp -ndm -nZy +hdk +jcx +ivs +cHJ rVD lFj dAJ dBD dAJ -pcb -nYA -oXS +box +bka +cXT pPo qKc -ssX -rnE -ssX -rnE -rnE -rnE -rvV -rvV -rvV -rvV -rvV -rvV -rvV +fCn +bka +fCn +bka +bka +bka +box +box +box +box +box +box +box fWu fmR fmR @@ -23668,16 +21171,16 @@ boq dAJ boq mGD -sWH -llp -tzf -nZy +hdk +jcx +kqf +cHJ ohu -hTv -hTv -gpt -hTv -pcb +box +box +bka +box +box ylD uSc pTn @@ -23689,7 +21192,7 @@ tES uSc vCR wAP -pcb +box xRJ fmR xRJ @@ -23793,29 +21296,29 @@ xrI fmR fWu fmR -lgU +bcm aLR aMq aMq dlQ bbO jvi -rQk +fdy boq boq xpm boq -wgK +ghB jvR rht iVt wqU -tWP +luM mEH -hTv +box hwl -ndm -pcb +ivs +box ody oZR pTA @@ -23828,10 +21331,10 @@ uTS vDx wAY xyv -pcb -xzt +box +box xRK -xzt +box fmR bRv vQc @@ -23932,44 +21435,44 @@ fmR fWu fWu fmR -lgU +bcm aLR bKo aMq bbR eFA boq -ngU -hTv -hTv -nCB -nCB -hTv +cYa +box +box +bSp +bSp +box hYu -llp -ndm +jcx +ivs sJF jkk -hTv +box ijc -ndm -pcb +ivs +box odW pac pTP -pcb +box rxk rxk rxk -pcb +box uUZ pVV pVV pVV xSK -lIl +gao iEJ -xzt +box xRJ bRv fWu @@ -24078,36 +21581,36 @@ gQk eGk boq fmR -hTv +box uut yeN mqB knm cnE -llp +jcx tSq -tWP +luM kQN -hTv +box hwl -ndm -pcb +ivs +box ofr paB pTP -qML +bFJ pVV pVV pVV -qML +bFJ uUZ vFG pVV pVV xSK -mJJ +jTE mHB -xzt +box xRJ bRv eCH @@ -24213,39 +21716,39 @@ fWu fWu fmR fmR -lgU +bcm rXh fmR -hTv +box psp -llp -ndm +jcx +ivs knm qlP -llp -ndm +jcx +ivs oYw cbS -hTv -ndm -ndm -pcb +box +ivs +ivs +box ogJ -pcb -pcb +box +box qNh rAT rAT tjg -pcb +box uVY vGG pVV pVV -pcb +box lOo iKC -xzt +box naJ xRJ dVf @@ -24351,23 +21854,23 @@ fmR num bRv fWu -ngU +cYa boq fmR -hTv +box uut -llp +jcx yeN iNh jaD rht wqU -tWP -hTv -hTv -hTv -hTv -pcb +luM +box +box +box +box +box ogS pdz pVn @@ -24375,15 +21878,15 @@ qOf rFk rFk tlz -pcb +box uYl vIT wEk pVV -pcb +box nsa osZ -xzt +box naJ naJ fmR @@ -24492,20 +21995,20 @@ fWu fWu fWu fWu -hTv -hTv -nCB -nCB -hTv +box +box +bSp +bSp +box tvG -llp -ndm +jcx +ivs bZV knm ppm lYp epz -qML +bFJ ohN pec pVV @@ -24513,15 +22016,15 @@ pec pVV sDz pVV -tHw +bSp vaS vJz -wFc +acu pVV -pcb -xzt -xzt -xzt +box +box +box +box naJ xRJ fmR @@ -24630,20 +22133,20 @@ fmR fmR fmR fWu -hTv +box bqN -llp +jcx kIe knm cHN -llp +jcx wqU kjb kmz -ndm +ivs lYp oJr -pcb +box ojb pdz pZI @@ -24651,7 +22154,7 @@ qOm rIl rIl tmx -pcb +box vcW vKE wFe @@ -24659,7 +22162,7 @@ pVV mMK wIw wDv -xzt +box naJ fWu dVf @@ -24768,28 +22271,28 @@ vQc vQc fmR fWu -hTv +box gds yeN -tzf +kqf knm bCY -llp -ndm -jiU +jcx +ivs +jaW knm dHM lYp cre -pcb +box ogJ -pcb -pcb +box +box qOE rPe rPe tnl -pcb +box uUZ vMi pVV @@ -24797,7 +22300,7 @@ pVV xTZ nvt lXm -xzt +box oSl fWu bRv @@ -24808,16 +22311,16 @@ vQc lEv lEv lEv -hec -ycV -ycV -ycV -ycV -ycV -ycV -ycV -ycV -ycV +box +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm fWu fWu fWu @@ -24906,28 +22409,28 @@ vQc vQc fmR fWu -hTv +box bqN -llp -llp +jcx +jcx khV nXQ -llp +jcx wqU jtL -hTv -nCB -nCB -hTv -pcb +box +bSp +bSp +box +box ojb pfu qaL -qML +bFJ pVV pVV pVV -qML +bFJ ven vOH pVV @@ -24943,19 +22446,19 @@ fmR vQc vQc vQc -fLm -fLm -fLm -hec +bSp +bSp +bSp +box iCm ygo -xil -xTw +dAJ +ead cqb -jrN -xTw +hdN +ead jKc -ycV +bcm fmR fmR fmR @@ -25044,36 +22547,36 @@ vQc vQc fmR fWu -hTv -hTv -nCB -nCB -hTv +box +box +bSp +bSp +box kKa fPm -ndm -tWP +ivs +luM knm mPJ -mHP +hDW oJr -pcb +box ojb pfu qaL -pcb +box rRU sEP rRU -pcb +box vgS pVV pVV pVV -pcb -xzt -xzt -xzt +box +box +box +box fWu bRv fWu @@ -25081,19 +22584,19 @@ fmR vQc vQc vQc -fLm +bSp xvP kTE -hec -ycV -ycV -ycV -ovg -ycV -ycV -cqb -gtX -ycV +box +bcm +bcm +bcm +ncr +bcm +bcm +cqb +gtX +bcm fmR fmR fmR @@ -25182,20 +22685,20 @@ vQc vQc fmR fWu -hTv -mNv -llp +box +jCQ +jcx rhC knm sCM yeN wqU -tWP +luM knm -ndm -mHP +ivs +hDW mPJ -pcb +box omN pgz qby @@ -25219,26 +22722,26 @@ vQc iyF fmR vQc -fLm +bSp vKP vTy -hec +box fML iWM pmg -uxN +dnm yaZ -ycV +bcm cqb -hec +box cYa -ycV -ycV -ycV +bcm +bcm +bcm cYa cYa -ycV -ycV +bcm +bcm fmR fmR fWu @@ -25320,20 +22823,20 @@ fmR fmR fmR fWu -hTv +box oJr -llp -tzf +jcx +kqf knm jtp -llp -tzf +jcx +kqf aoa frZ -mHP -mHP +hDW +hDW mPT -pcb +box onp qbK qbK @@ -25345,7 +22848,7 @@ qQT qQT vTB wIH -pcb +box xRJ kPj kPj @@ -25357,7 +22860,7 @@ gxS fmR fmR fWu -fLm +bSp aai pFs rGn @@ -25366,17 +22869,17 @@ wQr nnk xDj ttw -ycV -qFW -hec +bcm +boq +box edn -ckK +bve lfg hrC euF sAp oAl -ycV +bcm fmR fmR fWu @@ -25458,36 +22961,36 @@ fmR fmR fWu fWu -hTv -mNv -llp -llp +box +jCQ +jcx +jcx tFi aWz -llp +jcx wqU -tWP -bRv -hTv -mbY -hTv -pcb -mDO -mDO -mDO -mDO -mDO -mDO -mDO -nvO -vjO -vVy -vjO -xzt -xWB -xWB -xWB -xWB +luM +box +box +elF +box +box +bka +bka +bka +bka +bka +bka +bka +afj +cXT +vFU +cXT +box +box +box +box +box naJ xRJ fWu @@ -25495,26 +22998,26 @@ fmR fmR fmR fWu -hec -hec -hec -hec +box +box +box +box jIi hqh xkI aqi aIN -ycV -qFW -hec +bcm +boq +box qGp qVp vgc -uxN +dnm ffn ffn -ipc -ycV +ckN +bcm fmR fmR fWu @@ -25596,36 +23099,36 @@ fmR fmR fWu fmR -hTv +box gae -woV +box fat -woV -woV -woV +box +box +box iXv jvG -woV -woV +box +box gae -woV -woV -mvn -mvn -mvn +box +box +bka +bka +bka dcS -xnM +boq ead -xnM +boq tQh vka -vZJ +dGm wMc -vjO +cXT xWH sJK jQD -xWB +box naJ naJ fWu @@ -25633,26 +23136,26 @@ fWu fWu fWu fWu -hec +box xcd -qFW -hec -ycV -ycV -ycV -ycV -ycV -ycV +boq +box +bcm +bcm +bcm +bcm +bcm +bcm cqb -hec +box bVr -ckK -ipc +bve +ckN hrC tFs fyE -ipc -ycV +ckN +bcm fmR fmR fWu @@ -25734,61 +23237,61 @@ fmR fmR fWu fmR -lgU +bcm eAp -mvn +bka iTP oYn epO -lGH +cXT jaW -jwi +hMu koR mYA mcN -lGH -ecT -ecT -ecT -mvn +cXT +ckN +ckN +ckN +bka gGv ead -vLH -vLH -vLH -kQR -vlt +bka +bka +bka +iYS +ivs wMo -vjO +cXT xXb dTl qjg -xWB -pcb +box +box ocC -pcb -pcb -pcb -pcb -pcb -hec -hec -hec -hec +box +box +box +box +box +box +box +box +box qed dVK dii eUe xjX -hec +box fuY -hec -ycV -ovg -ycV -ycV +box +bcm +ncr +bcm +bcm hrC -qFW +boq sYY cYa fmR @@ -25874,28 +23377,28 @@ fWu fmR baD eAt -mvn +bka fUN -hag -hag -ior +aYI +aYI +dGn jcb jxN kqf ivs mda -lGH +cXT nwK ouT nwK -mvn +bka wsm mZM -vLH +bka tpX tQl -vlt -vlt +ivs +ivs wNF vGZ xXb @@ -25905,30 +23408,30 @@ lcR sDo keE nUD -iZD -iZD +ivs +ivs ndS -mDO +bka fTH -qFW -qFW -qUU +boq +boq +dBD kYM cqb kJw -tgW -qFW -qFW -xTw -tgW -qFW +eFA +boq +boq +ead +eFA +boq isr dyf -kGn -uxN +hlc +dnm qhV -qFW -ycV +boq +bcm fmR fmR fWu @@ -26012,61 +23515,61 @@ fmR fmR dVr eAE -mvn +bka fVz iMw hCL -lGH +cXT jcx jAd kqG kYp mdp -lGH -ecT -ecT -ecT -mvn -xnM -ojA -vLH +cXT +ckN +ckN +ckN +bka +boq +dAJ +bka tpX tRh mcf -weH +dTl wMo -xBe +iWr xXb dTl dio yeH iWr -hNt +aIr ocH -tgY +iYS gVx hwk -mDO -qFW +bka +boq iQN -srV -srV -srV -srV -srV -srV -rzX -srV -srV -srV -rzX -srV -xTw -ycV +bcm +bcm +bcm +bcm +bcm +bcm +nvn +bcm +bcm +bcm +nvn +bcm +ead +bcm kCN pZK -ipc -ycV +ckN +bcm fmR fmR fWu @@ -26142,69 +23645,69 @@ fWu fmR fmR fmR -ngU -ngU +cYa +cYa fmR -lgU -ngU -lgU +bcm +cYa +bcm czV dsS gaN -mvn -lGH -lGH -mvn +bka +cXT +cXT +bka iXv jAF -mvn +bka lhE -lGH -mvn -lGH +cXT +bka +cXT kME -lGH -mvn -nbd +cXT +bka +eFA rSA -vLH +bka trx tRy vka wbh wMo -xCO +hUt xXb dTl dTl yeH -mDO +bka xUk -wqZ +gtX hjG -tgY +iYS kEE -mDO -qFW +bka +boq uEH -srV +bcm pSb cYU acu kkv rsh ojF -srV +bcm voO elO rKr -srV -wXk -tMS -qFW +bcm +drS +hhc +boq adx jGs -ycV +bcm fmR fmR fWu @@ -26288,13 +23791,13 @@ aMq aMq aMq bbR -fbp +boq geA ade hDu ioO ivu -jwi +hMu pLH lhK mdt @@ -26302,14 +23805,14 @@ mQt jXM pGN luM -moJ +hlc mZo rYw -pww +kQB qcq tSA vka -weH +dTl wPc vGZ xXb @@ -26318,30 +23821,30 @@ dTl yeH xgx hXM -wqZ +gtX qqo yiL ptA -mDO -tgW +bka +eFA jLk -srV +bcm xfX -vjb -vnN -qFr -ivQ +nCA +dnm +bPH +ckN fad rhs pii umc bgM -srV -tgW -ycV -ycV -ycV -ycV +bcm +eFA +bcm +bcm +bcm +bcm cYa fmR fmR @@ -26443,11 +23946,11 @@ lvE bIy mZM ojM -vLH +bka tvT cnL rjI -vlt +ivs wRz xEQ xXC @@ -26458,25 +23961,25 @@ rzm cgS rZp xjs -iZD +ivs lmF -mDO -wXk +bka +drS lOR -woW +iNd acu -klg -vnN -vnN +aNP +dnm +dnm pSb aSM -srV +bcm wae eUB hGs -srV -qFW -oOW +bcm +boq +cXT aqi sLz nWJ @@ -26564,7 +24067,7 @@ boq dAJ boq eFA -fbp +boq ghq hdk cKm @@ -26576,14 +24079,14 @@ ivi hGj ivi nAP -jwi +hMu cJf -mvn -nbd +bka +eFA ojW -vLH +bka qcP -weH +dTl rkT sID tEx @@ -26595,30 +24098,30 @@ yeH xgx pon wiL -hdP +dii nsT sis -mDO +bka qbx odj -srV +bcm aBf fad -scd -vnN -ivQ +hrC +dnm +ckN acu -qPi -srV -srV -srV -srV +cfQ +bcm +bcm +bcm +bcm oCR -kGn -uah -ckK +hlc +acu +bve sSN -ycV +bcm fmR fmR fmR @@ -26692,7 +24195,7 @@ fmR fWu fmR fmR -ngU +cYa aMq bbR bnV @@ -26702,7 +24205,7 @@ dfx boq dXi eFA -fbp +boq ghB dur hGL @@ -26716,55 +24219,55 @@ ivs kcp ivs xTN -mvn +bka ncr -olK -vLH +bcm +bka qdC tVS vmJ sKX wTz -vLH -xFa +bka +cXT vFU vFU -xFa -mDO +cXT +bka vWm ckl kdT mjv gks -mDO -ovg -ycV -qQJ +bka +ncr +bcm +hhc jAq vJN -vnN +dnm gxI pyx -ivQ +ckN gYp -srV +bcm dDH -qFW +boq dUh cqb -oOW +cXT gPw gPw -uah -ycV +acu +bcm fmR fmR fmR -sKi -sKi -uDy -sKi -gCo +bcm +bcm +nvn +bcm +box fmR fmR fWu @@ -26838,71 +24341,71 @@ boq boq boq dBm -ngU +cYa eGk gCr -mvn -mvn +bka +bka hJe ivu -nDI +bcm jCQ ivu -nDI +bcm jkS jkS -nDI +bcm kME -lGH -mvn -ygB +cXT +bka +acu vOm pJi -vLH +bka sMi sMi sMi -vLH -vLH +bka +bka wLk -wOu -mvm +eqJ +cJv bVK pat -mDO +bka aVA aVA aVA -mDO -mDO +bka +bka qTQ rPH -srV +bcm nek wAR -vnN -vnN +dnm +dnm gIH acu vFW -srV -qFW -ycV -ycV -ycV -ycV +bcm +boq +bcm +bcm +bcm +bcm jAu gIn gQv -ycV -sKi -sKi -sKi -sKi +bcm +bcm +bcm +bcm +bcm gCB lZp cIY -gCo +box fmR fmR vQc @@ -26971,76 +24474,76 @@ fWu fWu fWu fmR -ngU -ngU +cYa +cYa czV dgR -lgU -ngU +bcm +cYa boq fdA ghL -mvn +bka ufw iAc -nDI +bcm jDO iAc -nDI -xux -xux +bcm +aIr +aIr nDw -ecT +ckN lJm -mvn -wOu -wOu +bka +eqJ +eqJ pNw -wOu -wOu -wOu -wOu -tIS -wOu -wOu -wOu -vgK +eqJ +eqJ +eqJ +eqJ +ieT +eqJ +eqJ +eqJ +fHt xaB -vgK -vgK -vgK -vgK -vgK +fHt +fHt +fHt +fHt +fHt rNY -wVl -vgK -vgK -gKo -vjb -gAA -vnN -vnN +kYE +fHt +fHt +cXT +nCA +aNv +dnm +dnm wIE -ivQ +ckN tuC -srV -qFW -ycV +bcm +boq +bcm oSg aFd -jTH +iNd gDc eZa gEE -ycV -eNS +bcm +bZR suw uID eYv -xAL -pOy +dnm +cQa sPt -gCo +box fmR fmR vQc @@ -27110,7 +24613,7 @@ fmR fWu fmR fmR -hTv +box cGi dhA dBD @@ -27118,69 +24621,69 @@ boq dAJ feK gil -mvn +bka hJY iAH -nDI +bcm jGN krJ -nDI +bcm mdF -wPC +mCI nFR ovc daj -mvn +bka wYt orB -wVl -sNw -sNw -sNw -sNw -tJM -wQm -wQm +kYE +blf +blf +blf +blf +bSw +qPB +qPB dWe rRM -wQm -tJM +qPB +bSw nRL -wQm -wQm -wQm -wQm +qPB +qPB +qPB +qPB joH -sNw -vgK +blf +fHt kql -vnN -vnN -vnN -scd +dnm +dnm +dnm +hrC dJc acu mwU -srV +bcm vVY -kGn -qFW -qFW -kGn +hlc +boq +boq +hlc gDc hhR gDc -ycV -sKi -ufo -sKi -sKi -xgy +bcm +bcm +fZG +bcm +bcm +cXT uGG pZY -gCo -gCo -gCo +box +box +box vQc xrI xrI @@ -27249,76 +24752,76 @@ fWu fWu fWu box -fPe -fPe -fPe -fPe -fPe -fPe -fPe -mvn +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bka hMr iDF -mvn +bka hMr hMr ljt jkS jkS -mvn +bka vXO dap -mvn -wOu -wQm -sFR -uIP -rnw -rnw +bka +eqJ +qPB +aEn +bcm +cXT +cXT sNQ wUC -rnw -rnw -uIP -uIP -ceH -ygB -qzG -qzG -qzG -qzG +cXT +cXT +bcm +bcm +aok +acu +bcm +bcm +bcm +bcm uOH -qzG +bcm wYt -vgK +fHt sFI -vnN -scd -vnN -qFr +dnm +hrC +dnm +bPH icb -ivQ +ckN qkB -srV -qFW -ycV +bcm +boq +bcm qwh rou -ycV +bcm hiA keP dSR -ycV +bcm bGq -sKi +bcm wlk vwb -xAL -icr -icr +dnm +ctr +ctr rBN rrZ -gCo +box xrI xrI xrI @@ -27400,63 +24903,63 @@ hMu hMu hMu hMu -llJ -uRH -uRH -uRH -uRH -uRH -wOu -wOu +kYE +hMu +hMu +hMu +hMu +hMu +eqJ +eqJ otD -uIP +bcm twt qAB roM -sPV -tKb +eqJ +cJv roM roM rLk -sFR -ycV -ovg -qzG +aEn +bcm +ncr +bcm nsz gma gwH ipl -qzG -wOu +bcm +eqJ guA -gKo +cXT nIR fad -vnN -vnN -qMD +dnm +dnm +cAS acu -ivQ -kGn +ckN +hlc sdV -ycV -ycV -ycV -ycV -ycV -ycV -ycV -ycV -sKi -sKi -sKi -sKi +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm jZh kMK dGi xqp fwS -gCo +box xrI xrI xrI @@ -27526,75 +25029,75 @@ xrI xrI bSp cHk -dXp +bPH dGn -dXp -eHe -eHe -eHe +bPH +ctr +ctr +ctr dGn hMu bSw -jeH +blf jJz -jeH +blf vOu -pOU +hAb cCa -sNw -sNw -pOU -sNw -pOU -oEt -uIP +blf +blf +hAb +blf +hAb +clB +bcm twY -sPV +eqJ rsX -tSI -tSI +dTl +dTl vUD -wSe +fHt jhC -uIP -vmM -qFW -xky +bcm +bHu +boq +iNd fhh bYd iHX elc -qKJ +lOG wYt hRn -srV +bcm pSb njt mYF epY pYX -ivQ +ckN hMy -srV -qFW -xTw -qUU -qFW -wXk -qFW -qFW -tgW +bcm +boq +ead +dBD +boq +drS +boq +boq +eFA bcQ -sKi +bcm uax uEZ -sKi +bcm nPV -icr +ctr kbR nRC pNS -gCo +box xrI xrI xrI @@ -27665,7 +25168,7 @@ fWu box cHZ dnm -dGD +cXT dnm fRC fmy @@ -27673,66 +25176,66 @@ gle bCs hMu sdt -wGV -wGV -wGV -wGV -mEV -xco -xco +bcm +bcm +bcm +bcm +fZG +bcm +bcm cXT doS doS cXT -xco -uIP +bcm +bcm txW tXL rtA -tSI -tSI +dTl +dTl xFH -xdz +orB slY -uIP +bcm eQd kJw -kGn +hlc mVh nFA nAG snn -qzG -mLC +bcm +fbQ vtf -uMd -rhB -uMd -uMd -uMd -uMd -uMd -jYM -jYM -jYM -sZY -jYM -jYM +bcm +fZG +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +nvn +bcm +bcm dNe keZ -lMJ +ghL cYa eiB rXw eYw -oVG +ckN gIJ -oVG +ckN eUG -sKi -ufo -sKi -gCo +bcm +fZG +bcm +box xrI xrI xrI @@ -27801,75 +25304,75 @@ fWu fWu box box -fPe -dnH -hOc -dYw -eHe +bcm +aVk +hhc +aLi +ctr foe glu bCs bLW -wpP -mxn +fHt +hhc jNR gFm hnQ mVF -xco +bcm kdt kMP lKR -qbM +hqk nkG kdU -uIP +bcm tzz tZl vpr -tbW -ufF +blf +bSw vpr vpr beB -uIP +bcm uvt cqb -qzG +bcm fKz uaJ iaa axF -qzG +bcm muI -vgK -ete +fHt +cXT phm ndM iSQ nSa wWg nSa -jYM +bcm dDK lAd aOX aqw -jYM -jYM -jYM -jYM -jYM -qFW -sKi -sKi -qyX -sKi -qyX +bcm +bcm +bcm +bcm +bcm +boq +bcm +bcm +cfQ +bcm +cfQ dpe -sKi +bcm cbG -qRd +dyf soG xrI xrI @@ -27940,75 +25443,75 @@ fmR box bZR cKf -doK +dcs vhy dnm eNk lKz glw -qmw -rSR -iHu +bka +eqJ +cJv caI fTj crv -wGV -mEV -xco +bcm +fZG +bcm keh yiI wrO lKY nmj gzk -uIP -uIP -uIP -uIP +bcm +bcm +bcm +bcm sZe -udp -uIP -nHZ -uIP -uIP -qFW -ycV -qzG -qzG -pgP -qzG -qzG -qzG +qPB +bcm +fZG +bcm +bcm +boq +bcm +bcm +bcm +fZG +bcm +bcm +bcm dJj -vgK +fHt tzB ckN -ucT +ouT ckN -cDn +cAS aWh lda -sYg +iNd tfU wXW woP bAZ -jYM +bcm lmv ttc vzA -jYM -qFW -sKi -tCS +bcm +boq +bcm +acu uXf tNc -icr +ctr ggF qnO xGF apI -xJf +bSp xrI xrI wQi @@ -28076,77 +25579,77 @@ fmR fmR fmR box -fPe +bcm fZG -fPe -fPe +bcm +bcm ncr -qmw -qmw -qmw -qmw -rSR -wpP -wGV +bka +bka +bka +bka +eqJ +fHt +bcm jPv -krR +dAC hnQ meb -xco +bcm yen wVM lKY jfk nsr oLe -uIP +bcm qha -tZA +cQa rxJ -tbW -ufF +blf +bSw rxJ -xYy +bPH cxp -uIP -qFW -syo +bcm +boq +bcm hOW fsd tLk jby pXS -syo +bcm suC -vgK -ete -wTe -wTe -wTe -wTe -wTe +fHt +cXT +tVa +tVa +tVa +tVa +tVa cEp -jYM +bcm vSS wXW fPS xwf -jYM +bcm jVk -uaU +fgD ctQ -jYM +bcm vVY -kGn -tCS +hlc +acu czZ aTe etV -iVx -gCo -gCo -gCo -gCo +bve +box +box +box +box xrI xrI xrI @@ -28213,72 +25716,72 @@ fWu fmR fmR fmR -boB +box caq -cKo +cbG drS -ojA +dAJ ead -xnM -fvU -xnM -jRW -rSR -iHu -wGV +boq +dBD +boq +hlc +eqJ +cJv +bcm jQy ksY -wGV -mEV -xco +bcm +fZG +bcm kgL uaK uYH uYH qUc rYK -odc +iNd wEP qBK -uIP -tbW -udp -odc +bcm +blf +qPB +iNd xgS fKX -uIP -qFW -syo +bcm +boq +bcm gPu jtz lqn mLW -kuc +bao avC -qlF +iYS bcc -jYM +bcm cPP -jYM -jYM +bcm +bcm rnH -jYM -jYM -jYM -xoW +bcm +bcm +bcm +cXT lpv lpv gmH -jYM +bcm aWN ily nEL -jYM -tgW -sKi +bcm +eFA +bcm rKv pEk -icr +ctr ajF pEk bMv @@ -28351,72 +25854,72 @@ fWu fWu fWu fmR -brs -xJq -xJq -xJq -xJq -xJq +box +bka +bka +bka +bka +bka eNF -fwP -xJq +dsS +bka kQB -rSR +eqJ iJw -wGV +bcm jRh gJX hnQ ctU -xco +bcm kis cYQ -pjR +aIr vUi nvQ ugp -uIP -uIP -uai -uIP -tbW -udp -uIP -nHZ -uIP -uIP -qFW -syo +bcm +bcm +mOd +bcm +blf +qPB +bcm +fZG +bcm +bcm +boq +bcm eOJ jbp eZf lXE bUK -vff -spM -vgK -rCR -rsu +cXT +ivs +fHt +aok +hhc ujr aBB oXe blB -xoW +cXT kPK leo aIr aIr noI -rsu +hhc jxS dqS aIA -jYM -tgW -sKi +bcm +eFA +bcm atU oYi -icr +ctr atU oYi bMv @@ -28489,52 +25992,52 @@ fmR fmR fWu fmR -brs -cdQ +box +bZR cMM dtT -dtV +bcm ebN -ePj -ePj +acu +acu glT -xJq +bka hOK bUs -qNs -qNs -qNs -qNs -mFU -cGB -cGB -xco -pjX -qhn -xco -ntL -uIP -oov -uaG -rxJ -tbW -ufF +bka +bka +bka +bka +afj +bka +bka +bcm +pjX +qhn +bcm +fZG +bcm +oov +uaG +rxJ +blf +bSw rxJ -tZA +cQa tAQ -uIP -qFW -syo +bcm +boq +bcm kWX eIy oun jru xtx -qnk +hhc fik -vgK -tDN -jYM +fHt +jvA +bcm fTg kpH pgQ @@ -28545,16 +26048,16 @@ pFR hJN plk obe -jYM -xoW -xoW +bcm +cXT +cXT yfC -jYM -qFW -sKi +bcm +boq +bcm vrA pIu -icr +ctr sos sdG bMv @@ -28627,57 +26130,57 @@ aoZ aqQ fWu fmR -brs +box cfQ cNG -gqM -dtV -dtV +fZG +bcm +bcm ePH fyp gmE -xJq -rSR -iKO -fDX +bka +eqJ +aqy +cXT eBr kyU yjx mfj mRt -qNs -xTw -xil -qFW -tgW +bka +ead +dAJ +boq +eFA sbe -odc +iNd mLq uby -uIP +bcm tdj ujt -odc +iNd qBK wEP -uIP -tgW -syo +bcm +eFA +bcm aKc eIy jUa jru xtx -vff -ttg -vgK -pbm -jdQ +cXT +ehY +fHt +fYx +cfQ hLP mWa mWa hrg -xoW +cXT ulf rfF rfF @@ -28687,15 +26190,15 @@ lXt kDS kDS pmW -jYM -qFW -sKi +bcm +boq +bcm atU mcp -icr +ctr uKg oYi -gCo +box xrI xrI xrI @@ -28765,75 +26268,75 @@ xrI biW fWu bhl -brs +box cjh -cPT +ctr dwX -dHZ +cXT ecW -eQI +ctH fyz gox -xJq -rSR -iKV +bka +eqJ +cHJ odp fUn -xWF -xWF -xWF -woU -qNs -ovg -ycV -ycV -ycV -ycV -uIP -uIP -nHZ -uIP -uIP -uIP -uIP -nHZ -uIP -uIP +mCI +mCI +mCI +bPs +bka +ncr +bcm +bcm +bcm +bcm +bcm +bcm +fZG +bcm +bcm +bcm +bcm +fZG +bcm +bcm cqb -syo +bcm cbs eIy aWg jru xtx -syo +bcm jFg -vgK -nyE -nyE -xgQ -pjm +fHt +bcm +bcm +cXT +mWa mEf xEM -nyE +bcm mlO uTH -wnZ +bPs mEY rfF lJu fgO fgO qfs -vxC +hlc soB -sKi +bcm kIk mWF -icr +ctr obY ros -gCo +box xrI xrI xrI @@ -28905,73 +26408,73 @@ xrI biW bur cjO -cPT +ctr dxp -dHZ +cXT eff eRd fzO goF -xJq +bka hPu -iKV -fDX -jRm +cHJ +cXT +gtX gQK -llU +cYQ cAr cHJ -qNs -xTw -tgW -qFW -qUU -qFW -qFW -xTw -qFW -tgW -tgW -wXk -qFW -xil -qFW -jrN +bka +ead +eFA +boq +dBD +boq +boq +ead +boq +eFA +eFA +drS +boq +dAJ +boq +hdN dUh -syo +bcm lWa eIy tjb tJb xtx -vff -spM +cXT +ivs hqk hng nFd vMT -pjm -pjm +mWa +mWa qlV -xgQ +cXT ulf rus dFY -quQ +cYQ lJu kfP lRu lRu tdo -jYM -qFW -sKi -sKi -sKi +bcm +boq +bcm +bcm +bcm bYS pZY -gCo -gCo +box +box xrI xrI xrI @@ -29044,71 +26547,71 @@ biW bur coL cQa -dxV +dnm dIU -dxV +dnm cQa aJO aJO kQB -rSR +eqJ iMT bWt jTE -kBQ -kBQ +dii +dii uuR heM -qNs -qFW -xJj -xJj -xJj -xJj -xJj -xJj -xJj -xJj -xJj -xJj -xJj -xJj -xJj -xJj +bka +boq +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm pio -syo +bcm xzr eIy ngh jru idh -syo -mLC -mLC -nyE +bcm +fbQ +fbQ +bcm xsr xsr -pjm -pjm +mWa +mWa wge -nyE +bcm sEC ofb amL rfF mwV -jdQ +cfQ jCc jCc umP -jYM -xil +bcm +dAJ nkB hYZ -gQL +bcm wnL -kyR -xmq +akp +box xrI xrI xrI @@ -29179,27 +26682,27 @@ xrI biW xrI biW -diX +cae cpX cRl dxY -dHZ +cXT efJ -dxV -dbM +dnm +bPH gri -xJq -rSR +bka +eqJ eSl -fDX +cXT fXm kCa uOe mXt tPn -qNs -xil -xJj +bka +dAJ +bcm qpJ qWl sbu @@ -29207,27 +26710,27 @@ sGf qht ukb aWT -xJj +bcm xbe bSe dHm dQs -xJj -xTw -kGn +bcm +ead +hlc rTp mUA -iZc +ivs jru -rIB +bac nDL ybu -wKu +ivs ruB cRw vgF kym -pjm +mWa aHv ruB ulf @@ -29239,14 +26742,14 @@ tRG tee gnF hzZ -rsu -xTw +hhc +ead lgF pvX -kGn +hlc aAE jIr -xmq +box xrI xrI xrI @@ -29314,52 +26817,52 @@ xHr xrI sjH sjH -xDl +box aZs -xDl -brs +box +box afj cRz dzc -xJq -xJq +bka +bka eRZ fCK grG -xJq -hQT -hQT -qNs +bka +fbQ +fbQ +bka ocf -kCb -qNs -mFU -qNs -qNs -qFW -xJj +box +bka +afj +bka +bka +boq +bcm qqX nyg -shy -shy -shy +hbF +hbF +hbF qHk rHu -xJj -usm -vXl -uzL +bcm +hrC +eff +dnm dbd -xJj -xil -syo +bcm +dAJ +bcm kcW fgs qPa mpZ iqd -vff -tDD +cXT +jFg dGm oPW mWL @@ -29377,14 +26880,14 @@ tRG adT iaM cdI -jYM -jrN +bcm +hdN vZO cYa -gQL +bcm tbL sdE -xmq +box xrI xrI xrI @@ -29455,57 +26958,57 @@ awP aNj bac txr -xTn -xTn +fXm +fXm cRJ -xTn -xTn -xTn -xTn -xTn -xTn +fXm +fXm +fXm +fXm +fXm +fXm txr ehY -pdE -xSv +fHt +bSp biW biW -xSv +bSp bPs mSm -qFW -xTw +boq +ead lOG -usm -nBt +hrC +cuM sjq sGw tCf ulL -uzL +dnm wfk -uzL -uzL +dnm +dnm xiF paE -xJj -tgW -syo +bcm +eFA +bcm wQw cUo ahQ adc fXR -vff -jYh -ybT +cXT +ehY +hqk xqa hMi mtP vmU xgs xPs -xgQ +cXT wsg anC xhp @@ -29515,14 +27018,14 @@ blH hRz vQf eRr -jYM +bcm iJn bhD nGE -gQL +bcm aAE mDA -ybs +bSp biW xrI xrI @@ -29588,7 +27091,7 @@ xrI biW biW biW -xDl +box axw aNv axz @@ -29605,15 +27108,15 @@ dqZ txr ehY cJv -xSv +bSp biW biW -xSv +bSp idL mSG -tgW +eFA kSB -xJj +bcm qQt qQt qQt @@ -29621,46 +27124,46 @@ qQt qQt qQt vps -xJj +bcm uze vXr -xYR +ckN fvd -oce -qFW -syo +hhc +boq +bcm dIg dMC dPO tcA wZJ -syo -tDD +bcm +jFg vEw -nyE +bcm dnz -nyE +bcm dnz -nyE +bcm dnz -top -jYM -xoW +cPP +bcm +cXT vyq vyq jHN -jYM -jYM +bcm +bcm jCc jCc -jYM -ycV -ovg +bcm +bcm +ncr dzb -wva +cfQ kTe jMW -xmq +box biW xrI xrI @@ -29731,27 +27234,27 @@ axA azA bao bka -bAx -xOi +bcm +cXT qRQ -xDl -xDl -xDl -xDl -xDl -yfy -xDl +box +box +box +box +box +xWb +box eqJ -pdE +fHt xKU -xSv -xSv -wJL +bSp +bSp +bcm rCe -qFW -sMN -sMN -sMN +boq +bcm +bcm +bcm quJ qYA sjU @@ -29759,23 +27262,23 @@ sjU sjU qSs vpU -xJj -xJj -xJj +bcm +bcm +bcm xYZ -xJj -xJj +bcm +bcm uPN -syo +bcm lDM dMF dTC -syo +bcm tRB -vff -wKu -ybT -ybT +cXT +ivs +hqk +hqk atR nyl nyl @@ -29796,9 +27299,9 @@ hNU oih fHt ssd -lkM -xMI -lEZ +aAE +mDA +bFJ biW xrI xrI @@ -29872,22 +27375,22 @@ bkL bDf csz wQk -dJw +bFJ dJt bIE snB oMa dhJ -pYY +box hSv -yfE -yfE +ivs +ivs fYx kCL -wJL -sMN -tYL -sMN +bcm +bcm +ncr +bcm uSd plj yfz @@ -29908,35 +27411,35 @@ yfz yfz yfz yfz -sMN -sMN +bcm +bcm wOD -qiO -wKu -wVi +iYS +ivs +fHt oir -ugl -ugl -wpn -ugl -ugl -ugl -ugl -xMI -jJC -xgK -jJC +dTl +dTl +dio +dTl +dTl +dTl +dTl +mDA +iYS +ivs +iYS lNM -xgK -xgK -xgK -xgK -jJC +ivs +ivs +ivs +ivs +iYS fHt kYE -xeT +fgD lhY -vAV +bSp biW xrI xrI @@ -30001,10 +27504,10 @@ xrI xrI apf biW -xDl +box arT azA -xQq +ckN rNK wQk wQk @@ -30012,20 +27515,20 @@ ctr cTQ bls nfl -vFL -vFL -vFL -vFL -dJw +gzl +gzl +gzl +gzl +bFJ eqJ -yfE -jlC -pdE -pdE -uHB +ivs +iNA +fHt +fHt +cXT hRa cIr -ksv +fat yfz yfz oPa @@ -30047,34 +27550,34 @@ yfz xkj itA yfz -ksv +fat qUn -wKu +ivs dot -wVi -xfB +fHt +cfQ qIJ rYt jhS rYt hTl -xfB -xeT -xMI -uyh -uyh -rvz -uqg -wsD -uqg +cfQ +fgD +mDA +bcm +bcm +jkS +cXT +fbQ +cXT fUc -uyh -xgK +bcm +ivs fHt -nhm +bcm eST -xMI -vAV +mDA +bSp xrI xrI xrI @@ -30142,28 +27645,28 @@ xrI xBx asl rqX -xQq -xQq -xQq -xQq +ckN +ckN +ckN +ckN god wRt -pYY +box gHI egz kov fdg -vFL -pYY +gzl +box gPF -xKR -yfE -gKR -pdE +iYS +ivs +dTl +fHt +lmc +eqJ +cJv lmc -mhC -mSV -xEy yfz yfz viZ @@ -30187,32 +27690,32 @@ xkj yfz qQY vbq -wKu -wKu -wVi -rYF +ivs +ivs +fHt +cXT qJT -pCQ +god hbF ieI ufQ -nhm -xeT -xMI -mbJ +bcm +fgD +mDA +iNd gzn cUs rDY vxi isj msP -nnW -xgK +hhc +ivs fHt -rYF +cXT vUA akp -vAV +bSp xrI xrI xrI @@ -30280,7 +27783,7 @@ xrI xBx ati heF -xQq +ckN cAS eKo xpE @@ -30291,17 +27794,17 @@ mxw eiq gbN fHG -gtc +acu mhD nMn -yfE -yfE -jVB +ivs +ivs +cYQ fgD lmc -mhP -mTe -xEy +dio +dTl +lmc yfz yfz qaI @@ -30325,32 +27828,32 @@ yfz xkj qQY vbq -qiO -wKu -wKu -rYF -xAT -uHm +iYS +ivs +ivs +cXT +ctr +ctH hxf dnY -xAT -rSv -xeT -xMI -uqg +ctr +hhc +fgD +mDA +cXT hZN bve -tZZ +acu nCA gbi aof tkB -jJC +iYS fHt -rYF -lkM -xMI -vAV +cXT +aAE +mDA +bSp xrI xrI xrI @@ -30418,10 +27921,10 @@ xrI xBx ato aAH -xQq -xQq -xQq -xQq +ckN +ckN +ckN +ckN cuM cYO scz @@ -30430,16 +27933,16 @@ bKw eSN fIC dkn -pYY +box sIO -yfE -yfE -gKR -wSF +ivs +ivs +dTl +qPB lmc -mjI +blf jpf -xEy +lmc yfz yfz wbL @@ -30463,32 +27966,32 @@ yfz yfz qQY vbq -wKu -wKu +ivs +ivs qPB -rYF +cXT qJT -cBF +cuM qpn -vsS +ulL vhv -nhm -xeT -xMI -mbJ +bcm +fgD +mDA +iNd dqB iuT sYo pYe ixm iFb -mbJ -xgK +iNd +ivs fHt -rYF -xeT +cXT +fgD akp -vAV +bSp xrI xrI xrI @@ -30553,31 +28056,31 @@ xrI xrI xHr biW -xDl +box aud aAJ -xQq +ckN ukm -xTn -xTn +fXm +fXm cwe ctr bls nfl -vFL -vFL -vFL +gzl +gzl +gzl gtN -pYY +box mfT -yfE -wJG -wSF -wSF -uHB +ivs +dot +qPB +qPB +cXT qzU mVG -ksv +fat yfz yfz yfz @@ -30599,34 +28102,34 @@ yfz vAP yfz yfz -ksv +fat pIc nKz -wKu +ivs qPB -xfB +cfQ lFG -ots +aJO fti -ots +aJO vJv -xfB -xeT -xMI -vuv -uyh -uyh -uyh -uqg -uyh -uyh -uyh -xgK +cfQ +fgD +mDA +aEn +bcm +bcm +bcm +cXT +bcm +bcm +bcm +ivs fHt iNd -lkM -xMI -vAV +aAE +mDA +bSp xrI xrI xrI @@ -30694,28 +28197,28 @@ xrI xBx avp aBz -xQq +ckN bar bmt bDI cwU tVa -dJw +bFJ dPP ejA eVf cAP tAV -pYY +box euI -yfE -yfE +ivs +ivs jvA kCM -wJL -tYL +bcm +ncr mXN -sMN +bcm ovl lVi xIU @@ -30737,38 +28240,38 @@ fkc fKF gry nDm -sMN +bcm vYZ -wKu -wKu -wKu +ivs +ivs +ivs atR -xgK -xgK -xgK -xgK -xgK -xgK -xgK -xgK +ivs +ivs +ivs +ivs +ivs +ivs +ivs +ivs ojp -xgK -xgK -xgK -xgK -xgK -xgK -xgK -xgK -xgK -lQk -iNA -xgK -vAV -biW -xrI -qia -xrI +ivs +ivs +ivs +ivs +ivs +ivs +ivs +ivs +ivs +lQk +iNA +ivs +bSp +biW +xrI +qia +xrI xrI xrI xrI @@ -30835,27 +28338,27 @@ aHO azA bac bka -bAx -xOi +bcm +cXT qRQ -xDl -xDl +box +box elF -xDl -xDl -yfy -xDl -evv -wSF +box +box +xWb +box +blf +qPB jnE -xSv -xSv -wJL -wtb -rXP -sMN -sMN -xJg +bSp +bSp +bcm +dBD +boq +bcm +bcm +bcm sVI nFB oPz @@ -30864,24 +28367,24 @@ tDV ulN xIU yfz -slg -wuZ +cfQ +bcm yac bWn sxh -wuZ -wuZ +bcm +bcm mOd -wuZ -wuZ -qCr -ydT +bcm +bcm +ncr +bcm aok -tVB -wKu +hAb +ivs pYN vIB -vVa +pzZ tSZ xXh tSZ @@ -30896,13 +28399,13 @@ wUj wUj wUj wUj -pQh +dii fhO kGq eGd -xgK -jJC -vAV +ivs +iYS +bSp biW xrI xrI @@ -30974,73 +28477,73 @@ aQF bac txr bFh -xTn -xTn +fXm +fXm cRJ -xTn +fXm elK -xTn -xTn -xTn +fXm +fXm +fXm txr -xTH -wSF -xSv +ifO +qPB +bSp biW biW -xSv -xKO -xWW -ndy +bSp +ead +eFA +dAJ vUJ -xJg -qyU -xbj -uZp -xbj +bcm +gbi +ckN +acu +ckN tEJ sQs xIU yfz -uKQ +cXT xIx xom xoR xom jWe -wuZ +bcm vYP tls -wuZ -sjM -ydT -ydT +bcm +fxP +bcm +bcm blf -wKu +ivs pzZ -sjT -vAV -vAV -vAV -vAV -vAV -sjT -wlI -sjT +box +bSp +bSp +bSp +bSp +bSp +box +oWn +box fiO -vAV +bSp aHF maE -rVI -rVI -vAV +aIr +aIr +bSp fiO -sjT -irn -sjT -sjT -vAV -vAV +box +ekB +box +box +bSp +bSp xrI xrI xrI @@ -31121,42 +28624,42 @@ wQk cCN dqZ txr -xTH -fHO -xSv +ifO +bSw +bSp biW biW -xSv +bSp bvh jpn -nGT -rXP -xJg +cYa +boq +bcm bVq rbj -kLI +cAS xMP chk qTr itl xkj uRy -xJv +mGe ycL ebZ oIG lYl -slg +cfQ dAC -xlK -wuZ -xUt -xKO -ydT -tDO -wKu +ksY +bcm +drS +ead +bcm +euI +ivs pzZ -sjT +box xXc xXc xXc @@ -31164,16 +28667,16 @@ biW biW biW biW -vAV -oCv -vAV -tRV +bSp +boq +bSp +oFX wnS dfR -sOJ -vAV -oCv -vAV +mEQ +bSp +boq +bSp biW biW biW @@ -31246,55 +28749,55 @@ biW xXc sjH sjH -xDl +box baT -xDl -vGP +box +box fCn -mFm -yhA +dzc +bka qET bMI qET -yhA +bka gDk -hiF +bka fbQ fbQ -yhG -fZE -kDw -yhG -yhG -yhG -yhG -rXP -xJg -qzu -xJg +bka +bSp +gae +bka +bka +bka +bka +boq +bcm +cfQ +bcm oSc sRc -xJg -nVv -ydT -qCr -wuZ +bcm +fZG +bcm +ncr +bcm waP xom jQw xom -wIl +bao uRy dAC wBe -wuZ -wuZ -xWW -ydT +bcm +bcm +eFA +bcm bTq -wKu +ivs pzZ -sjT +box xXc xXc xXc @@ -31302,16 +28805,16 @@ xrI xrI xrI xrI -vAV -roF -vAV -vAV -vAV -vAV -vAV -vAV -roF -vAV +bSp +oYg +bSp +bSp +bSp +bSp +bSp +bSp +oYg +bSp xrI xrI xrI @@ -31387,52 +28890,52 @@ xXc xXc xXc xXc -vGP +box cxi eFg -dLi +cXT mGe -nFq +dnm haq -yhA -ylG +bka +cYQ hkw ifO -kWn -sDZ +cHJ +cXT jXn kFc lmR mlv xXF -yhG -xWW -nrq +bka +eFA +hhc qAy hKX -xbj +ckN sRd -xJg +bcm qUd -rXP -rXP -wuZ +boq +boq +bcm wbj xoR jau xoR dyZ -wuZ +bcm gYE dAC gbI -wuZ -rXP -qHx +bcm +boq +hhc blf -wKu +ivs pzZ -sjT +box xXc xXc xXc @@ -31525,54 +29028,54 @@ xrI xrI xXc xXc -vGP +box cxq bPH -lMh +bWt mGe bPH -nFq +dnm pcv -ylG -jrR +cYQ +cXT ifO -vmi -jow +iMT +bWt gao oNj mCI mCI mYR -yhG -xWW -xJg +bka +eFA +bcm mCY -xbj -xbj +ckN +ckN sRK -xJg +bcm qVI -rXP -ndy -obJ +boq +dAJ +hhc xKl xqU xoR xom rdX -wuZ +bcm jij oul cCt -wuZ -uko -ydT +bcm +cqb +bcm aAN fOn fOn -xyI -xyI -xyI +box +box +box xXc xrI xrI @@ -31666,51 +29169,51 @@ xXc bFJ aBY aUT -dLi +cXT dPZ -nFq +dnm cmc cDG -ylG -jrR +cYQ +cXT ifO -kWn -sDZ -mXi +cHJ +cXT +gtX xsU -lqk -mnp -naH -yhG -rXP -xJg +cYQ +cAr +cHJ +bka +boq +bcm qBl nFD oTz sSz -xJg +bcm umq -xUt +drS mQf -wuZ +bcm xLH ycN xom sgC igK -wuZ +bcm utM dAC gbI -wuZ -sch -ydT +bcm +pio +bcm hAb -uTg +qPB pUr pUr hIR -fSc +bSp xXc xrI xrI @@ -31803,69 +29306,69 @@ xXc bmG cae xLo -nFq -dLi +dnm +cXT dQg -nFq +dnm wJN pcv -ylG -jrR +cYQ +cXT ifO -kWn +cHJ jpY -mhM -tsS -tsS -tsS +jTE +dii +dii +dii ncv -yhG -xUt -xJg -xJg -xJg -oUp -xJg -xJg -jtw -sjM -rXP -toj -wuZ -wuZ -ukD -wuZ -wuZ -wuZ -wuZ -ukD -wuZ -wuZ -uko -ntE -nVP -nsv -vXK -apm -uTg -fSc -xXc -xrI -xrI -xrI -xrI -xrI -xrI -xrI -xrI -wQi -xrI -xrI -xrI -xrI -xrI -xrI -xrI +bka +drS +bcm +bcm +bcm +ncr +bcm +bcm +cYa +fxP +boq +aEn +bcm +bcm +ncr +bcm +bcm +bcm +bcm +ncr +bcm +bcm +cqb +ntE +blf +nsv +ivs +apm +qPB +bSp +xXc +xrI +xrI +xrI +xrI +xrI +xrI +xrI +xrI +wQi +xrI +xrI +xrI +xrI +xrI +xrI +xrI xrI xrI xrI @@ -31938,55 +29441,55 @@ xrI xrI ohJ xXc -vGP -vGP +box +box bcm aVk -krz +iNd uVb aLi fSA wnV -uXI +aIr dUE ifO -iPn -sDZ +eSl +cXT jCt rYj -lqw +box moR ndk -yhG -xKO -xWW -wtb -ndy -xKO -rXP -xWW -rXP -rXP -xKO -rXP -rXP -xWW -xKO -rXP -ndy -rXP -xUt -xWW +bka +ead +eFA +dBD +dAJ +ead +boq +eFA +boq +boq +ead +boq +boq +eFA +ead +boq +dAJ +boq +drS +eFA hdN -uko -fJY -ydT -nVP +cqb +dUh +bcm +blf kKv -vXK +ivs wRG -uTg -fSc +qPB +bSp xXc xrI xrI @@ -32076,55 +29579,55 @@ xrI xrI ohJ fmR -vGP -xUy -yew +box +bZR +cKf dcs hhc dQh mGE xfO -yhA +bka gEA -dve -uXC +bcm +blf kEn -yhG -yhG -yhG -yhG -njU -yhG -yhG -ydT -ydT -ydT -ydT -ydT -ydT +bka +bka +bka +bka +fCn +bka +bka +bcm +bcm +bcm +bcm +bcm +bcm nvn -ydT -qCr -ydT -ydT -ydT -ydT -ydT -ydT -ydT -ydT -ydT -ydT -ydT -ydT -ydT -ydT -nVP +bcm +ncr +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +bcm +blf rqo -vXK +ivs wRG -uTg -fSc +qPB +bSp xXc xrI xrI @@ -32214,55 +29717,55 @@ xrI xAJ apL fWu -vGP -yhA -fIF -yhA -yhA -yhA -yhA -yhA -yhA -kJK -dve -uXC +box +bka +afj +bka +bka +bka +bka +bka +bka +fZG +bcm +blf iYS -oIv +ivs jXp -oHV +kYE lsy -oXu -oXu +fHt +fHt nHk -oXu -oXu +fHt +fHt mKz -oXu -skN -qWW -qWW -qWW -qWW -qWW +fHt +rNY +fHt +fHt +fHt +fHt +fHt xid -xLY -rVK -rVK +kYE +eqJ +eqJ jXT -rVK -rVK +eqJ +eqJ ieT -rVK +eqJ jnb -qWW +fHt xKY -xLY -rVK +kYE +eqJ eap -vXK +ivs vQp clB -xyI +box xXc xrI xrI @@ -32352,70 +29855,70 @@ fmR fmR fmR fWu -smd +box bHj -lce -mid -qLl -qLl -qLl +ead +dBD +boq +boq +boq fxP -vGB -qLl +drS +boq hlc fiJ -oIv +ivs oJp oJp -oHV +kYE wfB hTO jqT -woQ -woQ -pnn -qCJ +qPB +qPB +bSw +nRL rex -woQ -uTg -uTg -uTg -xES -uTg -uTg -xLY -nVP -nVP -rTu -nVP -nVP +qPB +qPB +qPB +qPB +bSw +qPB +qPB +kYE +blf +blf +iYS +blf +blf otn -nVP +blf hAb -uTg -uTg -xLY -xES -uTg -uTg -vXK -xES -xyI +qPB +qPB +kYE +bSw +qPB +qPB +ivs +bSw +box xXc xXc xrI xrI xrI -ybs +bSp oYg -ybs -ybs -ybs -ybs -ybs -ybs +bSp +bSp +bSp +bSp +bSp +bSp oYg -ybs +bSp xrI xrI xrI @@ -32490,70 +29993,70 @@ fmR fmR fmR fWu -smd +box bHu -pfh -wcJ -vSy -vSy -vSy -vSy -vSy -vSy -vSy +eFA +box +bcm +bcm +bcm +bcm +bcm +bcm +bcm hUt -xPu -xPu -xPu -ylM +cXT +cXT +cXT +iNd fbQ fbQ -jrR +cXT nPx -wff -qAn -wff -wff +bcm +ncr +bcm +bcm sld -wff -wff +bcm +bcm umx -vsE +tVa wla xjS -dxX +cfQ ydu fNa -vXK -vXK +ivs +ivs dJb -dxX +cfQ lri eDu eDu iys -dxX +cfQ csU eDu rhu -vXK -uTg -xyI +ivs +qPB +box xXc biW biW biW biW -ybs -xUc -ybs +bSp +boq +bSp uaW fPG tpj mln -ybs -xUc -ybs +bSp +boq +bSp biW biW biW @@ -32629,73 +30132,73 @@ fmR fmR fWu bmS -smd -wxd -wcJ +box +prD +box bfK yga bWB ldw hIc -xPu +cXT hmG uHf iQT jrx gaw -xPu +cXT hvP hZa jsn -wff +bcm php -mbn -wff +cqb +bcm nNR smw sSC -wff -wff -vsK -wff -wff -wff -wff -wff +bcm +bcm +pjX +bcm +bcm +bcm +bcm +bcm aYI aYI -wff -wff -wff -qAn -xfa -xyI -xyI -xyI -xyI -xyI -ybm +bcm +bcm +bcm +ncr +box +box +box +box +box +box +ivs fEt -ybs -ybs -ybs -xmq -xmq +bSp +bSp +bSp +box +box ekB -xmq -fqV -ybs -szJ +box +fiO +bSp +aIr xYu xYu -szJ -ybs -fqV -xmq +aIr +bSp +fiO +box oWn -xmq -ybs -ybs +box +bSp +bSp biW xrI xrI @@ -32766,7 +30269,7 @@ vQc fmR fmR fWu -smd +box bLb aDS dye @@ -32774,66 +30277,66 @@ uHR bzq fgt eVH -jlF +aIr vGc hmM hUy sAb -kLu +dio eSa fpP lsI hZa -jxj -wff +cgS +bcm aHl -tZJ -wff +dAJ +bcm rgf smG sSZ -wff -usE -xzU -pqq -xjT -xLZ -yjA -wff +bcm +fTH +boq +eFA +lgF +pio +ead +bcm vDN -voa -wff +ivs +bcm rlZ -pqq -eMT -xfa +eFA +drS +box biW biW biW biW -xyI -ybm +box +ivs tmc -wpm -wpm -wpm -wpm -wpm -wpm -wpm +mCI +mCI +mCI +mCI +mCI +mCI +mCI gwf -wpm -wpm -wpm -wpm -wpm -wpm +mCI +mCI +mCI +mCI +mCI +mCI gwf -wpm -wpm -dEO -ybm -ybs +mCI +mCI +bPs +ivs +bSp xrI xrI xrI @@ -32905,73 +30408,73 @@ fmR fmR fWu bmS -smd -rgb -wcJ +box +oYg +box iwx dSO sAb -wZp -fKS -xPu +dTl +cYQ +cXT hnG sAb sAb -wZp +dTl pdK -xPu +cXT hvP hZa -jxj -wff +cgS +bcm wiM -pqq -wff -wff -wff -wff -wff -xzU -tBa -wff -wff -wff -xzU -wff +eFA +bcm +bcm +bcm +bcm +bcm +boq +cYa +bcm +bcm +bcm +boq +bcm qaH sWR -xfa +box xWb -xfa +box qOB -xfa +box xrI xrI xrI aoZ -xyI -ybm +box +ivs aqy -xbI -xbI -xbI -xbI -xbI -xbI -xbI -xbI -xbI -xbI -xbI -xbI -xbI -xbI -xbI -xbI -xbI +dii +dii +dii +dii +dii +dii +dii +dii +dii +dii +dii +dii +dii +dii +dii +dii +dii bGv -ybm -ybs +ivs +bSp xrI xrI xrI @@ -33045,13 +30548,13 @@ fWu yfo yfo cxu -wcJ +box uHR dTJ -wZp +dTl sAb xeQ -ylM +iNd hnR eAe iRm @@ -33061,55 +30564,55 @@ mPI lsN moY nez -lSb +hhc rqp -yjA -xzU -rQF +ead +boq +dBD fLJ -eMT -pqq -yjA -wff +drS +eFA +ead +bcm wll uWM -wff -xzU -wff +bcm +boq +bcm eTf -voa -xTc +ivs +box biW rfV -xzU +boq rfV biW xrI xrI xrI -ybs -ybm -hOX -ybs -ybs -ybs -xmq -xmq +bSp +ivs +eSl +bSp +bSp +bSp +box +box oWn -xmq -fqV -ybs -fHH -pBQ -szJ -szJ -ybs -fqV -xmq +box +fiO +bSp +aHF +maE +aIr +aIr +bSp +fiO +box ekB -xmq -ybs -ybs +box +bSp +bSp xXc xrI xrI @@ -33187,63 +30690,63 @@ dye iwx dSO euB -wZp +dTl fMV gEU hqq -jlF +aIr tOL -wZp +dTl nsc -xPu +cXT oJp iaL xhC -wff +bcm oAm -mbn -tBa +cqb +cYa dtb oYh wFf -tBa -xzU +cYa +boq xni qPq xku -wff -yjA -wff +bcm +ead +bcm ajh sWR dWn -xrI +xXc rfV -xzU +boq rfV xrI xrI xrI xrI -ybs -ybm -qDL -xmq +bSp +ivs +fHt +box xrI biW biW biW biW -ybs -xUc -ybs +bSp +boq +bSp oFX -xtw -tuD +wnS +dfR mEQ -ybs -xUc -ybs +bSp +boq +bSp biW biW biW @@ -33321,67 +30824,67 @@ iDZ fmR fmR sqZ -wcJ +box uHR eAe tUI eAe vUQ -xPu +cXT htq hVs tOL -kLu +dio nsc kFd oJp ihP -jxj -xUS -wff +cgS +dgR +bcm prD -xfa -xfa -xfa -xfa -xfa -xfa -xfa -wly +box +box +box +box +box +box +box +rNK veH xni -xzG -wff +hdN +bcm vDN -voa -xTc +ivs +box biW rfV -otM +fxP rfV biW xrI xrI xXc -ybs -ybm -qDL -xmq +bSp +ivs +fHt +box xrI xrI xrI xrI xrI -ybs +bSp oYg -ybs -ybs -ybs -ybs -ybs -ybs +bSp +bSp +bSp +bSp +bSp +bSp oYg -ybs +bSp xrI xrI xrI @@ -33459,52 +30962,52 @@ iDZ iDZ fmR fmR -vVU +bSp iwx -jlF +aIr eys -jlF +aIr fNM -kPi +hhc htx jzz iRE -ljc +czk kfk -xPu -uXI -ylG +cXT +aIr +cYQ yec -wff +bcm oBm -yjA -xfa +ead +box fmR xAJ bRv fWu fWu -tBa +cYa wtX fpi -wff -xzU -wff -voa +bcm +boq +bcm +ivs mEa -xTc -xfa -xfa +box +box +box cnV -xfa +box xrI xrI xrI biW -xmq -ybm -qDL -xmq +box +ivs +fHt +box xXc xrI xrI @@ -33597,52 +31100,52 @@ xrI xrI xrI iDZ -wcJ +box uft cok -vSy +bcm cok cFb -wcJ -vVU -wcJ -vVU -wcJ -ger -jID +box +bSp +box +bSp +box +elF +bcm ltq vRp -lAU -jID -loD +cXT +bcm +box knL -xfa +box fmR sni vQc fmR fmR -xfa -wff -wff -tBa -tZJ -lSb +box +bcm +bcm +cYa +dAJ +hhc vDN -voa +ivs tcF -wff +bcm soi -xzU -xfa +boq +box biW xrI xrI aoZ -xmq -ybm -qDL -xmq +box +ivs +fHt +box xXc xrI xrI @@ -33735,24 +31238,24 @@ xrI xrI xrI aHM -vVU +bSp vLP -jAQ -ylM -jAQ +dyf +iNd +dyf fOG -vVU +bSp biW biW biW biW -loD +box kFx jZU -ogI +aIr jyu xPQ -loD +box yhb yhb rgM @@ -33760,27 +31263,27 @@ nXO biW vQc fmR -xfa +box wtZ -xzU -pqq -yjA -wff -voa +boq +eFA +ead +bcm +ivs sWR -mjw -wff -wff -qAn -xfa +bcm +bcm +bcm +ncr +box biW xHr xHr biW -xmq -ybm -qDL -xmq +box +ivs +fHt +box xrI xrI xrI @@ -33873,24 +31376,24 @@ xrI xrI xrI xrI -vVU +bSp xlM -tQw +oYg njM -tQw +oYg mxM -vVU +bSp xrI xrI xrI xrI -xVt +bSp kJx xPv ilh usY lDR -loD +box mOn mOn nXO @@ -33899,26 +31402,26 @@ biW vQc uub xWb -xfa -wff -vsK -wff -wff +box +bcm +pjX +bcm +bcm hDt qFx -mjw +bcm xGq qDW tcJ -xTc -xTc -xTc -xTc -xTc -xTc -ybm -qDL -xmq +box +box +box +box +box +box +ivs +fHt +box xrI xrI xrI @@ -34022,13 +31525,13 @@ xrI xrI xrI xrI -loD +box wdt ltw iqy jzI nQK -loD +box vQc xrI xrI @@ -34042,21 +31545,21 @@ vlm wUB yhn wUB -pps -pps -pps +dTl +dTl +dTl wUB -pps +dTl wUB -voa +ivs wUB -voa +ivs wUB -voa +ivs wUB -ybm -qDL -xmq +ivs +fHt +box xXc xrI xrI @@ -34160,13 +31663,13 @@ xrI xrI xrI xrI -kgI -loD -lAU +bmS +box +cXT iwk dEl noc -loD +box xrI xrI xrI @@ -34177,24 +31680,24 @@ uub smh xPH wJk -xNS +dio yhB -xnt +vpr dZC -xnt +vpr yhB -pps +dTl yhB -xNS -voa -voa +dio +ivs +ivs yhB -voa +ivs yhB -voa -ybm -ofK -xmq +ivs +ivs +cJv +box xXc xrI xrI @@ -34299,40 +31802,40 @@ xrI xrI xrI biW -xVt +bSp tPH iAa jAf -xVt +bSp biW biW xHr xHr biW biW -xTc -xTc -xQP -xTc -mjw -mjw -voF -xnt -xnt -xnt -voF +box +box +bSp +box +bcm +bcm +cXT +vpr +vpr +vpr +cXT aEn -mjw +bcm vJn -xQP -xTc -xTc -xTc -xTc -xTc -xmq -xmq -xmq +bSp +box +box +box +box +box +box +box +box xXc xrI xrI @@ -34437,34 +31940,34 @@ xrI xrI xrI biW -xVt +bSp lEo jWn kuq -xVt +bSp biW xrI xrI xrI xrI biW -xTc +box uzv -vsV +isj thx -voF +cXT xOY qMW -ybY -ybY -ybY +mCI +mCI +mCI rgF llS -voF +cXT hCh -rib +ilh iIb -xQP +bSp biW xHr xXc @@ -34575,34 +32078,34 @@ xrI wQi xrI xrI -xVt -xVt +bSp +bSp ppW -xVt -xVt +bSp +bSp xrI xrI xrI xrI xHr biW -xTc +box qYV wFb wua vMa -voa +ivs xEJ -pps -pps -pps +dTl +dTl +dTl xGQ -voa +ivs aYe -qrx +hmM xGQ oJI -xTc +box biW xrI xrI @@ -34724,23 +32227,23 @@ xrI xrI xHr biW -xTc +box qZS vtm wuj -voF -voa +cXT +ivs jys jys jys jys jys -voa -jgQ +ivs +hUt kPV dWA fMM -xTc +box biW xrI xrI @@ -34862,23 +32365,23 @@ xrI xrI xHr biW -xTc +box rao snh -wuY -xTa -nMc +aof +dGn +dii xLw xLw cRR xLw xLw -nMc +dii jeD sLI fLl gMd -xTc +box biW xHr xrI @@ -35000,11 +32503,11 @@ xrI xrI xrI biW -xTc +box uBB gUo sor -voF +cXT wtu jOC jOC @@ -35012,11 +32515,11 @@ jOC jOC jOC wtu -voF -sSb +cXT +ltw czk kxq -xTc +box biW xHr xrI @@ -35138,23 +32641,23 @@ xrI xrI xHr biW -xTc -xQP -xTc +box +bSp +box pfd -xTc +box jTw -xTc -xTR -xQP -xQP -xTc +box +aZs +bSp +bSp +box pfd -xTc +box pur -xTc -xQP -xTc +box +bSp +box biW xHr xrI @@ -35278,19 +32781,19 @@ xHr biW biW biW -xQP +bSp wtu -xQP +bSp wtu -xQP +bSp biW biW biW -xQP +bSp wtu -xQP +bSp wtu -xQP +bSp biW biW biW @@ -35416,19 +32919,19 @@ xrI xrI xrI xrI -xQP +bSp vGv -xQP +bSp vGv -xQP +bSp xrI xrI xrI -xQP +bSp vGv -xQP +bSp owf -xQP +bSp xrI xrI wQi diff --git a/_maps/shuttles/alamo.dmm b/_maps/shuttles/alamo.dmm index 65f4cf7e6ec8b..178c5773e7825 100644 --- a/_maps/shuttles/alamo.dmm +++ b/_maps/shuttles/alamo.dmm @@ -12,7 +12,9 @@ dir = 8 }, /obj/machinery/door/airlock/dropship_hatch/left, -/turf/open/shuttle/dropship/floor, +/turf/open/shuttle/dropship/floor/out{ + dir = 1 + }, /area/shuttle/dropship/alamo) "ad" = ( /obj/structure/dropship_piece/one/front/right, @@ -48,9 +50,6 @@ /obj/machinery/computer/security/dropship/one, /turf/closed/shuttle/dropship1/panel, /area/shuttle/dropship/alamo) -"al" = ( -/turf/open/shuttle/dropship/floor, -/area/shuttle/dropship/alamo) "am" = ( /obj/machinery/computer/dropship_weapons/dropship1, /turf/closed/shuttle/dropship1/panel{ @@ -83,18 +82,13 @@ /turf/closed/shuttle/dropship1/interiorwindow, /area/shuttle/dropship/alamo) "as" = ( +/obj/machinery/light, /obj/structure/bed/chair/dropship/pilot{ dir = 1 }, -/obj/machinery/light, -/turf/open/shuttle/dropship/floor, -/area/shuttle/dropship/alamo) -"at" = ( -/obj/item/radio/intercom/dropship{ - pixel_x = 21; - pixel_y = 16 +/turf/open/shuttle/dropship/floor/out{ + dir = 8 }, -/turf/open/shuttle/dropship/floor, /area/shuttle/dropship/alamo) "au" = ( /obj/structure/bed/chair/dropship/pilot{ @@ -104,7 +98,9 @@ pixel_x = -6; pixel_y = -16 }, -/turf/open/shuttle/dropship/floor, +/turf/open/shuttle/dropship/floor/out{ + dir = 4 + }, /area/shuttle/dropship/alamo) "av" = ( /turf/closed/shuttle/dropship1/interiorwindow{ @@ -135,7 +131,7 @@ /area/shuttle/dropship/alamo) "aC" = ( /obj/machinery/door/airlock/hatch/cockpit, -/turf/open/shuttle/dropship/floor, +/turf/open/shuttle/dropship/floor/out, /area/shuttle/dropship/alamo) "aD" = ( /turf/closed/shuttle/dropship1/interiormisc{ @@ -160,27 +156,33 @@ }, /area/shuttle/dropship/alamo) "aI" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 4 - }, +/obj/structure/bed/chair/dropship/doublewide/left, +/obj/structure/bed/chair/dropship/doublewide/right, /turf/open/shuttle/dropship/floor, /area/shuttle/dropship/alamo) "aJ" = ( -/obj/item/radio/intercom/dropship, -/turf/open/shuttle/dropship/six, +/obj/machinery/vending/nanomed, +/turf/open/shuttle/dropship/nine, /area/shuttle/dropship/alamo) "aK" = ( /turf/open/shuttle/dropship/five, /area/shuttle/dropship/alamo) "aM" = ( -/obj/item/radio/intercom/dropship, -/turf/open/shuttle/dropship/seven, +/obj/structure/bed/chair/dropship/doublewide/left, +/obj/structure/bed/chair/dropship/doublewide/right, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/shuttle/dropship/floor/out{ + dir = 1 + }, /area/shuttle/dropship/alamo) "aN" = ( -/obj/structure/bed/chair/dropship/passenger{ +/obj/structure/bed/chair/dropship/doublewide/right/bravo, +/obj/structure/bed/chair/dropship/doublewide/left/alpha, +/turf/open/shuttle/dropship/floor/out{ dir = 8 }, -/turf/open/shuttle/dropship/floor, /area/shuttle/dropship/alamo) "aO" = ( /turf/closed/shuttle/dropship1/finright{ @@ -204,18 +206,15 @@ "aS" = ( /turf/open/shuttle/dropship/three, /area/shuttle/dropship/alamo) -"aT" = ( -/turf/closed/shuttle/dropship1/aisle, -/area/shuttle/dropship/alamo) "aU" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 8 +/obj/structure/bed/chair/dropship/doublewide/right, +/obj/structure/bed/chair/dropship/doublewide/left, +/obj/machinery/light{ + dir = 4 }, -/obj/machinery/camera/autoname/mainship/dropship_one{ - dir = 8; - pixel_x = 16 +/turf/open/shuttle/dropship/floor/out{ + dir = 1 }, -/turf/open/shuttle/dropship/floor, /area/shuttle/dropship/alamo) "aV" = ( /turf/closed/shuttle/dropship1/finright{ @@ -228,26 +227,25 @@ }, /area/shuttle/dropship/alamo) "aX" = ( -/obj/effect/attach_point/weapon/dropship1{ - dir = 8; - }, -/obj/structure/dropship_piece/one/wing/left/bottom, -/turf/template_noop, +/obj/machinery/vending/snack/alamo, +/turf/open/shuttle/dropship/thirtyeight, /area/shuttle/dropship/alamo) "aY" = ( /turf/closed/shuttle/dropship1/finleft, /area/shuttle/dropship/alamo) "aZ" = ( -/turf/closed/shuttle/dropship1/aisle{ - dir = 4 +/obj/machinery/camera/autoname/mainship/dropship_one{ + pixel_y = 32 }, +/turf/open/shuttle/dropship/five, /area/shuttle/dropship/alamo) "ba" = ( -/turf/closed/shuttle/dropship1/finright, +/obj/structure/bed/chair/dropship/doublewide/fieldcommander, +/turf/open/shuttle/dropship/floor/alt, /area/shuttle/dropship/alamo) "bb" = ( /obj/effect/attach_point/weapon/dropship1{ - dir = 4; + dir = 4 }, /obj/structure/dropship_piece/one/wing/right/bottom, /turf/template_noop, @@ -255,78 +253,56 @@ "bc" = ( /obj/machinery/door/poddoor/shutters/transit, /obj/machinery/door/airlock/dropship_hatch/right, -/turf/open/shuttle/dropship/floor, +/turf/open/shuttle/dropship/floor/out{ + dir = 1 + }, /area/shuttle/dropship/alamo) "bd" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 8 - }, -/obj/machinery/vending/nanomed{ - dir = 8 +/obj/docking_port/mobile/marine_dropship/one, +/turf/closed/shuttle/dropship1/aislewindow{ + dir = 1 }, -/turf/open/shuttle/dropship/floor, /area/shuttle/dropship/alamo) "be" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 4 - }, -/obj/machinery/vending/nanomed{ - dir = 4 - }, -/turf/open/shuttle/dropship/floor, -/area/shuttle/dropship/alamo) -"bg" = ( -/obj/docking_port/mobile/marine_dropship/one, -/turf/closed/shuttle/dropship1/aisle{ - dir = 4 +/obj/machinery/door/poddoor/shutters/transit{ + dir = 8 }, +/obj/machinery/door/airlock/dropship_hatch/left, +/turf/open/shuttle/dropship/floor/out, /area/shuttle/dropship/alamo) "bi" = ( -/turf/closed/shuttle/dropship1/edge{ - dir = 4 - }, +/obj/structure/bed/chair/dropship/doublewide/right, +/obj/structure/bed/chair/dropship/doublewide/left, +/turf/open/shuttle/dropship/floor, /area/shuttle/dropship/alamo) "bj" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 8 - }, /obj/machinery/light{ dir = 4 }, /turf/open/shuttle/dropship/floor, /area/shuttle/dropship/alamo) "bk" = ( -/turf/closed/shuttle/dropship1/aisle{ - dir = 8 +/obj/structure/dropship_piece/one/wing/left/bottom, +/obj/effect/attach_point/weapon/dropship1{ + dir = 4 }, +/turf/template_noop, /area/shuttle/dropship/alamo) "bl" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, /turf/open/shuttle/dropship/floor, /area/shuttle/dropship/alamo) -"bm" = ( -/turf/closed/shuttle/dropship1/edge{ - dir = 8 - }, -/area/shuttle/dropship/alamo) "bn" = ( -/obj/machinery/telecomms/relay/preset/telecomms/onboard, -/turf/closed/shuttle/dropship1/aisle{ - dir = 4 - }, +/turf/open/shuttle/dropship, /area/shuttle/dropship/alamo) "bo" = ( /turf/open/shuttle/dropship/four, /area/shuttle/dropship/alamo) "bp" = ( -/obj/item/radio/intercom/dropship, -/obj/machinery/holopad, -/turf/open/shuttle/dropship/five, +/obj/effect/attach_point/crew_weapon/dropship1, +/turf/open/shuttle/dropship/floor, /area/shuttle/dropship/alamo) "bq" = ( /turf/open/shuttle/dropship/eight, @@ -353,34 +329,20 @@ }, /area/shuttle/dropship/alamo) "bw" = ( -/obj/structure/bed/chair/dropship/passenger, -/turf/open/shuttle/dropship/floor, -/area/shuttle/dropship/alamo) -"bx" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 4 - }, -/obj/machinery/camera/autoname/mainship/dropship_one{ - dir = 4; - pixel_x = -16 - }, -/obj/machinery/vending/nanomed{ - dir = 4 - }, -/turf/open/shuttle/dropship/floor, +/turf/open/shuttle/dropship/eleven, /area/shuttle/dropship/alamo) "by" = ( /turf/closed/shuttle/dropship1/edge/alt, /area/shuttle/dropship/alamo) "bD" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 4 +/obj/structure/bed/chair/dropship/doublewide/left, +/obj/structure/bed/chair/dropship/doublewide/right, +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/camera/autoname/mainship/dropship_one{ - dir = 4; - pixel_x = -16 +/turf/open/shuttle/dropship/floor/out{ + dir = 1 }, -/turf/open/shuttle/dropship/floor, /area/shuttle/dropship/alamo) "bE" = ( /obj/structure/dropship_piece/one/engine/lefttop, @@ -399,8 +361,13 @@ }, /area/shuttle/dropship/alamo) "bI" = ( -/obj/effect/attach_point/crew_weapon/dropship1, -/turf/open/shuttle/dropship/floor, +/obj/machinery/camera/autoname/mainship/dropship_one{ + dir = 8; + pixel_x = 16 + }, +/turf/open/shuttle/dropship/floor/out{ + dir = 1 + }, /area/shuttle/dropship/alamo) "bJ" = ( /turf/closed/shuttle/dropship1/wall, @@ -459,17 +426,10 @@ /turf/closed/shuttle/dropship1/interiormisc, /area/shuttle/dropship/alamo) "bY" = ( -/obj/machinery/door/airlock/multi_tile/mainship/dropshiprear/ds1, -/obj/machinery/door/poddoor/shutters/transit{ - dir = 1 - }, -/turf/open/shuttle/dropship/floor, -/area/shuttle/dropship/alamo) -"bZ" = ( /obj/machinery/door/poddoor/shutters/transit{ dir = 1 }, -/turf/open/shuttle/dropship/floor, +/turf/open/shuttle/dropship/floor/alt, /area/shuttle/dropship/alamo) "ca" = ( /turf/closed/shuttle/dropship1/interiormisc{ @@ -512,56 +472,193 @@ /obj/structure/dropship_piece/one/rearwing/rightrrbottom, /turf/template_noop, /area/shuttle/dropship/alamo) +"di" = ( +/obj/machinery/telecomms/relay/preset/telecomms/onboard/nondense, +/turf/open/shuttle/dropship/five, +/area/shuttle/dropship/alamo) "dS" = ( /turf/closed/shuttle/dropship1/enginetwo{ dir = 4 }, /area/shuttle/dropship/alamo) +"ec" = ( +/obj/machinery/door/poddoor/shutters/transit, +/obj/machinery/door/airlock/dropship_hatch/right, +/turf/open/shuttle/dropship/floor/out, +/area/shuttle/dropship/alamo) +"ez" = ( +/obj/structure/bed/chair/dropship/doublewide/left, +/obj/structure/bed/chair/dropship/doublewide/right, +/obj/structure/closet/walllocker/hydrant/extinguisher{ + dir = 4 + }, +/turf/open/shuttle/dropship/floor/out, +/area/shuttle/dropship/alamo) +"gl" = ( +/turf/open/shuttle/dropship/thirtytwo, +/area/shuttle/dropship/alamo) "gB" = ( /turf/closed/shuttle/dropship1/edge/alt{ dir = 4 }, /area/shuttle/dropship/alamo) -"iV" = ( -/obj/structure/bed/chair/dropship/passenger{ +"hm" = ( +/obj/structure/bed/chair/dropship/doublewide/left, +/obj/structure/bed/chair/dropship/doublewide/right, +/obj/item/radio/intercom/dropship{ dir = 4 }, -/obj/structure/closet/walllocker/hydrant/extinguisher{ +/turf/open/shuttle/dropship/floor, +/area/shuttle/dropship/alamo) +"ie" = ( +/obj/machinery/door/poddoor/shutters/transit{ + dir = 1 + }, +/turf/open/shuttle/dropship/floor/out{ + dir = 4 + }, +/area/shuttle/dropship/alamo) +"ji" = ( +/obj/structure/bed/chair/dropship/doublewide/left, +/obj/structure/bed/chair/dropship/doublewide/right, +/obj/item/radio/intercom/dropship{ + dir = 8 + }, +/turf/open/shuttle/dropship/floor/out{ + dir = 8 + }, +/area/shuttle/dropship/alamo) +"jI" = ( +/obj/structure/bed/chair/dropship/doublewide/left, +/obj/structure/bed/chair/dropship/doublewide/right, +/turf/open/shuttle/dropship/floor/out{ + dir = 1 + }, +/area/shuttle/dropship/alamo) +"jS" = ( +/turf/closed/shuttle/dropship1/aislewindow{ + dir = 8 + }, +/area/shuttle/dropship/alamo) +"li" = ( +/turf/closed/shuttle/dropship1/aislewindow{ dir = 4 }, +/area/shuttle/dropship/alamo) +"me" = ( +/obj/structure/bed/chair/dropship/doublewide/left, +/obj/structure/bed/chair/dropship/doublewide/right, +/turf/open/shuttle/dropship/floor/out, +/area/shuttle/dropship/alamo) +"nt" = ( +/obj/structure/bed/chair/dropship/doublewide/left, +/obj/structure/bed/chair/dropship/doublewide/right, +/turf/open/shuttle/dropship/floor/out{ + dir = 4 + }, +/area/shuttle/dropship/alamo) +"nO" = ( +/obj/machinery/holopad, /turf/open/shuttle/dropship/floor, /area/shuttle/dropship/alamo) +"og" = ( +/obj/structure/bed/chair/dropship/doublewide/right/delta, +/obj/structure/bed/chair/dropship/doublewide/left/charlie, +/turf/open/shuttle/dropship/floor/out{ + dir = 4 + }, +/area/shuttle/dropship/alamo) +"oO" = ( +/obj/machinery/vending/nanomed{ + dir = 4 + }, +/turf/open/shuttle/dropship/thirtyeight, +/area/shuttle/dropship/alamo) +"pw" = ( +/turf/open/shuttle/dropship/thirtythree, +/area/shuttle/dropship/alamo) +"sk" = ( +/turf/open/shuttle/dropship/thirtyseven, +/area/shuttle/dropship/alamo) +"tf" = ( +/turf/open/shuttle/dropship/thirtysix, +/area/shuttle/dropship/alamo) "vw" = ( /obj/structure/dropship_piece/one/engine/leftbottom, /turf/template_noop, /area/shuttle/dropship/alamo) +"vQ" = ( +/turf/open/shuttle/dropship/floor/out, +/area/shuttle/dropship/alamo) +"yv" = ( +/turf/closed/shuttle/dropship1/finright, +/area/shuttle/dropship/alamo) "yA" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 8 +/turf/open/shuttle/dropship/floor/alt{ + dir = 1 }, -/obj/structure/closet/walllocker/hydrant/extinguisher{ +/area/shuttle/dropship/alamo) +"Aq" = ( +/turf/open/shuttle/dropship/thirtyfour, +/area/shuttle/dropship/alamo) +"Bi" = ( +/obj/machinery/door/poddoor/shutters/transit{ + dir = 1 + }, +/obj/machinery/door/airlock/multi_tile/mainship/dropshiprear/ds1, +/turf/open/shuttle/dropship/floor/out{ dir = 8 }, -/turf/open/shuttle/dropship/floor, /area/shuttle/dropship/alamo) "Dp" = ( /turf/open/shuttle/dropship/ten, /area/shuttle/dropship/alamo) +"DE" = ( +/turf/open/shuttle/dropship/nine, +/area/shuttle/dropship/alamo) "FA" = ( /turf/closed/shuttle/dropship1/enginetwo{ dir = 8 }, /area/shuttle/dropship/alamo) +"IA" = ( +/obj/machinery/camera/autoname/mainship/dropship_one{ + dir = 4; + pixel_x = -16 + }, +/turf/open/shuttle/dropship/floor/out{ + dir = 1 + }, +/area/shuttle/dropship/alamo) "Ki" = ( /obj/machinery/computer/shuttle/marine_dropship/one, /turf/closed/shuttle/dropship1/panel{ dir = 1 }, /area/shuttle/dropship/alamo) +"MG" = ( +/turf/closed/shuttle/dropship1/aislewindow, +/area/shuttle/dropship/alamo) +"Nj" = ( +/turf/open/shuttle/dropship/thirtyone, +/area/shuttle/dropship/alamo) +"OZ" = ( +/obj/machinery/vending/nanomed{ + dir = 8 + }, +/turf/open/shuttle/dropship/thirtynine, +/area/shuttle/dropship/alamo) "QK" = ( /obj/structure/dropship_piece/one/engine/rightbottom, /turf/template_noop, /area/shuttle/dropship/alamo) +"VW" = ( +/turf/open/shuttle/dropship/thirtyfive, +/area/shuttle/dropship/alamo) +"Yd" = ( +/obj/machinery/vending/cola/alamo, +/turf/open/shuttle/dropship/thirtynine, +/area/shuttle/dropship/alamo) "Zx" = ( /turf/closed/shuttle/dropship1/wall{ dir = 1 @@ -576,7 +673,7 @@ ao ao aG aQ -aX +bk ao ao ao @@ -600,10 +697,10 @@ ay aH aR aY -ac +bu +be ac bu -bi bu bt bF @@ -620,14 +717,14 @@ ao ao aq aE -aI +aX bD -aI -al -al -aI -aI -aI +hm +ez +Dp +bw +bD +me br bu bu @@ -645,17 +742,17 @@ ar aE aJ aS +Nj aS -aS -aS -aS +Aq +tf aS bo -aI -bx -iV +nt +oO +IA bl -aI +vQ bX cc cg @@ -666,20 +763,20 @@ af ak as aB -aK -bj -aN -bd -yA +aZ aN -bj -Dp -aS -aS +aK +jI +aI +aI +me +DE aS +sk aS aS -bY +pw +Bi ao ao "} @@ -687,22 +784,22 @@ ao ab ag Ki -at +yA aC -aK -aT bn -aZ -aZ -bg -bk +ba +di +jS +li +bd +MG +aK +jI +aK bp -bw -bI -al -al -al -bZ +nO +Dp +bY ao ao "} @@ -713,19 +810,19 @@ am au aD aK -bl +og +aK +jI aI -be -iV aI -bl -Dp -aS +me +DE aS +sk aS aS -aS -bZ +Aq +ie ao ao "} @@ -735,19 +832,19 @@ ai an av aE -aM -aS -aS -aS +aJ aS +gl aS +pw +VW aS bq -aN -bd -yA +ji +OZ +bI bj -aN +vQ ca cd ci @@ -758,14 +855,14 @@ ao ao aw aE -aN +Yd aU -aN -al -al -aN -aN -aN +bi +me +Dp +bw +aM +me bv by by @@ -783,11 +880,11 @@ ax aF aO aV -ba -bc +yv +gB bc +ec gB -bm by bs bE diff --git a/code/__DEFINES/_math.dm b/code/__DEFINES/_math.dm index 6393e6d6d5ab6..a70f94442e306 100644 --- a/code/__DEFINES/_math.dm +++ b/code/__DEFINES/_math.dm @@ -7,8 +7,8 @@ #define CARDINAL_DIRS list(1,2,4,8) #define CARDINAL_ALL_DIRS list(1,2,4,5,6,8,9,10) -#define get_dist_euclide_square(A, B) (A && B ? A.z == B.z ? (A.x - B.x)**2 + (A.y - B.y)**2 : INFINITY : INFINITY) -#define get_dist_euclide(A, B) (sqrt(get_dist_euclide_square(A, B))) +#define get_dist_euclidean_square(A, B) (A && B ? A.z == B.z ? (A.x - B.x)**2 + (A.y - B.y)**2 : INFINITY : INFINITY) +#define get_dist_euclidean(A, B) (sqrt(get_dist_euclidean_square(A, B))) #define LEFT 1 #define RIGHT 2 diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index 5bb076768fdf2..7324c18a3cb66 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -31,6 +31,13 @@ #define BLACKNESS_PLANE 0 //To keep from conflicts with SEE_BLACKNESS internals +//Float layers. These layer over normal layers, but a high float layer will layer over a lower float layer (i.e. -1 over -2) +#define BELOW_FLOAT_LAYER -2 +#define STANDARD_FLOAT_LAYER -1 +#define ABOVE_FLOAT_LAYER -0.9 +#define HIGH_FLOAT_LAYER -0.8 +#define VERY_HIGH_FLOAT_LAYER -0.7 + #define SPACE_LAYER 1.8 #define UNDER_TURF_LAYER 1.99 diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm index 48b58bda5fe01..a29622e6386ba 100644 --- a/code/__DEFINES/loadout.dm +++ b/code/__DEFINES/loadout.dm @@ -138,6 +138,7 @@ GLOBAL_LIST_INIT(leader_gear_listed_products, list( /obj/item/explosive/grenade/smokebomb/cloak = list(CAT_LEDSUP, "Cloak grenade", 7, "black"), /obj/item/explosive/grenade/incendiary = list(CAT_LEDSUP, "M40 HIDP incendiary grenade", 3, "black"), /obj/item/storage/pouch/explosive/razorburn = list(CAT_LEDSUP, "Pack of Razorburn grenades", 24, "orange"), + /obj/item/storage/pouch/explosive/antigas = list(CAT_LEDSUP, "Pack of M40-AG Antigas grenades", 16, "orange"), /obj/item/explosive/grenade/chem_grenade/razorburn_large = list(CAT_LEDSUP, "Razorburn canister", 21, "black"), /obj/item/explosive/grenade/chem_grenade/razorburn_small = list(CAT_LEDSUP, "Razorburn grenade", 6, "black"), /obj/item/weapon/gun/flamer/big_flamer/marinestandard = list(CAT_LEDSUP, "FL-84 flamethrower", 12, "black"), @@ -161,6 +162,7 @@ GLOBAL_LIST_INIT(commander_gear_listed_products, list( /obj/item/explosive/grenade/smokebomb/cloak = list(CAT_FCSUP, "Cloak grenade", 7, "black"), /obj/item/explosive/grenade/incendiary = list(CAT_FCSUP, "M40 HIDP incendiary grenade", 3, "black"), /obj/item/storage/pouch/explosive/razorburn = list(CAT_FCSUP, "Pack of Razorburn grenades", 24, "orange"), + /obj/item/storage/pouch/explosive/antigas = list(CAT_FCSUP, "Pack of M40-AG Antigas grenades", 16, "orange"), /obj/item/explosive/grenade/chem_grenade/razorburn_large = list(CAT_FCSUP, "Razorburn canister", 21, "black"), /obj/item/explosive/grenade/chem_grenade/razorburn_small = list(CAT_FCSUP, "Razorburn grenade", 6, "black"), /obj/item/weapon/gun/flamer/big_flamer/marinestandard = list(CAT_FCSUP, "FL-84 flamethrower", 12, "black"), diff --git a/code/controllers/subsystem/advanced_pathfinding.dm b/code/controllers/subsystem/advanced_pathfinding.dm index 4a806e1b4d65b..8927d57b9c9ac 100644 --- a/code/controllers/subsystem/advanced_pathfinding.dm +++ b/code/controllers/subsystem/advanced_pathfinding.dm @@ -82,8 +82,8 @@ GLOBAL_LIST_EMPTY(goal_nodes) /datum/path_step/New(atom/previous_atom, atom/current_atom, atom/goal_atom, old_distance_walked) ..() - distance_to_goal = get_dist_euclide_square(current_atom, goal_atom) - distance_walked = old_distance_walked + get_dist_euclide_square(current_atom, previous_atom) + distance_to_goal = get_dist_euclidean_square(current_atom, goal_atom) + distance_walked = old_distance_walked + get_dist_euclidean_square(current_atom, previous_atom) src.current_atom = current_atom src.previous_atom = previous_atom diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index 7de63af46442f..ceffa80a8e66a 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -363,7 +363,7 @@ SUBSYSTEM_DEF(persistence) name = "Explosive Heavy Weapons" description = "Flak cannon and Recoilless guns for roundstart vendors." item_list = list( - /obj/item/weapon/gun/heavy_isg = 1, + /obj/structure/largecrate/supply/weapons/heavy_flakgun = 1, /obj/item/ammo_magazine/heavy_isg/he = 8, /obj/item/ammo_magazine/heavy_isg/sabot = 5, /obj/item/storage/holster/backholster/rpg/full = 2, diff --git a/code/controllers/subsystem/weeds.dm b/code/controllers/subsystem/weeds.dm index a3493b74e057e..9e2357ff1b107 100644 --- a/code/controllers/subsystem/weeds.dm +++ b/code/controllers/subsystem/weeds.dm @@ -69,7 +69,7 @@ SUBSYSTEM_DEF(weeds) return FALSE for(var/turf/T AS in node.node_turfs) - if(pending[T] && (get_dist_euclide_square(node, T) >= get_dist_euclide_square(get_step(pending[T], 0), T))) + if(pending[T] && (get_dist_euclidean_square(node, T) >= get_dist_euclidean_square(get_step(pending[T], 0), T))) continue pending[T] = node spawn_attempts_by_node[T] = 5 //5 attempts maximum @@ -92,7 +92,7 @@ SUBSYSTEM_DEF(weeds) if(istype(O, /obj/alien/weeds/node)) return var/obj/alien/weeds/weed = O - if(weed.parent_node && weed.parent_node != node && get_dist_euclide_square(node, weed) >= get_dist_euclide_square(weed.parent_node, weed)) + if(weed.parent_node && weed.parent_node != node && get_dist_euclidean_square(node, weed) >= get_dist_euclidean_square(weed.parent_node, weed)) return if((weed.type == weed_to_spawn) && (weed.color_variant == node.color_variant)) weed.set_parent_node(node) diff --git a/code/datums/actions/action.dm b/code/datums/actions/action.dm index 99eceb77a0a81..bcff31422087f 100644 --- a/code/datums/actions/action.dm +++ b/code/datums/actions/action.dm @@ -61,6 +61,7 @@ KEYBINDINGS target = null return ..() +/// Cleans up the action if the owner is deleted /datum/action/proc/clean_action() SIGNAL_HANDLER SHOULD_CALL_PARENT(TRUE) diff --git a/code/datums/components/beacon.dm b/code/datums/components/beacon.dm index 7c8f27bb0e06f..7a6403512c424 100644 --- a/code/datums/components/beacon.dm +++ b/code/datums/components/beacon.dm @@ -120,7 +120,7 @@ var/marker_flags = GLOB.faction_to_minimap_flag[user.faction] if(!marker_flags) marker_flags = MINIMAP_FLAG_MARINE - SSminimaps.add_marker(source, marker_flags, image('icons/UI_icons/map_blips.dmi', null, "supply")) + SSminimaps.add_marker(source, marker_flags, image('icons/UI_icons/map_blips.dmi', null, "supply", ABOVE_FLOAT_LAYER)) message_admins("[ADMIN_TPMONTY(user)] set up a supply beacon.") //do something with this playsound(source, 'sound/machines/twobeep.ogg', 15, 1) diff --git a/code/datums/fire_support.dm b/code/datums/fire_support.dm index da16c6083b3b5..4a1c3935502b8 100644 --- a/code/datums/fire_support.dm +++ b/code/datums/fire_support.dm @@ -231,6 +231,7 @@ initiate_chat_message = "TARGET ACQUIRED SENTRY POD LAUNCHING." initiate_screen_message = "Co-ordinates confirmed, sentry pod launching." initiate_sound = null + portrait_type = /atom/movable/screen/text/screen_text/picture/potrait/pod_officer start_visual = null start_sound = null cooldown_duration = 1 SECONDS @@ -328,7 +329,7 @@ initiate_screen_message = "Coordinates confirmed, high explosive inbound!" initiate_title = "Rhino-1" initiate_sound = 'sound/weapons/guns/misc/mortar_travel.ogg' - portrait_type = /atom/movable/screen/text/screen_text/picture/potrait + portrait_type = /atom/movable/screen/text/screen_text/picture/potrait/tgmc_mortar start_visual = null start_sound = 'sound/weapons/guns/misc/mortar_long_whistle.ogg' @@ -391,7 +392,7 @@ icon_state = "acid_smoke_mortar" initiate_chat_message = "COORDINATES CONFIRMED. MORTAR BARRAGE INCOMING." initiate_screen_message = "Coordinates confirmed, acid smoke inbound!" - smoketype = /datum/effect_system/smoke_spread/xeno/acid + smoketype = /datum/effect_system/smoke_spread/xeno/acid/opaque smokeradius = 5 /datum/fire_support/mortar/smoke/satrapine @@ -401,6 +402,7 @@ icon_state = "satrapine_mortar" initiate_chat_message = "COORDINATES CONFIRMED. MORTAR BARRAGE INCOMING." initiate_screen_message = "Coordinates confirmed, satrapine inbound!" + portrait_type = /atom/movable/screen/text/screen_text/picture/potrait/som_mortar smoketype = /datum/effect_system/smoke_spread/satrapine smokeradius = 5 diff --git a/code/datums/gamemodes/campaign.dm b/code/datums/gamemodes/campaign.dm index dadbd279e32c3..e3c0cbbfad0b8 100644 --- a/code/datums/gamemodes/campaign.dm +++ b/code/datums/gamemodes/campaign.dm @@ -29,6 +29,8 @@ var/list/datum/faction_stats/stat_list = list() ///List of death times by ckey. Used for respawn time var/list/player_death_times = list() + ///List of timers to auto open the respawn window + var/list/respawn_timers = list() /datum/game_mode/hvh/campaign/announce() to_chat(world, "The current game mode is - Campaign!") @@ -196,15 +198,31 @@ if(!(player.faction in factions)) return player_death_times[player.ckey] = world.time + respawn_timers[player.ckey] = addtimer(CALLBACK(src, PROC_REF(auto_attempt_respawn), player.ckey), CAMPAIGN_RESPAWN_TIME + stat_list[player.faction]?.respawn_delay_modifier + 1, TIMER_STOPPABLE) + +///Auto pops up the respawn window +/datum/game_mode/hvh/campaign/proc/auto_attempt_respawn(respawnee_ckey) + for(var/mob/player AS in GLOB.player_list) + if(player.ckey != respawnee_ckey) + continue + respawn_timers[respawnee_ckey] = null + if(isliving(player) && player.stat != DEAD) + return + player_respawn(player) + return ///Wrapper for cutting the deathlist via timer due to the players not immediately returning to base /datum/game_mode/hvh/campaign/proc/cut_death_list_timer(datum/source) SIGNAL_HANDLER addtimer(CALLBACK(src, PROC_REF(cut_death_list)), AFTER_MISSION_TELEPORT_DELAY + 1) -///cuts the death time list at mission end +///cuts the death time and respawn_timers list at mission end /datum/game_mode/hvh/campaign/proc/cut_death_list(datum/source) player_death_times.Cut() + for(var/ckey in respawn_timers) + auto_attempt_respawn(ckey) //Faction datum doesn't pop up for ghosts + deltimer(respawn_timers[ckey]) + respawn_timers.Cut() ///respawns the player if attrition points are available /datum/game_mode/hvh/campaign/proc/attempt_attrition_respawn(mob/candidate) diff --git a/code/datums/gamemodes/campaign/faction_stats.dm b/code/datums/gamemodes/campaign/faction_stats.dm index 614409ab73a3a..18c3079d2e742 100644 --- a/code/datums/gamemodes/campaign/faction_stats.dm +++ b/code/datums/gamemodes/campaign/faction_stats.dm @@ -144,6 +144,9 @@ GLOBAL_LIST_INIT(campaign_mission_pool, list( get_player_stats(new_member) var/datum/action/campaign_loadout/loadouts = new loadouts.give_action(new_member) + if(!(new_member.job.job_cost)) + return + loadouts.action_activate() ///Returns a users individual stat datum, generating a new one if required /datum/faction_stats/proc/get_player_stats(mob/user) diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm index 05083144067a8..fb8b8600f6af5 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/head.dm @@ -9,8 +9,8 @@ jobs_supported = list(SOM_SQUAD_CORPSMAN) /datum/loadout_item/helmet/som_standard/medic/post_equip(mob/living/carbon/human/wearer, datum/outfit/quick/loadout) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_HEAD) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_HEAD) /datum/loadout_item/helmet/som_veteran name = "Veteran helmet" diff --git a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage.dm b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage.dm index f4079266faa98..d3fbd34ef6931 100644 --- a/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage.dm +++ b/code/datums/gamemodes/campaign/loadout_items/SOM/suit_storage.dm @@ -513,10 +513,10 @@ wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade/dragonbreath, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/micro_grenade, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_medic/mpi @@ -537,9 +537,9 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_medic/carbine @@ -561,10 +561,10 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_medic/smg name = "V-21" @@ -588,9 +588,9 @@ wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) /datum/loadout_item/suit_store/main_gun/som_medic/flechette_shotgun @@ -613,9 +613,9 @@ wearer.equip_to_slot_or_del(new /obj/item/storage/box/MRE/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/explosive/grenade/som, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/oxycodone, SLOT_IN_BACKPACK) - wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/russian_red, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/quickclotplus, SLOT_IN_BACKPACK) + wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) wearer.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/peridaxon_plus, SLOT_IN_BACKPACK) //Veteran diff --git a/code/datums/gamemodes/campaign/loadout_items/_TGMC/gloves.dm b/code/datums/gamemodes/campaign/loadout_items/_TGMC/gloves.dm index a4796ba73f0e9..ba80a309e78e2 100644 --- a/code/datums/gamemodes/campaign/loadout_items/_TGMC/gloves.dm +++ b/code/datums/gamemodes/campaign/loadout_items/_TGMC/gloves.dm @@ -53,7 +53,7 @@ //corpsman /datum/loadout_item/gloves/defib_gloves name = "Defib gloves" - desc = "Advanced medical gloves, these include small electrodes to defibrilate a patiant. No more bulky units!" + desc = "Advanced medical gloves, these include small electrodes to defibrilate a patient No more bulky units!" purchase_cost = 50 item_typepath = /obj/item/clothing/gloves/defibrillator jobs_supported = list(SQUAD_CORPSMAN) diff --git a/code/datums/gamemodes/campaign/missions/asat_capture.dm b/code/datums/gamemodes/campaign/missions/asat_capture.dm index a17748ca315a8..f5da116646ff0 100644 --- a/code/datums/gamemodes/campaign/missions/asat_capture.dm +++ b/code/datums/gamemodes/campaign/missions/asat_capture.dm @@ -7,7 +7,7 @@ map_traits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_RAIN = TRUE) map_light_colours = list(LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN) mission_flags = MISSION_DISALLOW_TELEPORT - max_game_time = 10 MINUTES + max_game_time = 8 MINUTES shutter_open_delay = list( MISSION_STARTING_FACTION = 90 SECONDS, MISSION_HOSTILE_FACTION = 0, diff --git a/code/datums/gamemodes/campaign/missions/fire_support_raid.dm b/code/datums/gamemodes/campaign/missions/fire_support_raid.dm index 15ddd34ebf70a..927f84368d3e5 100644 --- a/code/datums/gamemodes/campaign/missions/fire_support_raid.dm +++ b/code/datums/gamemodes/campaign/missions/fire_support_raid.dm @@ -7,8 +7,9 @@ map_file = '_maps/map_files/Campaign maps/jungle_outpost/jungle_outpost.dmm' map_traits = list(ZTRAIT_AWAY = TRUE, ZTRAIT_RAIN = TRUE) map_light_colours = list(LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN, LIGHT_COLOR_PALE_GREEN) + max_game_time = 10 MINUTES objectives_total = 9 - min_destruction_amount = 6 + min_destruction_amount = 7 shutter_open_delay = list( MISSION_STARTING_FACTION = 90 SECONDS, MISSION_HOSTILE_FACTION = 0, @@ -102,5 +103,5 @@ map_light_colours = list(COLOR_MISSION_RED, COLOR_MISSION_RED, COLOR_MISSION_RED, COLOR_MISSION_RED) map_light_levels = list(225, 150, 100, 75) objectives_total = 5 - min_destruction_amount = 3 + min_destruction_amount = 4 hostile_faction_additional_rewards = "Protect our fire support options to ensure continued access to mortar support. Combat robots and fire support is available if you successfully defend this outpost." diff --git a/code/datums/gamemodes/campaign/missions/mech_wars.dm b/code/datums/gamemodes/campaign/missions/mech_wars.dm index 9c34a2a8ac380..3926e88664a15 100644 --- a/code/datums/gamemodes/campaign/missions/mech_wars.dm +++ b/code/datums/gamemodes/campaign/missions/mech_wars.dm @@ -39,7 +39,7 @@ spawner = pick(GLOB.campaign_mech_spawners[faction]) new_mech = spawner.spawn_mech() GLOB.campaign_structures += new_mech - RegisterSignal(new_mech, COMSIG_QDELETING, TYPE_PROC_REF(/datum/campaign_mission, remove_mission_object)) + RegisterSignal(new_mech, COMSIG_QDELETING, PROC_REF(on_mech_destruction)) //anti mech infantry weapons if(i % 2) @@ -75,6 +75,17 @@ winning_team.add_asset(/datum/campaign_asset/mech/heavy/som) winning_team.add_asset(/datum/campaign_asset/mech/som) +///Cleans up after a mech is destroyed +/datum/campaign_mission/tdm/mech_wars/proc/on_mech_destruction(obj/vehicle/sealed/mecha/combat/greyscale/dead_mech) + SIGNAL_HANDLER + remove_mission_object(dead_mech) + if(outcome) + return + if(dead_mech.faction == hostile_faction) + start_team_cap_points += 10 + else if(dead_mech.faction == starting_faction) + hostile_team_cap_points += 10 + //mech spawn points /obj/effect/landmark/campaign/mech_spawner name = "tgmc med mech spawner" diff --git a/code/datums/gamemodes/campaign/rewards/reserves.dm b/code/datums/gamemodes/campaign/rewards/reserves.dm index 2d5a3a2ade497..558c4e2d9db7f 100644 --- a/code/datums/gamemodes/campaign/rewards/reserves.dm +++ b/code/datums/gamemodes/campaign/rewards/reserves.dm @@ -52,7 +52,13 @@ for(var/mob/candidate AS in GLOB.player_list) if(candidate.faction != faction.faction) continue + if(candidate.stat != DEAD) + continue mode.player_death_times -= candidate.ckey + deltimer(mode.respawn_timers[candidate.ckey]) + mode.respawn_timers[candidate.ckey] = null + mode.player_respawn(candidate) + to_chat(candidate, "Tactical reserves mobilised. You can now respawn immediately if possible.") candidate.playsound_local(null, 'sound/ambience/votestart.ogg', 50) diff --git a/code/datums/quick_load_beginners.dm b/code/datums/quick_load_beginners.dm index e72e55638cfec..c2554da595670 100644 --- a/code/datums/quick_load_beginners.dm +++ b/code/datums/quick_load_beginners.dm @@ -322,7 +322,7 @@ belt = /obj/item/storage/belt/grenade mask = /obj/item/clothing/mask/gas w_uniform = /obj/item/clothing/under/marine/corpman_vest - head = /obj/item/clothing/head/modular/m10x/antenna + head = /obj/item/clothing/head/modular/m10x/hod shoes = /obj/item/clothing/shoes/marine l_hand = /obj/item/paper/tutorial/beginner_chad @@ -435,7 +435,7 @@ /datum/outfit/quick/beginner/engineer/burnitall name = "Flamethrower" - desc = "For those who truly love to watch the world burn. Equipped with a laser and a flamethrower, you can be certain that none of your enemies will be left un-burnt." + desc = "For those who truly love to watch the world burn. Equipped with a laser carbine and a flamethrower, you can be certain that none of your enemies will be left un-burnt." suit_store = /obj/item/weapon/gun/energy/lasgun/lasrifle/standard_marine_carbine/beginner wear_suit = /obj/item/clothing/suit/modular/xenonauten/engineer @@ -645,7 +645,8 @@ human.equip_to_slot_or_del(new /obj/item/stack/medical/heal_pack/ointment, SLOT_IN_ACCESSORY) human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/plasma_pistol, SLOT_IN_BACKPACK) - human.equip_to_slot_or_del(new /obj/item/tool/extinguisher, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/explosive/grenade/smokebomb/cloak, SLOT_IN_BACKPACK) + human.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, SLOT_IN_BACKPACK) human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) human.equip_to_slot_or_del(new /obj/item/ammo_magazine/standard_smartmachinegun, SLOT_IN_BACKPACK) diff --git a/code/game/atoms/atom_movable.dm b/code/game/atoms/atom_movable.dm index b769bf8613dbc..c7557084e7b38 100644 --- a/code/game/atoms/atom_movable.dm +++ b/code/game/atoms/atom_movable.dm @@ -565,7 +565,7 @@ if(dist_x > dist_y) var/error = dist_x/2 - dist_y - while(!gc_destroyed && target &&((((x < target.x && dx == EAST) || (x > target.x && dx == WEST)) && get_dist_euclide(origin, src) < range) || isspaceturf(loc)) && throwing && istype(loc, /turf)) + while(!gc_destroyed && target &&((((x < target.x && dx == EAST) || (x > target.x && dx == WEST)) && get_dist_euclidean(origin, src) < range) || isspaceturf(loc)) && throwing && istype(loc, /turf)) // only stop when we've gone the whole distance (or max throw range) and are on a non-space tile, or hit something, or hit the end of the map, or someone picks it up if(error < 0) var/atom/step = get_step(src, dy) @@ -591,7 +591,7 @@ sleep(0.1 SECONDS) else var/error = dist_y/2 - dist_x - while(!gc_destroyed && target &&((((y < target.y && dy == NORTH) || (y > target.y && dy == SOUTH)) && get_dist_euclide(origin, src) < range) || isspaceturf(loc)) && throwing && istype(loc, /turf)) + while(!gc_destroyed && target &&((((y < target.y && dy == NORTH) || (y > target.y && dy == SOUTH)) && get_dist_euclidean(origin, src) < range) || isspaceturf(loc)) && throwing && istype(loc, /turf)) // only stop when we've gone the whole distance (or max throw range) and are on a non-space tile, or hit something, or hit the end of the map, or someone picks it up if(error < 0) var/atom/step = get_step(src, dx) diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm index 3b142a9ca0002..8b153fb590a7e 100644 --- a/code/game/objects/effects/effect_system/smoke.dm +++ b/code/game/objects/effects/effect_system/smoke.dm @@ -297,9 +297,9 @@ //////////////////////////////////// /obj/effect/particle_effect/smoke/antigas - alpha = 25 + alpha = 65 opacity = FALSE - color = "#030101" + color = "#1b1b1b" smoke_traits = SMOKE_PURGER ////////////////////////////////////// @@ -350,30 +350,36 @@ //Xeno acid smoke. /obj/effect/particle_effect/smoke/xeno/burn lifetime = 6 + alpha = 120 + opacity = FALSE color = "#86B028" //Mostly green? - smoke_traits = SMOKE_XENO|SMOKE_XENO_ACID|SMOKE_GASP|SMOKE_COUGH|SMOKE_HUGGER_PACIFY + smoke_traits = SMOKE_XENO|SMOKE_XENO_ACID|SMOKE_GASP|SMOKE_COUGH + +//Used for smokebomb nades. +/obj/effect/particle_effect/smoke/xeno/burn/opaque + alpha = 255 + opacity = TRUE //Xeno light acid smoke.for acid huggers /obj/effect/particle_effect/smoke/xeno/burn/light lifetime = 4 //Lasts for less time - alpha = 60 - opacity = FALSE - smoke_traits = SMOKE_XENO|SMOKE_XENO_ACID|SMOKE_GASP|SMOKE_COUGH //Xeno neurotox smoke. /obj/effect/particle_effect/smoke/xeno/neuro + alpha = 120 + opacity = FALSE color = "#ffbf58" //Mustard orange? - smoke_traits = SMOKE_XENO|SMOKE_XENO_NEURO|SMOKE_GASP|SMOKE_COUGH|SMOKE_EXTINGUISH|SMOKE_HUGGER_PACIFY + smoke_traits = SMOKE_XENO|SMOKE_XENO_NEURO|SMOKE_GASP|SMOKE_COUGH|SMOKE_EXTINGUISH ///Xeno neurotox smoke for Defilers; doesn't extinguish /obj/effect/particle_effect/smoke/xeno/neuro/medium + alpha = 255 + opacity = TRUE color = "#ffbf58" //Mustard orange? smoke_traits = SMOKE_XENO|SMOKE_XENO_NEURO|SMOKE_GASP|SMOKE_COUGH|SMOKE_HUGGER_PACIFY ///Xeno neurotox smoke for neurospit; doesn't extinguish or blind /obj/effect/particle_effect/smoke/xeno/neuro/light - alpha = 60 - opacity = FALSE smoke_traits = SMOKE_XENO|SMOKE_XENO_NEURO|SMOKE_GASP|SMOKE_COUGH|SMOKE_NEURO_LIGHT //Light neuro smoke doesn't extinguish /obj/effect/particle_effect/smoke/xeno/toxic @@ -444,6 +450,9 @@ /datum/effect_system/smoke_spread/xeno/acid smoke_type = /obj/effect/particle_effect/smoke/xeno/burn +/datum/effect_system/smoke_spread/xeno/acid/opaque + smoke_type = /obj/effect/particle_effect/smoke/xeno/burn/opaque + /datum/effect_system/smoke_spread/xeno/acid/light smoke_type = /obj/effect/particle_effect/smoke/xeno/burn/light diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index d7d35d46e8c93..95439b0e33c92 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -168,7 +168,7 @@ GLOBAL_LIST_EMPTY(blood_particles) var/marker_flags = GLOB.faction_to_minimap_flag[faction] if(marker_flags) - SSminimaps.add_marker(src, marker_flags, image('icons/UI_icons/map_blips_large.dmi', null, icon_state_on)) + SSminimaps.add_marker(src, marker_flags, image('icons/UI_icons/map_blips_large.dmi', null, icon_state_on, VERY_HIGH_FLOAT_LAYER)) set_visuals(faction) /obj/effect/temp_visual/order/attack_order diff --git a/code/game/objects/items/defibrillator.dm b/code/game/objects/items/defibrillator.dm index 35b4db058421f..67170ba966fb8 100644 --- a/code/game/objects/items/defibrillator.dm +++ b/code/game/objects/items/defibrillator.dm @@ -361,7 +361,7 @@ /obj/item/clothing/gloves/defibrillator name = "advanced medical combat gloves" - desc = "Advanced medical gloves, these include small electrodes to defibrilate a patiant. No more bulky units!" + desc = "Advanced medical gloves, these include small electrodes to defibrilate a patient No more bulky units!" icon_state = "defib_out_full" item_state = "defib_gloves" soft_armor = list(MELEE = 25, BULLET = 15, LASER = 10, ENERGY = 15, BOMB = 15, BIO = 5, FIRE = 15, ACID = 15) diff --git a/code/game/objects/items/devices/minimap_tablet.dm b/code/game/objects/items/devices/minimap_tablet.dm index 5be6c0794764f..743b9fcafdab2 100644 --- a/code/game/objects/items/devices/minimap_tablet.dm +++ b/code/game/objects/items/devices/minimap_tablet.dm @@ -310,7 +310,7 @@ GLOBAL_PROTECT(roles_allowed_minimap_draw) var/curr_dist var/turf/nearest for(var/turf/label AS in labelled_turfs) - var/dist = get_dist_euclide(label, target) + var/dist = get_dist_euclidean(label, target) if(dist > LABEL_REMOVE_RANGE) continue if(!curr_dist || curr_dist > dist) @@ -340,7 +340,7 @@ GLOBAL_PROTECT(roles_allowed_minimap_draw) textbox.maptext = label_text labelled_turfs += target - var/image/blip = image('icons/UI_icons/map_blips.dmi', null, "label") + var/image/blip = image('icons/UI_icons/map_blips.dmi', null, "label", ABOVE_FLOAT_LAYER) blip.overlays += textbox SSminimaps.add_marker(target, minimap_flag, blip) log_minimap_drawing("[key_name(source)] has added the label [label_text] at [c_x], [c_y]") diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm index 062238ace415f..06cc0856c26b6 100644 --- a/code/game/objects/items/explosives/grenades/marines.dm +++ b/code/game/objects/items/explosives/grenades/marines.dm @@ -218,18 +218,14 @@ qdel(src) -/proc/flame_radius(radius = 1, turf/epicenter, burn_intensity = 25, burn_duration = 25, burn_damage = 25, fire_stacks = 15, int_var = 0.5, dur_var = 0.5, colour = "red") //~Art updated fire. +/proc/flame_radius(radius = 1, turf/epicenter, burn_intensity = 25, burn_duration = 25, burn_damage = 25, fire_stacks = 15, colour = "red") //~Art updated fire. if(!isturf(epicenter)) CRASH("flame_radius used without a valid turf parameter") radius = clamp(radius, 1, 50) //Sanitize inputs - int_var = clamp(int_var, 0.1,0.5) - dur_var = clamp(int_var, 0.1,0.5) - fire_stacks = randfloat(burn_damage*(0.5-int_var),burn_damage*(0.5+int_var) ) + randfloat(burn_damage*(0.5-int_var),burn_damage*(0.5+int_var) ) - burn_damage = randfloat(burn_damage*(0.5-int_var),burn_damage*(0.5+int_var) ) + randfloat(burn_damage*(0.5-int_var),burn_damage*(0.5+int_var) ) for(var/t in filled_turfs(epicenter, radius, "circle", air_pass = TRUE)) var/turf/turf_to_flame = t - turf_to_flame.ignite(randfloat(burn_intensity*(0.5-int_var), burn_intensity*(0.5+int_var)) + randfloat(burn_intensity*(0.5-int_var), burn_intensity*(0.5+int_var)), randfloat(burn_duration*(0.5-int_var), burn_duration*(0.5-int_var)) + randfloat(burn_duration*(0.5-int_var), burn_duration*(0.5-int_var)), colour, burn_damage, fire_stacks) + turf_to_flame.ignite(randfloat(burn_duration*0.75, burn_duration), burn_intensity, colour, burn_damage, fire_stacks) /obj/item/explosive/grenade/incendiary/som name = "\improper S30-I incendiary grenade" @@ -324,7 +320,7 @@ hud_state = "grenade_acid" det_time = 4 SECONDS dangerous = TRUE - smoketype = /datum/effect_system/smoke_spread/xeno/acid + smoketype = /datum/effect_system/smoke_spread/xeno/acid/opaque smokeradius = 5 /obj/item/explosive/grenade/smokebomb/satrapine @@ -372,7 +368,7 @@ /obj/item/explosive/grenade/smokebomb/antigas name = "\improper M40-AG smoke grenade" - desc = "A gas grenade originally designed to remove any contaminates in the air for the purpose of cleaning, now repurposed to remove hostile gasses." + desc = "A gas grenade originally designed to remove any contaminants in the air for the purpose of cleaning, now repurposed to remove hostile gases." icon_state = "grenade_agas" item_state = "grenade_agas" hud_state = "grenade_antigas" @@ -411,7 +407,7 @@ smoke.set_up(6, loc, 7) smoke.start() flame_radius(4, get_turf(src)) - flame_radius(1, get_turf(src), burn_intensity = 45, burn_duration = 75, burn_damage = 15, fire_stacks = 75) //The closer to the middle you are the more it hurts + flame_radius(1, get_turf(src), burn_intensity = 75, burn_duration = 45, burn_damage = 15, fire_stacks = 75) //The closer to the middle you are the more it hurts qdel(src) /obj/item/explosive/grenade/phosphorus/activate(mob/user) @@ -446,7 +442,7 @@ explosion(loc, light_impact_range = 1, flash_range = 2) qdel(src) - +#define FLARE_FIRE_STACKS 5 /obj/item/explosive/grenade/flare name = "\improper M40 FLDP grenade" desc = "A TGMC standard issue flare utilizing the standard DP canister chassis. Capable of being loaded in any grenade launcher, or thrown by hand." @@ -489,39 +485,36 @@ if(!fuel || !active) turn_off() -/obj/item/explosive/grenade/flare/proc/turn_off() - active = FALSE - fuel = 0 - heat = 0 - item_fire_stacks = 0 - force = initial(force) - damtype = initial(damtype) - update_brightness() - icon_state = "[initial(icon_state)]_empty" // override icon state set by update_brightness - STOP_PROCESSING(SSobj, src) +/obj/item/explosive/grenade/flare/throw_impact(atom/hit_atom, speed) + if(isopenturf(hit_atom)) + var/obj/alien/weeds/node/N = locate() in loc + if(N) + qdel(N) + turn_off() + . = ..() + if(!.) + return + if(!active) + return -/obj/item/explosive/grenade/flare/proc/turn_on() - active = TRUE - force = 5 - throwforce = 10 - ENABLE_BITFIELD(resistance_flags, ON_FIRE) - item_fire_stacks = 5 - heat = 1500 - damtype = BURN - update_brightness() - playsound(src,'sound/items/flare.ogg', 15, 1) - START_PROCESSING(SSobj, src) + if(isliving(hit_atom)) + var/mob/living/living_target = hit_atom + living_target.fire_stacks += FLARE_FIRE_STACKS + living_target.IgniteMob() -/obj/item/explosive/grenade/flare/attack_self(mob/user) + var/target_zone = check_zone(living_target.zone_selected) + if(!target_zone || rand(40)) + target_zone = "chest" + if(launched && CHECK_BITFIELD(resistance_flags, ON_FIRE) && !living_target.on_fire) + living_target.apply_damage(randfloat(throwforce * 0.75, throwforce * 1.25), BURN, target_zone, FIRE, updating_health = TRUE) //Do more damage if launched from a proper launcher and active - // Usual checks +/obj/item/explosive/grenade/flare/attack_self(mob/user) if(!fuel) to_chat(user, span_notice("It's out of fuel.")) return if(active) return - // All good, turn it on. user.visible_message(span_notice("[user] activates the flare."), span_notice("You depress the ignition button, activating it!")) turn_on(user) @@ -529,48 +522,46 @@ if(!active) turn_on(user) -/obj/item/explosive/grenade/flare/on/Initialize(mapload) - . = ..() - active = TRUE - heat = 1500 - update_brightness() - force = 5 - throwforce = 10 - ENABLE_BITFIELD(resistance_flags, ON_FIRE) - item_fire_stacks = 5 - damtype = BURN - START_PROCESSING(SSobj, src) - -/obj/item/explosive/grenade/flare/proc/update_brightness() +/obj/item/explosive/grenade/flare/update_icon_state() if(active && fuel > 0) icon_state = "[initial(icon_state)]_active" item_state = "[initial(item_state)]_active" - set_light_on(TRUE) + else if(!fuel) + icon_state = "[initial(icon_state)]_empty" + item_state = "[initial(item_state)]_empty" else icon_state = initial(icon_state) item_state = initial(item_state) - set_light_on(FALSE) -/obj/item/explosive/grenade/flare/throw_impact(atom/hit_atom, speed) - if(isopenturf(hit_atom)) - var/obj/alien/weeds/node/N = locate() in loc - if(N) - qdel(N) - turn_off() - . = ..() - if(!.) - return - if(!active) - return - if(isliving(hit_atom)) - var/mob/living/L = hit_atom +///Shuts the flare off +/obj/item/explosive/grenade/flare/proc/turn_off() + active = FALSE + fuel = 0 + heat = 0 + force = initial(force) + damtype = initial(damtype) + update_icon() + set_light_on(FALSE) + STOP_PROCESSING(SSobj, src) - var/target_zone = check_zone(L.zone_selected) - if(!target_zone || rand(40)) - target_zone = "chest" - if(launched && CHECK_BITFIELD(resistance_flags, ON_FIRE) && !L.on_fire) - L.apply_damage(randfloat(throwforce * 0.75, throwforce * 1.25), BURN, target_zone, FIRE, updating_health = TRUE) //Do more damage if launched from a proper launcher and active +///Activates the flare +/obj/item/explosive/grenade/flare/proc/turn_on() + active = TRUE + force = 5 + throwforce = 10 + ENABLE_BITFIELD(resistance_flags, ON_FIRE) + heat = 1500 + damtype = BURN + update_icon() + set_light_on(TRUE) + playsound(src,'sound/items/flare.ogg', 15, 1) + START_PROCESSING(SSobj, src) + +//Starts on +/obj/item/explosive/grenade/flare/on/Initialize(mapload) + . = ..() + turn_on() /obj/item/explosive/grenade/flare/civilian name = "flare" @@ -619,8 +610,7 @@ upper_fuel_limit = 20 light_system = STATIC_LIGHT//movable light has a max range light_color = LIGHT_COLOR_CYAN - ///The brightness of the flare - var/brightness = 12 + light_range = 12 /obj/item/explosive/grenade/flare/strongerflare/throw_impact(atom/hit_atom, speed) . = ..() @@ -628,11 +618,6 @@ return anchored = TRUE//prevents marines from picking up and running around with a stronger flare -/obj/item/explosive/grenade/flare/strongerflare/update_brightness() +/obj/item/explosive/grenade/flare/strongerflare/turn_off() . = ..() - if(active && fuel > 0) - icon_state = "[initial(icon_state)]_active" - set_light(brightness) - else - icon_state = initial(icon_state) - set_light(0) + set_light(0) diff --git a/code/game/objects/items/firesupport_binoculars.dm b/code/game/objects/items/firesupport_binoculars.dm index d4402f608d33d..cf65f59e19e9f 100644 --- a/code/game/objects/items/firesupport_binoculars.dm +++ b/code/game/objects/items/firesupport_binoculars.dm @@ -7,10 +7,11 @@ ///Faction locks this item if specified var/faction = null ///lase effect - var/obj/effect/overlay/temp/laser_target/laser + var/image/laser_overlay + ///lasing time var/target_acquisition_delay = 5 SECONDS ///Last stored turf targetted by rangefinders - var/turf/targetturf + var/turf/target_atom ///Current mode for support request var/datum/fire_support/mode = null ///firemodes available for these binos @@ -41,11 +42,9 @@ . += span_warning("Available in [round(timeleft(mode.cooldown_timer) MILLISECONDS)] seconds.") /obj/item/binoculars/fire_support/Destroy() - if(laser) - QDEL_NULL(laser) + unset_target() mode = null mode_list = null - targetturf = null return ..() @@ -70,7 +69,7 @@ /obj/item/binoculars/fire_support/onunzoom(mob/living/user) . = ..() - QDEL_NULL(laser) + unset_target() if(!user?.client) return @@ -115,77 +114,88 @@ update_icon() ///lases a target and calls fire support on it -/obj/item/binoculars/fire_support/proc/acquire_target(atom/A, mob/living/carbon/human/user) +/obj/item/binoculars/fire_support/proc/acquire_target(atom/target, mob/living/carbon/human/user) set waitfor = 0 + if(user.do_actions) + balloon_alert_to_viewers("Busy") + return if(is_mainship_level(user.z)) user.balloon_alert(user, "Can't use here") return if(faction && user.faction != faction) balloon_alert_to_viewers("Security locks engaged") return - if(laser) + if(laser_overlay) to_chat(user, span_warning("You're already targeting something.")) return - if(!mode) - balloon_alert_to_viewers("Select a mode!") - return - if(!(mode.fire_support_flags & FIRESUPPORT_AVAILABLE)) - balloon_alert_to_viewers("[mode.name] unavailable") - return - if(!mode.uses) - balloon_alert_to_viewers("[mode.name] expended") - return - if(mode.cooldown_timer) - balloon_alert_to_viewers("On cooldown") - return - - var/turf/TU = get_turf(A) - var/distance = get_dist(TU, get_turf(user)) - var/zoom_screen_size = zoom_tile_offset + zoom_viewsize + 1 - if(TU.z != user.z || distance == -1 || (distance > zoom_screen_size)) - to_chat(user, span_warning("You can't focus properly through \the [src] while looking through something else.")) + if(!bino_checks(target, user)) return - - if(!user.mind) + if(!can_see_target(target, user)) + balloon_alert_to_viewers("No clear view") return - var/area/targ_area = get_area(A) - if(isspacearea(targ_area)) - to_chat(user, span_warning("Cannot fire into space.")) - return - if(targ_area.ceiling >= CEILING_UNDERGROUND) - to_chat(user, span_warning("DEPTH WARNING: Target too deep for ordnance.")) - return - if(user.do_actions) - return playsound(src, 'sound/effects/nightvision.ogg', 35) to_chat(user, span_notice("INITIATING LASER TARGETING. Stand still.")) - var/obj/effect/overlay/temp/laser_target/cas/CS = new (TU) - laser = CS - if(!do_after(user, target_acquisition_delay, NONE, user, BUSY_ICON_HOSTILE)) + target_atom = target + laser_overlay = image("icon" = 'icons/obj/items/projectiles.dmi',"icon_state" = "sniper_laser", "layer" =-LASER_LAYER) + target_atom.apply_fire_support_laser(laser_overlay) + if(!do_after(user, target_acquisition_delay, NONE, user, BUSY_ICON_HOSTILE, extra_checks = CALLBACK(src, PROC_REF(can_see_target), target, user))) + to_chat(user, span_danger("You lose sight of your target!")) + playsound(user,'sound/machines/click.ogg', 25, 1) + unset_target() + return + if(!bino_checks(target, user)) return + + playsound(src, 'sound/effects/binoctarget.ogg', 35) + mode.initiate_fire_support(get_turf(target_atom), user) + unset_target() + +///Internal bino checks, mainly around firemode +/obj/item/binoculars/fire_support/proc/bino_checks(atom/target, mob/living/user) if(!mode) balloon_alert_to_viewers("Select a mode!") - return + return FALSE if(!(mode.fire_support_flags & FIRESUPPORT_AVAILABLE)) balloon_alert_to_viewers("[mode.name] unavailable") - return + return FALSE if(!mode.uses) balloon_alert_to_viewers("[mode.name] expended") - return + return FALSE if(mode.cooldown_timer) balloon_alert_to_viewers("On cooldown") - return + return FALSE + var/area/targ_area = get_area(target) + if(isspacearea(targ_area)) + to_chat(user, span_warning("Cannot fire into space.")) + return FALSE + if(targ_area.ceiling >= CEILING_UNDERGROUND) + to_chat(user, span_warning("DEPTH WARNING: Target too deep for ordnance.")) + return FALSE + return TRUE - playsound(src, 'sound/effects/binoctarget.ogg', 35) - QDEL_NULL(laser) - mode.initiate_fire_support(TU, user) +///Checks if we can draw LOS to the target +/obj/item/binoculars/fire_support/proc/can_see_target(atom/target, mob/living/user) + if(QDELETED(target)) + return FALSE + if(target.z != user.z) + return FALSE + if(!(user in viewers(zoom_tile_offset + zoom_viewsize + 1, target))) + return FALSE + return TRUE + +///Unsets the target and cleans up +/obj/item/binoculars/fire_support/proc/unset_target() + if(target_atom) + target_atom.remove_fire_support_laser(laser_overlay) + target_atom = null + if(laser_overlay) + QDEL_NULL(laser_overlay) ///Acquires coords of a target turf /obj/item/binoculars/fire_support/proc/acquire_coordinates(atom/A, mob/living/carbon/human/user) - var/turf/TU = get_turf(A) - targetturf = TU - to_chat(user, span_notice("COORDINATES: LONGITUDE [targetturf.x]. LATITUDE [targetturf.y].")) + var/turf/target_turf = get_turf(A) + to_chat(user, span_notice("COORDINATES: LONGITUDE [target_turf.x]. LATITUDE [target_turf.y].")) playsound(src, 'sound/effects/binoctarget.ogg', 35) @@ -215,3 +225,18 @@ FIRESUPPORT_TYPE_SATRAPINE_SMOKE_MORTAR, FIRESUPPORT_TYPE_SMOKE_MORTAR_SOM, ) + +///Sets a laser overlay for fire support binos +/atom/proc/apply_fire_support_laser(image/laser_overlay) + add_overlay(laser_overlay) + +/mob/living/carbon/apply_fire_support_laser(image/laser_overlay) + overlays_standing[LASER_LAYER] = laser_overlay + apply_overlay(LASER_LAYER) + +///Removes a laser overlay for fire support binos +/atom/proc/remove_fire_support_laser(image/laser_overlay) + cut_overlay(laser_overlay) + +/mob/living/carbon/remove_fire_support_laser(image/laser_overlay) + remove_overlay(LASER_LAYER) diff --git a/code/game/objects/items/radio/headset.dm b/code/game/objects/items/radio/headset.dm index b6425a42c05f7..bcbfa9129bc9c 100644 --- a/code/game/objects/items/radio/headset.dm +++ b/code/game/objects/items/radio/headset.dm @@ -289,7 +289,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( if(!ghost?.can_reenter_corpse) SSminimaps.add_marker(wearer, marker_flags, image('icons/UI_icons/map_blips.dmi', null, "undefibbable")) return - SSminimaps.add_marker(wearer, marker_flags, image('icons/UI_icons/map_blips.dmi', null, "defibbable")) + SSminimaps.add_marker(wearer, marker_flags, image('icons/UI_icons/map_blips.dmi', null, "defibbable", ABOVE_FLOAT_LAYER)) return if(wearer.assigned_squad) var/image/underlay = image('icons/UI_icons/map_blips.dmi', null, "squad_underlay") diff --git a/code/game/objects/items/scanners.dm b/code/game/objects/items/scanners.dm index 47432865e3ae9..38385e6620052 100644 --- a/code/game/objects/items/scanners.dm +++ b/code/game/objects/items/scanners.dm @@ -403,7 +403,6 @@ REAGENT SCANNER throw_range = 20 var/details = FALSE - var/recent_fail = TRUE /obj/item/mass_spectrometer/Initialize(mapload) . = ..() @@ -418,9 +417,6 @@ REAGENT SCANNER /obj/item/mass_spectrometer/attack_self(mob/user as mob) if (user.stat) return - if (crit_fail) - to_chat(user, span_warning("This device has critically failed and is no longer functional!")) - return if(!reagents.total_volume) return var/list/blood_traces @@ -434,16 +430,7 @@ REAGENT SCANNER break var/dat = "Trace Chemicals Found: " for(var/R in blood_traces) - if(prob(reliability)) - dat += "\n\t[R][details ? " ([blood_traces[R]] units)" : "" ]" - recent_fail = FALSE - else if(recent_fail) - crit_fail = TRUE - reagents.clear_reagents() - to_chat(user, span_warning("Device malfunction occured. Please consult manual for manufacturer contact and warranty.")) - return - else - recent_fail = TRUE + dat += "\n\t[R][details ? " ([blood_traces[R]] units)" : "" ]" to_chat(user, "[dat]") reagents.clear_reagents() @@ -467,7 +454,6 @@ REAGENT SCANNER throw_range = 20 var/details = FALSE - var/recent_fail = FALSE /obj/item/reagent_scanner/afterattack(obj/O, mob/user as mob, proximity) if(!proximity) @@ -476,24 +462,13 @@ REAGENT SCANNER return if(!istype(O)) return - if (crit_fail) - to_chat(user, span_warning("This device has critically failed and is no longer functional!")) - return if(!O.reagents || !length(O.reagents.reagent_list)) to_chat(user, span_notice("No chemical agents found in [O]")) return var/dat = "" var/one_percent = O.reagents.total_volume / 100 for (var/datum/reagent/R in O.reagents.reagent_list) - if(prob(reliability)) - dat += "\n \t [span_notice(" [R.name][details ? ": [R.volume / one_percent]%" : ""]")]" - recent_fail = FALSE - else if(recent_fail) - crit_fail = TRUE - to_chat(user, span_warning("Device malfunction occured. Please consult manual for manufacturer contact and warranty.")) - return - else - recent_fail = TRUE + dat += "\n \t [span_notice(" [R.name][details ? ": [R.volume / one_percent]%" : ""]")]" to_chat(user, span_notice("Chemicals found: [dat]")) /obj/item/reagent_scanner/adv diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index b0aaba40eb380..f796b76adea37 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -66,28 +66,11 @@ max_w_class = WEIGHT_CLASS_BULKY max_storage_space = 28 -/obj/item/storage/backpack/holding/proc/failcheck(mob/user) - if (prob(reliability)) - return TRUE //No failure - if (prob(reliability)) - to_chat(user, span_warning("The Bluespace portal resists your attempt to add another item.")) - else - to_chat(user, span_warning("The Bluespace generator malfunctions!")) - for (var/obj/O in src.contents) //it broke, delete what was in it - qdel(O) - crit_fail = 1 - icon_state = "brokenpack" - /obj/item/storage/backpack/holding/attackby(obj/item/I, mob/user, params) - if(crit_fail) - to_chat(user, span_warning("The Bluespace generator isn't working.")) - - else if(istype(I, /obj/item/storage/backpack/holding) && !I.crit_fail) - to_chat(user, span_warning("The Bluespace interfaces of the two devices conflict and malfunction.")) - qdel(I) - - else + if(!istype(I, /obj/item/storage/backpack/holding)) return ..() + to_chat(user, span_warning("The Bluespace interfaces of the two devices conflict and malfunction.")) + qdel(I) /obj/item/storage/backpack/santabag name = "Santa's Gift Bag" diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index 2fb66f33b99cb..d6a9df8839f2a 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -533,8 +533,8 @@ /obj/item/storage/holster/icc_mg - name = "\improper ML-14 scabbard (10x26mm)" - desc = "A backpack holster allowing the storage of any a ML-14 Assault Machinegun, also carries ammo for the other portion of the system." + name = "\improper ML-41 scabbard (10x26mm)" + desc = "A backpack holster allowing the storage of any a ML-41 Assault Machinegun, also carries ammo for the other portion of the system." icon_state = "icc_bagmg" storage_slots = 5 max_storage_space = 16 diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index ecace1d9ebd8f..13d39fc2ad49c 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -400,6 +400,13 @@ new /obj/item/explosive/grenade/chem_grenade/razorburn_small(src) new /obj/item/explosive/grenade/chem_grenade/razorburn_large(src) +/obj/item/storage/pouch/explosive/antigas/Initialize(mapload) + . = ..() + new /obj/item/explosive/grenade/smokebomb/antigas(src) + new /obj/item/explosive/grenade/smokebomb/antigas(src) + new /obj/item/explosive/grenade/smokebomb/antigas(src) + new /obj/item/explosive/grenade/smokebomb/antigas(src) + /obj/item/storage/pouch/explosive/upp fill_type = /obj/item/explosive/grenade/upp fill_number = 4 diff --git a/code/game/objects/machinery/computer/dropship_weapons.dm b/code/game/objects/machinery/computer/dropship_weapons.dm index 8a67d9eecac0a..463df4e343ac8 100644 --- a/code/game/objects/machinery/computer/dropship_weapons.dm +++ b/code/game/objects/machinery/computer/dropship_weapons.dm @@ -7,6 +7,7 @@ icon_state = "consoleright" screen_overlay = "consoleright_emissive" circuit = null + opacity = FALSE resistance_flags = RESIST_ALL interaction_flags = INTERACT_MACHINE_TGUI var/shuttle_tag // Used to know which shuttle we're linked to. diff --git a/code/game/objects/machinery/computer/nt_access.dm b/code/game/objects/machinery/computer/nt_access.dm index 39f9b9dd2e35c..29011e3c6ba68 100644 --- a/code/game/objects/machinery/computer/nt_access.dm +++ b/code/game/objects/machinery/computer/nt_access.dm @@ -170,7 +170,7 @@ ///Change minimap icon if its on or off /obj/machinery/computer/nt_access/proc/update_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips_large.dmi', null, "[code_color]_disk[current_timer ? "_on" : "_off"]")) + SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips_large.dmi', null, "[code_color]_disk[current_timer ? "_on" : "_off"]", VERY_HIGH_FLOAT_LAYER)) /obj/machinery/computer/nt_access/red name = "red NT security override terminal" diff --git a/code/game/objects/machinery/computer/nuke_disk_generator.dm b/code/game/objects/machinery/computer/nuke_disk_generator.dm index 456112658faa6..38c3c8fc428db 100644 --- a/code/game/objects/machinery/computer/nuke_disk_generator.dm +++ b/code/game/objects/machinery/computer/nuke_disk_generator.dm @@ -185,7 +185,7 @@ ///Change minimap icon if its on or off /obj/machinery/computer/nuke_disk_generator/proc/update_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips_large.dmi', null, "[disk_color]_disk[current_timer ? "_on" : "_off"]")) + SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips_large.dmi', null, "[disk_color]_disk[current_timer ? "_on" : "_off"]", VERY_HIGH_FLOAT_LAYER)) /obj/machinery/computer/nuke_disk_generator/red name = "red nuke disk generator" diff --git a/code/game/objects/machinery/constructable_frame.dm b/code/game/objects/machinery/constructable_frame.dm index ebe3b92544254..2a6969c75a236 100644 --- a/code/game/objects/machinery/constructable_frame.dm +++ b/code/game/objects/machinery/constructable_frame.dm @@ -33,10 +33,6 @@ /obj/machinery/constructable_frame/machine_frame/attackby(obj/item/I, mob/living/user, params) - if(I.crit_fail) - to_chat(user, span_warning("This part is faulty, you cannot add this to the machine!")) - return - switch(state) if(1) if(iscablecoil(I)) diff --git a/code/game/objects/machinery/mortar.dm b/code/game/objects/machinery/mortar.dm index ec5e1696a1566..0e64c88595ab2 100644 --- a/code/game/objects/machinery/mortar.dm +++ b/code/game/objects/machinery/mortar.dm @@ -273,7 +273,7 @@ var/obj/projectile/shell = new /obj/projectile(loc) var/datum/ammo/ammo = GLOB.ammo_list[arty_shell.ammo_type] shell.generate_bullet(ammo) - var/shell_range = min(get_dist_euclide(src, target), ammo.max_range) + var/shell_range = min(get_dist_euclidean(src, target), ammo.max_range) shell.fire_at(target, null, src, shell_range, ammo.shell_speed) perform_firing_visuals() @@ -375,7 +375,7 @@ location.ceiling_debris_check(2) log_game("[key_name(user)] has fired the [src] at [AREACOORD(target)]") - var/max_offset = round(abs((get_dist_euclide(src,target)))/offset_per_turfs) + var/max_offset = round(abs((get_dist_euclidean(src,target)))/offset_per_turfs) var/firing_spread = max_offset + spread if(firing_spread > max_spread) firing_spread = max_spread diff --git a/code/game/objects/machinery/nuclearbomb.dm b/code/game/objects/machinery/nuclearbomb.dm index 0a4c9547715cf..0f45568f922dd 100644 --- a/code/game/objects/machinery/nuclearbomb.dm +++ b/code/game/objects/machinery/nuclearbomb.dm @@ -16,7 +16,7 @@ flags_atom = CRITICAL_ATOM resistance_flags = RESIST_ALL layer = BELOW_MOB_LAYER - interaction_flags = INTERACT_OBJ_UI + interaction_flags = INTERACT_MACHINE_TGUI var/deployable = TRUE var/extended = FALSE var/lighthack = FALSE @@ -352,7 +352,7 @@ ///Change minimap icon if its on or off /obj/machinery/nuclearbomb/proc/update_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips_large.dmi', null, "nuke[timer_enabled ? "_on" : "_off"]")) + SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips_large.dmi', null, "nuke[timer_enabled ? "_on" : "_off"]", VERY_HIGH_FLOAT_LAYER)) #undef NUKE_STAGE_NONE #undef NUKE_STAGE_COVER_REMOVED diff --git a/code/game/objects/machinery/overwatch.dm b/code/game/objects/machinery/overwatch.dm index 72a6f8a0679db..0647bf5fee292 100644 --- a/code/game/objects/machinery/overwatch.dm +++ b/code/game/objects/machinery/overwatch.dm @@ -817,7 +817,7 @@ GLOBAL_LIST_EMPTY(active_cas_targets) if(marked_lase) remove_mark_from_lase() //There can only be one marked_lase = laser_target - SSminimaps.add_marker(laser_target, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "ob_warning")) + SSminimaps.add_marker(laser_target, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "ob_warning", VERY_HIGH_FLOAT_LAYER)) addtimer(CALLBACK(src, PROC_REF(remove_mark_from_lase)), 30 SECONDS) if(FIRE_LASE) selected_target = laser_target diff --git a/code/game/objects/machinery/research.dm b/code/game/objects/machinery/research.dm index 3a8f1f0032bda..097a7cd36a62b 100644 --- a/code/game/objects/machinery/research.dm +++ b/code/game/objects/machinery/research.dm @@ -48,7 +48,6 @@ RES_TIER_UNCOMMON = list( /obj/item/research_product/money/uncommon, /obj/item/implanter/blade, - /obj/item/attachable/shoulder_mount, ), RES_TIER_RARE = list( /obj/item/research_product/money/rare, @@ -65,7 +64,6 @@ RES_TIER_UNCOMMON = list( /obj/item/research_product/money/uncommon, /obj/item/implanter/chem/blood, - /obj/item/attachable/shoulder_mount, ), RES_TIER_RARE = list( /obj/item/research_product/money/rare, diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index ceae6562cdbea..a65af1a0f2909 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -1487,7 +1487,7 @@ /obj/item/ammo_magazine/sniper/flak = -1, ), "Mounted" = list( - /obj/item/weapon/gun/standard_auto_cannon = -1, + /obj/structure/largecrate/supply/weapons/standard_flakgun = -1, /obj/item/ammo_magazine/auto_cannon = -1, /obj/item/ammo_magazine/auto_cannon/flak = -1, /obj/item/weapon/gun/standard_minigun = -1, @@ -1499,7 +1499,7 @@ /obj/item/ammo_magazine/standard_agls/flare = -1, /obj/item/ammo_magazine/standard_agls/cloak = -1, /obj/item/ammo_magazine/standard_agls/tanglefoot = -1, - /obj/item/weapon/gun/heavy_isg = -1, + /obj/structure/largecrate/supply/weapons/heavy_flakgun = -1, /obj/item/ammo_magazine/heavy_isg/he = -1, /obj/item/ammo_magazine/heavy_isg/sabot = -1, ), @@ -1521,7 +1521,6 @@ /obj/item/armor_module/module/fire_proof_helmet = -1, /obj/item/armor_module/module/tyr_extra_armor = -1, /obj/item/armor_module/module/tyr_head = -1, - /obj/item/attachable/shoulder_mount = -1, /obj/item/armor_module/module/mimir_environment_protection = -1, /obj/item/armor_module/module/mimir_environment_protection/mimir_helmet = -1, /obj/item/armor_module/module/better_shoulder_lamp = -1, diff --git a/code/game/objects/machinery/vending/new_marine_vendors.dm b/code/game/objects/machinery/vending/new_marine_vendors.dm index a828b87e7f127..293cbe416d6f7 100644 --- a/code/game/objects/machinery/vending/new_marine_vendors.dm +++ b/code/game/objects/machinery/vending/new_marine_vendors.dm @@ -702,6 +702,7 @@ ) /obj/effect/vendor_bundle/stretcher + desc = "A standard-issue TerraGov Marine Corps corpsman medivac stretcher. Comes with an extra beacon, but multiple beds can be linked to one beacon." gear_to_spawn = list( /obj/item/roller/medevac, /obj/item/medevac_beacon, diff --git a/code/game/objects/machinery/vending/vending_types.dm b/code/game/objects/machinery/vending/vending_types.dm index b818bf4a1f3b1..7ca1bd35c0bbc 100644 --- a/code/game/objects/machinery/vending/vending_types.dm +++ b/code/game/objects/machinery/vending/vending_types.dm @@ -117,6 +117,10 @@ /obj/item/reagent_containers/food/snacks/wrapped/berrybar = -1, ) +/obj/machinery/vending/snack/alamo + product_slogans = "" //silent for no spam + wrenchable = FALSE + /obj/machinery/vending/cola name = "Souto Softdrinks" desc = "A softdrink vendor provided by Souto Soda Company, Havana." @@ -137,19 +141,9 @@ /obj/item/reagent_containers/food/drinks/cans/cola = -1, ) - prices = list( - /obj/item/reagent_containers/food/drinks/cans/souto = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/diet = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/cherry = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/cherry/diet = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/lime = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/lime/diet = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/grape = 5, - /obj/item/reagent_containers/food/drinks/cans/souto/grape/diet = 5, - /obj/item/reagent_containers/food/drinks/cans/waterbottle = 2, - /obj/item/reagent_containers/food/drinks/cans/cola = 10, - ) - idle_power_usage = 200 +/obj/machinery/vending/cola/alamo + product_slogans = "" //silent for no spam + wrenchable = FALSE /obj/machinery/vending/medical name = "NanotrasenMed Plus" diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index b4c32041f934d..7cc5a54800a67 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -13,30 +13,26 @@ /// %-reduction-based armor. var/datum/armor/soft_armor - /// Flat-damage-reduction-based armor. + ///Modifies the AP of incoming attacks var/datum/armor/hard_armor - - var/obj_integrity //defaults to max_integrity + ///Object HP + var/obj_integrity + ///Max object HP var/max_integrity = 500 - var/integrity_failure = 0 //0 if we have no special broken behavior - var/reliability = 100 //Used by SOME devices to determine how reliable they are. - var/crit_fail = 0 - - ///throwforce needs to be at least 1 else it causes runtimes with shields + ///Integrety below this number causes special behavior + var/integrity_failure = 0 + ///Base throw damage. Throwforce needs to be at least 1 else it causes runtimes with shields var/throwforce = 1 - + ///Object behavior flags var/obj_flags = NONE - var/hit_sound //Sound this object makes when hit, overrides specific item hit sound. - var/destroy_sound //Sound this object makes when destroyed. - - var/item_fire_stacks = 0 //How many fire stacks it applies - + ///Sound when hit + var/hit_sound + ///Sound this object makes when destroyed + var/destroy_sound + ///ID access where all are required to access this object var/list/req_access = null + ///ID access where any one is required to access this object var/list/req_one_access = null - - ///Optimization for dynamic explosion block values, for things whose explosion block is dependent on certain conditions. - var/real_explosion_block - ///Odds of a projectile hitting the object, if the object is dense var/coverage = 50 diff --git a/code/game/objects/structures/campaign_structures/campaign_structure.dm b/code/game/objects/structures/campaign_structures/campaign_structure.dm index e3e3bd6222249..f0b5597afde8d 100644 --- a/code/game/objects/structures/campaign_structures/campaign_structure.dm +++ b/code/game/objects/structures/campaign_structures/campaign_structure.dm @@ -55,4 +55,4 @@ ///Update the minimap blips to show who is controlling this objective /obj/structure/campaign_objective/proc/update_control_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "campaign_objective")) + SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "campaign_objective", HIGH_FLOAT_LAYER)) diff --git a/code/game/objects/structures/campaign_structures/capture_objectives.dm b/code/game/objects/structures/campaign_structures/capture_objectives.dm index 927f6f249f0ed..c6807225bfc07 100644 --- a/code/game/objects/structures/campaign_structures/capture_objectives.dm +++ b/code/game/objects/structures/campaign_structures/capture_objectives.dm @@ -47,7 +47,7 @@ else new_icon_state = capturing_faction ? "campaign_objective_decap_som" : "campaign_objective_som" - SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, new_icon_state)) + SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, new_icon_state, HIGH_FLOAT_LAYER)) /obj/structure/campaign_objective/capture_objective/attack_hand(mob/living/user) if(!ishuman(user)) diff --git a/code/game/objects/structures/campaign_structures/deploy_blockers.dm b/code/game/objects/structures/campaign_structures/deploy_blockers.dm index c47964d645434..66e6b1bb8e00b 100644 --- a/code/game/objects/structures/campaign_structures/deploy_blockers.dm +++ b/code/game/objects/structures/campaign_structures/deploy_blockers.dm @@ -26,7 +26,7 @@ /obj/structure/campaign_deployblocker/Initialize(mapload) . = ..() GLOB.campaign_structures += src - SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "tele_block")) + SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "tele_block", HIGH_FLOAT_LAYER)) var/datum/game_mode/hvh/campaign/mode = SSticker.mode if(!istype(mode)) return diff --git a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm index ab232e64fe389..f561335d40122 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm @@ -160,6 +160,11 @@ /obj/item/ammo_magazine/auto_cannon/flak = 3, ) +/obj/structure/largecrate/supply/weapons/heavy_flakgun + name = "\improper FK-88 mounted flak gun (x1)" + desc = "A supply crate containing a FK-88 mounted flak gun. Ammo sold separately." + supplies = list(/obj/item/weapon/gun/heavy_isg = 1) + /obj/structure/largecrate/supply/ammo name = "ammunition case" icon_state = "case" diff --git a/code/game/objects/structures/dropship_ammo.dm b/code/game/objects/structures/dropship_ammo.dm index 228b5bed8ce03..a6e5c8ac72eb6 100644 --- a/code/game/objects/structures/dropship_ammo.dm +++ b/code/game/objects/structures/dropship_ammo.dm @@ -441,7 +441,7 @@ /obj/structure/ship_ammo/cas/rocket/napalm/detonate_on(turf/impact, attackdir = NORTH) impact.ceiling_debris_check(3) explosion(impact, devastating_explosion_range, heavy_explosion_range, light_explosion_range) - flame_radius(fire_range, impact, 60, 30) //cooking for a long time + flame_radius(fire_range, impact, 30, 60) //cooking for a long time var/datum/effect_system/smoke_spread/phosphorus/warcrime = new warcrime.set_up(fire_range + 1, impact, 7) warcrime.start() diff --git a/code/game/objects/structures/orbital_cannon.dm b/code/game/objects/structures/orbital_cannon.dm index da049469a2078..cffb571f5a218 100644 --- a/code/game/objects/structures/orbital_cannon.dm +++ b/code/game/objects/structures/orbital_cannon.dm @@ -378,7 +378,7 @@ /obj/structure/ob_ammo/warhead/incendiary/warhead_impact(turf/target, inaccuracy_amt = 0) . = ..() var/range_num = max(15 - inaccuracy_amt, 12) - flame_radius(range_num, target, burn_intensity = 36, burn_duration = 40, colour = "blue") + flame_radius(range_num, target, burn_intensity = 46, burn_duration = 40, colour = "blue") var/datum/effect_system/smoke_spread/phosphorus/warcrime = new warcrime.set_up(17, target, 20) warcrime.start() diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm index 9d844076fa045..426cd7101abc9 100644 --- a/code/game/objects/structures/reagent_dispensers.dm +++ b/code/game/objects/structures/reagent_dispensers.dm @@ -240,13 +240,13 @@ exploding = TRUE if(reagents.total_volume > 500) - flame_radius(5, loc, 46, 40, 31, 30, colour = "blue") + flame_radius(5, loc, 40, 46, 31, 30, colour = "blue") explosion(loc, light_impact_range = 5) else if(reagents.total_volume > 100) - flame_radius(4, loc, 46, 40, 31, 30, colour = "blue") + flame_radius(4, loc, 40, 46, 31, 30, colour = "blue") explosion(loc, light_impact_range = 4) else - flame_radius(3, loc, 46, 40, 31, 30, colour = "blue") + flame_radius(3, loc, 40, 46, 31, 30, colour = "blue") explosion(loc, light_impact_range = 3) qdel(src) diff --git a/code/game/objects/structures/sensor_tower.dm b/code/game/objects/structures/sensor_tower.dm index 212aa3ba26261..84a233b893faf 100644 --- a/code/game/objects/structures/sensor_tower.dm +++ b/code/game/objects/structures/sensor_tower.dm @@ -173,6 +173,6 @@ /obj/structure/sensor_tower/proc/update_control_minimap_icon() SSminimaps.remove_marker(src) if(activated) - SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "relay_[towerid]_on_full")) + SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "relay_[towerid]_on_full", VERY_HIGH_FLOAT_LAYER)) else - SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "relay_[towerid][current_timer ? "_on" : "_off"]")) + SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "relay_[towerid][current_timer ? "_on" : "_off"]", VERY_HIGH_FLOAT_LAYER)) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 5ea84830066e5..f3f1a2eb1c2aa 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -303,7 +303,7 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers) /obj/structure/bed/medevac_stretcher name = "medevac stretcher" - desc = "A medevac stretcher with integrated beacon for rapid evacuation of an injured patient via dropship lift and an emergency bluespace teleporter for tele-evacuation to a linked beacon. Accepts patients and body bags." + desc = "A medevac stretcher with integrated beacon for rapid evacuation of an injured patient via dropship lift and an emergency bluespace teleporter for tele-evacuation to a linked beacon. Accepts patients and body bags. Right click to activate." icon = 'icons/obj/rollerbed.dmi' icon_state = "stretcher_down" buckling_y = 6 @@ -353,16 +353,6 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers) if(LAZYLEN(buckled_mobs) || buckled_bodybag) . += image("icon_state"="stretcher_box","layer"=LYING_MOB_LAYER + 0.1) - -/obj/structure/bed/medevac_stretcher/verb/activate_medevac_displacer() - set name = "Activate Medevac Displacement Field" - set desc = "Teleport the occupant of the stretcher to a linked beacon." - set category = "Object" - set src in oview(1) - - activate_medevac_teleport(usr) - - /obj/structure/bed/medevac_stretcher/attack_hand_alternate(mob/living/user) activate_medevac_teleport(user) @@ -516,7 +506,7 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers) /obj/item/roller/medevac name = "medevac stretcher" - desc = "A collapsed medevac stretcher that can be carried around." + desc = "A collapsed medevac stretcher that can be carried around. Can be used to instantly transport a marine to a linked beacon. Don't forget the beacon!" icon_state = "stretcher_folded" var/last_teleport = null var/obj/item/medevac_beacon/linked_beacon = null diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index f632ccd08ff92..d93d55b0ed9f9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -1,6 +1,16 @@ -#define DROPSHIP_CHAIR_UNFOLDED 1 -#define DROPSHIP_CHAIR_FOLDED 2 -#define DROPSHIP_CHAIR_BROKEN 3 +#define DROPSHIP_CHAIR_UNBUCKLED "" +#define DROPSHIP_CHAIR_FOLDED 0 +#define DROPSHIP_CHAIR_BUCKLED "_buckled" +#define DROPSHIP_CHAIR_BROKEN "_broken" + +#define LEADER_CHAIR 0 + +#define NO_CHAIR_COLOR "" +#define ALPHA_CHAIR "_alpha" +#define BRAVO_CHAIR "_bravo" +#define CHARLIE_CHAIR "_charlie" +#define DELTA_CHAIR "_delta" +#define FC_CHAIR "_fc" /obj/structure/bed/chair //YES, chairs are a type of bed, which are a type of stool. This works, believe me. -Pete name = "chair" @@ -262,9 +272,34 @@ icon_state = "officechair_dark" anchored = FALSE +/obj/structure/bed/chair/dropship + name = "dropship chair" + desc = "Holds you in place during high altitude drops." + icon_state = "shuttle_chair" + /// Handles the chair buckle bars overlay + var/image/chairbar = null + buildstacktype = 0 + /// Handles the current state of the chair (buckled, unbuckled, folded, broke) + var/chair_state = DROPSHIP_CHAIR_UNBUCKLED + +/obj/structure/bed/chair/dropship/update_overlays() + . = ..() + if(chair_state == DROPSHIP_CHAIR_BUCKLED) + . += image('icons/obj/objects.dmi', icon_state = "shuttle_bars", layer = ABOVE_MOB_LAYER) + return + +/obj/structure/bed/chair/dropship/doublewide/post_buckle_mob(mob/buckling_mob) + chair_state = DROPSHIP_CHAIR_BUCKLED + update_icon() + return ..() + +/obj/structure/bed/chair/dropship/doublewide/post_unbuckle_mob(mob/buckled_mob) + chair_state = DROPSHIP_CHAIR_UNBUCKLED + update_icon() + return ..() + /obj/structure/bed/chair/dropship/pilot icon_state = "pilot_chair" - anchored = TRUE name = "pilot's chair" desc = "A specially designed chair for pilots to sit in." @@ -273,47 +308,24 @@ /obj/structure/bed/chair/dropship/passenger name = "passenger seat" - desc = "Holds you in place during high altitude drops." - icon_state = "shuttle_chair" - var/image/chairbar = null - var/chair_state = DROPSHIP_CHAIR_UNFOLDED - buildstacktype = 0 resistance_flags = RESIST_ALL var/is_animating = 0 /obj/structure/bed/chair/dropship/passenger/CanAllowThrough(atom/movable/mover, turf/target, height = 0, air_group = 0) - if(chair_state == DROPSHIP_CHAIR_UNFOLDED && istype(mover, /obj/vehicle/sealed) && !is_animating) + if(chair_state == DROPSHIP_CHAIR_UNBUCKLED && istype(mover, /obj/vehicle/sealed) && !is_animating) visible_message(span_danger("[mover] slams into [src] and breaks it!")) INVOKE_ASYNC(src, PROC_REF(fold_down), TRUE) return FALSE return ..() -/obj/structure/bed/chair/dropship/passenger/Initialize(mapload) - . = ..() - chairbar = image("icons/obj/objects.dmi", "shuttle_bars") - chairbar.layer = ABOVE_MOB_LAYER - - -/obj/structure/bed/chair/dropship/passenger/post_buckle_mob(mob/buckling_mob) - icon_state = "shuttle_chair_buckled" - overlays += chairbar - return ..() - - -/obj/structure/bed/chair/dropship/passenger/post_unbuckle_mob(mob/buckled_mob) - icon_state = "shuttle_chair" - overlays -= chairbar - return ..() - - /obj/structure/bed/chair/dropship/passenger/buckle_mob(mob/living/buckling_mob, force = FALSE, check_loc = TRUE, lying_buckle = FALSE, hands_needed = 0, target_hands_needed = 0, silent) - if(chair_state != DROPSHIP_CHAIR_UNFOLDED) + if(chair_state != DROPSHIP_CHAIR_UNBUCKLED) return FALSE return ..() /obj/structure/bed/chair/dropship/passenger/proc/fold_down(break_it = FALSE) - if(chair_state == DROPSHIP_CHAIR_UNFOLDED) + if(chair_state == DROPSHIP_CHAIR_UNBUCKLED) is_animating = 1 flick("shuttle_chair_new_folding", src) is_animating = 0 @@ -332,7 +344,7 @@ is_animating = 1 flick("shuttle_chair_new_unfolding", src) is_animating = 0 - chair_state = DROPSHIP_CHAIR_UNFOLDED + chair_state = DROPSHIP_CHAIR_UNBUCKLED sleep(0.5 SECONDS) icon_state = "shuttle_chair" @@ -355,7 +367,7 @@ if(iswrench(I)) switch(chair_state) - if(DROPSHIP_CHAIR_UNFOLDED) + if(DROPSHIP_CHAIR_UNBUCKLED) user.visible_message(span_warning("[user] begins loosening the bolts on \the [src]."), span_warning("You begin loosening the bolts on \the [src].")) playsound(loc, 'sound/items/ratchet.ogg', 25, 1) @@ -400,6 +412,138 @@ span_warning("You repair \the [src].")) chair_state = DROPSHIP_CHAIR_FOLDED +/obj/structure/bed/chair/dropship/doublewide + name = "doublewide seat" + icon_state = "doublewide_chair" //only facing south cause the rest are ugly + max_integrity = 130 + /// Handles the color of the chair + var/chair_color = NO_CHAIR_COLOR + /// If the chair can only be sat in by a leader or not + var/leader_chair = FALSE + /// pixel x shift to give to the buckled mob + var/buckling_x = 0 + +/obj/structure/bed/chair/dropship/doublewide/attack_alien(mob/living/carbon/xenomorph/X, damage_amount = X.xeno_caste.melee_damage, damage_type = BRUTE, damage_flag = "", effects = TRUE, armor_penetration = 0, isrightclick = FALSE) + if(X.status_flags & INCORPOREAL) + return FALSE + if(LAZYLEN(buckled_mobs)) + unbuckle_all_mobs(TRUE) + return ..() + +/obj/structure/bed/chair/dropship/doublewide/welder_act(mob/living/user, obj/item/I) + if(LAZYLEN(buckled_mobs)) + balloon_alert_to_viewers("You cannot repair this chair while someone is sitting in it") + return + welder_repair_act(user, I, 130, 1 SECONDS, 0, SKILL_ENGINEER_METAL, 1) + chair_state = DROPSHIP_CHAIR_UNBUCKLED + update_icon() + return + +/obj/structure/bed/chair/dropship/doublewide/update_icon_state() + . = ..() + var/percentage = (obj_integrity / max_integrity) * 100 + switch(percentage) + if(-INFINITY to 65) + chair_state = DROPSHIP_CHAIR_BROKEN + icon_state = "doublewide_chair[chair_color][chair_state]" + +/obj/structure/bed/chair/dropship/doublewide/attackby(obj/item/I, mob/user, params) + . = ..() + if(LAZYLEN(buckled_mobs) && chair_state == DROPSHIP_CHAIR_BROKEN) + unbuckle_mob(buckled_mobs[1]) + balloon_alert_to_viewers("This chair is too damaged to stay sitting in") + +/obj/structure/bed/chair/dropship/doublewide/buckle_mob(mob/living/buckling_mob, force = FALSE, check_loc = TRUE, lying_buckle = FALSE, hands_needed = 0, target_hands_needed = 0, silent) + if(chair_state == DROPSHIP_CHAIR_BROKEN) + balloon_alert_to_viewers("This chair is too damaged to sit in") + return FALSE + if(leader_chair && buckling_mob.skills.getRating(SKILL_LEADERSHIP) < SKILL_LEAD_TRAINED) + balloon_alert(buckling_mob, "You don't feel worthy enough to sit in this chair") + return FALSE + if(buckling_x) + src.pixel_x = buckling_x + return ..() + +/obj/structure/bed/chair/dropship/doublewide/post_buckle_mob(mob/buckling_mob) + buckling_mob.pixel_x = buckling_x + buckling_mob.old_x = buckling_x + doublewide_mob_density(buckling_mob, TRUE) + return ..() + +/obj/structure/bed/chair/dropship/doublewide/post_unbuckle_mob(mob/buckled_mob) + buckled_mob.pixel_x = initial(buckled_mob.pixel_x) + buckled_mob.old_x = initial(buckled_mob.pixel_x) + doublewide_mob_density(buckled_mob, FALSE) + return ..() + +/// Handles checking the changing density for the person buckling or unbuckling and the person next to the buckling/unbuckling person +/obj/structure/bed/chair/dropship/doublewide/proc/doublewide_mob_density(mob/interactionmob, buckling) + var/obj/structure/bed/chair/dropship/doublewide/other_doublewide = locate(/obj/structure/bed/chair/dropship/doublewide) in interactionmob.loc + var/mob/living/other_chair_buckled_mob + if(other_doublewide) //if there is another doublewide + if(LAZYLEN(other_doublewide.buckled_mobs) && (other_doublewide.buckled_mobs[1] != interactionmob)) + other_chair_buckled_mob = other_doublewide.buckled_mobs[1] + if(buckling) + other_chair_buckled_mob.density = TRUE + interactionmob.density = TRUE + return + //if theyre unbuckling with and there is another buckled mob + other_chair_buckled_mob.density = FALSE + interactionmob.density = TRUE + return + if(buckling) //if theyre buckling with no other chairs + interactionmob.density = FALSE + return + //if there is no other doublewide or theyre unbuckling + interactionmob.density = TRUE + +/obj/structure/bed/chair/dropship/doublewide/left + pixel_x = -8 + buckling_x = -8 + +/obj/structure/bed/chair/dropship/doublewide/right + pixel_x = 9 + buckling_x = 9 + +/obj/structure/bed/chair/dropship/doublewide/left/alpha + name = "Alpha Squad Leader's Chair" + desc = "A chair specially reserved for the Alpha Squad Leader." + icon_state = "doublewide_chair_alpha" + chair_color = ALPHA_CHAIR + leader_chair = TRUE + max_integrity = 200 + +/obj/structure/bed/chair/dropship/doublewide/right/bravo + name = "Bravo Squad Leader's Chair" + desc = "A chair specially reserved for the Bravo Squad Leader." + icon_state = "doublewide_chair_bravo" + chair_color = BRAVO_CHAIR + leader_chair = TRUE + max_integrity = 200 + +/obj/structure/bed/chair/dropship/doublewide/left/charlie + name = "Charlie Squad Leader's Chair" + desc = "A chair specially reserved for the Charlie Squad Leader." + icon_state = "doublewide_chair_charlie" + chair_color = CHARLIE_CHAIR + leader_chair = TRUE + max_integrity = 200 + +/obj/structure/bed/chair/dropship/doublewide/right/delta + name = "Delta Squad Leader's Chair" + desc = "A chair specially reserved for the Delta Squad Leader." + icon_state = "doublewide_chair_delta" + chair_color = DELTA_CHAIR + leader_chair = TRUE + max_integrity = 200 + +/obj/structure/bed/chair/dropship/doublewide/fieldcommander + name = "Field Commander's Chair" + desc = "A chair specially reserved for the Field Commander." + icon_state = "doublewide_chair_fc" + chair_color = FC_CHAIR + leader_chair = TRUE + max_integrity = 200 /obj/structure/bed/chair/ob_chair name = "seat" diff --git a/code/game/objects/structures/teleporter.dm b/code/game/objects/structures/teleporter.dm index f64230e3c3c2f..82beb4f4a01ff 100644 --- a/code/game/objects/structures/teleporter.dm +++ b/code/game/objects/structures/teleporter.dm @@ -28,7 +28,7 @@ /obj/machinery/deployable/teleporter/Initialize(mapload) . = ..() - SSminimaps.add_marker(src, MINIMAP_FLAG_MARINE, image('icons/UI_icons/map_blips.dmi', null, "teleporter")) + SSminimaps.add_marker(src, MINIMAP_FLAG_MARINE, image('icons/UI_icons/map_blips.dmi', null, "teleporter", HIGH_FLOAT_LAYER)) /obj/machinery/deployable/teleporter/attack_hand(mob/living/user) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 34c425e9284a9..70bdb9b461272 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -13,6 +13,8 @@ coverage = 20 var/dismantle = FALSE //If we're dismantling the window properly no smashy smashy max_integrity = 15 + ///Optimization for dynamic explosion block values, for things whose explosion block is dependent on certain conditions. + var/real_explosion_block = 0 var/state = 2 var/reinf = FALSE var/basestate = "window" diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm index ea4d403657bec..3a2fbf97722aa 100644 --- a/code/game/turfs/closed.dm +++ b/code/game/turfs/closed.dm @@ -511,8 +511,13 @@ opacity = FALSE allow_pass_flags = PASS_GLASS +/turf/closed/shuttle/dropship1/aislewindow + icon_state = "shuttle_aisle_window" + opacity = FALSE + /turf/closed/shuttle/dropship1/panel icon_state = "shuttle_interior_panel" + opacity = FALSE /turf/closed/shuttle/dropship1/engineone icon_state = "shuttle_interior_backengine" diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index e1d098a1f98c0..f46a45ae5ab60 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -146,6 +146,84 @@ /turf/open/shuttle/dropship/fourteen icon_state = "floor6" +/turf/open/shuttle/dropship/fourteen + icon_state = "rasputin14" + +/turf/open/shuttle/dropship/fifteen + icon_state = "rasputin15" + +/turf/open/shuttle/dropship/sixteen + icon_state = "rasputin16" + +/turf/open/shuttle/dropship/seventeen + icon_state = "rasputin17" + +/turf/open/shuttle/dropship/eighteen + icon_state = "rasputin18" + +/turf/open/shuttle/dropship/nineteen + icon_state = "rasputin19" + +/turf/open/shuttle/dropship/twenty + icon_state = "rasputin20" + +/turf/open/shuttle/dropship/twentyone + icon_state = "rasputin21" + +/turf/open/shuttle/dropship/twentytwo + icon_state = "rasputin22" + +/turf/open/shuttle/dropship/twentythree + icon_state = "rasputin23" + +/turf/open/shuttle/dropship/twentyfour + icon_state = "rasputin24" + +/turf/open/shuttle/dropship/twentyfive + icon_state = "rasputin25" + +/turf/open/shuttle/dropship/twentysix + icon_state = "rasputin26" + +/turf/open/shuttle/dropship/twentyseven + icon_state = "rasputin27" + +/turf/open/shuttle/dropship/twentyeight + icon_state = "rasputin28" + +/turf/open/shuttle/dropship/twentynine + icon_state = "rasputin29" + +/turf/open/shuttle/dropship/thirty + icon_state = "rasputin30" + +/turf/open/shuttle/dropship/thirtyone + icon_state = "rasputin31" + +/turf/open/shuttle/dropship/thirtytwo + icon_state = "rasputin32" + +/turf/open/shuttle/dropship/thirtythree + icon_state = "rasputin33" + +/turf/open/shuttle/dropship/thirtyfour + icon_state = "rasputin34" + +/turf/open/shuttle/dropship/thirtyfive + icon_state = "rasputin35" + +/turf/open/shuttle/dropship/thirtysix + icon_state = "rasputin36" + +/turf/open/shuttle/dropship/thirtyseven + icon_state = "rasputin37" + +/turf/open/shuttle/dropship/thirtyeight + icon_state = "rasputin38" + +/turf/open/shuttle/dropship/thirtynine + icon_state = "rasputin39" + /turf/open/shuttle/dropship/grating icon = 'icons/turf/elevator.dmi' icon_state = "floor_grating" diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 9108aa1596631..cca39eca95642 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -567,6 +567,9 @@ if(P.chair_state != DROPSHIP_CHAIR_BROKEN) has_obstacle = TRUE break + if(istype(O, /obj/structure/bed/chair/dropship/doublewide)) + has_obstacle = TRUE + break else if(istype(O, /obj/structure/bed/nest)) //We don't care about other beds/chairs/whatever the fuck. has_obstacle = TRUE break diff --git a/code/modules/admin/fun_verbs.dm b/code/modules/admin/fun_verbs.dm index 4effe8a50a8c8..85f366f13116f 100644 --- a/code/modules/admin/fun_verbs.dm +++ b/code/modules/admin/fun_verbs.dm @@ -665,7 +665,7 @@ /proc/delayed_detonate_bomb_napalm(turf/impact) impact.ceiling_debris_check(3) explosion(impact, 2, 3, 4, 0, 6) - flame_radius(5, impact, 60, 30) + flame_radius(5, impact, 30, 60) /datum/admins/proc/drop_dynex_bomb() diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 721e9839eec05..d7652d5fd4b38 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -238,9 +238,7 @@ cell.charge -= 1000 / severity if (cell.charge < 0) cell.charge = 0 - if(cell.reliability != 100 && prob(50/severity)) - cell.reliability -= 10 / severity - ..() + return ..() // Called just before an attack_hand(), in mob/UnarmedAttack() /obj/item/clothing/gloves/proc/Touch(atom/A, proximity) diff --git a/code/modules/clothing/modular_armor/style_line.dm b/code/modules/clothing/modular_armor/style_line.dm index fdc6d11b0dc1c..3df08b74972a4 100644 --- a/code/modules/clothing/modular_armor/style_line.dm +++ b/code/modules/clothing/modular_armor/style_line.dm @@ -116,6 +116,7 @@ icon_state = "beret_inhand" item_state = "beret" starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/armor/stylehat_badge) + flags_inv_hide = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/classic_beret @@ -124,18 +125,21 @@ icon_state = "classic_beret_inhand" item_state = "classic_beret" starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/armor/stylehat_badge/classic) + flags_inv_hide = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/boonie name = "TGMC boonie" desc = "A boonie hat used by the TGMC, purpose made for operations in enviroments with a lot of sun, or dense vegetation." icon_state = "boonie_inhand" item_state = "boonie" + flags_inv_hide = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/cap name = "TGMC cap" desc = "A common patrol cap used by the TGMC, stylish and comes in many colors. Mostly useful to keep the sun and officers away." icon_state = "cap_inhand" item_state = "cap" + flags_inv_hide = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/slouchhat @@ -143,6 +147,7 @@ desc = "A slouch hat, makes you feel down under, doesn't it? Has 'PROPERTY OF THE TGMC' markings under the hat." icon_state = "slouch_inhand" item_state = "slouch" + flags_inv_hide = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/ushanka name = "TGMC ushanka" @@ -150,6 +155,7 @@ icon_state = "ushanka_inhand" item_state = "ushanka" starting_attachments = list(/obj/item/armor_module/storage/helmet, /obj/item/armor_module/armor/stylehat_badge/ushanka) + flags_inv_hide = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/campaignhat @@ -157,6 +163,7 @@ desc = "A campaign hat, you can feel the menacing aura that this hat erodes just by looking at it." icon_state = "campaign_inhand" item_state = "campaign" + flags_inv_hide = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/beanie @@ -164,6 +171,7 @@ desc = "A beanie, just looking at it makes you feel like an 'Oussama', or in better terms- A modern phenomenon of people suddenly needing to bench once they put on a beanie." icon_state = "beanie_inhand" item_state = "beanie" + flags_inv_hide = HIDE_EXCESS_HAIR /obj/item/clothing/head/modular/style/headband name = "TGMC headband" @@ -177,6 +185,7 @@ desc = "A bandana that goes on your head. Has TGMC markings on the back tie, and it seems that the knot will never come undone somehow." icon_state = "headbandana_inhand" item_state = "headbandana" + flags_inv_hide = HIDE_EXCESS_HAIR // style masks /obj/item/clothing/mask/gas/modular/skimask diff --git a/code/modules/events/intel_computer.dm b/code/modules/events/intel_computer.dm index 5e51d702456f5..f7487b5d75d31 100644 --- a/code/modules/events/intel_computer.dm +++ b/code/modules/events/intel_computer.dm @@ -20,6 +20,6 @@ /datum/round_event/intel_computer/proc/activate(obj/machinery/computer/intel_computer/I) I.active = TRUE - SSminimaps.add_marker(I, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "intel")) + SSminimaps.add_marker(I, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "intel", ABOVE_FLOAT_LAYER)) minor_announce("Our data sifting algorithm has detected valuable classified information on a access point in [get_area(I)]. Should this data be recovered by ground forces, a reward will be given in the form of increased assets.", title = "TGMC Intel Division") xeno_message("We sense a looming threat from [get_area(I)]. We must keep the hosts away from there.") diff --git a/code/modules/factory/unboxer.dm b/code/modules/factory/unboxer.dm index a0f0c2271e020..03940fa631686 100644 --- a/code/modules/factory/unboxer.dm +++ b/code/modules/factory/unboxer.dm @@ -303,13 +303,13 @@ /obj/item/factory_refill/railgun_hvap_magazine_refill name = "box of rounded metal plates" desc = "A box with round metal plates inside. Used to refill Unboxers." - refill_type = /obj/item/factory_part/railgun_magazine + refill_type = /obj/item/factory_part/railgun_hvap_magazine refill_amount = 20 /obj/item/factory_refill/railgun_smart_magazine_refill name = "box of rounded metal plates" desc = "A box with round metal plates inside. Used to refill Unboxers." - refill_type = /obj/item/factory_part/railgun_magazine + refill_type = /obj/item/factory_part/railgun_smart_magazine refill_amount = 20 /obj/item/factory_refill/minigun_powerpack_refill @@ -324,12 +324,6 @@ refill_type = /obj/item/factory_part/sniper_flak_magazine refill_amount = 20 -/obj/item/factory_refill/sniper_flak_magazine_refill - name = "box of rounded metal plates" - desc = "A box with round metal plates inside. Used to refill Unboxers." - refill_type = /obj/item/factory_part/sniper_flak_magazine - refill_amount = 20 - /obj/item/factory_refill/amr_magazine_refill name = "box of rounded metal plates" desc = "A box with round metal plates inside. Used to refill Unboxers." diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 5c2fa668c23ee..d34a3aad84c3f 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -298,11 +298,6 @@ Contains most of the procs that are called when a mob is attacked by something hit_report += "(RAW DMG: [throw_damage])" - if(thrown_item.item_fire_stacks) - fire_stacks += thrown_item.item_fire_stacks - IgniteMob() - hit_report += "(set ablaze)" - //thrown weapon embedded object code. if(affecting.limb_status & LIMB_DESTROYED) hit_report += "(delimbed [affecting.display_name])" diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index a2d05405f96c0..d2c002952573b 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -568,9 +568,11 @@ /datum/species/synthetic/handle_unique_behavior(mob/living/carbon/human/H) if(H.health <= -30 && H.stat != DEAD) // Instead of having a critical condition, they overheat and slowly die. - H.adjustFireLoss(rand(14, 24)) // This may need tweaks - if(prob(8)) - to_chat(H, span_alert("Critical damage sustained. Internal temperature regulation systems offline. Immediate repair required.")) + H.apply_effect(4 SECONDS, STUTTER) // Added flavor + H.adjustFireLoss(rand(5, 16)) // Melting!!! + if(prob(12)) + H.visible_message(span_boldwarning("[H] shudders violently and shoots out sparks!"), span_warning("Critical damage sustained. Internal temperature regulation systems offline. Shutdown imminent. Estimated integrity: [round(H.health)]%.")) + do_sparks(4, TRUE, H) /datum/species/synthetic/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) . = ..() @@ -629,9 +631,11 @@ /datum/species/early_synthetic/handle_unique_behavior(mob/living/carbon/human/H) if(H.health <= -30 && H.stat != DEAD) // Instead of having a critical condition, they overheat and slowly die. - H.adjustFireLoss(rand(18, 28)) // This may need tweaks - if(prob(8)) - to_chat(H, span_alert("Critical damage sustained. Internal temperature regulation systems offline. Immediate repair required.")) + H.apply_effect(4 SECONDS, STUTTER) // Added flavor + H.adjustFireLoss(rand(7, 19)) // Melting even more!!! + if(prob(12)) + H.visible_message(span_boldwarning("[H] shudders violently and shoots out sparks!"), span_warning("Critical damage sustained. Internal temperature regulation systems offline. Shutdown imminent. Estimated integrity: [round(H.health)]%.")) + do_sparks(4, TRUE, H) /datum/species/early_synthetic/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) . = ..() diff --git a/code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm index 50569ac432f33..06b5f1d56f7c8 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/boiler/abilities_boiler.dm @@ -188,20 +188,39 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( /datum/action/ability/activable/xeno/bombard/on_cooldown_finish() to_chat(owner, span_notice("We feel your toxin glands swell. We are able to bombard an area again.")) + var/mob/living/carbon/xenomorph/boiler/firer = owner + if(firer.selected_ability == src) + firer.set_bombard_pointer() return ..() /datum/action/ability/activable/xeno/bombard/on_selection() + var/mob/living/carbon/xenomorph/boiler/firer = owner + var/current_ammo = firer.corrosive_ammo + firer.neuro_ammo + if(current_ammo <= 0) + to_chat(firer, span_notice("We have nothing prepared to fire.")) + return FALSE + + firer.visible_message(span_notice("\The [firer] begins digging their claws into the ground."), \ + span_notice("We begin digging ourselves into place."), null, 5) + if(!do_after(firer, 3 SECONDS, FALSE, null, BUSY_ICON_HOSTILE)) + on_deselection() + firer.selected_ability = null + firer.update_action_button_icons() + firer.reset_bombard_pointer() + return FALSE + + firer.visible_message(span_notice("\The [firer] digs itself into the ground!"), \ + span_notice("We dig ourselves into place! If we move, we must wait again to fire."), null, 5) + firer.set_bombard_pointer() RegisterSignal(owner, COMSIG_MOB_ATTACK_RANGED, TYPE_PROC_REF(/datum/action/ability/activable/xeno/bombard, on_ranged_attack)) /datum/action/ability/activable/xeno/bombard/on_deselection() + var/mob/living/carbon/xenomorph/boiler/firer = owner + if(firer.selected_ability == src) + firer.reset_bombard_pointer() + to_chat(firer, span_notice("We relax our stance.")) UnregisterSignal(owner, COMSIG_MOB_ATTACK_RANGED) -/// Signal proc for clicking at a distance -/datum/action/ability/activable/xeno/bombard/proc/on_ranged_attack(mob/living/carbon/xenomorph/X, atom/A, params) - SIGNAL_HANDLER - if(can_use_ability(A, TRUE)) - INVOKE_ASYNC(src, PROC_REF(use_ability), A) - /datum/action/ability/activable/xeno/bombard/can_use_ability(atom/A, silent = FALSE, override_flags) . = ..() if(!.) @@ -266,6 +285,36 @@ GLOBAL_LIST_INIT(boiler_glob_image_list, list( update_button_icon() add_cooldown() +/datum/action/ability/activable/xeno/bombard/clean_action() + var/mob/living/carbon/xenomorph/boiler/firer = owner + firer.reset_bombard_pointer() + return ..() + +/// Signal proc for clicking at a distance +/datum/action/ability/activable/xeno/bombard/proc/on_ranged_attack(mob/living/carbon/xenomorph/X, atom/A, params) + SIGNAL_HANDLER + if(can_use_ability(A, TRUE)) + INVOKE_ASYNC(src, PROC_REF(use_ability), A) + +/mob/living/carbon/xenomorph/boiler/Moved(atom/OldLoc,Dir) + . = ..() + if(selected_ability?.type == /datum/action/ability/activable/xeno/bombard) + var/datum/action/ability/activable/bomb = actions_by_path[/datum/action/ability/activable/xeno/bombard] + bomb.on_deselection() + selected_ability.button.icon_state = "template" + selected_ability = null + update_action_button_icons() + +/// Set the boiler's mouse cursor to the green firing cursor. +/mob/living/carbon/xenomorph/boiler/proc/set_bombard_pointer() + if(client) + client.mouse_pointer_icon = 'icons/mecha/mecha_mouse.dmi' + +/// Resets the boiler's mouse cursor to the default cursor. +/mob/living/carbon/xenomorph/boiler/proc/reset_bombard_pointer() + if(client) + client.mouse_pointer_icon = initial(client.mouse_pointer_icon) + // *************************************** // *********** Acid spray // *************************************** diff --git a/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm b/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm index b25a49b538d59..0a40efcdc1606 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/drone/castedatum_drone.dm @@ -53,6 +53,7 @@ /datum/action/ability/activable/xeno/plant_weeds, /datum/action/ability/activable/xeno/secrete_resin, /datum/action/ability/activable/xeno/secrete_special_resin, + /datum/action/ability/xeno_action/place_acidwell, /datum/action/ability/activable/xeno/essence_link, /datum/action/ability/activable/xeno/psychic_cure/acidic_salve, /datum/action/ability/activable/xeno/transfer_plasma/drone, @@ -82,6 +83,7 @@ /datum/action/ability/activable/xeno/plant_weeds, /datum/action/ability/activable/xeno/secrete_resin, /datum/action/ability/activable/xeno/secrete_special_resin, + /datum/action/ability/xeno_action/place_acidwell, /datum/action/ability/activable/xeno/essence_link, /datum/action/ability/activable/xeno/psychic_cure/acidic_salve, /datum/action/ability/activable/xeno/transfer_plasma/drone, diff --git a/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm b/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm index 6b948c7c4324c..86283906d32b8 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm @@ -46,6 +46,12 @@ keybinding_signals = list( KEYBINDING_NORMAL = COMSIG_XENOABILITY_PETRIFY, ) + ///List of mobs currently petrified + var/list/mob/living/carbon/human/petrified_humans = list() + +/datum/action/ability/xeno_action/petrify/clean_action() + end_effects() + return ..() /datum/action/ability/xeno_action/petrify/action_activate() var/obj/effect/overlay/eye/eye = new @@ -64,7 +70,6 @@ finish_charging() playsound(owner, 'sound/effects/petrify_activate.ogg', 50) - var/list/mob/living/carbon/human/humans = list() for(var/mob/living/carbon/human/human in view(PETRIFY_RANGE, owner.loc)) if(is_blind(human)) continue @@ -86,16 +91,16 @@ stone_overlay.overlays += mask human.overlays += stone_overlay - humans[human] = stone_overlay + petrified_humans[human] = stone_overlay - if(!length(humans)) + if(!length(petrified_humans)) flick("eye_closing", eye) addtimer(CALLBACK(src, PROC_REF(remove_eye), eye), 7, TIMER_CLIENT_TIME) return addtimer(CALLBACK(src, PROC_REF(remove_eye), eye), 10, TIMER_CLIENT_TIME) flick("eye_explode", eye) - addtimer(CALLBACK(src, PROC_REF(end_effects), humans), PETRIFY_DURATION) + addtimer(CALLBACK(src, PROC_REF(end_effects)), PETRIFY_DURATION) add_cooldown() succeed_activate() @@ -109,14 +114,15 @@ ADD_TRAIT(owner, TRAIT_STAGGER_RESISTANT, XENO_TRAIT) ///ends all combat-relazted effects -/datum/action/ability/xeno_action/petrify/proc/end_effects(list/humans) - for(var/mob/living/carbon/human/human AS in humans) +/datum/action/ability/xeno_action/petrify/proc/end_effects() + for(var/mob/living/carbon/human/human AS in petrified_humans) human.notransform = FALSE human.status_flags &= ~GODMODE REMOVE_TRAIT(human, TRAIT_HANDS_BLOCKED, REF(src)) human.move_resist = initial(human.move_resist) human.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, COLOR_GRAY) - human.overlays -= humans[human] + human.overlays -= petrified_humans[human] + petrified_humans.Cut() ///callback for removing the eye from viscontents /datum/action/ability/xeno_action/petrify/proc/remove_eye(obj/effect/eye) diff --git a/code/modules/mob/living/carbon/xenomorph/castes/queen/abilities_queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/queen/abilities_queen.dm index 081739dc4c920..48d7d36a5efc8 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/queen/abilities_queen.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/queen/abilities_queen.dm @@ -76,40 +76,42 @@ return ..() /datum/action/ability/activable/xeno/screech/use_ability(atom/A) - var/mob/living/carbon/xenomorph/queen/X = owner + var/mob/living/carbon/xenomorph/queen/xeno_owner = owner //screech is so powerful it kills huggers in our hands - if(istype(X.r_hand, /obj/item/clothing/mask/facehugger)) - var/obj/item/clothing/mask/facehugger/FH = X.r_hand + if(istype(xeno_owner.r_hand, /obj/item/clothing/mask/facehugger)) + var/obj/item/clothing/mask/facehugger/FH = xeno_owner.r_hand if(FH.stat != DEAD) FH.kill_hugger() - if(istype(X.l_hand, /obj/item/clothing/mask/facehugger)) - var/obj/item/clothing/mask/facehugger/FH = X.l_hand + if(istype(xeno_owner.l_hand, /obj/item/clothing/mask/facehugger)) + var/obj/item/clothing/mask/facehugger/FH = xeno_owner.l_hand if(FH.stat != DEAD) FH.kill_hugger() succeed_activate() add_cooldown() - playsound(X.loc, 'sound/voice/alien_queen_screech.ogg', 75, 0) - X.visible_message(span_xenohighdanger("\The [X] emits an ear-splitting guttural roar!")) + playsound(xeno_owner.loc, 'sound/voice/alien_queen_screech.ogg', 75, 0) + xeno_owner.visible_message(span_xenohighdanger("\The [xeno_owner] emits an ear-splitting guttural roar!")) GLOB.round_statistics.queen_screech++ SSblackbox.record_feedback("tally", "round_statistics", 1, "queen_screech") - X.create_shriekwave() //Adds the visual effect. Wom wom wom + xeno_owner.create_shriekwave() //Adds the visual effect. Wom wom wom - var/list/nearby_living = list() - for(var/mob/living/L in hearers(WORLD_VIEW, X)) - nearby_living.Add(L) for(var/obj/vehicle/sealed/armored/tank AS in GLOB.tank_list) - if(get_dist(tank, X) > WORLD_VIEW_NUM) + if(get_dist(tank, xeno_owner) > WORLD_VIEW_NUM) continue - nearby_living += tank.occupants - - for(var/mob/living/L AS in GLOB.mob_living_list) - if(get_dist(L, X) > WORLD_VIEW_NUM) + if(tank.z != owner.z) continue - L.screech_act(X, WORLD_VIEW_NUM, L in nearby_living) + for(var/mob/living/living_victim AS in tank.occupants) + living_victim.screech_act(xeno_owner, WORLD_VIEW_NUM) //todo: The effects of screech are weird due to relying on get_dist for a mob on a diff z-level + + var/list/nearby_living = list() //if you're a hearer you get effected more severely + for(var/mob/living/living_victim in hearers(WORLD_VIEW, xeno_owner)) + nearby_living.Add(living_victim) + + for(var/mob/living/living_victim AS in cheap_get_living_near(xeno_owner, WORLD_VIEW_NUM)) + living_victim.screech_act(xeno_owner, WORLD_VIEW_NUM, living_victim in nearby_living) /datum/action/ability/activable/xeno/screech/ai_should_start_consider() return TRUE diff --git a/code/modules/mob/living/carbon/xenomorph/castes/warrior/abilities_warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/warrior/abilities_warrior.dm index ee2471a22a048..220fa99bdb82c 100644 --- a/code/modules/mob/living/carbon/xenomorph/castes/warrior/abilities_warrior.dm +++ b/code/modules/mob/living/carbon/xenomorph/castes/warrior/abilities_warrior.dm @@ -230,7 +230,7 @@ if(!silent) owner.balloon_alert(owner, "Dead") return FALSE - if(get_dist_euclide_square(living_target, owner) > WARRIOR_LUNGE_RANGE * 5) + if(get_dist_euclidean_square(living_target, owner) > WARRIOR_LUNGE_RANGE * 5) if(!silent) owner.balloon_alert(owner, "Too far") return FALSE diff --git a/code/modules/mob/living/carbon/xenomorph/facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/facehuggers.dm index 72e0b4aea089f..5d2a404ad01fb 100644 --- a/code/modules/mob/living/carbon/xenomorph/facehuggers.dm +++ b/code/modules/mob/living/carbon/xenomorph/facehuggers.dm @@ -258,16 +258,23 @@ go_idle() return - var/i = 10//So if we have a pile of dead bodies around, it doesn't scan everything, just ten iterations. - for(var/mob/living/carbon/M in view(4,src)) - if(!i) - break - if(M.can_be_facehugged(src)) - visible_message(span_warning("\The scuttling [src] leaps at [M]!"), null, null, 4) - leaping = TRUE - throw_at(M, 4, 1) - return //We found a target and will jump towards it; cancel out. If we didn't find anything, continue and try again later - --i + var/mob/living/carbon/chosen_target + + for(var/mob/living/carbon/M in view(4, src)) + // Using euclidean distance means it will prioritize cardinal directions, which are less likely to miss due to wall jank. + if(chosen_target && (get_dist_euclidean(src, M) > get_dist_euclidean(src, chosen_target))) + continue + + if(!M.can_be_facehugged(src)) + continue + + chosen_target = M + + if(chosen_target) + visible_message(span_warning("\The scuttling [src] leaps at [chosen_target]!"), null, null, 4) + leaping = TRUE + throw_at(chosen_target, 4, 1) + return remove_danger_overlay() //Remove the danger overlay pre_leap() //Go into the universal leap set up proc diff --git a/code/modules/mob/living/carbon/xenomorph/life.dm b/code/modules/mob/living/carbon/xenomorph/life.dm index 96d560bc2ec38..e0c9e11e38944 100644 --- a/code/modules/mob/living/carbon/xenomorph/life.dm +++ b/code/modules/mob/living/carbon/xenomorph/life.dm @@ -140,6 +140,8 @@ SEND_SIGNAL(src, COMSIG_XENOMORPH_PLASMA_REGEN, plasma_mod) + plasma_mod[1] = clamp(plasma_mod[1], 0, xeno_caste.plasma_max * xeno_caste.plasma_regen_limit - plasma_stored) + gain_plasma(plasma_mod[1]) /mob/living/carbon/xenomorph/can_receive_aura(aura_type, atom/source, datum/aura_bearer/bearer) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index b7c103227611d..ef1bd9d1947c0 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -71,9 +71,6 @@ var/obj/O = AM O.stop_throw() apply_damage(O.throwforce*(speed * 0.2), O.damtype, BODY_ZONE_CHEST, MELEE, is_sharp(O), has_edge(O), TRUE, O.penetration) - if(O.item_fire_stacks) - fire_stacks += O.item_fire_stacks - IgniteMob() visible_message(span_warning(" [src] has been hit by [AM]."), null, null, 5) if(ismob(AM.thrower)) diff --git a/code/modules/paperwork/beginner_tutorials.dm b/code/modules/paperwork/beginner_tutorials.dm index 6a88dd674aef9..61235612899a2 100644 --- a/code/modules/paperwork/beginner_tutorials.dm +++ b/code/modules/paperwork/beginner_tutorials.dm @@ -2,327 +2,746 @@ /obj/item/paper/tutorial/beginner_rifleman name = "Rifleman Tutorial" - info = {"As a rifleman, you are suited for virtually all theatres of combat. Your AR-12 assault rifle is accurate and effective at all ranges, and its powerful underbarrel grenade launcher poses even further danger to mid-range threats. Inside your backpack is a box of flares to refill your flare pouch, gauze and ointment for brute (slashes) and burn (acid) wounds respectively, and backup magazines for your AR 12. Your belt contains backup magazines for your AR-12, while your body armor contains additional grenades to reload your underbarrel grenade launcher with. Your left pocket contains a flare gun holster and several flares. Your right pocket contains a first aid kit, complete with Bicaridine (which heals brute damage), Kelotane (which heals burn damage), Tramadol (which is a painkiller), Tricordrazine (which heals all damage, but slowly), and Dylovene (which heals toxin, or poison damage), as well as splints and inaprovaline. Your helmet contains two protein bars, in case you get hungry, and your boots contain a standard issue combat knife for clearing weeds or breaking things.
-
- Try to spend as much time as possible near other marines - being alone is very dangerous. Your versatility is an immense strength and makes you the ideal battle buddy for virtually any other marine. You can easily work with a shotgunner to clear close quarters areas, or perhaps with a machine gunner to hold a fortified position, or even take point in front of a marksman. When not in immediate danger, use your flare gun to keep your surroundings lit, as your and your fellow marines' lives may very well depend on it.
+ info = {"As a rifleman, you are suited for virtually all theatres of combat.\ + Your AR-12 assault rifle is accurate and effective at all ranges, and its powerful underbarrel grenade launcher poses even further danger to mid-range threats.\ + Inside your backpack is a box of flares to refill your flare pouch, gauze and ointment for brute (slashes) and burn (acid) wounds respectively,\ + and backup magazines for your AR 12.\ + Your belt contains backup magazines for your AR-12, while your body armor contains additional grenades to reload your underbarrel grenade launcher.\ + Your left pocket contains a flare gun holster and several flares.\ + Your right pocket contains a first aid kit, with Bicaridine (heals brute damage), Kelotane (heals burn damage), Tramadol (a painkiller),\ + Tricordrazine (heals all damage, but slowly), and Dylovene (heals toxin damage), as well as splints and inaprovaline.\ + Your helmet contains two protein bars, in case you get hungry, and your boots contain a standard-issue combat knife for clearing weeds or breaking things.
+
+ Try to spend as much time as possible near other marines - being alone is very dangerous.\ + Your versatility is an immense strength and makes you the ideal battle buddy for virtually any other marine.\ + You can easily work with a shotgunner to clear close quarters areas, or perhaps with a machine gunner to hold a fortified position, or even take point in front of a marksman.\ + When not in immediate danger, use your flare gun to keep your surroundings lit, as your and your fellow marines' lives may very well depend on it.

TIPS

- BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment as long as you hold still. You can remove pills from their packets directly by right clicking on the packet, even while it's in storage.
-
- While holding your AR-12, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil. In the top left of your screen are several weapon-specific buttons. The "Take Aim" button toggles aim mode, a feature that slows your rate of fire in exchange for allowing you to shoot through allied marines. (Note that your grenades will NOT go through marines!) The second option changes the firing mode, between Single Automatic, Burst, and Burst Automatic. Automatic modes will keep firing as long as you hold down the mouse button. The third option enables your underbarrel grenade launcher. Once enabled, you can use right click to launch a grenade out!
-
- On running out of ammo, the empty magazine will automatically eject from the rifle. To reload, simply grab a new magazine with an empty hand and click your gun with it. Alternatively, you can perform a tactical reload by click-dragging the magazine from its storage directly onto the rifle, which can be done without an empty hand and with a different magazine still in the gun. You can reload the underbarrel launcher by right clicking on the gun while holding a valid grenade (like the HEDP grenades in your webbing.)
-
- Your flare gun can be rapidly reloaded by just right clicking the flare pouch with it in hand. Your flare pouch can be refilled by left clicking on it while holding a flare box. Flare any dark area you can see to reduce the risk of a xenomorph ambushing you from the dark. On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
-
- Your P23 has a pistol lace attached. By toggling it in the top left while wielding it, it becomes impossible for you to drop - or for it to be knocked out of your hand by a xenomorph. Similarly, your AR-12 has a magnetic harness, which means if you drop it or otherwise lose it, it'll automatically snap back to your armor.
-
- Because your AR-12 can effectively engage at all ranges, your optimal range is whatever your opponent's optimal range isn't. Try keeping the distance from ferocious melee enemies, while getting too close for comfort with squishier ranged ones."} + BKTT is an acronym used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation\ + that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system,\ + and too many at once risks a dangerous overdose.\ + Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment\ + as long as you hold still. You can remove pills from their packets directly by right-clicking on the packet, even while it's in storage.
+
+ While holding your AR-12, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil.\ + In the top left of your screen are several weapon-specific buttons. The "Take Aim" button toggles aim mode, a feature that slows your rate of fire\ + in exchange for allowing you to shoot through allied marines. (Note that your grenades will NOT go through marines!)\ + The second option changes the firing mode, between Single Automatic, Burst, and Burst Automatic.\ + Automatic modes will keep firing as long as you hold down the mouse button.\ + The third option enables your underbarrel grenade launcher. Once enabled, you can use right-click to launch a grenade out!
+
+ On running out of ammo, the empty magazine will automatically eject from the rifle.\ + To reload, simply grab a new magazine with an empty hand and click your gun with it.\ + Alternatively, you can perform a tactical reload by click-dragging the magazine from its storage directly onto the rifle,\ + which can be done without an empty hand and with a different magazine still in the gun.\ + You can reload the underbarrel launcher by right-clicking on the gun while holding a valid grenade (like the HEDP grenades in your webbing).
+
+ Your flare gun can be rapidly reloaded by just right-clicking the flare pouch with it in hand.\ + Your flare pouch can be refilled by left-clicking on it while holding a flare box. + Flare any dark area you can see to reduce the risk of a xenomorph ambushing you.\ + On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
+
+ Your P23 has a pistol lace attached.\ + By toggling it in the top left while wielding it, it becomes impossible for you to drop - or for it to be knocked out of your hand by a xenomorph.\ + Similarly, your AR-12 has a magnetic harness, which means if you drop it or otherwise lose it, it'll automatically snap back to your armor.
+
+ Because your AR-12 can effectively engage at all ranges, your optimal range is whatever your opponent's optimal range isn't.\ + Try keeping the distance from ferocious melee enemies, while getting too close for comfort with squishier ranged ones."} /obj/item/paper/tutorial/beginner_machinegunner - name = "Machinergunner Tutorial" - info = {"As a machinegunner, you are the backbone of a marine force. While you possess heavy armor reinforced with Tyr-pattern plating (strengthening its defense even further against melee attacks), your slow move speed and the unwieldy nature of your MG-60 machine gun means you should not be spearheading any pushes. Aim mode is your best friend - combined with your red dot sight and bipod, you are very apt at sitting just behind the front line, eliminating threats and keeping the marines in front of you safe. Your backpack contains several additional box magazines, allowing you to carry almost two THOUSAND rounds on your person at any time. Your left pouch contains a first aid kit, complete with Bicaridine (which heals brute damage), Kelotane (which heals burn damage), Tramadol (which is a painkiller), Tricordrazine (which heals all damage, but slowly), and Dylovene (which heals toxin, or poison damage), as well as splints and inaprovaline. Your right pocket contains a flare gun holster and several flares. Your suit storage contains two plasma pistols, which are low in damage but can start fires. Your webbing contains an MRE to eat and both gauze and ointment, your helmet contains two protein bars for further eating, and your boots contain a standard issue combat knife for clearing weeds or breaking things.
-
- Your full strength is hard to utilize on your own or in the very front of battle. Your ideal positions are either safely behind a barricade guarding a front or flank from assault, or behind your fellow marines, shooting over them with aim mode to protect them from enemies. Keep in mind that your heavy armor and weapon means you move rather slowly - so if you get the order to leave a position, get moving early to avoid being left behind.
+ name = "Machinegunner Tutorial" + info = {"As a machinegunner, you are the backbone of a marine force. While you possess heavy armor reinforced with\ + Tyr-pattern plating (strengthening its defense even further against melee attacks), your slow move speed and the unwieldy nature of your MG-60 machinegun\ + means you should not be spearheading any pushes. Aim mode is your best friend - combined with your bipod, you are very apt at sitting just behind the front line,\ + eliminating threats and keeping the marines in front of you safe.\ + Your backpack contains several additional box magazines, allowing you to carry almost two THOUSAND rounds on your person at any time.\ + Your left pouch contains a first aid kit, complete with Bicaridine (heals brute damage), Kelotane (heals burn damage), Tramadol (a painkiller),\ + Tricordrazine (heals all damage, but slowly), and Dylovene (heals toxin damage), as well as splints and inaprovaline.\ + Your right pocket contains a flare gun holster and several flares. Your suit storage contains two plasma pistols, which are low in damage but can start fires.\ + Your webbing contains an MRE to eat and both gauze and ointment, your helmet contains two protein bars for further eating,\ + and your boots contain a standard-issue combat knife for clearing weeds or breaking things.
+
+ Your full strength is hard to utilize on your own or in the very front of battle.\ + Your ideal positions are either safely behind a barricade guarding a front or flank from assault,\ + or behind your fellow marines, shooting over them with aim mode to protect them from enemies.\ + Keep in mind that your heavy armor and weapon means you move rather slowly - so if you get the order to leave a position, get moving early to avoid being left behind.

TIPS

- BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment as long as you hold still. Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb. Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state. You can remove pills from their packets directly by right clicking on the packet, even while it's in storage.
-
- While holding your MG-60, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil. In the top left of your screen are several weapon-specific buttons. The "Take Aim" button toggles aim mode, a feature that slows your rate of fire in exchange for allowing you to shoot through allied marines. The bipod button will deploy your bipod, increasing fire rate and accuracy significantly for as long as you remain stationary.
-
- On running out of ammo, the empty magazine will automatically eject from the machine gun. To reload, simply grab a new magazine with an empty hand and click your gun with it. Alternatively, you can perform a tactical reload by click-dragging the magazine from its storage directly onto the machine gun, which can be done without an empty hand and with a different magazine still in the gun.
-
- Your flare gun can be rapidly reloaded by just right clicking the flare pouch with it in hand. Your flare pouch can be refilled by left clicking on it while holding a flare box. Flare any dark area you can see to reduce the risk of a xenomorph ambushing you from the dark. On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
-
- On your belt is a belt harness. By left clicking on your belt harness with your machine gun, you can attach them. If you drop your machine gun, or have a xenomorph make you drop it, your machine gun will automatically return to your armor if it's attached.
-
- If you are facehugged, quickly take out your plasma pistol and shoot the ground with it, then walk into the fire. While this will cause you to be set on fire, facehuggers will detach in the presence of fire, preventing you from becoming infected. You can press B (or click resist in the bottom right) once the facehugger has detached to stop, drop, and roll, extinguishing the fire.
-
- Your impressive magazine size means you don't need to reload often. You can suppress one spot for an impressive amount of time, and you have the ammo and damage to clear out resin walls.
+ BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix\ + for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system,\ + and too many at once risks a dangerous overdose.\ + Your gauze and ointment are body-part specific, unlike medication, but once you start applying one,\ + you will keep applying it to all body parts that require treatment as long as you hold still.\ + Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb.\ + Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine\ + that is so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state.\ + You can remove pills from their packets directly by right-clicking on the packet, even while it's in storage.
+
+ While holding your MG-60, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil.\ + In the top left of your screen are several weapon-specific buttons. The "Take Aim" button toggles aim mode, a feature that slows your rate of fire\ + in exchange for allowing you to shoot through allied marines. The bipod button will deploy your bipod, increasing fire rate and accuracy significantly\ + for as long as you remain stationary.
+
+ On running out of ammo, the empty magazine will automatically eject from the machine gun.\ + To reload, simply grab a new magazine with an empty hand and click your gun with it.\ + Alternatively, you can perform a tactical reload by click-dragging the magazine from its storage directly onto the machine gun, which can be done without an empty hand\ + and with a different magazine still in the gun.
+
+ Your flare gun can be rapidly reloaded by just right-clicking the flare pouch with it in hand.\ + Your flare pouch can be refilled by left clicking on it while holding a flare box.\ + Flare any dark area you can see to reduce the risk of a xenomorph ambushing you from the dark.\ + On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
+
+ On your belt is a belt harness. By left clicking on your belt harness with your machine gun, you can attach them.\ + If you drop your machine gun, or have a xenomorph make you drop it, your machine gun will automatically return to your armor if it's attached.
+
+ If you are facehugged, quickly take out your plasma pistol and shoot the ground with it, then walk into the fire.\ + While this will cause you to be set on fire, facehuggers will detach in the presence of fire, preventing you from becoming infected.\ + You can press B (or click resist in the bottom right) once the facehugger has detached to stop, drop, and roll, extinguishing the fire.
+
+ Your impressive magazine size means you don't need to reload often.\ + You can suppress one spot for an impressive amount of time, and you have the ammo and damage to clear out resin walls.

The more bullets you shoot, the better a marine you are. It's actually that simple."} /obj/item/paper/tutorial/beginner_marksman name = "Marksman Tutorial" - info = {"As a marksman, you are a master of precision and range, and should utilize both of these advantages as much as possible. Your DMR-37 is incredibly accurate at long ranges and packs a devastating punch. Due to your ability to engage at long range - and conversely, your inability to engage properly at short range - you should be staying as far from conflict as possible while still remaining in your rifle's effective range. Your backpack and both of your pouches contain spare magazines for your DMR. Your backpack also contains an MRE to eat, and both gauze and ointment for treating injuries. Your armor contains Bicaridine (which heals brute damage), Kelotane (which heals burn damage), Tramadol (which is a painkiller), Tricordrazine (which heals all damage, but slowly), and an inaprovaline injector for helping other marines in critical condition. Your webbing contains the MK88 Mod 4, a fully automatic handgun for self-defense, as well as spare magazines for it. Your helmet contains protein bars to eat, and your boots contain a survival knife for clearing weeds and breaking things.
-
- With your DMR, aim to support other marines from afar using your scope and aim mode. Your range means that many xenomorphs might not realize you're watching over an area until you're already shooting at them - use this to your advantage. Your rate of fire is relatively slow compared to automatic weapons, so make each of your shots count.
+ info = {"As a marksman, you are a master of precision and range, and should utilize both of these advantages as much as possible.\ + Your DMR-37 is incredibly accurate at long ranges and packs a devastating punch. Due to your ability to engage at long range - and conversely,\ + your inability to engage properly at short range - you should be staying as far from conflict as possible while still remaining in your rifle's effective range.\ + Your backpack and both of your pouches contain spare magazines for your DMR. Your backpack also contains an MRE to eat, and both gauze and ointment for treating injuries.\ + Your armor contains Bicaridine (heals brute damage), Kelotane (heals burn damage), Tramadol (a painkiller),\ + Tricordrazine (heals all damage, but slowly), and an inaprovaline injector for helping other marines in critical condition.\ + Your webbing contains the MK88 Mod 4, a fully automatic handgun for self-defense, as well as spare magazines for it.\ + Your helmet contains protein bars to eat, and your boots contain a survival knife for clearing weeds and breaking things.
+
+ With your DMR, aim to support other marines from afar using your scope and aim mode.\ + Your range means that many xenomorphs might not realize you're watching over an area until you're already shooting at them - use this to your advantage.\ + Your rate of fire is relatively slow compared to automatic weapons, so make each of your shots count.

TIPS

- BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment as long as you hold still. Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state. You can remove pills from their packets directly by right clicking on the packet, even while it's in storage.
-
- On running out of ammo, the empty magazine will automatically eject from the DMR. To reload, simply grab a new magazine with an empty hand and click your gun with it. Alternatively, you can perform a tactical reload by click-dragging the magazine from its storage directly onto the DMR, which can be done without an empty hand and with a different magazine still in the gun.
-
- While holding your DMR-37, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil. In the top left of your screen are several weapon-specific buttons. The "Take Aim" button toggles aim mode, a feature that slows your rate of fire in exchange for allowing you to shoot through allied marines. The scope button will zoom your screen out and towards the direction you're currently facing, allowing you to see (and shoot at) targets much farther away.
-
- On your belt is a belt harness. By left clicking on your belt harness with your DMR, you can attach them. If you drop your DMR, or have a xenomorph make you drop it, your DMR will automatically return to your armor if it's attached.
-
- Try holding your fire until your target is already engaging someone else. While this may seem counter-intuitive, it allows you to wait until they've already committed to a fight (that's likely to damage them) and may cause them to not notice your presence until it's too late, increasing the odds of securing a kill.
-
- Do not attempt to use your DMR at too close of a range, as marksman weapons have a chance to miss against enemies that are near you. Instead, try switching to your 88 Mod 4, your fully automatic handgun that's much more effective at close range."} + BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix\ + for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process\ + through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start\ + applying one, you will keep applying it to all body parts that require treatment as long as you hold still.\ + Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious\ + on the ground (referred to as "critical condition") to rescue them from that state.\ + You can remove pills from their packets directly by right-clicking on the packet, even while it's in storage.
+
+ On running out of ammo, the empty magazine will automatically eject from the DMR.\ + To reload, simply grab a new magazine with an empty hand and click your gun with it.\ + Alternatively, you can perform a tactical reload by click-dragging the magazine from its storage directly onto the DMR,\ + which can be done without an empty hand and with a different magazine still in the gun.
+
+ While holding your DMR-37, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil.\ + In the top left of your screen are several weapon-specific buttons.\ + The "Take Aim" button toggles aim mode, a feature that slows your rate of fire in exchange for allowing you to shoot through allied marines.\ + The scope button will zoom your screen out and towards the direction you're currently facing, allowing you to see (and shoot at) targets much farther away.
+
+ On your belt is a belt harness. By left clicking on your belt harness with your DMR, you can attach them. If you drop your DMR,\ + or have a xenomorph make you drop it, your DMR will automatically return to your armor if it's attached.
+
+ Try holding your fire until your target is already engaging someone else. While this may seem counter-intuitive,\ + it allows you to wait until they've already committed to a fight (that's likely to damage them) and may cause them to not notice your presence until it's too late,\ + increasing the odds of securing a kill.
+
+ Do not attempt to use your DMR at too close of a range, as marksman weapons have a chance to miss against enemies that are near you.\ + Instead, try switching to your MK88 Mod 4, your fully automatic handgun that's much more effective at close range.\ + Use your strengths in overwatching the battlefield to assist in securing valuable kills. "} /obj/item/paper/tutorial/beginner_shotgunner name = "Shotgunner Tutorial" - info = {"As a shotgunner, you are the spearhead of the marine force. Your semiautomatic SH-39 fires slugs that will devastate any target at short to medium range, dealing heavy damage as well as leaving them stunned and staggered. Your role is to be at the front of any marine push, side by side with your fellow marines as you charge into danger. Your shotgun shell rig on your belt, as well as your backpack, hold many additional slugs to reload your shotgun with. Your backpack also contains an MRE to eat, and both gauze and ointment for treating injuries, as well as inaprovaline. Your left pouch contains a first aid kit, complete with Bicaridine (which heals brute damage), Kelotane (which heals burn damage), Tramadol (which is a painkiller), Tricordrazine (which heals all damage, but slowly), and Dylovene (which heals toxin, or poison damage), as well as splints and inaprovaline. Your right pocket contains a flare gun holster and several flares. Your webbing contains a plasma pistol, a low damage sidearm that starts fires wherever it hits. Your suit storage contains boxes of additional flares. Your helmet contains protein bars to eat, and your boot contains a combat knife for clearing weeds and breaking things.
-
- You should be close to the enemy constantly to take full advantage of your shotgun. This does not mean you should run off alone, as this is a good way to get yourself killed; rather, be in front of other marines, clearing away enemies to allow them to safely advance and cover you.
+ info = {"As a shotgunner, you are the spearhead of the marine force.\ + Your semiautomatic SH-39 fires slugs that will devastate any target at short to medium range, dealing heavy damage as well as leaving them stunned and staggered.\ + Your role is to be at the front of any marine push, side by side with your fellow marines as you charge into danger. Your shotgun shell rig on your belt,\ + as well as your backpack, hold many additional slugs to reload your shotgun with.\ + Your backpack also contains an MRE to eat, and both gauze and ointment for treating injuries, as well as inaprovaline.\ + Your left pouch contains a first aid kit, complete with Bicaridine (heals brute damage), Kelotane (heals burn damage),\ + Tramadol (which is a painkiller), Tricordrazine (heals all damage, but slowly), and Dylovene (heals toxin damage),\ + as well as splints and inaprovaline. Your right pocket contains a flare gun holster and several flares.\ + Your webbing contains a plasma pistol, a low damage sidearm that starts fires wherever it hits.\ + Your suit storage contains boxes of additional flares. Your helmet contains protein bars to eat, and your boot contains a combat knife for clearing weeds and breaking things.
+
+ You should be close to the enemy constantly to take full advantage of your shotgun.\ + This does not mean you should run off alone, as this is a good way to get yourself killed;\ + rather, be in front of other marines, clearing away enemies to allow them to safely advance and cover you.

TIPS

- BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment as long as you hold still. Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb. Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state. You can remove pills from their packets directly by right clicking on the packet, even while it's in storage.
+ BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix\ + for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process\ + through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start\ + applying one, you will keep applying it to all body parts that require treatment as long as you hold still.\ + Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb.\ + Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious\ + on the ground (referred to as "critical condition") to rescue them from that state.\ + You can remove pills from their packets directly by right-clicking on the packet, even while it's in storage.

While holding your SH-39, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil.

- Your flare gun can be rapidly reloaded by just right clicking the flare pouch with it in hand. Your flare pouch can be refilled by left clicking on it while holding a flare box. Flare any dark area you can see to reduce the risk of a xenomorph ambushing you from the dark. On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
+ Your flare gun can be rapidly reloaded by just right-clicking the flare pouch with it in hand.\ + Your flare pouch can be refilled by left clicking on it while holding a flare box.\ + Flare any dark area you can see to reduce the risk of a xenomorph ambushing you.\ + On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.

- If you are facehugged, quickly take out your plasma pistol and shoot the ground with it, then walk into the fire. While this will cause you to be set on fire, facehuggers will detach in the presence of fire, preventing you from becoming infected. You can press B (or click resist in the bottom right) once the facehugger has detached to stop, drop, and roll, extinguishing the fire.
+ If you are facehugged, quickly take out your plasma pistol and shoot the ground with it, then walk into the fire.\ + While this will cause you to be set on fire, facehuggers will detach in the presence of fire, preventing you from becoming infected.\ + You can press B (or click resist in the bottom right) once the facehugger has detached to stop, drop, and roll, extinguishing the fire.

To reload your shotgun, take out a handful of shells with a free hand and click your gun with them while it's in your other hand.

- Shotguns can take a variety of rounds, in case slugs aren't your style. Buckshot rounds have more stopping power but fall off at mid range, while flechette rounds are less generally effective in exchange for drastically improved performance against heavily armored targets. The requisitions-exclusive incendiary slugs aren't quite as powerful as standard slugs but set anything they hit on fire!
+ Shotguns can take a variety of rounds, in case slugs aren't your style. Buckshot rounds have more stopping power but fall off at mid range,\ + while flechette rounds are less generally effective in exchange for drastically improved performance against heavily armored targets.\ + The requisitions-exclusive incendiary slugs aren't quite as powerful as standard slugs but set anything they hit on fire!

- The green M50 signal flares in your body armor don't last as long as normal flares but deploying them signals to CAS (close air support) that you're requesting an airstrike in the region, also granting them the ability to see and shoot at xenomorphs in the area.
+ The green M50 signal flares in your body armor don't last as long as normal flares but deploying them signals to CAS (close air support)\ + that you're requesting an airstrike in the region, also granting them the ability to see and shoot at xenomorphs in the area.

- Using the powerful knockback of your shotgun to knock xenomorphs TOWARDS other marines is a good way to get kills - most xenomorphs can't deal with that many marines at once!
+ Using the powerful knockback of your shotgun to knock xenomorphs TOWARDS other marines is a good way to get kills\ + - most xenomorphs can't deal with that many marines at once!

Shotguns don't have access to aimmode, so be careful near other marines so you don't risk shooting them.

- You have incredibly high per-shot damage. Waiting a little bit to allow a xenomorph to get closer before opening fire can lure it into a false sense of safety, potentially scoring you a kill."} + You have incredibly high per-shot damage. Waiting a little bit to allow a xenomorph to get closer before opening fire can lure it\ + into a false sense of safety, potentially scoring you a kill."} /obj/item/paper/tutorial/beginner_shocktrooper name = "Shocktrooper Tutorial" - info = {"As a shock trooper, you are a versatile yet powerful frontliner, and aim to change up tactics often to gain the advantage. You use the multimodal laser rifle, an experimental battery-powered weapon with an underbarrel flamethrower. Your belt contains spare energy cells for your laser rifle. Your right pocket and body armor contain a powerpack each- effectively bulkier versions of energy cells. Your body armor also contains a box of flares. Your left pocket contains a flare gun holster and several flares. Your backpack contains a large amount of miniature fuel tanks for use with your underbarrel flamethrower, as well as an inaprovaline autoinjector. Your webbing contains Bicaridine (which heals brute damage), Kelotane (which heals burn damage), Tramadol (which is a painkiller), Tricordrazine (which heals all damage, but slowly), and gauze and ointment, which also heal brute and burn damage respectively. Your helmet contains protein bars and your boots contain an MRE, in case you get hungry.
+ info = {"As a shock trooper, you are a versatile yet powerful frontliner, and aim to change up tactics often to gain the advantage.\ + You use the multimodal laser rifle, an experimental battery-powered weapon with an underbarrel flamethrower.\ + Your belt contains spare energy cells for your laser rifle. Your right pocket and body armor contain a powerpack to recharge energy cells.\ + Your body armor also contains a box of flares. Your left pocket contains a flare gun holster and several flares.\ + Your backpack contains a large amount of miniature fuel tanks for use with your underbarrel flamethrower, as well as an inaprovaline autoinjector.\ + Your webbing contains Bicaridine (heals brute damage), Kelotane (heals burn damage), Tramadol (a painkiller), Tricordrazine (heals all damage, but slowly),\ + and gauze and ointment, which also heal brute and burn damage, respectively. Your helmet contains protein bars and your boots contain an MRE, in case you get hungry.

- Switching between the different modes of your laser rifle is key to mastery on the battlefield. Like other frontliners, you aim to lead the push into enemy territory, clearing the path forward and facing xenomorphs head-on.
+ Switching between the different modes of your laser rifle is key to mastery on the battlefield.\ + Like other frontliners, you aim to lead the push into enemy territory, clearing the path forward and facing xenomorphs head-on.

TIPS

- BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment as long as you hold still. Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state. You can remove pills from their packets directly by right clicking on the packet, even while it's in storage.
-
- On running out of ammo, the empty battery will automatically eject from the rifle. To reload, simply grab a new battery with an empty hand and click your gun with it. Alternatively, you can perform a tactical reload by click-dragging the battery from its storage directly onto the rifle, which can be done without an empty hand and with a different battery still in the gun. The powerpacks are a bit different - they have to be click-dragged while in one of your pockets to attach to the gun, and once attached remain in your pocket. However, they have four times the energy of a normal magazine. To refuel your underbarrel flamethrower, right click the gun with an empty hand to remove the old tank, then right click the gun again with a fresh tank.
-
- While holding your laser rifle, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil. In the top left of your screen are several weapon-specific buttons. By pressing toggle mini flamethrower, you enable your underbarrel flamethrower, which you can now shoot with right click.
-
- Your flare gun can be rapidly reloaded by just right clicking the flare pouch with it in hand. Your flare pouch can be refilled by left clicking on it while holding a flare box. Flare any dark area you can see to reduce the risk of a xenomorph ambushing you from the dark. On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
-
- By pressing unique action (default: space bar), you can cycle between the different modes of your laser gun. Standard mode rapidly fires laser beams, Overcharge mode fires more powerful beams at a lower rate of fire, weakening mode slows the target mildly as well as draining their plasma, and microwave applies a stacking debuff (up to five times) that deals armor-piercing damage over time. Note that different modes consume battery charge at different rates.
-
- Laser weapons, unlike traditional ballistics, can fire through windows unimpeded. Use this with stronger windows, such as ballistic glass, to attack the enemy without them being able to attack you back."} + BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix\ + for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process\ + through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start\ + applying one, you will keep applying it to all body parts that require treatment as long as you hold still.\ + Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious\ + on the ground (referred to as "critical condition") to rescue them from that state.\ + You can remove pills from their packets directly by right-clicking on the packet, even while it's in storage.
+
+ On running out of ammo, the empty battery will automatically eject from the rifle.\ + To reload, simply grab a new battery with an empty hand and click your gun with it.\ + Alternatively, you can perform a tactical reload by click-dragging the battery from its storage directly onto the rifle,\ + which can be done without an empty hand and with a different battery still in the gun.\ + You can click a powercell to your powerpacks to recharge them. They have four times the energy of a normal magazine.\ + To refuel your underbarrel flamethrower, right-click the gun with an empty hand to remove the old tank, then right-click the gun again with a fresh tank.
+
+ While holding your laser rifle, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil.\ + In the top left of your screen are several weapon-specific buttons.\ + By pressing toggle mini flamethrower, you enable your underbarrel flamethrower, which you can now shoot with right-click.
+
+ Your flare gun can be rapidly reloaded by just right clicking the flare pouch with it in hand.\ + Your flare pouch can be refilled by left clicking on it while holding a flare box.\ + Flare any dark area you can see to reduce the risk of a xenomorph ambushing you.\ + On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
+
+ By pressing unique action (default: space bar), you can cycle between the different modes of your laser gun.\ + Standard mode rapidly fires laser beams, Overcharge mode fires more powerful beams at a lower rate of fire, weakening mode slows the target mildly\ + as well as draining their plasma, and microwave applies a stacking debuff (up to five times) that deals armor-piercing damage over time.\ + Note that different modes consume battery charge at different rates.
+
+ Laser weapons, unlike traditional ballistics, can fire through windows unimpeded.\ + Use this with stronger windows, such as ballistic glass, to attack the enemy without them being able to attack you back."} /obj/item/paper/tutorial/beginner_hazmat name = "Hazmat Tutorial" - info = {"As a HAZMAT, you excel in situations too dangerous for other marines. Your Mimir type armor grants you complete immunity to toxic gas, from acid to neurotoxin. It also provides an increased resistance against acid in general, for dealing with ranged xenomorphs. Your AR-11 is somewhat unwieldy and inaccurate, but packs both potent bursts and an impressive 70-round magazine. Your backpack, left pouch, and suit storage are all filled with spare magazines for your AR-11. Your right pouch contains a first aid kit, complete with Bicaridine (which heals brute damage), Kelotane (which heals burn damage), Tramadol (which is a painkiller), Tricordrazine (which heals all damage, but slowly), and Dylovene (which heals toxin, or poison damage), as well as splints and inaprovaline. Your webbing contains flares for lighting areas, gauze and ointment for treating wounds, and a miniature fire extinguisher. Your helmet contains protein bars and your boots contain an MRE, for if you get hungry.
-
- Unlike other marines, you have no reason to fear toxic gas - and thanks to your tactical sensor, you pose quite a threat to xenomorphs while in it. Hide in smoke and use your sensor to fire at xenomorphs that can't see you back. In the absence of smoke, your AR-11 is still quite powerful, and can be used in many situations, though its inaccuracy makes it somewhat less potent at longer ranges.
+ info = {"As a HAZMAT, you excel in situations too dangerous for other marines. Your Mimir type armor grants you complete immunity to toxic gas,\ + from acid to neurotoxin. It also provides an increased resistance against acid in general, for dealing with ranged xenomorphs.\ + Your AR-11 is somewhat unwieldy and inaccurate, but packs both potent bursts and an impressive 70-round magazine.\ + Your backpack, left pouch, and suit storage are all filled with spare magazines for your AR-11.\ + Your right pouch contains a first aid kit, complete with Bicaridine (heals brute damage), Kelotane (heals burn damage), Tramadol (a painkiller),\ + Tricordrazine (heals all damage, but slowly), and Dylovene (heals toxin damage), as well as splints and inaprovaline.\ + Your webbing contains flares for lighting areas, gauze and ointment for treating wounds, and a miniature fire extinguisher.\ + Your helmet contains protein bars and your boots contain an MRE, for if you get hungry.
+
+ Unlike other marines, you have no reason to fear toxic gas - and thanks to your tactical sensor, you pose quite a threat to xenomorphs while in it.\ + Hide in smoke and use your sensor to fire at xenomorphs that can't see you back.\ + In the absence of smoke, your AR-11 is still quite powerful, and can be used in many situations, though its inaccuracy makes it somewhat less potent at longer ranges.

TIPS

- BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment as long as you hold still. Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb. Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state. You can remove pills from their packets directly by right clicking on the packet, even while it's in storage.
-
- While holding your AR-11, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil. In the top left of your screen are several weapon-specific buttons. The "Take Aim" button toggles aim mode, a feature that slows your rate of fire in exchange for allowing you to shoot through allied marines. The second option changes the firing mode, between Single Automatic, Burst, and Burst Automatic. Automatic modes will keep firing as long as you hold down the mouse button. The tactical sensor option toggles your tactical sensor - you should keep this on always.
-
- Your tactical sensor will periodically blip, detecting moving targets in an area a little bigger than your screen. Green circles are friendly targets (or anyone wearing a marine ID), while red circles accompanied with an audible blip are unknown (almost always hostile) targets. This sensor works even without vision, such as through any form of smoke and through walls.
-
- On running out of ammo, the empty magazine will automatically eject from the rifle. To reload, simply grab a new magazine with an empty hand and click your gun with it. Alternatively, you can perform a tactical reload by click-dragging the magazine from its storage directly onto the rifle, which can be done without an empty hand and with a different magazine still in the gun.
-
- Your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility. However, note that xenomorphs will often determine a marine's position in a smoke cloud by their light, so you should turn OFF your light if hiding in smoke!
-
- On your belt is a belt harness. By left clicking on your belt harness with your AR-11, you can attach them. If you drop your AR, or have a xenomorph make you drop it, your AR will automatically return to your armor if it's attached.
-
- While you're no machinegunner, you have over 700 rounds on you. Don't be afraid to shoot at anything that blips on your tactical sensor (as long as there aren't friendlies in the way!)"} + BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix\ + for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process\ + through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start\ + applying one, you will keep applying it to all body parts that require treatment as long as you hold still.\ + Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb.\ + Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious\ + on the ground (referred to as "critical condition") to rescue them from that state.\ + You can remove pills from their packets directly by right-clicking on the packet, even while it's in storage.
+
+ While holding your AR-11, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil.\ + In the top left of your screen are several weapon-specific buttons.\ + The "Take Aim" button toggles aim mode, a feature that slows your rate of fire in exchange for allowing you to shoot through allied marines.\ + The second option changes the firing mode, between Single Automatic, Burst, and Burst Automatic. Automatic modes will keep firing as long as you hold down the mouse button.\ + The tactical sensor option toggles your tactical sensor - you should keep this on always.
+
+ Your tactical sensor will periodically blip, detecting moving targets in an area a little bigger than your screen.\ + Green circles are friendly targets (or anyone wearing a marine ID), while red circles accompanied with an audible blip are unknown (almost always hostile) targets.\ + This sensor works even without vision, such as through any form of smoke and through walls.
+
+ On running out of ammo, the empty magazine will automatically eject from the rifle.\ + To reload, simply grab a new magazine with an empty hand and click your gun with it.\ + Alternatively, you can perform a tactical reload by click-dragging the magazine from its storage directly onto the rifle, which can be done without an empty hand\ + and with a different magazine still in the gun.
+
+ Your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.\ + However, note that xenomorphs will often determine a marine's position in a smoke cloud by their light, so you should turn OFF your light if hiding in smoke!
+
+ On your belt is a belt harness. By left-clicking on your belt harness with your AR-11, you can attach them.\ + If you drop your AR, or have a xenomorph make you drop it, your AR will automatically return to your armor if it's attached.
+
+ While you're no machinegunner, you have over 700 rounds on you. Don't be afraid to shoot at anything that blips on your tactical sensor\ + (as long as there aren't friendlies in the way!)"} /obj/item/paper/tutorial/beginner_cqc name = "CQC Tutorial" - info = {"As a CQC marine, you are incredibly mobile, and should be using and abusing your speed to dart in and out of danger. You are effective both spearheading the assault and pushing into flanks. Your AR-18 carbine isn't the most dangerous rifle, nor does it have a particularly high magazine size, but it's incredibly lightweight compared to almost any other weapon, and its relative accuracy and stability even while moving and high fire rate allow it to pose a surprise threat to almost any xenomorphs. Your belt, body armor, and backpack all contain spare magazines for your AR-18. Your backpack also contains an MRE (in case you get hungry) as well as gauze and ointment to treat injuries with. Your left pocket contains a flare gun and several flares. Your right pouch contains a first aid kit, complete with Bicaridine (which heals brute damage), Kelotane (which heals burn damage), Tramadol (which is a painkiller), Tricordrazine (which heals all damage, but slowly), and Dylovene (which heals toxin, or poison damage), as well as splints and inaprovaline. Your webbing contains gauze and ointment for healing, an MRE for eating, and two boxes of flares. Your helmet contains protein bars for eating, and your boots contain a combat knife for clearing weeds and breaking things.
-
- Your speed is your greatest strength. You should be using it to rush into combat and chase after already injured enemies, only to rapidly retreat before things turn south. You're ideal at scouting locations, quickly reinforcing threatened positions, and overall being everywhere at once.
+ info = {"As a CQC marine, you are incredibly mobile, and should be using and abusing your speed to dart in and out of danger.\ + You are effective both spearheading the assault and pushing into flanks.\ + Your AR-18 carbine isn't the most dangerous rifle, nor does it have a particularly high magazine size, but it's incredibly lightweight\ + compared to almost any other weapon, and its relative accuracy and stability even while moving and high fire rate allow it to pose\ + a surprise threat to almost any xenomorphs. Your belt, body armor, and backpack all contain spare magazines for your AR-18.\ + Your backpack also contains an MRE (in case you get hungry) as well as gauze and ointment to treat injuries with.\ + Your left pocket contains a flare gun and several flares.\ + Your right pouch contains a first aid kit, complete with Bicaridine (heals brute damage), Kelotane (heals burn damage), Tramadol (a painkiller),\ + Tricordrazine (heals all damage, but slowly), and Dylovene (heals toxin damage), as well as splints and inaprovaline.\ + Your webbing contains gauze and ointment for healing, an MRE for eating, and two boxes of flares.\ + Your helmet contains protein bars for eating, and your boots contain a combat knife for clearing weeds and breaking things.
+
+ Your speed is your greatest strength. You should be using it to rush into combat and chase after already injured enemies,\ + only to rapidly retreat before things turn south. You're ideal at scouting locations, quickly reinforcing threatened positions, and being everywhere at once.

TIPS

- BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment as long as you hold still. Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb. Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state. You can remove pills from their packets directly by right clicking on the packet, even while it's in storage.
-
- While holding your AR-18, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil. In the top left of your screen are several weapon-specific buttons. The "Take Aim" button toggles aim mode, a feature that slows your rate of fire in exchange for allowing you to shoot through allied marines. The second option changes the firing mode, between Single Automatic, Burst, and Burst Automatic. Automatic modes will keep firing as long as you hold down the mouse button. The tactical sensor option toggles your tactical sensor - you should keep this on always.
-
- On running out of ammo, the empty magazine will automatically eject from the rifle. To reload, simply grab a new magazine with an empty hand and click your gun with it. Alternatively, you can perform a tactical reload by click-dragging the magazine from its storage directly onto the rifle, which can be done without an empty hand and with a different magazine still in the gun.
-
- Your flare gun can be rapidly reloaded by just right clicking the flare pouch with it in hand. Your flare pouch can be refilled by left clicking on it while holding a flare box. Flare any dark area you can see to reduce the risk of a xenomorph ambushing you from the dark. On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
-
- Don't be afraid to charge headfirst into danger if you think you can save a teammate or get a kill - you have the speed to get back out, after all. The ALT key by default allows humans or clones to sprint at the cost of stamina, to go even faster!
-
- While your rifle runs out of ammo quickly, its rapid fire four round bursts deal impressive damage. Combined with your speed, you are the master of ambushing."} + BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix\ + for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process\ + through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start\ + applying one, you will keep applying it to all body parts that require treatment as long as you hold still.\ + Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb.\ + Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious\ + on the ground (referred to as "critical condition") to rescue them from that state.\ + You can remove pills from their packets directly by right-clicking on the packet, even while it's in storage.
+
+ While holding your AR-18, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil.\ + In the top left of your screen are several weapon-specific buttons.\ + The "Take Aim" button toggles aim mode, a feature that slows your rate of fire in exchange for allowing you to shoot through allied marines.\ + The second option changes the firing mode, between Single Automatic, Burst, and Burst Automatic.\ + Automatic modes will keep firing as long as you hold down the mouse button. The tactical sensor option toggles your tactical sensor - you should keep this on always.
+
+ On running out of ammo, the empty magazine will automatically eject from the rifle.\ + To reload, simply grab a new magazine with an empty hand and click your gun with it.\ + Alternatively, you can perform a tactical reload by click-dragging the magazine from its storage directly onto the rifle, which can be done without\ + an empty hand and with a different magazine still in the gun.
+
+ Your flare gun can be rapidly reloaded by just right-clicking the flare pouch with it in hand.\ + Your flare pouch can be refilled by left clicking on it while holding a flare box.\ + Flare any dark area you can see to reduce the risk of a xenomorph ambushing you.\ + On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
+
+ Don't be afraid to charge headfirst into danger if you think you can save a teammate or get a kill - you have the speed to get back out, after all.\ + The ALT key by default allows humans or clones to sprint at the cost of stamina, to go even faster!
+
+ While your rifle runs out of ammo quickly, its rapid-fire four-round bursts deal impressive damage. Combined with your speed, you are the master of ambushing."} /obj/item/paper/tutorial/beginner_chad name = "Grenadier Tutorial" - info = {"As a grenadier, you are the master of area denial. Your six-chamber GL-70 grenade launcher boasts unparalleled roomclearing potential, and impressive lethality - just take care to avoid harming your fellow marines. Your belt, backpack, both pockets, and body armor are all filled with HEDP grenades to reload your grenade launcher with. Your webbing contains Bicaridine (which heals brute damage), Kelotane (which heals burn damage), Tramadol (which is a painkiller), Tricordrazine (which heals all damage, but slowly), and gauze and ointment, which also heal brute and burn damage respectively. Your backpack also contains an inaprovaline injector, which can be used to help other critically injured marines. Your helmet contains two protein bars, in case you get hungry, and your boots contain a derringer, a two-shot sidearm for when the first six grenades didn't kill the bug.
+ info = {"As a grenadier, you are the master of area denial. Your six-chamber GL-70 grenade launcher boasts unparalleled room-clearing potential,\ + and impressive lethality - just take care to avoid harming your fellow marines.\ + Your belt, backpack, both pockets, and body armor are all filled with HEDP grenades to reload your grenade launcher with.\ + Your webbing contains Bicaridine (heals brute damage), Kelotane (heals burn damage), Tramadol (a painkiller), Tricordrazine (heals all damage, but slowly),\ + and gauze and ointment, which also heal brute and burn damage respectively. Your backpack also contains an inaprovaline injector.\ + Your helmet contains two protein bars, in case you get hungry, and your boots contain a derringer, a two-shot sidearm for when the first six grenades didn't kill the bug.

- Your power is as much of a liability as it is a utility if you aren't careful. Before you get happy on the trigger, make SURE there aren't going to be marines in the blast radius, unless you want to end up filled with bullet holes (which your Hod accident prevention plating will partially block!) With that warning out of the way, you can kill even the beefiest of xenomorphs with good aim.
+ Your power is as much of a liability as it is a utility if you aren't careful.\ + Before you get happy on the trigger, make SURE there aren't going to be marines in the blast radius, unless you want to end up filled with bullet holes\ + (which your Hod accident prevention plating will partially block!) With that warning out of the way, you can kill even the beefiest of xenomorphs with good aim.

TIPS

- BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment as long as you hold still. Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state. You can remove pills from their packets directly by right clicking on the packet, even while it's in storage.
+ BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix\ + for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process\ + through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start\ + applying one, you will keep applying it to all body parts that require treatment as long as you hold still.\ + Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious\ + on the ground (referred to as "critical condition") to rescue them from that state.\ + You can remove pills from their packets directly by right-clicking on the packet, even while it's in storage.

While holding your grenade launcher, press Z to wield it. You MUST wield your grenade launcher to use it!

- To reload your grenade launcher, grab a grenade from one of your storages and left click the grenade launcher with it while it's in your other hand.
+ To reload your grenade launcher, grab a grenade from one of your storages and left-click the grenade launcher with it while it's in your other hand.

- You possess an antenna module on your helmet, which allows you to recieve shipments from requisitions (on the ship) while in the field. To request something, say :u followed by a clear and polite request as to what you would like to recieve. For example, if you ran out of grenades, you might say ":u RO, requesting HEDP grenades to my antenna." After some amount of time, you will likely get a response in the requisitions channel (pay attention!) along the lines of "Yourname, your order is ready. Raise your antenna." To do this, click the antenna icon in the top left - you should get a notification in the bottom right informing you it's successfully raised. You should then HOLD STILL until you recieve your order. (Once you've raised your antenna, it's polite to inform the RO, or requisitions officer, that it's raised.) After some time, you should hear a WOOSH noise, and a box will teleport to where you're standing with what you requested.
+ Hlin-pattern armor plating, orderable from requisitions, makes you practically immune to explosives. Get trigger happy!\ + (Don't get TOO trigger happy, though - your fellow marines are NOT immune.)

- Hlin-pattern armor plating, orderable from requisitions, makes you practically immune to explosives. Get trigger happy! (Don't get TOO trigger happy, though - your fellow marines are NOT immune.)
+ Your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
- Your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
-
- Explosions knock anything near them back, even over barricades. With careful aim, you can knock xenomorphs towards marines, who can then finish them off with more traditional firearms - and with REALLY careful aim, you can knock a xenomorph into a barricaded position it can't escape from, practically guaranteeing its demise!
"} + As a grenadier, you hold the power to clear rooms and control territory like no other. Victory is just a well-placed grenade away."} /obj/item/paper/tutorial/builder name = "Builder Tutorial" - info = {"The builder loadout is designed around you establishing defenses, barricades made from metal, plasteel or sandbags. You are the frontline, without you marines will be exposed to attacks from any and all directions. Use your quicker build speed and tools to aid and repair barricades, and fix APCs for generating the nuclear disks to win the round! Your loadout contains materials, a MG42 Light machine gun for self defense and suppression, and a radiopack for ordering more material to entrench and establish a fortified defensive position.
+ info = {"The Builder loadout is designed around you establishing defenses, barricades made from metal, plasteel or sandbags.\ + You are the frontline - without you marines will be exposed to attacks from any and all directions.\ + Your backpack contains some materials, a box of flares, and extra drums for your gun, as well as gauze and ointment to treat injuries with. + Your left pocket contains a tool pouch for all the tools you'll need to perform your engineering duties.\ + Your right pouch contains a first aid kit, complete with Bicaridine (heals brute damage), Kelotane (heals burn damage), Tramadol (a painkiller),\ + Tricordrazine (heals all damage, but slowly), and Dylovene (heals toxin damage), as well as splints and inaprovaline.\ + Your helmet contains protein bars for eating, and your boots contain an MRE for further eating.\ + The optical mesons on your eyewear slot give you the ability to see the shape of rooms behind solid walls, though you can't see anything (including xenomorphs!)\ + behind those walls.\ + Use your quicker build speed and tools to aid and repair barricades, and fix APCs for generating the nuclear disks to win the round!\ + Your suit storage contains materials, and your loadout also containsa MG42 Light machine gun for self defense and suppression,\ + and a radiopack for ordering more material to entrench and establish a fortified defensive position.

TIPS

- In your webbing you will find a spare powercell and a handheld cell crank charger to charge them, when fixing apcs swap the empty battery for your full one and insert the empty one into your crank and charge it for the next disk!
-
- When building defensive barricades it is best to not make them "flush" with nearby doors or walls. Instead pull back 1 tile and build it there, this prevents xenos from hiding around the corner behind the walls and smacking your cades freely without repercussion.
-
- All metal barricades can be upgraded, the basic upgrade is of course barbed wire. This damages xenos when they attack the barricade and prevents them (and marines!) from climbing over the barricade.
-
- BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment as long as you hold still. Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb. Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state. You can remove pills from their packets directly by right clicking on the packet, even while it's in storage."} + In your webbing you will find a spare powercell and a handheld cell crank charger to charge them, when fixing apcs swap the empty battery for\ + your full one. Insert the empty one into your crank, press Z to start charging, and charge it for the next disk!
+
+ When building defensive barricades it is best to not make them "flush" with nearby doors or walls.\ + Instead pull back 1 tile and build it there; this prevents xenos from hiding around the corner behind the walls and smacking your cades freely without repercussion.
+
+ All metal barricades can be upgraded, the basic upgrade is barbed wire.\ + This damages xenos when they attack the barricade and prevents them (and marines!) from climbing over the barricade.\ + Press Z with metal sheets in your hand to open up a radial menu where you can select to build barbed wire.\ + You can also build razorwire, which you can deploy to the tile in front of you by using it in-hand. Razorwire can trap charging xenomorphs momentarily to\ + allow marines to shoot them.\ + You can click a barricade with a piece of metal to open a radial menu to upgrade it. Cades have to be at full health to upgrade, so you might need to click them with + a welder first to fix any damages.\ + Caustic armor increases the cade's resistance to acid spit and prevents it from being melted.\ + Concussive armor increases the cade's resistance to explosions and Warlock's gravity crush ability.\ + Ballistic armor increases the cade's resistance to projectile and melee damage and xenomorph charges.\
+
+ BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol\ + used as an all-rounder combat medicine mix for any situation that heals all different types of damage.\ + Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, + and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start\ + applying one, you will keep applying it to all body parts that require treatment as long as you hold still.\ + Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb.\ + Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious\ + on the ground (referred to as "critical condition") to rescue them from that state.\ + You can remove pills from their packets directly by right-clicking on the packet, even while it's in storage.
+
+ Through your building expertise, marines can hold various critical locations, ensuring steady progress towards mission completion."} /obj/item/paper/tutorial/flamer name = "Flamer Tutorial" - info = {"As a flamethrower specialist your job is to burn, burn some more and BURN again. You are equipped with a flamethrower bag that refills your flamethrower everytime you insert it back into the bag, and also have a lascarbine for more practical and pragmatic self defense. Also comes with a large box of claymore anti-personnel mines, and some general materials for helping fortify positions.
+ info = {"As a Flamethrower specialist, your job is to burn, burn some more and BURN again.\ + You are equipped with a flamethrower bag that refills your flamethrower every time you insert it back into the bag,\ + and also have a laser carbine for more practical and pragmatic self-defense. Also comes with a large box of claymore anti-personnel mines,\ + and some general materials for helping fortify positions in the suit storage.
+ Your backpack contains some materials, a box of flares, and extra drums for your gun, as well as gauze and ointment to treat injuries with. + Your left pocket contains a tool pouch for all the tools you'll need to perform your engineering duties.\ + Your right pouch contains a first aid kit, complete with Bicaridine (heals brute damage), Kelotane (heals burn damage), Tramadol (a painkiller),\ + Tricordrazine (heals all damage, but slowly), and Dylovene (heals toxin damage), as well as splints and inaprovaline.\ + Your helmet contains protein bars for eating, and your boots contain an MRE for further eating.\ + The optical mesons on your eyewear slot give you the ability to see the shape of rooms behind solid walls, though you can't see anything (including xenomorphs!)\ + behind those walls.\ + Removing resin walls will help open up the battlefield for your fellow marines, ensuring greater vision and mobility, and, hopefully, a greater number of successful\ + fights against xenomorphs.\
TIPS

- Your flamethrower is best used to clear resin walls, it is a poor weapon for self defense and is best used to help carve a path through enemy mazes and to deny areas of movement without punishing xenos for trekking through the flames.
+ Your flamethrower is best used to clear resin walls, it is a poor weapon for self defense and is best used to help carve a path through\ + enemy mazes and to deny areas of movement without punishing xenos for trekking through the flames.
+
+ Red resin walls are fire-resistant and require you to engage them in close quarters with a melee weapon to detroy them - the bayonet on your laser carbine is good for this,\ + just be careful about any xenomorphs lurking in the mazes!
+
+ Requisitions offers many useful upgrades to your kit. You can request a SURT pyrotechnic module for your armor that will make you unable to be set on fire.\ + You can also request X Fuel, a fuel for flamethrowers that burns hotter for longer and appears blue.\ +
+ Your laser carbine is good for short-range defense. You can toggle the modes of it using unique action (default: space bar).\ + The spread mode deals greater armor penetration and damage but is slow to fire. Impact mode knocks back targets. Cripple mode will slow enemies down.

- In your webbing you will find a spare powercell and a handheld cell crank charger to charge them, when fixing apcs swap the empty battery for your full one and insert the empty one into your crank and charge it for the next disk!
+ In your webbing you will find a spare powercell and a handheld cell crank charger to charge them, when fixing apcs swap the empty battery for\ + your full one. Insert the empty one into your crank, press Z to start charging, and charge it for the next disk!

- Your claymore mines are useful for denying an area from being easily flanked and can cause serious disruption (or even kill!) backlining xenomorphs from causing you a bad day.
+ Your claymore mines are useful for denying an area from being easily flanked and can cause serious disruption for (or even kill)\ + backlining xenomorphs trying to cause you a bad day.

- BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment as long as you hold still. Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb. Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state. You can remove pills from their packets directly by right clicking on the packet, even while it's in storage."} + BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix\ + for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process\ + through your system, and too many at once risks a dangerous overdose.\ + Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying\ + it to all body parts that require treatment as long as you hold still.\ + Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb.\ + Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious\ + on the ground (referred to as "critical condition") to rescue them from that state.\ + You can remove pills from their packets directly by right-clicking on the packet, even while it's in storage.
+
+ By removing resin structures with your flamethrower, you ensure area denial and dominance, flushing xenomorphs out and providing favorable battle circumstances for your\ + fellow marines."} /obj/item/paper/tutorial/plasmacutter - name = "PlasmaCutter Tutorial" - info = {"Tired of watching marines endlessly pour into a maze or terribly held choke point? This is the class for you then! With your plasma cutter you will be able to easily delete resin walls from existence, and carve through metal, reinforced or even solid rock walls! With this kit you'll be able to widen choke points and eradicate mazes with ease. This loadout also comes with a few materials for defenses and a MP19 SMG for self defense in your welderpack.
+ name = "Plasma Cutter Tutorial" + info = {"Tired of watching marines endlessly pour into a maze or terribly held choke point? This is the class for you then!\ + With your plasma cutter, you will be able to easily delete resin walls from existence, and carve through metal, reinforced, or even solid rock walls!\ + With this kit you'll be able to widen choke points and eradicate mazes with ease.\ + This loadout also comes with a few materials for defenses in your suit storage, and a MP19 SMG for self-defense in your technician welderpack.\ + Your left pocket contains a tool pouch for all the tools you'll need to perform your engineering duties.\ + Your right pouch contains a first aid kit, complete with Bicaridine (heals brute damage), Kelotane (heals burn damage), Tramadol (a painkiller),\ + Tricordrazine (heals all damage, but slowly), and Dylovene (heals toxin damage), as well as splints and inaprovaline.\ + Your helmet contains protein bars for eating, and your boots contain an MRE for further eating.\ + The optical mesons on your eyewear slot give you the ability to see the shape of rooms behind solid walls, though you can't see anything (including xenomorphs!)\ + behind those walls.\ + Removing chokes and flanks will help your team to take better angles and more successfully push objectives.\

TIPS

- Your Plasma Cutter (often abbreviated to PC) is a very versatile tool but it contains a limited charge of 7500, for resin walls the charge is rather miniscule at 100 Charge but a much heavier or thicker metallic or rock wall will cost you 1000 charge so make sure to keep track of how much charge your battery contains! Do remember to keep your welding module or goggles on when using it however, as the plasma cutter will damage your eyes until they're blind!
+ Your Plasma Cutter (often abbreviated to PC) is a very versatile tool but it contains a limited charge of 7500;\ + for resin walls the charge is rather miniscule at 100 Charge but a much heavier or thicker metallic or rock wall will cost you 1000 Charge,\ + so make sure to keep track of how much charge your battery contains!\ + Do remember to keep your welding module or goggles on when using it, however, as the Plasma Cutter will damage your eyes!
+
+ In your webbing you will find a spare powercell and a handheld cell crank charger to charge them, when fixing apcs swap the empty battery for\ + your full one. Insert the empty one into your crank, press Z to start charging, and charge it for the next disk!

- In your webbing you will find a spare powercell and a handheld cell crank charger to charge them, when fixing apcs swap the empty battery for your full one and insert the empty one into your crank and charge it for the next disk!
+ Your Plasma Cutter can be used as a melee weapon in emergency situations, while not the best by any means it can work in a pinch\ + and if you manage to smack a xenomorph you'll get rewarded with draining them of a small amount of plasma and earning a bit of charge for your Plasma Cutter.\ + Use this to destroy mazes and punish xenomorphss for trying to attack you by refilling your battery.

- Your plasma cutter can be used as a melee weapon in emergency situations, while not the best by any means it can work in a pinch and if you manage to smack a xeno you'll get rewarded with draining them of a small amount of plasma and a bit of charge for your plasma cutter. Use this to destroy mazes and punish xenos for trying to attack you by refilling your battery. A recommended combo when frontlining us combining it with a defensive shield!
+ BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix\ + for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process\ + through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start\ + applying one, you will keep applying it to all body parts that require treatment as long as you hold still.\ + Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb.\ + Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious\ + on the ground (referred to as "critical condition") to rescue them from that state.\ + You can remove pills from their packets directly by right-clicking on the packet, even while it's in storage.

- BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment as long as you hold still. Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb. Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state. You can remove pills from their packets directly by right clicking on the packet, even while it's in storage."} + Your ability to treat terrain as a sandbox has infinite potential for assisting your allies."} /obj/item/paper/tutorial/lifesaver name = "Lifesaver Tutorial" - info = {"As the lifesaver, you are a MEDIC first and foremost. You should be prioritizing healing marines over trying to fight xenomorphs yourself. Your belt contains many pill bottles - examine them to find out what they do with shift click, and draw from them with right click. Your belt also contains splints, which are used on fractured bones, and a medical analyzer, which will tell you exactly what's wrong with a person. Avoid giving someone more than one pill of a given medicine at a time; many pills overdose at three, and some at two, and some marines might go and take a pill themselves, so one is safest. In your armor storage are an assortment of autoinjectors. Combat injectors should be used on marines in active danger, quick clot plus helps deal with internal bleeding, peridaxon plus heals organs, and dexalin plus helps with deoxygenation. Your right pouch contains three stacks of trauma and burn kits, which will cause a body part they're applied to to heal brute or burn damage over time respectively. It also contains a hypospray full of meraderm, a medicine mixture that heals both brute and burn damage quickly. Your webbing contains oxycodone, a painkiller, nanoblood, a blood replacement, a stasis bag to hold patients you aren't actively treating in to prevent their condition from worsening, tweezers to remove shrapnel, a roller bed to roll around patients with, and a medivac to evacuate patients. Your boots and helmet contain food.
-
- Stay away from the frontlines - let patients come to (or be dragged to) you instead of putting yourself in danger. Try to remain in a safe location, as xenomorphs do not obey the Geneva convention and will in fact deliberately target you and your patients as often as possible.
+ info = {"As the lifesaver, you are a MEDIC first and foremost. You should be prioritizing healing marines over trying to fight xenomorphs yourself.\ + Your belt contains many pill bottles - examine them to find out what they do with shift+click, and draw from them with right-click.\ + Your belt also contains splints, which are used on fractured bones, and a medical analyzer, which will tell you exactly what's wrong with a person.\ + Avoid giving someone more than one pill of a given medicine at a time; many pills overdose at three, and some at two, and some marines might go and take a pill themselves,\ + so one is safest. In your armor storage are an assortment of autoinjectors. Combat injectors should be used on marines in active danger, Quick Clot Plus helps deal\ + with internal bleeding, Peridaxon Plus heals organs, and Dexalin Plus helps with deoxygenation.\ + Your right pouch contains three stacks of trauma and burn kits, which will cause a body part they're applied to to heal brute or burn damage over time respectively.\ + It also contains a hypospray full of MeraDerm, a medicine mixture that heals both brute and burn damage quickly.\ + Your webbing contains Oxycodone, a painkiller; Nanoblood, a blood replacement; a stasis bag to hold patients you aren't actively treating in to prevent their\ + condition from worsening; tweezers to remove shrapnel; a roller bed to roll around patients with; and a medivac to evacuate patients.\ + Your boots and helmet contain food.
+
+ Stay away from the frontlines - let patients come to (or be dragged to) you instead of putting yourself in danger.\ + Try to remain in a safe location, as xenomorphs do not obey the Geneva Convention and will in fact deliberately target you and your patients as often as possible.

TIPS

- Your gloves are defibrillators. By clicking on any dead target with their exosuit removed (drag their sprite onto your sprite to remove it) you will attempt to bring them back to life, healing them somewhat and then resuscitating them if they're healed enough. Drag your gloves to your backpack to recharge them. This even works on robots! Make sure your intent is help while doing this or you might just punch them right after they revive, taking them out again.
+ Your gloves are defibrillators. By clicking on any dead target with their exosuit removed (drag their sprite onto your sprite to remove it)\ + you will attempt to bring them back to life, healing them somewhat and then resuscitating them if they're healed enough.\ + Drag your gloves to your backpack to recharge them. This even works on robots!\ + Make sure your intent is help while doing this or you might just punch them right after they revive, taking them out again.

- While holding your repeater, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil. In the top left of your screen are several weapon-specific buttons. The "Take Aim" button toggles aim mode, a feature that slows your rate of fire in exchange for allowing you to shoot through allied marines.
+ While holding your repeater, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil.\ + In the top left of your screen are several weapon-specific buttons.\ + The "Take Aim" button toggles aim mode, a feature that slows your rate of fire in exchange for allowing you to shoot through allied marines.

As your rifle is bolt-action, it needs to be racked after every shot. Do this by pressing your Unique Action key, which defaults to the spacebar.

- Your backpack contains ammo packets. You can click on your shotgun shell pouch to quickly transfer ammo into the pouch. You can then reload your repeater by clicking it while it's in your hand with the handful of bullets.
+ Your backpack contains ammo packets. You can click on your shotgun shell pouch to quickly transfer ammo into the pouch.\ + You can then reload your repeater by clicking it while it's in your hand with the handful of bullets.

- Before you do ANYTHING to a patient, use your medical analyzer on them. Not analyzing is the number one cause of overdoses. Right clicking with the analyzer instead shows them their own health scan, useful for getting their attention or informing them that they're fully healed.
+ Before you do ANYTHING to a patient, use your medical analyzer on them. Not analyzing is the number one cause of overdoses.\ + Right-clicking with the analyzer instead shows them their own health scan, useful for getting their attention or informing them that they're fully healed.

- When you dispense your equipment, a medivac beacon will appear on the floor. Pick this up, take your medivac and click it on the beacon so it says linked! Once done, you should go to your ship's medical bay and place the beacon by pressing Z with it in hand. Once groundside, you can now medivac people for treatment shipside. Shipside can fix bone fractures, clone damage, facehugging, and anything else you can't. To evac someone, deploy your medivac by pressing Z with it in hand, drag them onto it to buckle them to it, then right click to send them up. Drag the medivac to you to pick it back up once you're done.
+ When you dispense your equipment, a medivac beacon will appear on the floor.\ + Pick this up, take your medivac and click it on the beacon so it says linked!\ + Once done, you should go to your ship's medical bay and place the beacon by pressing Z with it in hand.\ + Once groundside, you can now medivac people for treatment shipside.\ + Shipside can fix bone fractures, clone damage, facehugging, and anything else you can't.\ + To evac someone, deploy your medivac by pressing Z with it in hand, drag them onto it to buckle them to it, then right click to send them up.\ + Drag the medivac to you to pick it back up once you're done.

- Marines will "go cold" after five minutes of being dead, rendering them permanently unrevivable. This timer can be extended via your stasis bag or with CPR, which other marines can perform while you work by left clicking the corpse on help intent while neither of them are wearing a mask.
+ Marines will "go cold" after five minutes of being dead, rendering them permanently unrevivable.\ + This timer can be extended via your stasis bag or with CPR, which other marines can perform while you work by left-clicking the corpse on help intent\ + while neither of them are wearing a mask.

- Accidentally overdose a marine? They're full of deadly neurotoxin? Don't panic - use hypervene. While uncomfortable for the marine, this medication (located in your medical belt) will rapidly purge their system.
+ Accidentally overdose a marine? They're full of deadly neurotoxin? Don't panic - use Hypervene.\ + While uncomfortable for the marine, this medication (located in your medical belt) will rapidly purge their system.

- You can use meralyne and dermaline at the same time as Bicaridine and kelotane, for an accelerated healing rate."} + You can use Meralyne and Dermaline at the same time as Bicaridine and kelotane, for an accelerated healing rate. Keep the Corps well and the rest will follow."} /obj/item/paper/tutorial/hypobelt name = "Hypobelt Tutorial" - info = {"As the hypobelt medic, you are the master of rapid healing. Your belt is full of hyposprays which instantly apply a dose of medicine when you click a marine with them. Examine them with shift click to read their labels to find out what they do. Avoid injecting someone more than once or twice with the same medicine to prevent an overdose! Your pouch contains three stacks of trauma and burn kits, which will cause a body part they're applied to to heal brute or burn damage over time respectively. It also contains a hypospray full of meraderm, a medicine mixture that heals both brute and burn damage quickly. These hyposprays can be refilled by the bottles in the syringe cases of your belt. Your webbing is filled with splints for treating fractures. Your body armor contains oxycodone, a painkiller, a stasis bag to hold patients you aren't actively treating in to prevent their condition from worsening, tweezers to remove shrapnel, a roller bed to roll around patients with, and a medivac to evacuate patients. Your boots and helmet contain food.
-
- Your light armor and quick injectors make you adept at rapidly getting marines back into the action. However, take care to avoid danger; xenomorphs WILL target you, and you will go down fast without proper protection.
+ info = {"As the hypobelt medic, you are the master of rapid healing.\ + Your belt is full of hyposprays which instantly apply a dose of medicine when you click a marine with them.\ + Examine them with shift+click to read their labels to find out what they do.\ + Avoid injecting someone more than once or twice with the same medicine to prevent an overdose!\ + Your pouch contains three stacks of trauma and burn kits, which will cause a body part they're applied to to heal brute or burn damage over time respectively.\ + It also contains a hypospray full of MeraDerm, a medicine mixture that heals both brute and burn damage quickly.\ + These hyposprays can be refilled by the bottles in the syringe cases of your belt.\ + Your webbing is filled with splints for treating fractures.\ + Your body armor contains Oxycodone, a painkiller; a stasis bag to hold patients you aren't actively treating in to prevent their condition from worsening;\ + tweezers to remove shrapnel; a roller bed to roll around patients with; and a medivac to evacuate patients.\ + Your boots and helmet contain food.
+
+ Your light armor and quick injectors make you adept at rapidly getting marines back into the action.\ + However, take care to avoid danger; xenomorphs WILL target you, and you will go down fast without proper protection.

TIPS

- Your gloves are medical analyzers, which you can use on a patient by left clicking them. Before you do ANYTHING to a patient, use your medical analyzer on them. Not analyzing is the number one cause of overdoses. Right click with the analyzer instead shows them their own health scan, useful for getting their attention or informing them that they're fully healed.
+ Your gloves are medical analyzers, which you can use on a patient by left clicking them.\ + Before you do ANYTHING to a patient, use your medical analyzer on them.\ + Not analyzing is the number one cause of overdoses.\ + Right-click with the analyzer instead shows them their own health scan, useful for getting their attention or informing them that they're fully healed.
+
+ In your backpack is a defibrillator. By holding it and clicking on any dead target with their exosuit removed (drag their sprite onto your sprite to remove it)\ + you will attempt to bring them back to life, healing them somewhat and then resuscitating them if they're healed enough.\ + Drag your defib to your backpack to recharge them. This even works on robots!

- In your backpack is a defibrillator. By clicking on any dead target with their exosuit removed (drag their sprite onto your sprite to remove it) you will attempt to bring them back to life, healing them somewhat and then resuscitating them if they're healed enough. Drag your defib to your backpack to recharge them. This even works on robots!
+ When you dispense your equipment, a medivac beacon will appear on the floor.\ + Pick this up, take your medivac and click it on the beacon so it says linked!\ + Once done, you should go to your ship's medical bay and place the beacon by pressing Z with it in hand.\ + Once groundside, you can now medivac people for treatment shipside. Shipside can fix bone fractures, clone damage, facehugging, and anything else you can't.\ + To evac someone, deploy your medivac by pressing Z with it in hand, drag them onto it to buckle them to it, then right-click to send them up.\ + Drag the medivac to you to pick it back up once you're done.

- When you dispense your equipment, a medivac beacon will appear on the floor. Pick this up, take your medivac and click it on the beacon so it says linked! Once done, you should go to your ship's medical bay and place the beacon by pressing Z with it in hand. Once groundside, you can now medivac people for treatment shipside. Shipside can fix bone fractures, clone damage, facehugging, and anything else you can't. To evac someone, deploy your medivac by pressing Z with it in hand, drag them onto it to buckle them to it, then right click to send them up. Drag the medivac to you to pick it back up once you're done.
+ Marines will "go cold" after five minutes of being dead, rendering them permanently unrevivable.\ + This timer can be extended via your stasis bag or with CPR, which other marines can perform while you work by left-clicking the corpse\ + on help intent while neither of them are wearing a mask.

- Marines will "go cold" after five minutes of being dead, rendering them permanently unrevivable. This timer can be extended via your stasis bag or with CPR, which other marines can perform while you work by left clicking the corpse on help intent while neither of them are wearing a mask.
+ Accidentally overdose a marine? They're full of deadly neurotoxin? Don't panic - use Hypervene.\ + While uncomfortable for the marine, this medication (located in your medical belt) will rapidly purge their system.

- Accidentally overdose a marine? They're full of deadly neurotoxin? Don't panic - use hypervene. While uncomfortable for the marine, this medication (located in your medical belt) will rapidly purge their system.
+ You can use Meralyne and Dermaline at the same time as Bicaridine and kelotane, for an accelerated healing rate.

- You can use meralyne and dermaline at the same time as Bicaridine and kelotane, for an accelerated healing rate.
+ As your shotgun is pump-action, you'll need to pump it after every shot by pressing Unique Action (default space bar).

- As your shotgun is pump-action, you'll need to pump it after every shot by pressing Unique Action (default space.)
+ You can reload your shotgun by grabbing a handful of slugs from your backpack and clicking your shotgun with them.

- You can reload your shotgun by grabbing a handful of slugs from your backpack and clicking your shotgun with them."} + Remember your primary goal is to keep the force healthy and allow them to continue with progressing the operation."} /obj/item/paper/tutorial/smartmachinegunner name = "Smartmachinegunner Tutorial" - info = {"As the smartmachinegunner, you are the very backbone of your squad, and should be behind another marine or three at all times. Your SG-29 is capable of firing directly through your teammates without risk of harm, so staying safe and behind your allies is essential to gaining full value out of it. Your backpack and body armor contain both fire extinguishers and spare ammo, with your backpack also containing a plasma pistol to start fires with. Your left pouch contains a flare gun holster and several flares. Your right pouch contains a first aid kit, complete with Bicaridine (which heals brute damage), Kelotane (which heals burn damage), Tramadol (which is a painkiller), Tricordrazine (which heals all damage, but slowly), and Dylovene (which heals toxin, or poison damage), as well as splints and inaprovaline. Your webbing contains flares for creating lights and gauze and ointment for treating injuries. Your helmet and boots contain food, in case you get hungry.
-
- You should NEVER be at the front of a group of marines. Aim to provide covering fire for those who are in front, and let them protect you in turn by, well, being in front of you. Remember that your SG-29 fires through marines, so you don't need to worry about friendly fire.
+ info = {"As the smartmachinegunner, you are the very backbone of your squad, and should be behind another marine or three at all times.\ + Your SG-29 is capable of firing directly through your teammates without risk of harm, so staying safe and behind your allies is essential\ + to gaining full value out of it. Your backpack and body armor contain both fire extinguisher and spare ammo, with your backpack also containing\ + a plasma pistol to start fires with, inaprovaline, and a cloak grenade to escape skirmishes. Your left pouch contains a flare gun holster and several flares.\ + Your right pouch contains a first aid kit complete with Bicaridine (heals brute damage), Kelotane (heals burn damage), Tramadol (a painkiller),\ + Tricordrazine (heals all damage, but slowly), and Dylovene (heals toxin damage), as well as splints and inaprovaline.\ + Your webbing contains flares for creating lights and gauze and ointment for treating injuries.\ + Your helmet and boots contain food, in case you get hungry.
+
+ You should NEVER be at the front of a group of marines.\ + Aim to provide covering fire for those who are in front, and let them protect you in turn by, well, being in front of you.\ + Remember that your SG-29 fires through marines, so you don't need to worry about friendly fire.

TIPS

- BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment as long as you hold still. Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb. Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state. You can remove pills from their packets directly by right clicking on the packet, even while it's in storage.
+ BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix\ + for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process\ + through your system, and too many at once risks a dangerous overdose.\ + Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that\ + require treatment as long as you hold still. Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb.\ + Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious\ + on the ground (referred to as "critical condition") to rescue them from that state.\ + You can remove pills from their packets directly by right-clicking on the packet, even while it's in storage.

- Your flare gun can be rapidly reloaded by just right clicking the flare pouch with it in hand. Your flare pouch can be refilled by left clicking on it while holding a flare box. Flare any dark area you can see to reduce the risk of a xenomorph ambushing you from the dark. On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
+ Your flare gun can be rapidly reloaded by just right-clicking the flare pouch with it in hand.\ + Your flare pouch can be refilled by left clicking on it while holding a flare box.\ + Flare any dark area you can see to reduce the risk of a xenomorph ambushing you.\ + On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.

- On your belt is a belt harness. By left clicking on your belt harness with your machine gun, you can attach them. If you drop your machine gun, or have a xenomorph make you drop it, your machine gun will automatically return to your armor if it's attached.
+ On your belt is a belt harness. By left clicking on your belt harness with your machine gun, you can attach them.\ + If you drop your machine gun, or have a xenomorph make you drop it, your machine gun will automatically return to your armor if it's attached.

- If you are facehugged, quickly take out your plasma pistol and shoot the ground with it, then walk into the fire. While this will cause you to be set on fire, facehuggers will detach in the presence of fire, preventing you from becoming infected. You can press B (or click resist in the bottom right) once the facehugger has detached to stop, drop, and roll, extinguishing the fire.
+ If you are facehugged, quickly take out your plasma pistol and shoot the ground with it, then walk into the fire.\ + While this will cause you to be set on fire, facehuggers will detach in the presence of fire, preventing you from becoming infected.\ + You can press B (or click resist in the bottom right) once the facehugger has detached to stop, drop, and roll, extinguishing the fire.

- Your impressive magazine size means you don't need to reload often. You can suppress one spot for an impressive amount of time, and you have the ammo and damage to clear out resin walls.
+ Your impressive magazine size means you don't need to reload often. You can suppress one spot for an impressive amount of time,\ + and you have the ammo and damage to clear out resin walls.

- While holding your SG-29, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil. In the top left of your screen are several weapon-specific buttons. The tactical sensor option toggles your tactical sensor - you should keep this on always.
+ While holding your SG-29, use Z to wield your weapon with both hands, increasing accuracy and stability and reducing recoil.\ + In the top left of your screen are several weapon-specific buttons. The tactical sensor option toggles your tactical sensor - you should keep this on always.

- Your tactical sensor will periodically blip, detecting moving targets in an area a little bigger than your screen. Green circles are friendly targets (or anyone wearing a marine ID), while red circles accompanied with an audible blip are unknown (almost always hostile) targets. This sensor works even without vision, such as through any form of smoke and through walls.
+ Your tactical sensor will periodically blip, detecting moving targets in an area a little bigger than your screen.\ + Green circles are friendly targets (or anyone wearing a marine ID), while red circles accompanied with an audible blip are unknown (almost always hostile) targets.\ + This sensor works even without vision, such as through any form of smoke and through walls.

- On running out of ammo, the empty magazine will automatically eject from the smartgun. To reload, simply grab a new magazine with an empty hand and click your gun with it. Alternatively, you can perform a tactical reload by click-dragging the magazine from its storage directly onto the rifle, which can be done without an empty hand and with a different magazine still in the gun.
+ On running out of ammo, the empty magazine will automatically eject from the smartgun. To reload, simply grab a new magazine with an empty hand\ + and click your gun with it. Alternatively, you can perform a tactical reload by click-dragging the magazine from its storage directly onto the rifle,\ + which can be done without an empty hand and with a different magazine still in the gun.

STAY BEHIND OTHER MARINES. I cannot stress this enough. You are a priority target for xenomorphs due to your ability to provide covering fire from behind other marines.

- Your massive drum size of 250 rounds means you don't need to reload often. Because of this, you should avoid reloading in dangerous areas if you can help it, instead waiting until you're back behind fortifications or other marines.
+ Your massive drum size of 250 rounds means you don't need to reload often. Because of this, you should avoid reloading in dangerous areas if you can help it,\ + instead waiting until you're back behind fortifications or other marines.

- You possess an antenna module on your helmet, which allows you to receive shipments from requisitions (on the ship) while in the field. To request something, say :u followed by a clear and polite request as to what you would like to receive. For example, if you ran out of ammo, you might say ":u RO, requesting SG-29 drums to my antenna." After some amount of time, you will likely get a response in the requisitions channel (pay attention!) along the lines of "Yourname, your order is ready. Raise your antenna." To do this, click the antenna icon in the top left - you should get a notification in the bottom right informing you it's successfully raised. You should then HOLD STILL until you receive your order. (Once you've raised your antenna, it's polite to inform the RO, or requisitions officer, that it's raised.) After some time, you should hear a WOOSH noise, and a box will teleport to where you're standing with what you requested. Note that requisitions is the ONLY place you can get more smartgun ammo!
+ Your ammunition refills will come from Requisitions. To request something, say :u followed by a clear and polite request as to what you would like to receive.\ + For example, if you ran out of ammo, you might say ":u RO, requesting SG-85 bins to the FC's beacon."\ + After some amount of time, you will likely get a response in the requisitions channel (pay attention!) along the lines of "Yourname, your order is ready. Sending."\ + After some time, you should hear a WOOSH noise, and a box will teleport to the beacon with what you requested.\ + Note that requisitions is the ONLY place you can get more smartgun ammo!

You are the most mobile among smartgunners - use this to your advantage. You are the best at providing cover fire for a mobile squad."} /obj/item/paper/tutorial/smartminigunner name = "Smartminigunner Tutorial" - info = {"As the smartminigunner, you are the very embodiment of BRRT. With your huge SG-85 smart minigun, you can fire ten rounds per second for one hundred straight seconds, providing powerful covering fire for other marines. No enemy wants to get stuck in your line of fire. Instead of a backpack you carry a back mounted powerpack that feeds and powers your SG-85. In your body armor are two bins to refill your powerpack with. Your left pouch contains a flare gun holster and several flares. Your right pouch contains a first aid kit, complete with Bicaridine (which heals brute damage), Kelotane (which heals burn damage), Tramadol (which is a painkiller), Tricordrazine (which heals all damage, but slowly), and Dylovene (which heals toxin, or poison damage), as well as splints and inaprovaline. Your webbing contains flares for creating lights and gauze and ointment for treating injuries. Your helmet and boots contain food, in case you get hungry.
-
- Your minigun boasts both high levels of armor piercing and the ability to shoot through allies - use both to your advantage. Note that the heavy nature of your minigun and your brief windup before you can fire means you're best positioned defensively, firing at the toughest targets within range.
+ info = {"As the smartminigunner, you are the very embodiment of BRRT. With your huge SG-85 smart minigun,\ + you can fire ten rounds per second for one hundred straight seconds, providing powerful covering fire for other marines.\ + No enemy wants to get stuck in your line of fire. Instead of a backpack you carry a back mounted powerpack that feeds and powers your SG-85.\ + In your body armor are two bins to refill your powerpack with. Your left pouch contains a flare gun holster and several flares. \ + Your right pouch contains a first aid kit, complete with Bicaridine (heals brute damage), Kelotane (heals burn damage),\ + Tramadol (a painkiller), Tricordrazine (heals all damage, but slowly), and Dylovene (heals toxin damage),\ + as well as splints and inaprovaline. Your webbing contains flares for creating lights and gauze and ointment for treating injuries.\ + Your helmet and boots contain food, in case you get hungry.
+
+ Your minigun boasts both high levels of armor piercing and the ability to shoot through allies - use both to your advantage.\ + Note that the heavy nature of your minigun and your brief windup before you can fire means you're best positioned defensively, firing at the toughest targets within range.

TIPS
- BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start applying one, you will keep applying it to all body parts that require treatment as long as you hold still. Your splints are used to alleviate the effects of bone fractures, by applying them to a fractured limb. Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state. You can remove pills from their packets directly by right clicking on the packet, even while it's in storage.
-
- Your flare gun can be rapidly reloaded by just right clicking the flare pouch with it in hand. Your flare pouch can be refilled by left clicking on it while holding a flare box. Flare any dark area you can see to reduce the risk of a xenomorph ambushing you from the dark. On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
-
- On your belt is a belt harness. By left clicking on your belt harness with your minigun, you can attach them. If you drop your minigun, or have a xenomorph make you drop it, your machine gun will automatically return to your armor if it's attached. On the same note, by left clicking your powerpack, you hook up your minigun, allowing it to draw from it for ammo. If you drop your minigun, even if it's saved by the belt harness, you will have to re-attach it to the powerpack.
+ BKTT is an acronym that is used to describe the combination of Bicaridine, Kelotane, Tricordizine, and Tramadol used as an all-rounder combat medicine mix\ + for any situation that heals all different types of damage. Make sure not to take more than two of each pill at a time - medicine takes a while to process\ + through your system, and too many at once risks a dangerous overdose. Your gauze and ointment are body-part specific, unlike medication, but once you start\ + applying one, you will keep applying it to all body parts that require treatment as long as you hold still. Your splints are used to alleviate the effects of bone fractures,\ + by applying them to a fractured limb. Your inaprovaline autoinjector is not to be applied to yourself - rather, it should be applied to an alive marine that is\ + so heavily injured they are unconscious on the ground (referred to as "critical condition") to rescue them from that state.\ + You can remove pills from their packets directly by right clicking on the packet, even while it's in storage.
+
+ Your flare gun can be rapidly reloaded by just right clicking the flare pouch with it in hand.\ + Your flare pouch can be refilled by left clicking on it while holding a flare box.\ + Flare any dark area you can see to reduce the risk of a xenomorph ambushing you.\ + On a similar note, your suit's light can be toggled in the top left - you should almost always keep this on to help your visibility.
+
+ On your belt is a belt harness. By left clicking on your belt harness with your minigun, you can attach them.\ + If you drop your minigun, or have a xenomorph make you drop it, your machine gun will automatically return to your armor if it's attached.\ + On the same note, by left clicking your powerpack, you hook up your minigun, allowing it to draw from it for ammo.\ + If you drop your minigun, even if it's saved by the belt harness, you will have to re-attach it to the powerpack.

To reload your power back, take it into your hand, then grab an ammo bin with your other hand and click the power pack with it.

- While holding your SG-85, use Z to wield your weapon with both hands, which is required to fire it. In the top left of your screen are several weapon-specific buttons. The tactical sensor option toggles your tactical sensor - you should keep this on always.
+ While holding your SG-85, use Z to wield your weapon with both hands, which is required to fire it. In the top left of your screen are several weapon-specific buttons.\ + The tactical sensor option toggles your tactical sensor - you should keep this on always.

- Your tactical sensor will periodically blip, detecting moving targets in an area a little bigger than your screen. Green circles are friendly targets (or anyone wearing a marine ID), while red circles accompanied with an audible blip are unknown (almost always hostile) targets. This sensor works even without vision, such as through any form of smoke and through walls.
+ Your tactical sensor will periodically blip, detecting moving targets in an area a little bigger than your screen.\ + Green circles are friendly targets (or anyone wearing a marine ID), while red circles accompanied with an audible blip are unknown (almost always hostile) targets.\ + This sensor works even without vision, such as through any form of smoke and through walls.

- You possess an antenna module on your helmet, which allows you to receive shipments from requisitions (on the ship) while in the field. To request something, say :u followed by a clear and polite request as to what you would like to receive. For example, if you ran out of ammo, you might say ":u RO, requesting SG-85 bins to my antenna." After some amount of time, you will likely get a response in the requisitions channel (pay attention!) along the lines of "Yourname, your order is ready. Raise your antenna." To do this, click the antenna icon in the top left - you should get a notification in the bottom right informing you it's successfully raised. You should then HOLD STILL until you receive your order. (Once you've raised your antenna, it's polite to inform the RO, or requisitions officer, that it's raised.) After some time, you should hear a WOOSH noise, and a box will teleport to where you're standing with what you requested. Note that requisitions is the ONLY place you can get more smartgun ammo!
+ Your ammunition refills will come from Requisitions. To request something, say :u followed by a clear and polite request as to what you would like to receive.\ + For example, if you ran out of ammo, you might say ":u RO, requesting SG-85 bins to the FC's beacon."\ + After some amount of time, you will likely get a response in the requisitions channel (pay attention!) along the lines of "Yourname, your order is ready. Sending."\ + After some time, you should hear a WOOSH noise, and a box will teleport to the beacon with what you requested.\ + Note that requisitions is the ONLY place you can get more smartgun ammo!

STAY BEHIND OTHER MARINES. I cannot stress this enough. You are a priority target for xenomorphs due to your ability to provide covering fire from behind other marines.

- You almost never need to reload - you have enough rounds to fire for almost two straight minutes. Because of this, you should exclusively reload when it is completely safe to do so, as other marines are counting on you to protect them.
+ You almost never need to reload - you have enough rounds to fire for almost two straight minutes.\ + Because of this, you should exclusively reload when it is completely safe to do so, as other marines are counting on you to protect them.

Your minigun boasts an incredibly high amount of armor piercing. Aim for particularly durable targets, like Crushers and Kings, as you'll likely do a lot more damage."} diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index bbadf686599c6..0e2a60f11d6b7 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -110,8 +110,6 @@ M.state = 2 M.icon_state = "box_1" for(var/obj/O in component_parts) - if(O.reliability != 100 && crit_fail) - O.crit_fail = TRUE O.forceMove(loc) qdel(src) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index a40278ebf5781..35de3bf6b44ae 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -54,14 +54,9 @@ explode() return 0 - if(maxcharge < amount) return 0 + if(maxcharge < amount) + return 0 var/amount_used = min(maxcharge-charge,amount) - if(crit_fail) return 0 - if(!prob(reliability)) - minor_fault++ - if(prob(minor_fault)) - crit_fail = 1 - return 0 charge += amount_used return amount_used @@ -72,8 +67,6 @@ . += "The manufacturer's label states this cell has a power rating of [maxcharge], and that you should not swallow it.\nThe charge meter reads [round(src.percent() )]%." else . += "This power cell has an exciting chrome finish, as it is an uber-capacity cell type! It has a power rating of [maxcharge]!\nThe charge meter reads [round(src.percent() )]%." - if(crit_fail) - . += span_warning("This power cell seems to be faulty.") if(rigged) if(get_dist(user,src) < 3) //Have to be close to make out the *DANGEROUS* details . += span_danger("This power cell looks jury rigged to explode!") @@ -196,9 +189,7 @@ charge -= 1000 / severity if (charge < 0) charge = 0 - if(reliability != 100 && prob(50/severity)) - reliability -= 10 / severity - ..() + return ..() /obj/item/cell/ex_act(severity) diff --git a/code/modules/power/groundmap_geothermal.dm b/code/modules/power/groundmap_geothermal.dm index 1a5bbfe8bc9ed..b90f8bd16433c 100644 --- a/code/modules/power/groundmap_geothermal.dm +++ b/code/modules/power/groundmap_geothermal.dm @@ -32,7 +32,7 @@ GLOBAL_VAR_INIT(generators_on_ground, 0) . = ..() RegisterSignals(SSdcs, list(COMSIG_GLOB_OPEN_TIMED_SHUTTERS_LATE, COMSIG_GLOB_OPEN_TIMED_SHUTTERS_XENO_HIVEMIND, COMSIG_GLOB_OPEN_SHUTTERS_EARLY, COMSIG_GLOB_TADPOLE_LAUNCHED), PROC_REF(activate_corruption)) update_icon() - SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "generator")) + SSminimaps.add_marker(src, MINIMAP_FLAG_ALL, image('icons/UI_icons/map_blips.dmi', null, "generator", ABOVE_FLOAT_LAYER)) if(is_ground_level(z)) GLOB.generators_on_ground += 1 diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index a8c3587eb3b67..19d68ec5a9bd7 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -223,8 +223,6 @@ M.state = 2 M.icon_state = "box_1" for(var/obj/O in component_parts) - if(O.reliability != 100 && crit_fail) - O.crit_fail = TRUE O.forceMove(loc) qdel(src) diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index 041bef59df1fe..56f111efde9f3 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -121,7 +121,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh CRASH("staggerstun called without a mob target") if(!isliving(victim)) return - if(get_dist_euclide(proj.starting_turf, victim) > max_range) + if(get_dist_euclidean(proj.starting_turf, victim) > max_range) return var/impact_message = "" if(isxeno(victim)) @@ -2701,7 +2701,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh smoke.set_up(6, T, 7) smoke.start() flame_radius(4, T) - flame_radius(1, T, burn_intensity = 45, burn_duration = 75, burn_damage = 15, fire_stacks = 75) + flame_radius(1, T, burn_intensity = 75, burn_duration = 45, burn_damage = 15, fire_stacks = 75) /datum/ammo/mortar/smoke/howi/plasmaloss smoketype = /datum/effect_system/smoke_spread/plasmaloss @@ -3965,7 +3965,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh damage = 50 damage_type = STAMINA damage_falloff = 0 - penetration = 40 + penetration = 50 bullet_color = BOILER_LUMINOSITY_AMMO_NEUROTOXIN_COLOR reagent_transfer_amount = 30 ///On a direct hit, how long is the target paralyzed? @@ -3975,7 +3975,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh ///On a direct hit, how much drowsyness gets added to the target? var/hit_drowsyness = 12 ///Base spread range - var/fixed_spread_range = 3 + var/fixed_spread_range = 4 ///Which type is the smoke we leave on passed tiles, provided the projectile has AMMO_LEAVE_TURF enabled? var/passed_turf_smoke_type = /datum/effect_system/smoke_spread/xeno/neuro/light ///We're going to reuse one smoke spread system repeatedly to cut down on processing. @@ -4077,7 +4077,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh danger_message = span_danger("A glob of acid lands with a splat and explodes into corrosive bile!") damage = 50 damage_type = BURN - penetration = 40 + penetration = 50 bullet_color = BOILER_LUMINOSITY_AMMO_CORROSIVE_COLOR hit_paralyze_time = 1 SECONDS hit_eye_blur = 1 @@ -4107,7 +4107,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh danger_message = span_danger("A pressurized glob of acid lands with a nasty splat and explodes into noxious fumes!") max_range = 40 damage = 75 - penetration = 60 + penetration = 70 reagent_transfer_amount = 55 passed_turf_smoke_type = /datum/effect_system/smoke_spread/xeno/neuro/light hit_paralyze_time = 2 SECONDS @@ -4127,7 +4127,7 @@ GLOBAL_LIST_INIT(no_sticky_resin, typecacheof(list(/obj/item/clothing/mask/faceh danger_message = span_danger("A pressurized glob of acid lands with a concerning hissing sound and explodes into corrosive bile!") max_range = 40 damage = 75 - penetration = 60 + penetration = 70 passed_turf_smoke_type = /datum/effect_system/smoke_spread/xeno/acid/light hit_paralyze_time = 1.5 SECONDS hit_eye_blur = 4 diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index b9955a9d0300e..f560a9c3a0621 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -1502,164 +1502,6 @@ inaccurate. Don't worry if force is ever negative, it won't runtime. detaching_gun.deployable_item = null detaching_gun.turret_flags &= ~(TURRET_HAS_CAMERA|TURRET_SAFETY|TURRET_ALERTS) - -/obj/item/attachable/shoulder_mount - name = "experimental shoulder attachment point" - desc = "A brand new advance in combat technology. This device, once attached to a firearm, will allow the firearm to be mounted onto any piece of modular armor. Once attached to the armor and activated, the gun will fire when the user chooses.\nOnce attached to the armor, right clicking the armor with an empty hand will select what click will fire the armor (middle, right, left). Right clicking with ammunition will reload the gun. Using the Unique Action keybind will perform the weapon's unique action only when the gun is active." - icon = 'icons/mob/modular/shoulder_gun.dmi' - icon_state = "shoulder_gun" - slot = ATTACHMENT_SLOT_RAIL - pixel_shift_x = 13 - ///What click the gun will fire on. - var/fire_mode = "right" - ///Blacklist of item types not allowed to be in the users hand to fire the gun. - var/list/in_hand_items_blacklist = list( - /obj/item/weapon/gun, - /obj/item/weapon/shield, - ) - -/obj/item/attachable/shoulder_mount/on_attach(attaching_item, mob/user) - . = ..() - var/obj/item/weapon/gun/attaching_gun = attaching_item - ENABLE_BITFIELD(flags_attach_features, ATTACH_BYPASS_ALLOWED_LIST|ATTACH_APPLY_ON_MOB) - attaching_gun.AddElement(/datum/element/attachment, ATTACHMENT_SLOT_MODULE, icon, null, null, null, null, 0, 0, flags_attach_features, attach_delay, detach_delay, attach_skill, attach_skill_upper_threshold, attach_sound, attachment_layer = COLLAR_LAYER) - RegisterSignal(attaching_gun, COMSIG_ATTACHMENT_ATTACHED, PROC_REF(handle_armor_attach)) - RegisterSignal(attaching_gun, COMSIG_ATTACHMENT_DETACHED, PROC_REF(handle_armor_detach)) - -/obj/item/attachable/shoulder_mount/on_detach(detaching_item, mob/user) - var/obj/item/weapon/gun/detaching_gun = detaching_item - detaching_gun.RemoveElement(/datum/element/attachment, ATTACHMENT_SLOT_MODULE, icon, null, null, null, null, 0, 0, flags_attach_features, attach_delay, detach_delay, attach_skill, attach_skill_upper_threshold, attach_sound, attachment_layer = COLLAR_LAYER) - DISABLE_BITFIELD(flags_attach_features, ATTACH_BYPASS_ALLOWED_LIST|ATTACH_APPLY_ON_MOB) - UnregisterSignal(detaching_gun, list(COMSIG_ATTACHMENT_ATTACHED, COMSIG_ATTACHMENT_DETACHED)) - return ..() - -/obj/item/attachable/shoulder_mount/ui_action_click(mob/living/user, datum/action/item_action/action, obj/item/weapon/gun/G) - if(!istype(master_gun.loc, /obj/item/clothing/suit/modular) || master_gun.loc.loc != user) - return - return activate(user) - -/obj/item/attachable/shoulder_mount/activate(mob/user, turn_off) - . = ..() - if(CHECK_BITFIELD(master_gun.flags_item, IS_DEPLOYED)) - DISABLE_BITFIELD(master_gun.flags_item, IS_DEPLOYED) - UnregisterSignal(user, COMSIG_MOB_MOUSEDOWN) - master_gun.set_gun_user(null) - . = FALSE - else if(!turn_off) - ENABLE_BITFIELD(master_gun.flags_item, IS_DEPLOYED) - update_icon() - master_gun.set_gun_user(user) - RegisterSignal(user, COMSIG_MOB_MOUSEDOWN, PROC_REF(handle_firing)) - master_gun.RegisterSignal(user, COMSIG_MOB_MOUSEDRAG, TYPE_PROC_REF(/obj/item/weapon/gun, change_target)) - . = TRUE - for(var/datum/action/item_action/toggle/action_to_update AS in actions) - action_to_update.set_toggle(.) - -///Handles the gun attaching to the armor. -/obj/item/attachable/shoulder_mount/proc/handle_armor_attach(datum/source, attaching_item, mob/user) - SIGNAL_HANDLER - if(!istype(attaching_item, /obj/item/clothing/suit/modular)) - return - master_gun.set_gun_user(null) - RegisterSignal(attaching_item, COMSIG_ITEM_EQUIPPED, PROC_REF(handle_activations)) - RegisterSignal(attaching_item, COMSIG_ATOM_ATTACK_HAND_ALTERNATE, PROC_REF(switch_mode)) - RegisterSignal(attaching_item, COMSIG_ATOM_ATTACKBY_ALTERNATE, PROC_REF(reload_gun)) - RegisterSignal(master_gun, COMSIG_MOB_GUN_FIRED, PROC_REF(after_fire)) - master_gun.base_gun_icon = master_gun.placed_overlay_iconstate - master_gun.update_icon() - -///Handles the gun detaching from the armor. -/obj/item/attachable/shoulder_mount/proc/handle_armor_detach(datum/source, detaching_item, mob/user) - SIGNAL_HANDLER - if(!istype(detaching_item, /obj/item/clothing/suit/modular)) - return - for(var/datum/action/action_to_delete AS in actions) - if(action_to_delete.target != src) - continue - QDEL_NULL(action_to_delete) - break - update_icon() - master_gun.base_gun_icon = initial(master_gun.icon_state) - master_gun.update_icon() - UnregisterSignal(detaching_item, list(COMSIG_ITEM_EQUIPPED, COMSIG_ATOM_ATTACK_HAND_ALTERNATE, COMSIG_ATOM_ATTACKBY_ALTERNATE)) - UnregisterSignal(master_gun, COMSIG_MOB_GUN_FIRED) - UnregisterSignal(user, COMSIG_MOB_MOUSEDOWN) - -///Sets up the action. -/obj/item/attachable/shoulder_mount/proc/handle_activations(datum/source, mob/equipper, slot) - if(!isliving(equipper)) - return - if(slot != SLOT_WEAR_SUIT) - LAZYREMOVE(actions_types, /datum/action/item_action/toggle) - var/datum/action/item_action/toggle/old_action = locate(/datum/action/item_action/toggle) in actions - if(!old_action) - return - old_action.remove_action(equipper) - actions = null - else - LAZYADD(actions_types, /datum/action/item_action/toggle) - var/datum/action/item_action/toggle/new_action = new(src) - new_action.give_action(equipper) - -///Performs the firing. -/obj/item/attachable/shoulder_mount/proc/handle_firing(datum/source, atom/object, turf/location, control, params) - SIGNAL_HANDLER - var/list/modifiers = params2list(params) - if(!modifiers[fire_mode]) - return - if(!istype(master_gun.loc, /obj/item/clothing/suit/modular) || master_gun.loc.loc != source) - return - if(source.Adjacent(object)) - return - var/mob/living/user = master_gun.gun_user - if(user.incapacitated() || user.lying_angle || LAZYACCESS(user.do_actions, src) || !user.dextrous || (!CHECK_BITFIELD(master_gun.flags_gun_features, GUN_ALLOW_SYNTHETIC) && !CONFIG_GET(flag/allow_synthetic_gun_use) && issynth(user))) - return - var/active_hand = user.get_active_held_item() - var/inactive_hand = user.get_inactive_held_item() - for(var/item_blacklisted in in_hand_items_blacklist) - if(!istype(active_hand, item_blacklisted) && !istype(inactive_hand, item_blacklisted)) - continue - to_chat(user, span_warning("[src] beeps. Guns or shields in your hands are interfering with its targetting. Aborting.")) - return - master_gun.start_fire(source, object, location, control, null, TRUE) - -///Switches click fire modes. -/obj/item/attachable/shoulder_mount/proc/switch_mode(datum/source, mob/living/user) - SIGNAL_HANDLER - switch(fire_mode) - if("right") - fire_mode = "middle" - to_chat(user, span_notice("[master_gun] will now fire on a 'middle click'.")) - if("middle") - fire_mode = "left" - to_chat(user, span_notice("[master_gun] will now fire on a 'left click'.")) - if("left") - fire_mode = "right" - to_chat(user, span_notice("[master_gun] will now fire on a 'right click'.")) - -///Reloads the gun -/obj/item/attachable/shoulder_mount/proc/reload_gun(datum/source, obj/item/attacking_item, mob/living/user) - SIGNAL_HANDLER - INVOKE_ASYNC(master_gun, TYPE_PROC_REF(/obj/item/weapon/gun, reload), attacking_item, user) - -///Performs the unique action after firing and checks to see if the user is still able to fire. -/obj/item/attachable/shoulder_mount/proc/after_fire(datum/source, atom/target, obj/item/weapon/gun/fired_gun) - SIGNAL_HANDLER - if(CHECK_BITFIELD(master_gun.reciever_flags, AMMO_RECIEVER_REQUIRES_UNIQUE_ACTION)) - INVOKE_ASYNC(master_gun, TYPE_PROC_REF(/obj/item/weapon/gun, do_unique_action), master_gun.gun_user) - var/mob/living/user = master_gun.gun_user - var/active_hand = user.get_active_held_item() - var/inactive_hand = user.get_inactive_held_item() - for(var/item_blacklisted in in_hand_items_blacklist) - if(!istype(active_hand, item_blacklisted) && !istype(inactive_hand, item_blacklisted)) - continue - to_chat(user, span_warning("[src] beeps. Guns or shields in your hands are interfering with its targetting. Stopping fire.")) - master_gun.stop_fire() - return - if(!user.incapacitated() && !user.lying_angle && !LAZYACCESS(user.do_actions, src) && user.dextrous && (CHECK_BITFIELD(master_gun.flags_gun_features, GUN_ALLOW_SYNTHETIC) || CONFIG_GET(flag/allow_synthetic_gun_use) || !issynth(user))) - return - master_gun.stop_fire() - /obj/item/attachable/flamer_nozzle name = "standard flamer nozzle" desc = "The standard flamer nozzle. This one fires a stream of fire for direct and accurate flames. Though not as area filling as its counterpart, this one excels at directed frontline combat." diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 03bcb115c5779..60dd5b8c02b06 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -392,7 +392,6 @@ /obj/item/attachable/magnetic_harness, /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) mode_list = list( @@ -453,7 +452,6 @@ /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, - /obj/item/attachable/shoulder_mount, /obj/item/attachable/gyro, /obj/item/attachable/verticalgrip, /obj/item/attachable/angledgrip, @@ -545,8 +543,8 @@ ammo_datum_type = /datum/ammo/energy/lasgun/marine/pistol ammo_level_icon = null rounds_per_shot = 20 - gun_firemode = GUN_FIREMODE_SEMIAUTO - gun_firemode_list = list(GUN_FIREMODE_SEMIAUTO) + gun_firemode = GUN_FIREMODE_AUTOMATIC + gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) attachable_allowed = list( /obj/item/attachable/bayonet, /obj/item/attachable/bayonetknife, @@ -587,7 +585,7 @@ fire_delay = 0.15 SECONDS fire_sound = 'sound/weapons/guns/fire/Laser Pistol Standard.ogg' message_to_user = "You set the laser pistol's charge mode to standard fire." - fire_mode = GUN_FIREMODE_SEMIAUTO + fire_mode = GUN_FIREMODE_AUTOMATIC icon_state = "tep" description = "Fires a standard laser pulse. Moderate damage." @@ -641,7 +639,6 @@ /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, - /obj/item/attachable/shoulder_mount, /obj/item/attachable/gyro, /obj/item/attachable/verticalgrip, /obj/item/attachable/angledgrip, @@ -774,7 +771,6 @@ /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, - /obj/item/attachable/shoulder_mount, /obj/item/attachable/gyro, /obj/item/attachable/verticalgrip, /obj/item/attachable/angledgrip, @@ -874,7 +870,6 @@ /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, - /obj/item/attachable/shoulder_mount, /obj/item/attachable/gyro, /obj/item/attachable/verticalgrip, /obj/item/attachable/angledgrip, @@ -979,7 +974,6 @@ /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, - /obj/item/attachable/shoulder_mount, /obj/item/attachable/gyro, /obj/item/attachable/verticalgrip, /obj/item/attachable/angledgrip, @@ -1092,8 +1086,8 @@ default_ammo_type = /obj/item/cell/lasgun/volkite/small allowed_ammo_types = list(/obj/item/cell/lasgun/volkite/small) fire_sound = 'sound/weapons/guns/fire/volkite_3.ogg' - gun_firemode = GUN_FIREMODE_SEMIAUTO - gun_firemode_list = list(GUN_FIREMODE_SEMIAUTO) + gun_firemode = GUN_FIREMODE_AUTOMATIC + gun_firemode_list = list(GUN_FIREMODE_AUTOMATIC) fire_delay = 0.35 SECONDS scatter = -1 scatter_unwielded = 5 @@ -1132,7 +1126,6 @@ /obj/item/attachable/magnetic_harness, /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 13,"rail_x" = 9, "rail_y" = 23, "under_x" = 30, "under_y" = 10, "stock_x" = 22, "stock_y" = 12) scatter = 3 @@ -1185,7 +1178,6 @@ /obj/item/attachable/scope/marine, /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) attachable_offset = list("muzzle_x" = 38, "muzzle_y" = 13,"rail_x" = 9, "rail_y" = 24, "under_x" = 45, "under_y" = 11, "stock_x" = 22, "stock_y" = 12) accuracy_mult = 1.1 diff --git a/code/modules/projectiles/guns/flamer.dm b/code/modules/projectiles/guns/flamer.dm index 14474cae1dd35..9a2d933e072a1 100644 --- a/code/modules/projectiles/guns/flamer.dm +++ b/code/modules/projectiles/guns/flamer.dm @@ -28,7 +28,6 @@ /obj/item/attachable/flamer_nozzle, /obj/item/attachable/flamer_nozzle/wide, /obj/item/attachable/flamer_nozzle/wide/red, - /obj/item/attachable/shoulder_mount, ) attachments_by_slot = list( ATTACHMENT_SLOT_MUZZLE, diff --git a/code/modules/projectiles/guns/grenade_launchers.dm b/code/modules/projectiles/guns/grenade_launchers.dm index d5fb0e8e6dee9..aac3db9dee624 100644 --- a/code/modules/projectiles/guns/grenade_launchers.dm +++ b/code/modules/projectiles/guns/grenade_launchers.dm @@ -221,7 +221,10 @@ The Grenade Launchers wield_delay = 0.2 SECONDS aim_slowdown = 1 flags_gun_features = GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES - attachable_allowed = list() + attachable_allowed = list( + /obj/item/attachable/magnetic_harness, + /obj/item/attachable/flashlight, + ) attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 14, "rail_y" = 22, "under_x" = 19, "under_y" = 14, "stock_x" = 19, "stock_y" = 14) fire_delay = 1.05 SECONDS max_chamber_items = 0 diff --git a/code/modules/projectiles/guns/pistols.dm b/code/modules/projectiles/guns/pistols.dm index 0792121ecd711..9afea81d79957 100644 --- a/code/modules/projectiles/guns/pistols.dm +++ b/code/modules/projectiles/guns/pistols.dm @@ -98,7 +98,6 @@ /obj/item/attachable/gyro, /obj/item/attachable/lace, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, /obj/item/attachable/scope/marine, /obj/item/weapon/gun/shotgun/combat/masterkey, ) @@ -198,7 +197,6 @@ /obj/item/attachable/heavy_barrel, /obj/item/attachable/lace, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES @@ -258,7 +256,6 @@ /obj/item/attachable/quickfire, /obj/item/attachable/lace, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES fire_delay = 0.15 SECONDS @@ -338,7 +335,6 @@ /obj/item/attachable/flashlight/under, /obj/item/attachable/lace, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES @@ -384,7 +380,6 @@ /obj/item/attachable/buildasentry, /obj/item/attachable/flashlight/under, /obj/item/attachable/suppressor/unremovable/invisible, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES diff --git a/code/modules/projectiles/guns/revolvers.dm b/code/modules/projectiles/guns/revolvers.dm index 4c683c5e3572e..73fcf69c9a74a 100644 --- a/code/modules/projectiles/guns/revolvers.dm +++ b/code/modules/projectiles/guns/revolvers.dm @@ -84,7 +84,6 @@ /obj/item/attachable/lasersight, /obj/item/attachable/lace, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19,"rail_x" = 13, "rail_y" = 23, "under_x" = 22, "under_y" = 14, "stock_x" = 22, "stock_y" = 19) fire_delay = 0.15 SECONDS @@ -183,7 +182,6 @@ /obj/item/attachable/compensator, /obj/item/attachable/lace, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 19,"rail_x" = 8, "rail_y" = 23, "under_x" = 24, "under_y" = 15, "stock_x" = 22, "stock_y" = 15) @@ -298,7 +296,6 @@ /obj/item/attachable/extended_barrel, /obj/item/attachable/lasersight, /obj/item/attachable/lace, - /obj/item/attachable/shoulder_mount, /obj/item/attachable/stock/t76, /obj/item/attachable/scope/standard_magnum, ) @@ -328,7 +325,6 @@ /obj/item/attachable/extended_barrel, /obj/item/attachable/lasersight, /obj/item/attachable/lace, - /obj/item/attachable/shoulder_mount, /obj/item/attachable/stock/t76, /obj/item/attachable/scope/standard_magnum, /obj/item/attachable/compensator, diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 689ab421633c3..4a71841f03476 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -68,7 +68,6 @@ /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES @@ -156,7 +155,6 @@ /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES @@ -244,7 +242,6 @@ /obj/item/weapon/gun/grenade_launcher/underslung, /obj/item/attachable/buildasentry, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_AMMO_COUNTER|GUN_CAN_POINTBLANK|GUN_SMOKE_PARTICLES @@ -323,7 +320,6 @@ /obj/item/weapon/gun/grenade_launcher/underslung, /obj/item/attachable/buildasentry, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_AMMO_COUNTER|GUN_CAN_POINTBLANK|GUN_SMOKE_PARTICLES @@ -393,7 +389,6 @@ /obj/item/weapon/gun/grenade_launcher/underslung, /obj/item/attachable/buildasentry, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES @@ -444,7 +439,6 @@ /obj/item/weapon/gun/grenade_launcher/underslung, /obj/item/attachable/buildasentry, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, - /obj/item/attachable/shoulder_mount, ) attachable_offset = list("muzzle_x" = 44, "muzzle_y" = 19,"rail_x" = 15, "rail_y" = 21, "under_x" = 25, "under_y" = 16, "stock_x" = 18, "stock_y" = 15) @@ -498,7 +492,6 @@ /obj/item/attachable/buildasentry, /obj/item/attachable/stock/m41a, /obj/item/weapon/gun/grenade_launcher/underslung/invisible, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES @@ -560,7 +553,6 @@ /obj/item/attachable/magnetic_harness, /obj/item/attachable/buildasentry, /obj/item/attachable/stock/mpi_km, - /obj/item/attachable/shoulder_mount, /obj/item/attachable/verticalgrip, /obj/item/weapon/gun/pistol/plasma_pistol, /obj/item/weapon/gun/shotgun/combat/masterkey, @@ -612,7 +604,6 @@ /obj/item/attachable/magnetic_harness, /obj/item/attachable/buildasentry, /obj/item/attachable/stock/mpi_km/black, - /obj/item/attachable/shoulder_mount, /obj/item/attachable/verticalgrip, /obj/item/weapon/gun/pistol/plasma_pistol, /obj/item/weapon/gun/shotgun/combat/masterkey, @@ -674,7 +665,6 @@ /obj/item/attachable/magnetic_harness, /obj/item/attachable/buildasentry, /obj/item/attachable/stock/lmg_d, - /obj/item/attachable/shoulder_mount, /obj/item/attachable/verticalgrip, /obj/item/attachable/foldable/bipod, /obj/item/weapon/gun/pistol/plasma_pistol, @@ -796,7 +786,6 @@ /obj/item/weapon/gun/grenade_launcher/underslung, /obj/item/attachable/buildasentry, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES @@ -1004,7 +993,6 @@ /obj/item/attachable/magnetic_harness, /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_SMOKE_PARTICLES @@ -1042,6 +1030,7 @@ icon = 'icons/obj/items/guns/machineguns64.dmi' icon_state = "m412l1" item_state = "m412l1" + fire_animation = "m412l1_fire" item_icons = list( slot_l_hand_str = 'icons/mob/inhands/guns/machineguns_left_1.dmi', slot_r_hand_str = 'icons/mob/inhands/guns/machineguns_right_1.dmi', @@ -1075,7 +1064,6 @@ /obj/item/weapon/gun/grenade_launcher/underslung, /obj/item/attachable/buildasentry, /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_SMOKE_PARTICLES @@ -1317,7 +1305,6 @@ /obj/item/attachable/buildasentry, /obj/item/attachable/stock/sgstock, /obj/item/attachable/sgbarrel, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_IFF|GUN_SMOKE_PARTICLES @@ -1377,7 +1364,6 @@ /obj/item/attachable/stock/strstock, /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_IFF|GUN_SMOKE_PARTICLES @@ -1879,7 +1865,6 @@ /obj/item/attachable/motiondetector, /obj/item/attachable/flashlight/under, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_AMMO_COUNTER|GUN_WIELDED_STABLE_FIRING_ONLY|GUN_WIELDED_FIRING_ONLY|GUN_SMOKE_PARTICLES @@ -2281,7 +2266,6 @@ /obj/item/attachable/magnetic_harness, /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_SMOKE_PARTICLES @@ -2636,6 +2620,7 @@ icon = 'icons/obj/items/guns/machineguns64.dmi' icon_state = "minimi" item_state = "minimi" + fire_animation = "minimi_fire" item_icons = list( slot_l_hand_str = 'icons/mob/inhands/guns/machineguns_left_64.dmi', slot_r_hand_str = 'icons/mob/inhands/guns/machineguns_right_64.dmi', @@ -2669,7 +2654,6 @@ /obj/item/attachable/magnetic_harness, /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_AMMO_COUNTER|GUN_WIELDED_FIRING_ONLY|GUN_SMOKE_PARTICLES diff --git a/code/modules/projectiles/guns/shotguns.dm b/code/modules/projectiles/guns/shotguns.dm index 873e84dcbf64f..6900db6fb3fec 100644 --- a/code/modules/projectiles/guns/shotguns.dm +++ b/code/modules/projectiles/guns/shotguns.dm @@ -337,6 +337,7 @@ icon = 'icons/obj/items/guns/shotguns64.dmi' icon_state = "trenchgun" item_state = "trenchgun" + cock_animation = "trenchgun_pump" fire_sound = 'sound/weapons/guns/fire/trenchgun.ogg' reload_sound = 'sound/weapons/guns/interact/shotgun_cmb_insert.ogg' cocked_sound = 'sound/weapons/guns/interact/trenchgun_pump.ogg' @@ -421,7 +422,6 @@ /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, /obj/item/attachable/stock/mosin, - /obj/item/attachable/shoulder_mount, ) flags_item_map_variant = NONE flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES @@ -489,7 +489,6 @@ /obj/item/attachable/scope/marine, /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES @@ -723,7 +722,6 @@ /obj/item/attachable/foldable/t35stock, /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) starting_attachment_types = list(/obj/item/attachable/foldable/t35stock) diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm index 5a38f860f5af6..743010f8d7a12 100644 --- a/code/modules/projectiles/guns/smgs.dm +++ b/code/modules/projectiles/guns/smgs.dm @@ -124,7 +124,6 @@ /obj/item/attachable/magnetic_harness, /obj/item/attachable/motiondetector, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES diff --git a/code/modules/projectiles/guns/specialist.dm b/code/modules/projectiles/guns/specialist.dm index 93299658dcc86..dd24b9e4e38ba 100644 --- a/code/modules/projectiles/guns/specialist.dm +++ b/code/modules/projectiles/guns/specialist.dm @@ -60,8 +60,6 @@ Note that this means that snipers will have a slowdown of 3, due to the scope /obj/item/attachable/scope/antimaterial, /obj/item/attachable/buildasentry, /obj/item/attachable/sniperbarrel, - /obj/item/attachable/scope/pmc, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_WIELDED_FIRING_ONLY|GUN_AMMO_COUNTER|GUN_IFF|GUN_SMOKE_PARTICLES starting_attachment_types = list(/obj/item/attachable/scope/antimaterial, /obj/item/attachable/sniperbarrel) @@ -518,8 +516,6 @@ Note that this means that snipers will have a slowdown of 3, due to the scope wield_delay = 0.7 SECONDS // Very fast to put up. attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 12, "rail_y" = 20, "under_x" = 19, "under_y" = 14, "stock_x" = 19, "stock_y" = 14) attachable_allowed = list( - /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, /obj/item/attachable/flashlight, /obj/item/weapon/gun/flamer/hydro_cannon/pepperball, /obj/item/attachable/magnetic_harness, @@ -616,8 +612,6 @@ Note that this means that snipers will have a slowdown of 3, due to the scope attachable_allowed = list( /obj/item/attachable/magnetic_harness, /obj/item/attachable/scope/mini, - /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) flags_gun_features = GUN_WIELDED_FIRING_ONLY|GUN_WIELDED_STABLE_FIRING_ONLY|GUN_AMMO_COUNTER|GUN_SMOKE_PARTICLES @@ -749,7 +743,6 @@ Note that this means that snipers will have a slowdown of 3, due to the scope aim_slowdown = 2.75 attachable_allowed = list( /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) general_codex_key = "explosive weapons" @@ -768,8 +761,6 @@ Note that this means that snipers will have a slowdown of 3, due to the scope /obj/item/weapon/gun/launcher/rocket/m57a4/deathsquad attachable_allowed = list( - /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, /obj/item/attachable/magnetic_harness, ) starting_attachment_types = list(/obj/item/attachable/magnetic_harness) @@ -818,7 +809,6 @@ Note that this means that snipers will have a slowdown of 3, due to the scope attachable_allowed = list( /obj/item/attachable/magnetic_harness, /obj/item/attachable/buildasentry, - /obj/item/attachable/shoulder_mount, ) attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 18,"rail_x" = 15, "rail_y" = 19, "under_x" = 19, "under_y" = 14, "stock_x" = 19, "stock_y" = 14) diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index f66ee7a05311d..7803d661a280f 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -647,10 +647,10 @@ desc = "A magazine filled with 5.56x45mm rifle rounds for the EM-88 series of firearms." //------------------------------------------------------- -//ML-14 Assault Machiengun +//ML-41 Assault Machiengun /obj/item/ammo_magazine/icc_mg - name = "\improper ML-14 GPMG box magazine (10x25mm)" - desc = "A belt box for the ML-14 assault machinegun." + name = "\improper ML-41 GPMG box magazine (10x26mm)" + desc = "A belt box for the ML-41 assault machinegun." icon_state = "minimi" icon_state_mini = "mag_gpmg" caliber = CALIBER_10x26_CASELESS @@ -661,8 +661,8 @@ // This is a 'belt'. /obj/item/ammo_magazine/icc_mg/belt - name = "\improper ML-14 GPMG buttpack magazine (10x25mm)" - desc = "A buttpack for the ML-14 which carries the ammo inside." + name = "\improper ML-41 GPMG buttpack magazine (10x26mm)" + desc = "A buttpack for the ML-41 which carries the ammo inside." icon_state = "minimi_belt" flags_equip_slot = ITEM_SLOT_BELT flags_magazine = MAGAZINE_WORN diff --git a/code/modules/reagents/reagents/other.dm b/code/modules/reagents/reagents/other.dm index cb2c42d457a3d..6af24146b3a18 100644 --- a/code/modules/reagents/reagents/other.dm +++ b/code/modules/reagents/reagents/other.dm @@ -30,6 +30,7 @@ purge_list = list(/datum/reagent/toxin, /datum/reagent/medicine, /datum/reagent/consumable) purge_rate = 1 taste_description = "water" + scannable = TRUE /datum/reagent/water/reaction_turf(turf/T, volume) if(volume >= 3) diff --git a/code/modules/reqs/supplypacks.dm b/code/modules/reqs/supplypacks.dm index 554bb0fecdf8b..aa9f8c15953b8 100644 --- a/code/modules/reqs/supplypacks.dm +++ b/code/modules/reqs/supplypacks.dm @@ -2218,12 +2218,12 @@ FACTORY /datum/supply_packs/factory/railgun_hvap_magazine_refill name = "Railgun HVAP magazine assembly refill" - contains = list(/obj/item/factory_refill/railgun_magazine_refill) + contains = list(/obj/item/factory_refill/railgun_hvap_magazine_refill) cost = 200 /datum/supply_packs/factory/railgun_smart_magazine_refill name = "Railgun magazine assembly refill" - contains = list(/obj/item/factory_refill/railgun_magazine_refill) + contains = list(/obj/item/factory_refill/railgun_smart_magazine_refill) cost = 200 /datum/supply_packs/factory/minigun_powerpack_refill @@ -2237,17 +2237,17 @@ FACTORY cost = 600 /datum/supply_packs/factory/amr_magazine_refill - name = "T-26 AMR magazine assembly refill" + name = "T-26 AMR standard magazine assembly refill" contains = list(/obj/item/factory_refill/amr_magazine_refill) cost = 400 /datum/supply_packs/factory/amr_magazine_incend_refill - name = "T-26 AMR magazine assembly refill" + name = "T-26 AMR incendiary magazine assembly refill" contains = list(/obj/item/factory_refill/amr_magazine_incend_refill) cost = 400 /datum/supply_packs/factory/amr_magazine_flak_refill - name = "T-26 AMR magazine assembly refill" + name = "T-26 AMR flak magazine assembly refill" contains = list(/obj/item/factory_refill/amr_magazine_flak_refill) cost = 400 diff --git a/code/modules/shuttle/marine_dropship.dm b/code/modules/shuttle/marine_dropship.dm index db1166aa8a23b..5fdc6364584ea 100644 --- a/code/modules/shuttle/marine_dropship.dm +++ b/code/modules/shuttle/marine_dropship.dm @@ -493,6 +493,7 @@ resistance_flags = RESIST_ALL req_one_access = list(ACCESS_MARINE_DROPSHIP, ACCESS_MARINE_LEADER) // TLs can only operate the remote console possible_destinations = "lz1;lz2;alamo" + opacity = FALSE /obj/machinery/computer/shuttle/marine_dropship/attack_alien(mob/living/carbon/xenomorph/xeno_attacker, damage_amount = xeno_attacker.xeno_caste.melee_damage, damage_type = BRUTE, armor_type = MELEE, effects = TRUE, armor_penetration = xeno_attacker.xeno_caste.melee_ap, isrightclick = FALSE) var/datum/game_mode/infestation/infestation_mode = SSticker.mode //Minor QOL, any xeno can check the console after a leader hijacks @@ -711,7 +712,6 @@ name = "\improper 'Alamo' flight controls" desc = "The flight controls for the 'Alamo' Dropship. Named after the Alamo Mission, stage of the Battle of the Alamo in the United States' state of Texas in the Spring of 1836. The defenders held to the last, encouraging other Texians to rally to the flag." possible_destinations = "lz1;lz2;alamo" - opacity = FALSE /obj/machinery/computer/shuttle/marine_dropship/one/Initialize(mapload) . = ..() @@ -741,6 +741,12 @@ /turf/open/shuttle/dropship/floor/alt icon_state = "rasputin14" +/turf/open/shuttle/dropship/floor/corners + icon_state = "rasputin16" + +/turf/open/shuttle/dropship/floor/out + icon_state = "rasputin17" + /obj/machinery/door/airlock/multi_tile/mainship/dropshiprear/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override) . = ..() if(!istype(port, /obj/docking_port/mobile/marine_dropship)) diff --git a/code/modules/vehicles/armored/__armored.dm b/code/modules/vehicles/armored/__armored.dm index 2511c9a91bb36..83a23c507b6d4 100644 --- a/code/modules/vehicles/armored/__armored.dm +++ b/code/modules/vehicles/armored/__armored.dm @@ -118,7 +118,7 @@ if(MAP_ARMOR_STYLE_DESERT) icon_state += "_desert" if(minimap_icon_state) - SSminimaps.add_marker(src, minimap_flags, image('icons/UI_icons/map_blips_large.dmi', null, minimap_icon_state)) + SSminimaps.add_marker(src, minimap_flags, image('icons/UI_icons/map_blips_large.dmi', null, minimap_icon_state, HIGH_FLOAT_LAYER)) GLOB.tank_list += src /obj/vehicle/sealed/armored/Destroy() diff --git a/code/modules/xenomorph/pherotower.dm b/code/modules/xenomorph/pherotower.dm index a93b0753908bc..0d61a0caa8213 100644 --- a/code/modules/xenomorph/pherotower.dm +++ b/code/modules/xenomorph/pherotower.dm @@ -18,7 +18,7 @@ /obj/structure/xeno/pherotower/Initialize(mapload, _hivenumber) . = ..() - SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('icons/UI_icons/map_blips.dmi', null, "phero")) + SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('icons/UI_icons/map_blips.dmi', null, "phero", ABOVE_FLOAT_LAYER)) GLOB.hive_datums[hivenumber].pherotowers += src //Pheromone towers start off with recovery. diff --git a/code/modules/xenomorph/resin_gargoyle.dm b/code/modules/xenomorph/resin_gargoyle.dm index 733cc79a738bf..96b1f33494e02 100644 --- a/code/modules/xenomorph/resin_gargoyle.dm +++ b/code/modules/xenomorph/resin_gargoyle.dm @@ -59,4 +59,4 @@ ///resets minimap icon for the gargoyle /obj/structure/xeno/resin_gargoyle/proc/update_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('icons/UI_icons/map_blips.dmi', null, "gargoyle[is_alerting ? "_alarm" : ""]")) + SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('icons/UI_icons/map_blips.dmi', null, "gargoyle[is_alerting ? "_alarm" : ""]", ABOVE_FLOAT_LAYER)) diff --git a/code/modules/xenomorph/silo.dm b/code/modules/xenomorph/silo.dm index 261798d0cda0a..a41f95ef137f7 100644 --- a/code/modules/xenomorph/silo.dm +++ b/code/modules/xenomorph/silo.dm @@ -152,4 +152,4 @@ ///Change minimap icon if silo is under attack or not /obj/structure/xeno/silo/proc/update_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('icons/UI_icons/map_blips.dmi', null, "silo[warning ? "_warn" : "_passive"]")) + SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('icons/UI_icons/map_blips.dmi', null, "silo[warning ? "_warn" : "_passive"]", HIGH_FLOAT_LAYER)) diff --git a/code/modules/xenomorph/spawner.dm b/code/modules/xenomorph/spawner.dm index f432a5a694188..bb2a8407df469 100644 --- a/code/modules/xenomorph/spawner.dm +++ b/code/modules/xenomorph/spawner.dm @@ -94,7 +94,7 @@ ///Change minimap icon if spawner is under attack or not /obj/structure/xeno/spawner/proc/update_minimap_icon() SSminimaps.remove_marker(src) - SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('icons/UI_icons/map_blips.dmi', null, "spawner[warning ? "_warn" : "_passive"]")) + SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('icons/UI_icons/map_blips.dmi', null, "spawner[warning ? "_warn" : "_passive"]", ABOVE_FLOAT_LAYER)) /obj/structure/xeno/spawner/proc/on_spawn(list/squad) if(!isxeno(squad[length(squad)])) diff --git a/code/modules/xenomorph/tunnel.dm b/code/modules/xenomorph/tunnel.dm index 063e24cf642c2..1e8e05df15af0 100644 --- a/code/modules/xenomorph/tunnel.dm +++ b/code/modules/xenomorph/tunnel.dm @@ -30,7 +30,7 @@ TUNNEL for(var/datum/atom_hud/xeno_tactical/xeno_tac_hud in GLOB.huds) //Add to the xeno tachud xeno_tac_hud.add_to_hud(src) hud_set_xeno_tunnel() - SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('icons/UI_icons/map_blips.dmi', null, "xenotunnel")) + SSminimaps.add_marker(src, MINIMAP_FLAG_XENO, image('icons/UI_icons/map_blips.dmi', null, "xenotunnel", VERY_HIGH_FLOAT_LAYER)) /obj/structure/xeno/tunnel/Destroy() var/turf/drop_loc = get_turf(src) diff --git a/html/changelogs/AutoChangeLog-pr-15386.yml b/html/changelogs/AutoChangeLog-pr-15386.yml new file mode 100644 index 0000000000000..851e3b339e190 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-15386.yml @@ -0,0 +1,5 @@ +author: "AzonStarfall" +delete-after: True +changes: + - rscadd: "Expanded the Arachne vehicle bay." + - rscdel: "Removed the Arachne flight control station, to make room for the vehicle bay." \ No newline at end of file diff --git a/html/changelogs/archive/2024-03.yml b/html/changelogs/archive/2024-03.yml index 99c4d13844c63..99642b9f11ca7 100644 --- a/html/changelogs/archive/2024-03.yml +++ b/html/changelogs/archive/2024-03.yml @@ -190,3 +190,105 @@ - balance: Large xenos will not be thrown by light or weak explosions - balance: Mechs will only be thrown by devastating explosions - balance: Weak explosions will now only throw loose items +2024-03-12: + 00ze-cyclone: + - balance: laspistol and serpenta are now full auto + Barnet2: + - balance: Explosives using flame_radius (phos nades, incen nades) no longer have + damage RNG, and less duration RNG + - balance: Incendiary OB now has the same burn level as xfuel + Lumipharon: + - qol: 'Campaign: Added some extra crates to the home bases and other minor adjustments' + blackdav123: + - balance: Preweeded Magmoor + coldironwarrior: + - bugfix: POS, Arachne, and Theseus have one set of sandbags for synths; Theseus + and Sulaco now have a few guaranteed pairs of insuls in engineering + - bugfix: adds two more 30mm GAU ammo crates to Sulaco CAS bay to keep it in parity + with other ships' CAS bays + - balance: all shipmaps now start with two combat droids + - bugfix: reorganizes CAS weapons bay on Pillar of Spring so POs can now get at + their weapons easier + - bugfix: 'PoS minor changes: removes a duplicate rack; fixes decaling by the alamo; + moves a vent that was covered by a photocopier in engineering' +2024-03-13: + Barnet2: + - balance: Restores pre-root boiler dig mechanic, have to sit still and wait 3 seconds + before firing a glob (you can still move, but cancels the channel) + lbnesquik: + - bugfix: The AI can interact with the nuke again +2024-03-14: + Barnet2: + - balance: Boiler gas is now translucent, AP on direct hit for all glob types increased + by 10 + - balance: Normal boiler gas (non-lance) has 1 more tile of radius + ClosetedSkeletonGH: + - rscadd: Alamo has been revamped to be more RP friendly and efficient + - bugfix: fixes soder machines costing money + - bugfix: fixes not being able to see out of the front of the almamo + Dikozda: + - rscadd: Drones can now place acid wells. + Naaanii: + - rscdel: Removes shoulder mount from research gacha. + Neocloudy: + - balance: The overheating damage for Normal Synthetics is now 5-16 + - balance: The overheating damage for Early Synthetics is now 7-19 + - rscadd: Synthetics may spark when overheating from severe damage. They will also + stammer when overheating. + coldironwarrior: + - balance: antigas grenade sets in FC and SL vendors; 24 points for a set of four + grenades + - bugfix: beginner tutorial sheets updated + lbnesquik: + - imageadd: added pump animation for trench gun + - imageadd: added firing animation for M412LI, and Minimi + - bugfix: fixed ICC mg mags not having the right name + - bugfix: fixed ICC mg mags not having the right caliber + - bugfix: water is now scannable by medical scanners +2024-03-15: + Lumipharon: + - code_imp: Cleaned up some object and flare code + - qol: Certain minimap blips such as important structures or defibbable marines + layer over other blips + - bugfix: Queen screech will no longer go through z-levels + - balance: 'Campaign: SOM medics now always have 2 RR injectors in their helmets' + - bugfix: 'Campaign: Fixed a few mismatched portraits when calling in firesupport' + - qol: 'Campaign: Loadout screen automatically opens on spawn where required' + - qol: 'Campaign: Respawn window automatically opens when your respawn timer is + up, or when the rapid reserve asset is used' + Notamaniac: + - rscadd: Adds say tech hints + coldironwarrior: + - qol: re-organizes theseus hangar and staff officer quarters + - qol: style hats now mask hairs behind them so they look like they're layered on + your head properly + - imageadd: resprites mimir module worn sprite +2024-03-16: + Barnet2: + - bugfix: Campaign mortar acid smoke is opaque + DeltaFire15: + - bugfix: Certain xenomorphs can no longer regenerate past their plasma cap under + specific circumstances. + - bugfix: Railgun factory parts now give you their respective ammunition types instead + of only standard canisters. + - spellcheck: AMR factory parts now can be differentiated by name as opposed to + by feeling. + Kapu1178: + - bugfix: Facehuggers will now prioritize the nearest marine, preferring cardinal + directions. + Lumipharon: + - balance: 'Campaign: reduced mission time for ASAT and both fire support missions' + - balance: 'Campaign: Increased number of objectives required for minor victory + for fire support missions' + - balance: 'Campaign: Killing mechs in mech war awards a small number of capture + points' + - balance: 'Campaign: Fire support binos require line of sight, but can now target + any atom' + - bugfix: fixed flak guns being vended incorrectly + - qol: Antigas smoke is more visible + blackdav123: + - balance: GL-81 can now fit magnetic harness and rail flashlight. + lbnesquik: + - qol: Added a little description to the medivac bed in the corpsman vendor. + - spellcheck: Corrected a typo of patiant to patient + - code_imp: Removed a now useless verb diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index 2436238d98f9f..30241d98b2513 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/modular/modular_armor_modules.dmi b/icons/mob/modular/modular_armor_modules.dmi index 4e05bd48d8c1d..158cebc79f41d 100644 Binary files a/icons/mob/modular/modular_armor_modules.dmi and b/icons/mob/modular/modular_armor_modules.dmi differ diff --git a/icons/obj/items/guns/machineguns64.dmi b/icons/obj/items/guns/machineguns64.dmi index c7bf1edc283d6..7f9db29fac100 100644 Binary files a/icons/obj/items/guns/machineguns64.dmi and b/icons/obj/items/guns/machineguns64.dmi differ diff --git a/icons/obj/items/guns/shotguns64.dmi b/icons/obj/items/guns/shotguns64.dmi index d4041994f14ed..63d39913d8680 100644 Binary files a/icons/obj/items/guns/shotguns64.dmi and b/icons/obj/items/guns/shotguns64.dmi differ diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index fd17f85ef5108..6597b2ff859e5 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ diff --git a/icons/turf/dropship.dmi b/icons/turf/dropship.dmi index dbd3d5e301d76..4e361c023ec46 100644 Binary files a/icons/turf/dropship.dmi and b/icons/turf/dropship.dmi differ diff --git a/icons/turf/shuttle.dmi b/icons/turf/shuttle.dmi index 4abe371009bcf..9af4987cf314c 100644 Binary files a/icons/turf/shuttle.dmi and b/icons/turf/shuttle.dmi differ diff --git a/strings/tips/meta.txt b/strings/tips/meta.txt index 71e0b42e93930..f173dcaa57443 100644 --- a/strings/tips/meta.txt +++ b/strings/tips/meta.txt @@ -23,3 +23,4 @@ There are no such things as macros, only keybinds. Communication, be it from a marine to a marine, a drone to the queen, or command to everyone, is vital and information on flanks can change how the entire round plays out. As an alien or marine, be careful of the flank, regardless of if the push is going well or stalling out. Half of getting good is knowing to be aggressive. The other half is knowing when not to be aggressive. +When talking, surround what you type (without the quotes) with "__", "++" or "||" to underline, bold, or italicize what you say. You combine these modifiers too!