diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index de835b016463..096f8d427098 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -8,6 +8,9 @@ dir = 4; pixel_x = -20 }, +/obj/structure/platform/ship_three{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "ai" = ( @@ -24,6 +27,9 @@ }, /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/borderfloorblack, +/obj/structure/platform/ship_three{ + dir = 6 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "ar" = ( @@ -62,6 +68,9 @@ req_access = null }, /obj/item/radio/intercom/directional/west, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/port) "bn" = ( @@ -111,6 +120,12 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/trimline/opaque/yellow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/corner{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/fore) "bJ" = ( @@ -304,13 +319,14 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "dI" = ( -/obj/effect/turf_decal/trimline/opaque/yellow/corner{ +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/siding/thinplating{ dir = 1 }, -/obj/effect/turf_decal/siding/thinplating/corner{ +/obj/effect/turf_decal/trimline/opaque/yellow/line{ dir = 1 }, -/obj/machinery/firealarm/directional/north, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/fore) "dS" = ( @@ -342,6 +358,9 @@ /obj/item/clothing/ears/earmuffs, /obj/machinery/light/directional/north, /obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/platform/ship_three{ + dir = 4 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "eg" = ( @@ -538,6 +557,7 @@ }, /obj/effect/turf_decal/borderfloorblack, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/platform/ship_three, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "fN" = ( @@ -623,8 +643,8 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/item/flashlight/lamp/green, +/obj/effect/spawner/bunk_bed, +/obj/structure/curtain/bounty, /turf/open/floor/carpet/black, /area/ship/crew) "gC" = ( @@ -654,8 +674,8 @@ /area/ship/bridge) "gH" = ( /obj/machinery/porta_turret/ship/inteq{ - id = "colossus_grid"; - dir = 4 + dir = 4; + id = "colossus_grid" }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew) @@ -773,6 +793,9 @@ /obj/structure/sign/warning/vacuum/external{ pixel_x = 32 }, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/port) "hQ" = ( @@ -802,6 +825,9 @@ }, /obj/machinery/light/directional/south, /obj/machinery/computer/helm/viewscreen/directional/west, +/obj/structure/platform/ship_three{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "ie" = ( @@ -915,8 +941,8 @@ dir = 1 }, /obj/machinery/turretid/ship{ - pixel_y = 24; - id = "colossus_grid" + id = "colossus_grid"; + pixel_y = 24 }, /turf/open/floor/plasteel/dark, /area/ship/bridge) @@ -928,6 +954,12 @@ /turf/open/floor/plasteel/tech, /area/ship/maintenance/port) "ju" = ( +/obj/effect/turf_decal/siding/thinplating/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/opaque/yellow/corner{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/fore) "jw" = ( @@ -1038,7 +1070,10 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/newscaster/security_unit/directional/north, -/obj/machinery/rnd/server, +/obj/structure/bed/dogbed, +/mob/living/simple_animal/pet/dog/pug{ + name = "Solstice" + }, /turf/open/floor/plasteel/dark, /area/ship/crew/office) "kV" = ( @@ -1063,6 +1098,9 @@ dir = 4 }, /obj/item/radio/intercom/directional/east, +/obj/structure/platform/ship_three{ + dir = 4 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "lr" = ( @@ -1073,6 +1111,9 @@ dir = 8; pixel_x = 12 }, +/obj/structure/platform/ship_three{ + dir = 4 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "ls" = ( @@ -1092,13 +1133,12 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/hallway/central) "lA" = ( -/mob/living/simple_animal/pet/gondola{ - desc = "Why Inteq keeps this Gondola around is anybody's guess. Something about its peaceful demeanor still manages to put everybody at ease."; - name = "Solstice"; - real_name = "Solstice" +/obj/structure/weightmachine/weightlifter, +/obj/structure/platform/ship_three{ + dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/ship/crew/office) +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) "lB" = ( /obj/effect/turf_decal/industrial/traffic{ dir = 8 @@ -1139,8 +1179,8 @@ /area/ship/hallway/fore) "mb" = ( /obj/machinery/porta_turret/ship/inteq/light{ - id = "colossus_grid"; - dir = 5 + dir = 5; + id = "colossus_grid" }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/hallway/port) @@ -1220,6 +1260,9 @@ /obj/machinery/atmospherics/pipe/layer_manifold, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/east, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/port) "ny" = ( @@ -1292,6 +1335,9 @@ /obj/item/pickaxe/mini, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/airalarm/directional/west, +/obj/structure/platform/ship_three{ + dir = 10 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "on" = ( @@ -1317,6 +1363,9 @@ }, /obj/structure/table, /obj/machinery/jukebox/boombox, +/obj/structure/platform/ship_three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "ot" = ( @@ -1345,10 +1394,6 @@ /obj/item/clothing/mask/gas/inteq, /turf/open/floor/plasteel/tech/grid, /area/ship/security/armory) -"pa" = ( -/obj/structure/sign/number/nine, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security/armory) "pd" = ( /obj/machinery/photocopier, /obj/effect/turf_decal/corner/opaque/yellow, @@ -1472,6 +1517,9 @@ /obj/machinery/atmospherics/pipe/layer_manifold/visible, /obj/structure/catwalk/over/plated_catwalk/dark, /obj/item/radio/intercom/directional/west, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/engineering) "qQ" = ( @@ -1515,6 +1563,9 @@ /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, /obj/machinery/airalarm/directional/south, +/obj/item/flashlight/lamp/green{ + pixel_y = 12 + }, /turf/open/floor/plasteel/grimy, /area/ship/crew) "rb" = ( @@ -1554,6 +1605,9 @@ /obj/item/storage/box/cups{ pixel_y = 10 }, +/obj/structure/platform/ship_three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "rJ" = ( @@ -1604,11 +1658,10 @@ /turf/open/floor/plasteel/tech, /area/ship/security/armory) "rS" = ( -/obj/effect/turf_decal/trimline/opaque/yellow/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/thinplating/corner{ - dir = 8 +/obj/effect/turf_decal/siding/thinplating, +/obj/effect/turf_decal/trimline/opaque/yellow/line, +/obj/structure/chair/handrail{ + dir = 1 }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/fore) @@ -1652,6 +1705,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/directional/north, /obj/machinery/computer/helm/viewscreen/directional/west, +/obj/structure/platform/ship_three{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "sc" = ( @@ -1737,8 +1793,8 @@ /area/ship/crew/office) "sT" = ( /obj/machinery/porta_turret/ship/inteq/light{ - id = "colossus_grid"; - dir = 5 + dir = 5; + id = "colossus_grid" }, /turf/closed/wall/mineral/plastitanium, /area/ship/crew) @@ -1819,6 +1875,9 @@ /obj/structure/closet/wall/directional/east{ icon_state = "emergency_wall" }, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/port) "tI" = ( @@ -1831,6 +1890,9 @@ dir = 1 }, /obj/effect/landmark/start/assistant, +/obj/structure/platform/ship_three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "tK" = ( @@ -1845,6 +1907,9 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "tR" = ( @@ -1976,6 +2041,7 @@ pixel_x = 5; pixel_y = 21 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "uT" = ( @@ -2071,8 +2137,8 @@ /area/ship/cargo) "vJ" = ( /obj/machinery/porta_turret/ship/inteq{ - id = "colossus_grid"; - dir = 5 + dir = 5; + id = "colossus_grid" }, /turf/closed/wall/mineral/plastitanium, /area/ship/maintenance/port) @@ -2134,6 +2200,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 }, +/obj/structure/chair{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "wS" = ( @@ -2149,6 +2218,9 @@ /obj/effect/turf_decal/borderfloorblack{ dir = 1 }, +/obj/structure/platform/ship_three{ + dir = 5 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "wW" = ( @@ -2290,6 +2362,7 @@ pixel_x = 5 }, /obj/effect/turf_decal/borderfloorblack, +/obj/structure/platform/ship_three, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "yP" = ( @@ -2443,8 +2516,8 @@ /area/ship/maintenance/port) "Bi" = ( /obj/machinery/porta_turret/ship/inteq{ - id = "colossus_grid"; - dir = 9 + dir = 9; + id = "colossus_grid" }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/office) @@ -2523,6 +2596,9 @@ pixel_y = -5 }, /obj/machinery/light/small/directional/west, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/grimy, /area/ship/crew) "BK" = ( @@ -2559,6 +2635,9 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/item/radio/intercom/directional/west, /obj/structure/reagent_dispensers/watertank, +/obj/structure/platform/ship_three{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "BY" = ( @@ -2616,6 +2695,9 @@ pixel_x = -5; pixel_y = -19 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Cu" = ( @@ -2909,6 +2991,7 @@ pixel_x = -5; pixel_y = 21 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Gl" = ( @@ -3087,6 +3170,9 @@ pixel_x = 5; pixel_y = -19 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "HG" = ( @@ -3304,6 +3390,9 @@ /area/ship/bridge) "KM" = ( /obj/structure/closet/emcloset/wall/directional/west, +/obj/structure/platform/ship_three{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Ld" = ( @@ -3317,16 +3406,15 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/port) -"Le" = ( -/obj/structure/sign/number/one, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security/armory) "Ll" = ( /obj/machinery/porta_turret/ship/inteq{ - id = "colossus_grid"; - dir = 4 + dir = 4; + id = "colossus_grid" }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/bridge) @@ -3557,12 +3645,13 @@ /obj/structure/rack, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/metal/fifty, +/obj/structure/platform/ship_three, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "Oa" = ( /obj/machinery/porta_turret/ship/inteq/light{ - id = "colossus_grid"; - dir = 6 + dir = 6; + id = "colossus_grid" }, /turf/closed/wall/mineral/plastitanium, /area/ship/bridge) @@ -3600,9 +3689,8 @@ icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/bed, /obj/structure/curtain/bounty, -/obj/item/bedsheet/brown, +/obj/effect/spawner/bunk_bed, /turf/open/floor/carpet/black, /area/ship/crew) "Ou" = ( @@ -3635,8 +3723,8 @@ /area/ship/maintenance/starboard) "OI" = ( /obj/machinery/porta_turret/ship/inteq{ - id = "colossus_grid"; - dir = 6 + dir = 6; + id = "colossus_grid" }, /turf/closed/wall/mineral/plastitanium, /area/ship/maintenance/starboard) @@ -3671,6 +3759,7 @@ /obj/machinery/autolathe, /obj/effect/turf_decal/borderfloorblack, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/platform/ship_three, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "Pl" = ( @@ -3744,10 +3833,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden/layer1, /turf/open/floor/plasteel/tech, /area/ship/engineering) -"PV" = ( -/obj/structure/sign/number/four, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security/armory) "Qj" = ( /obj/machinery/light_switch{ dir = 1; @@ -3795,8 +3880,8 @@ /area/ship/maintenance/starboard) "Qw" = ( /obj/machinery/porta_turret/ship/inteq{ - id = "colossus_grid"; - dir = 10 + dir = 10; + id = "colossus_grid" }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/security/armory) @@ -3949,8 +4034,8 @@ /area/ship/cargo) "RZ" = ( /obj/machinery/porta_turret/ship/inteq/light{ - id = "talos_grid"; - dir = 6 + dir = 6; + id = "talos_grid" }, /turf/closed/wall/mineral/plastitanium, /area/ship/security) @@ -4030,6 +4115,9 @@ /obj/structure/sign/warning/incident{ pixel_x = 32 }, +/obj/structure/platform/ship_three{ + dir = 4 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Su" = ( @@ -4239,7 +4327,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/industrial/warning{ - dir = 1 + dir = 1; + layer = 2.04 + }, +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 8 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 8 }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/fore) @@ -4258,6 +4353,9 @@ pixel_x = 20; pixel_y = 11 }, +/obj/structure/platform/ship_three{ + dir = 4 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Wn" = ( @@ -4300,6 +4398,9 @@ /obj/item/roller{ pixel_y = 10 }, +/obj/structure/platform/ship_three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "WF" = ( @@ -4362,15 +4463,17 @@ /obj/structure/table/rolling, /obj/machinery/light/directional/south, /obj/machinery/computer/helm/viewscreen/directional/east, +/obj/structure/platform/ship_three{ + dir = 4 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "WS" = ( -/obj/structure/bed, /obj/structure/sign/poster/contraband/backdoor_xeno_babes_6{ pixel_y = -32 }, /obj/structure/curtain/bounty, -/obj/item/bedsheet/brown, +/obj/effect/spawner/bunk_bed, /turf/open/floor/carpet/black, /area/ship/crew) "Xb" = ( @@ -4383,6 +4486,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "Xc" = ( @@ -4487,6 +4591,9 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/platform/ship_three{ + dir = 9 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "XR" = ( @@ -4503,9 +4610,13 @@ /area/ship/crew) "XS" = ( /obj/effect/spawner/random/vending/cola, -/obj/effect/turf_decal/trimline/opaque/yellow/line, -/obj/effect/turf_decal/siding/thinplating, /obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 10 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 10 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/fore) "XV" = ( @@ -4516,7 +4627,9 @@ /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/hallway/fore) "Yv" = ( -/obj/structure/sign/number/eight, +/obj/structure/sign/number/random{ + pixel_y = -8 + }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/security/armory) "Yx" = ( @@ -4555,6 +4668,7 @@ /obj/effect/turf_decal/corner_techfloor_gray{ dir = 8 }, +/obj/structure/chair/handrail, /turf/open/floor/plating, /area/ship/maintenance/port) "Zc" = ( @@ -4830,7 +4944,7 @@ om kV XQ ah -Ve +lA hZ vH rh @@ -5100,7 +5214,7 @@ Sa Dq Dq Dq -pa +Yv "} (22,1,1) = {" XJ @@ -5122,7 +5236,7 @@ EI Dq MQ qQ -PV +Yv "} (23,1,1) = {" XJ @@ -5144,7 +5258,7 @@ VL Dq Xb DW -Le +Yv "} (24,1,1) = {" XJ @@ -5172,7 +5286,7 @@ Dq XJ vv aH -lA +jw tx xD va diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 2bd113ca646a..343f96e514b3 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -1,8 +1,4 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"ab" = ( -/obj/structure/sign/number/four, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage/starboard) "ae" = ( /obj/structure/cable{ icon_state = "4-8" @@ -303,6 +299,9 @@ /obj/effect/turf_decal/siding/thinplating/dark, /obj/machinery/light/directional/west, /obj/effect/decal/cleanable/dirt, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "bK" = ( @@ -344,6 +343,9 @@ /obj/item/roller, /obj/item/roller, /obj/item/roller, +/obj/structure/platform/ship_three{ + dir = 10 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "ce" = ( @@ -449,6 +451,9 @@ dir = 1; pixel_y = -19 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "cD" = ( @@ -875,6 +880,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "fF" = ( @@ -919,6 +925,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/grimy, /area/ship/crew) "ge" = ( @@ -964,6 +973,9 @@ /obj/effect/turf_decal/trimline/opaque/yellow/line, /obj/effect/turf_decal/siding/thinplating, /obj/machinery/firealarm/directional/south, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "gr" = ( @@ -1173,6 +1185,9 @@ icon_state = "multiz_pipe"; name = "multi deck pipe adapter" }, +/obj/structure/platform/industrial_alt{ + dir = 6 + }, /turf/open/floor/plasteel/elevatorshaft, /area/ship/hallway/central) "hK" = ( @@ -1749,7 +1764,6 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "lB" = ( -/obj/structure/railing, /obj/effect/turf_decal/box/corners{ dir = 8 }, @@ -1759,6 +1773,9 @@ /obj/item/storage/bag/ore, /obj/item/pickaxe/mini, /obj/item/pickaxe/mini, +/obj/structure/platform/ship_three{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "lC" = ( @@ -1803,6 +1820,9 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/storage/port) "lO" = ( @@ -1910,6 +1930,9 @@ dir = 10; layer = 2.030 }, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/storage) "mw" = ( @@ -2238,7 +2261,10 @@ /obj/machinery/status_display/shuttle{ pixel_y = 32 }, -/obj/structure/reagent_dispensers/water_cooler, +/obj/structure/platform/ship_three{ + dir = 1 + }, +/obj/structure/weightmachine/stacklifter, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "om" = ( @@ -2787,6 +2813,7 @@ /obj/item/target{ pixel_x = 5 }, +/obj/structure/platform/ship_three, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "qT" = ( @@ -3206,10 +3233,6 @@ }, /turf/open/floor/carpet/black, /area/ship/crew/dorm) -"ts" = ( -/obj/structure/sign/number/one, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage/starboard) "tu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 @@ -3392,6 +3415,9 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/west, /obj/machinery/autolathe, +/obj/structure/platform/ship_three{ + dir = 9 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "uC" = ( @@ -3429,6 +3455,9 @@ }, /obj/structure/table, /obj/item/storage/box/cups, +/obj/structure/platform/ship_three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "vi" = ( @@ -3599,7 +3628,20 @@ /obj/effect/turf_decal/box/corners{ dir = 4 }, -/obj/structure/weightmachine/stacklifter, +/obj/structure/platform/ship_three{ + dir = 1 + }, +/obj/structure/closet/crate{ + name = "food crate" + }, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/effect/spawner/random/food_or_drink/ration, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/item/reagent_containers/food/drinks/waterbottle/large, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "wu" = ( @@ -3765,6 +3807,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "xf" = ( @@ -3774,6 +3819,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plasteel/stairs/right{ dir = 4 }, @@ -3915,13 +3963,12 @@ /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) "yb" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, /obj/structure/curtain/bounty, /obj/structure/sign/poster/contraband/masked_men{ pixel_y = -32 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/bunk_bed, /turf/open/floor/carpet/black, /area/ship/crew/dorm) "yc" = ( @@ -3954,6 +4001,9 @@ dir = 4 }, /obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "yl" = ( @@ -4139,9 +4189,14 @@ pixel_x = 19; pixel_y = -2 }, -/obj/structure/weightmachine/weightlifter, /obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, +/obj/structure/platform/ship_three{ + dir = 1 + }, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "zw" = ( @@ -4177,12 +4232,11 @@ /turf/open/floor/plating, /area/ship/hallway/port) "zG" = ( -/obj/item/bedsheet/brown, -/obj/structure/bed, /obj/structure/curtain/bounty, /obj/structure/sign/poster/contraband/lusty_xenomorph{ pixel_x = -32 }, +/obj/effect/spawner/bunk_bed, /turf/open/floor/carpet/black, /area/ship/crew/dorm) "zK" = ( @@ -4213,6 +4267,9 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 6 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/engineering/communications) "zT" = ( @@ -4530,6 +4587,9 @@ pixel_y = 0 }, /obj/item/storage/box/bodybags, +/obj/structure/platform/ship_three{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "BY" = ( @@ -4558,8 +4618,8 @@ /area/ship/crew) "Cr" = ( /obj/machinery/porta_turret/ship/inteq/light{ - id = "talos_grid"; - dir = 9 + dir = 9; + id = "talos_grid" }, /turf/closed/wall/mineral/plastitanium, /area/ship/engineering/communications) @@ -4645,7 +4705,9 @@ /obj/effect/turf_decal/box/corners{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/platform/ship_three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "CX" = ( @@ -4742,6 +4804,7 @@ icon_state = "1-8" }, /obj/structure/crate_shelf, +/obj/structure/platform/ship_three, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Ds" = ( @@ -4782,6 +4845,7 @@ /obj/item/clothing/ears/earmuffs, /obj/effect/decal/cleanable/dirt, /obj/structure/crate_shelf, +/obj/structure/platform/ship_three, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "DO" = ( @@ -4855,8 +4919,8 @@ /area/ship/engineering/communications) "ED" = ( /obj/machinery/porta_turret/ship/inteq/light{ - id = "talos_grid"; - dir = 10 + dir = 10; + id = "talos_grid" }, /turf/closed/wall/mineral/plastitanium, /area/ship/storage) @@ -4884,10 +4948,6 @@ }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) -"Ff" = ( -/obj/structure/sign/number/nine, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/storage/starboard) "Fh" = ( /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable{ @@ -4914,6 +4974,9 @@ "Fl" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plating/airless, /area/ship/maintenance/starboard) "Fm" = ( @@ -5143,6 +5206,9 @@ dir = 8; pixel_x = 20 }, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Gz" = ( @@ -5161,6 +5227,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/carpet/black, /area/ship/crew/dorm) "GL" = ( @@ -5182,12 +5251,11 @@ /turf/open/floor/plating/airless, /area/ship/maintenance/starboard) "GR" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, /obj/structure/curtain/bounty, /obj/structure/sign/poster/contraband/d_day_promo{ pixel_x = 32 }, +/obj/effect/spawner/bunk_bed, /turf/open/floor/carpet/black, /area/ship/crew/dorm) "GU" = ( @@ -5300,8 +5368,8 @@ /obj/item/ammo_box/magazine/m12g_bulldog, /obj/item/ammo_box/magazine/m12g_bulldog, /obj/item/storage/guncase/inherit{ - pixel_y = 2; - pixel_x = -2 + pixel_x = -2; + pixel_y = 2 }, /obj/item/gun/ballistic/shotgun/automatic/bulldog/inteq/no_mag, /obj/item/ammo_box/magazine/m12g_bulldog, @@ -5320,6 +5388,7 @@ "HD" = ( /obj/machinery/firealarm/directional/south, /obj/structure/reagent_dispensers/fueltank, +/obj/structure/platform/ship_three, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "HI" = ( @@ -5614,6 +5683,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/platform/ship_three, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Kd" = ( @@ -5965,6 +6035,7 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Ml" = ( @@ -5992,6 +6063,9 @@ dir = 1 }, /obj/item/radio/intercom/directional/south, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/storage/starboard) "Mx" = ( @@ -6094,6 +6168,9 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/layer_manifold/visible, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "Nd" = ( @@ -6101,6 +6178,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/grimy, /area/ship/crew) "Nf" = ( @@ -6136,7 +6216,10 @@ }, /obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, +/obj/structure/platform/ship_three, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Nk" = ( @@ -6161,6 +6244,9 @@ /obj/effect/turf_decal/trimline/opaque/yellow/warning{ dir = 4 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "NF" = ( @@ -6376,6 +6462,7 @@ dir = 8 }, /obj/machinery/firealarm/directional/north, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "PL" = ( @@ -6522,7 +6609,9 @@ /turf/open/floor/plasteel/dark, /area/ship/security) "QS" = ( -/obj/structure/sign/number/eight, +/obj/structure/sign/number/random{ + pixel_y = -8 + }, /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/storage/starboard) "QU" = ( @@ -6898,6 +6987,23 @@ /obj/effect/turf_decal/box/corners, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"Tx" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/trimline/opaque/yellow/line, +/obj/effect/turf_decal/siding/thinplating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/chair/handrail{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/hallway/central) "TA" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/grimy, @@ -7032,6 +7138,9 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Uh" = ( @@ -7064,17 +7173,10 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, -/obj/structure/closet/crate{ - name = "food crate" +/obj/structure/platform/ship_three{ + dir = 1 }, -/obj/effect/spawner/random/food_or_drink/ration, -/obj/effect/spawner/random/food_or_drink/ration, -/obj/effect/spawner/random/food_or_drink/ration, -/obj/effect/spawner/random/food_or_drink/ration, -/obj/effect/spawner/random/food_or_drink/ration, -/obj/item/reagent_containers/food/drinks/waterbottle/large, -/obj/item/reagent_containers/food/drinks/waterbottle/large, -/obj/item/reagent_containers/food/drinks/waterbottle/large, +/obj/structure/weightmachine/weightlifter, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Um" = ( @@ -7104,6 +7206,9 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/storage/starboard) "Uy" = ( @@ -7220,6 +7325,7 @@ /obj/structure/sign/warning/nosmoking{ pixel_x = -32 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "Vp" = ( @@ -7326,6 +7432,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/firealarm/directional/north, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "VX" = ( @@ -7394,6 +7501,9 @@ dir = 1 }, /obj/item/radio/intercom/directional/south, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/storage/port) "Wp" = ( @@ -7414,6 +7524,18 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/carpet, /area/ship/storage/starboard) +"Wy" = ( +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating{ + dir = 4 + }, +/obj/structure/chair/handrail{ + dir = 8 + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/hallway/central) "Wz" = ( /obj/machinery/computer/helm{ dir = 8 @@ -7559,8 +7681,8 @@ /area/ship/engineering) "Xo" = ( /obj/machinery/turretid/ship{ - pixel_y = 24; - id = "talos_grid" + id = "talos_grid"; + pixel_y = 24 }, /turf/open/floor/carpet/orange, /area/ship/bridge) @@ -7634,6 +7756,7 @@ "Yq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/handrail, /turf/open/floor/plating/airless, /area/ship/maintenance/port) "Yt" = ( @@ -7706,6 +7829,13 @@ /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel/dark, /area/ship/storage) +"YT" = ( +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) "YU" = ( /obj/effect/turf_decal/industrial/warning/fulltile, /obj/structure/cable{ @@ -7823,6 +7953,7 @@ /obj/effect/turf_decal/trimline/opaque/yellow/warning{ dir = 8 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "Zq" = ( @@ -7846,6 +7977,9 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/showroomfloor, /area/ship/crew/toilet) "ZE" = ( @@ -8530,7 +8664,7 @@ SS Bv wY nJ -SC +Wy SC mC iZ @@ -8667,7 +8801,7 @@ zh jc Lc uO -Ic +YT nY ua MW @@ -8878,7 +9012,7 @@ sN Nk hT DY -Rg +Tx mK cR rJ @@ -9088,7 +9222,7 @@ Pt uI Ng CJ -Ff +QS sw sw sw @@ -9122,7 +9256,7 @@ TO uI uc rw -ts +QS sw sw sw @@ -9156,7 +9290,7 @@ oS uI Wr pb -ab +QS sw sw sw diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index 78821ad9c0b9..2bb5331f1dae 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -78,21 +78,24 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2, +/obj/structure/railing/corner{ + dir = 1 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "aW" = ( /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "bh" = ( -/obj/structure/railing{ - dir = 6 - }, /obj/effect/turf_decal/borderfloor{ dir = 6 }, /obj/effect/turf_decal/box/corners, /obj/structure/rack, /obj/effect/spawner/random/maintenance/five, +/obj/structure/platform/ship_three{ + dir = 6 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "bv" = ( @@ -119,11 +122,17 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "bI" = ( /obj/effect/turf_decal/borderfloorwhite, /obj/machinery/light/directional/south, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ship/medical/surgery) "bJ" = ( @@ -198,10 +207,6 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "ct" = ( -/obj/structure/railing{ - dir = 5; - layer = 2.9 - }, /obj/structure/closet/crate{ name = "training equipment crate" }, @@ -224,6 +229,9 @@ /obj/effect/turf_decal/borderfloor{ dir = 5 }, +/obj/structure/platform/ship_three{ + dir = 5 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "cu" = ( @@ -246,6 +254,7 @@ /obj/machinery/light_switch{ pixel_y = 20 }, +/obj/structure/railing, /turf/open/floor/plasteel/stairs{ dir = 8 }, @@ -424,6 +433,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/railing, /turf/open/floor/plasteel/stairs/right{ dir = 8 }, @@ -451,6 +461,7 @@ /obj/item/clothing/head/helmet/space/inteq, /obj/item/clothing/suit/space/inteq, /obj/item/clothing/suit/space/inteq, +/obj/structure/platform/ship_three/corner, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "ei" = ( @@ -491,6 +502,12 @@ }, /turf/closed/wall/mineral/plastitanium, /area/ship/maintenance/port) +"en" = ( +/obj/structure/sign/number/random{ + pixel_y = -8 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/medical/surgery) "ew" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 1 @@ -648,6 +665,9 @@ /obj/effect/turf_decal/siding/thinplating/corner{ dir = 4 }, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/port) "fO" = ( @@ -764,6 +784,12 @@ /obj/machinery/holopad/emergency/security, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) +"gI" = ( +/obj/structure/chair/handrail{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned, +/area/ship/cargo) "gU" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner, /obj/effect/turf_decal/siding/thinplating/dark/corner{ @@ -977,9 +1003,6 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "jj" = ( -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, /obj/structure/cable{ icon_state = "2-8" }, @@ -1032,6 +1055,18 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) +"jF" = ( +/obj/effect/turf_decal/trimline/opaque/brown/warning{ + dir = 8 + }, +/obj/effect/turf_decal/borderfloorwhite{ + dir = 4 + }, +/obj/structure/chair/handrail{ + dir = 1 + }, +/turf/open/floor/plasteel/tech, +/area/ship/medical) "jG" = ( /obj/machinery/rnd/server, /turf/open/floor/plasteel/patterned/ridged, @@ -1080,6 +1115,9 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "jR" = ( @@ -1091,6 +1129,9 @@ /obj/effect/turf_decal/steeldecal/steel_decals_central7{ dir = 4 }, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "jS" = ( @@ -1270,13 +1311,6 @@ /turf/open/floor/plasteel/tech/grid, /area/ship/medical) "lD" = ( -/obj/structure/sign/warning/nosmoking/burnt{ - pixel_y = -32 - }, -/obj/item/cigbutt/cigarbutt{ - pixel_x = -7; - pixel_y = 3 - }, /obj/machinery/telecomms/relay/preset/mining{ autolinkers = list("relay","hub"); freq_listening = list(1347); @@ -1380,6 +1414,9 @@ /area/ship/crew/canteen) "ml" = ( /obj/machinery/light/directional/west, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/patterned, /area/ship/medical) "mp" = ( @@ -1519,6 +1556,9 @@ /turf/open/floor/plating, /area/ship/maintenance/starboard) "ni" = ( +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/crew/canteen) "nk" = ( @@ -1595,6 +1635,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/railing, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "nZ" = ( @@ -1704,6 +1745,7 @@ /obj/structure/sign/warning/nosmoking/circle{ pixel_y = 32 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/dark, /area/ship/medical) "pj" = ( @@ -1798,6 +1840,7 @@ /obj/structure/cable{ icon_state = "0-6" }, +/obj/structure/chair/handrail, /turf/open/floor/plating, /area/ship/maintenance/port) "pO" = ( @@ -1939,6 +1982,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "qZ" = ( @@ -1951,6 +2000,9 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/firealarm/directional/south, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) "rc" = ( @@ -1975,6 +2027,12 @@ }, /turf/open/floor/plating, /area/ship/hallway/central) +"rw" = ( +/obj/structure/sign/number/random{ + pixel_y = -8 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/maintenance/starboard) "rL" = ( /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -2200,9 +2258,6 @@ /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "te" = ( -/obj/effect/turf_decal/borderfloor{ - dir = 1 - }, /obj/structure/rack, /obj/item/target/clown{ pixel_x = 9; @@ -2218,6 +2273,9 @@ /obj/effect/turf_decal/box/corners{ dir = 1 }, +/obj/structure/platform/ship_three/corner{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "tf" = ( @@ -2282,6 +2340,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "tS" = ( @@ -2450,6 +2511,7 @@ /area/ship/hallway/port) "wa" = ( /obj/machinery/light/small/directional/north, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned/brushed, /area/ship/crew/canteen) "wb" = ( @@ -2704,10 +2766,6 @@ /turf/open/floor/carpet/black, /area/ship/crew/dorm) "yy" = ( -/obj/structure/railing{ - dir = 5; - layer = 2.9 - }, /obj/effect/turf_decal/borderfloor{ dir = 4 }, @@ -2715,6 +2773,9 @@ dir = 4 }, /obj/structure/rack, +/obj/structure/platform/ship_three{ + dir = 4 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "yK" = ( @@ -2902,12 +2963,13 @@ dir = 4; pixel_x = -20 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/dark, /area/ship/medical) "zT" = ( -/obj/structure/railing, /obj/effect/turf_decal/borderfloor/corner, /obj/structure/reagent_dispensers/fueltank, +/obj/structure/platform/ship_three, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Ab" = ( @@ -3017,6 +3079,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plasteel/stairs/left{ dir = 8 }, @@ -3076,10 +3141,9 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "Bc" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, /obj/structure/curtain/bounty, /obj/machinery/light/directional/west, +/obj/effect/spawner/bunk_bed, /turf/open/floor/carpet/black, /area/ship/crew/dorm) "Bh" = ( @@ -3100,7 +3164,7 @@ /obj/structure/sign/poster/official/help_others{ pixel_y = 32 }, -/turf/closed/wall/mineral/plastitanium, +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/crew/office) "BL" = ( /obj/effect/turf_decal/corner/opaque/brown{ @@ -3531,6 +3595,9 @@ dir = 8; pixel_x = 20 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Fs" = ( @@ -3542,13 +3609,12 @@ /turf/open/floor/plasteel/dark, /area/ship/medical) "FF" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, /obj/structure/curtain/bounty, /obj/structure/sign/poster/contraband/masked_men{ pixel_y = -32 }, /obj/machinery/firealarm/directional/east, +/obj/effect/spawner/bunk_bed, /turf/open/floor/carpet/black, /area/ship/crew/dorm) "FH" = ( @@ -3584,6 +3650,7 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "FY" = ( +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned/brushed, /area/ship/medical/surgery) "FZ" = ( @@ -3694,6 +3761,9 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Hw" = ( @@ -3824,6 +3894,22 @@ "Io" = ( /turf/open/floor/plasteel/patterned, /area/ship/medical) +"Iu" = ( +/obj/structure/catwalk/over/plated_catwalk, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plasteel/tech/grid, +/area/ship/cargo) "IA" = ( /obj/effect/turf_decal/spline/fancy/opaque/black{ dir = 1 @@ -3875,13 +3961,6 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Jd" = ( -/obj/effect/turf_decal/borderfloor{ - dir = 1 - }, -/obj/structure/railing{ - dir = 1; - layer = 2.9 - }, /obj/structure/closet/crate{ name = "sandbags crate" }, @@ -3894,6 +3973,12 @@ pixel_x = 5; pixel_y = -5 }, +/obj/effect/turf_decal/borderfloor/corner{ + dir = 4 + }, +/obj/structure/platform/ship_three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Jh" = ( @@ -4240,6 +4325,9 @@ dir = 1; pixel_y = -20 }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plasteel/stairs{ dir = 8 }, @@ -4408,6 +4496,9 @@ /obj/effect/turf_decal/trimline/opaque/brown/line{ dir = 1 }, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/medical) "NM" = ( @@ -4762,6 +4853,10 @@ dir = 10 }, /obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Re" = ( @@ -4882,6 +4977,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/light/small/directional/west, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/hallway/central) "Sl" = ( @@ -4925,6 +5023,14 @@ pixel_x = 8; pixel_y = -1 }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/warning/nosmoking/burnt{ + pixel_x = 32 + }, +/obj/item/cigbutt/cigarbutt{ + pixel_x = -7; + pixel_y = 3 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Td" = ( @@ -4950,9 +5056,6 @@ /turf/closed/wall/mineral/plastitanium, /area/ship/hallway/central) "TB" = ( -/obj/structure/railing{ - dir = 6 - }, /obj/item/target{ pixel_x = -9; pixel_y = 10 @@ -4970,6 +5073,9 @@ dir = 4 }, /obj/structure/rack, +/obj/structure/platform/ship_three{ + dir = 4 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "TC" = ( @@ -4997,9 +5103,8 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "TW" = ( -/obj/structure/bed, -/obj/item/bedsheet/brown, /obj/structure/curtain/bounty, +/obj/effect/spawner/bunk_bed, /turf/open/floor/carpet/black, /area/ship/crew/dorm) "Uf" = ( @@ -5011,6 +5116,9 @@ /obj/structure/cable{ icon_state = "0-5" }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Ui" = ( @@ -5485,6 +5593,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/medical/surgery) "YM" = ( @@ -5529,6 +5640,10 @@ }, /turf/open/floor/plating, /area/ship/maintenance/port) +"Zb" = ( +/obj/structure/chair/handrail, +/turf/open/floor/plasteel/mono/dark, +/area/ship/cargo) "Zc" = ( /obj/structure/bed/dogbed{ anchored = 1; @@ -5562,6 +5677,7 @@ /obj/structure/sign/warning/incident{ pixel_y = 32 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "Zu" = ( @@ -5725,7 +5841,7 @@ pU ei HA lD -AD +rw "} (5,1,1) = {" cu @@ -5758,7 +5874,7 @@ Dj Uz SX Dw -AD +rw "} (6,1,1) = {" cu @@ -5791,7 +5907,7 @@ ko AD AD AD -AD +rw "} (7,1,1) = {" Zu @@ -5824,7 +5940,7 @@ ns SL pC zD -SL +en "} (8,1,1) = {" Zu @@ -5912,7 +6028,7 @@ OM OM OM Kz -ZF +gI SL jL jL @@ -5961,8 +6077,8 @@ SL (12,1,1) = {" tZ BC -oO -oO +tZ +tZ gh zs fN @@ -6044,7 +6160,7 @@ hm Cc JJ zT -nX +Iu LI jG ml @@ -6065,7 +6181,7 @@ tZ Qc AP HC -ou +Zb ou ou Hw @@ -6077,7 +6193,7 @@ NG dO yy bh -nX +Iu LI Yt Io @@ -6098,7 +6214,7 @@ ME iN xl HC -ou +Zb ou gq xj @@ -6218,7 +6334,7 @@ bR XD NZ wI -wI +jF WC Td "} diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index aa5426c9512f..8a869d9bb413 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/shuttles/inteq/inteq_vaquero.dmm @@ -52,12 +52,12 @@ /area/ship/security) "bg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/box/corners{ - dir = 4 - }, /obj/structure/weightmachine/weightlifter, /obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plasteel/patterned, +/obj/structure/platform/ship_three{ + dir = 1 + }, +/turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "bi" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -200,7 +200,7 @@ /obj/effect/turf_decal/box/corners{ dir = 4 }, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "dy" = ( /obj/structure/cable{ @@ -220,6 +220,9 @@ pixel_y = -20 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plating, /area/ship/maintenance/port) "dO" = ( @@ -416,6 +419,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "gt" = ( @@ -465,6 +471,18 @@ }, /turf/open/floor/plasteel/dark, /area/ship/bridge) +"hh" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/opaque/yellow/line{ + dir = 8 + }, +/obj/structure/chair/handrail{ + dir = 4 + }, +/turf/open/floor/plasteel/patterned/grid, +/area/ship/hallway/central) "hn" = ( /obj/structure/cable{ icon_state = "0-4" @@ -533,6 +551,7 @@ dir = 1 }, /obj/machinery/light/small/directional/north, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/dark, /area/ship/security) "id" = ( @@ -678,6 +697,7 @@ pixel_y = 22 }, /obj/machinery/firealarm/directional/north, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/tech, /area/ship/maintenance/starboard) "jB" = ( @@ -987,12 +1007,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine/hull/reinforced, /area/ship/external/dark) -"oQ" = ( -/obj/structure/sign/number/eight{ - pixel_y = -8 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security) "oX" = ( /obj/structure/table/reinforced, /obj/item/lighter{ @@ -1042,14 +1056,11 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) -"pl" = ( -/obj/structure/sign/number/nine{ - pixel_y = -8 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/security) "pM" = ( /obj/effect/turf_decal/corner/opaque/yellow{ dir = 4 @@ -1138,6 +1149,9 @@ dir = 4 }, /obj/machinery/firealarm/directional/south, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "ro" = ( @@ -1211,6 +1225,9 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ dir = 8 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "sS" = ( @@ -1248,6 +1265,9 @@ /obj/effect/turf_decal/box/corners{ dir = 8 }, +/obj/structure/platform/ship_three{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "uy" = ( @@ -1305,7 +1325,7 @@ /turf/template_noop, /area/template_noop) "vo" = ( -/obj/structure/sign/number/one{ +/obj/structure/sign/number/random{ pixel_y = -8 }, /turf/closed/wall/mineral/plastitanium/nodiagonal, @@ -1316,7 +1336,7 @@ /obj/structure/closet/crate, /obj/item/stack/sheet/glass/twenty, /obj/item/stack/sheet/metal/twenty, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "vw" = ( /obj/structure/marker_beacon{ @@ -1348,6 +1368,9 @@ /obj/effect/turf_decal/trimline/opaque/yellow/line{ dir = 4 }, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/central) "vV" = ( @@ -1373,7 +1396,7 @@ "wI" = ( /obj/structure/weightmachine/weightlifter, /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/box/corners{ +/obj/structure/platform/ship_three{ dir = 1 }, /turf/open/floor/plasteel/patterned/cargo_one, @@ -1537,6 +1560,9 @@ /obj/item/reagent_containers/food/drinks/waterbottle/large, /obj/item/reagent_containers/food/drinks/waterbottle/large, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/platform/ship_three{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "zr" = ( @@ -1547,7 +1573,7 @@ dir = 5 }, /obj/effect/turf_decal/box/corners, -/turf/open/floor/plasteel/patterned, +/turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "zG" = ( /obj/effect/turf_decal/industrial/warning/fulltile, @@ -1949,6 +1975,9 @@ }, /obj/effect/turf_decal/siding/thinplating/dark, /obj/machinery/firealarm/directional/south, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/security) "Dh" = ( @@ -2150,8 +2179,8 @@ /area/ship/crew) "GI" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/box/corners{ - dir = 4 +/obj/structure/platform/ship_three{ + dir = 1 }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) @@ -2237,14 +2266,15 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned/brushed, /area/ship/medical) "HS" = ( -/obj/effect/turf_decal/box/corners{ - dir = 1 - }, /obj/structure/reagent_dispensers/watertank, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/structure/platform/ship_three{ + dir = 9 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Ie" = ( @@ -2273,6 +2303,9 @@ pixel_y = -32 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "IX" = ( @@ -2294,6 +2327,9 @@ }, /obj/structure/catwalk/over/plated_catwalk, /obj/machinery/light/directional/west, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Jc" = ( @@ -2316,14 +2352,14 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/office) "Jl" = ( -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, /obj/machinery/autolathe, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/platform/ship_three{ + dir = 8 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "JB" = ( @@ -2379,6 +2415,9 @@ /area/ship/maintenance/port) "Ky" = ( /obj/item/trash/can, +/obj/structure/platform/ship_three{ + dir = 8 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "KR" = ( @@ -3370,6 +3409,9 @@ /obj/effect/turf_decal/industrial/caution{ dir = 1 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "Zi" = ( @@ -3674,7 +3716,7 @@ pM dO Zv jO -jO +hh Cs jV gt @@ -3858,7 +3900,7 @@ te hN oZ ba -pl +vo ox ww "} @@ -3898,7 +3940,7 @@ te gh CQ Bl -oQ +vo ww ww "}