From 09244e1ff1107d02acf3e39a4765a62dcd55bfa4 Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Fri, 22 Nov 2024 18:15:55 -0800 Subject: [PATCH 1/6] inteq platforms --- _maps/shuttles/inteq/inteq_colossus.dmm | 181 +++++++++++++++++------- _maps/shuttles/inteq/inteq_talos.dmm | 69 ++++++--- _maps/shuttles/inteq/inteq_valor.dmm | 113 ++++++++++----- _maps/shuttles/inteq/inteq_vaquero.dmm | 41 +++--- 4 files changed, 287 insertions(+), 117 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index de835b016463..4486a20fc22f 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" = ( @@ -111,6 +117,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 +316,13 @@ /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, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/fore) "dS" = ( @@ -342,6 +354,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 +553,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 +639,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 +670,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) @@ -802,6 +818,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 +934,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 +947,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 +1063,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 +1091,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 +1104,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 +1126,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 +1172,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) @@ -1292,6 +1325,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 +1353,9 @@ }, /obj/structure/table, /obj/machinery/jukebox/boombox, +/obj/structure/platform/ship_three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "ot" = ( @@ -1515,6 +1554,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 +1596,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,12 +1649,8 @@ /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, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/fore) "rW" = ( @@ -1652,6 +1693,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 +1781,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) @@ -1831,6 +1875,9 @@ dir = 1 }, /obj/effect/landmark/start/assistant, +/obj/structure/platform/ship_three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "tK" = ( @@ -2071,8 +2118,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) @@ -2149,6 +2196,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 +2340,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 +2494,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) @@ -2559,6 +2610,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" = ( @@ -3304,6 +3358,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" = ( @@ -3325,8 +3382,8 @@ /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 +3614,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 +3658,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 +3692,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 +3728,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" = ( @@ -3795,8 +3853,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 +4007,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 +4088,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 +4300,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 +4326,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 +4371,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 +4436,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" = ( @@ -4487,6 +4563,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 +4582,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" = ( @@ -4830,7 +4913,7 @@ om kV XQ ah -Ve +lA hZ vH rh @@ -5172,7 +5255,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..805f3ac4d04a 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -344,6 +344,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" = ( @@ -1173,6 +1176,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 +1755,6 @@ /turf/open/floor/plating, /area/ship/engineering/engine) "lB" = ( -/obj/structure/railing, /obj/effect/turf_decal/box/corners{ dir = 8 }, @@ -1759,6 +1764,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" = ( @@ -2239,6 +2247,9 @@ pixel_y = 32 }, /obj/structure/reagent_dispensers/water_cooler, +/obj/structure/platform/ship_three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "om" = ( @@ -2787,6 +2798,7 @@ /obj/item/target{ pixel_x = 5 }, +/obj/structure/platform/ship_three, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "qT" = ( @@ -3392,6 +3404,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 +3444,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" = ( @@ -3600,6 +3618,9 @@ dir = 4 }, /obj/structure/weightmachine/stacklifter, +/obj/structure/platform/ship_three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "wu" = ( @@ -3774,6 +3795,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 +3939,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" = ( @@ -4142,6 +4165,9 @@ /obj/structure/weightmachine/weightlifter, /obj/machinery/light/directional/north, /obj/effect/decal/cleanable/dirt, +/obj/structure/platform/ship_three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "zw" = ( @@ -4177,12 +4203,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" = ( @@ -4530,6 +4555,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 +4586,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 +4673,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 +4772,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 +4813,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 +4887,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) @@ -5182,12 +5214,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 +5331,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 +5351,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 +5646,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" = ( @@ -6137,6 +6170,7 @@ /obj/machinery/light/directional/south, /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, +/obj/structure/platform/ship_three, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Nk" = ( @@ -7075,6 +7109,9 @@ /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/platform/ship_three{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Um" = ( @@ -7559,8 +7596,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) diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index 1db2ec07d37b..6ab99e8b8d1a 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,6 +122,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) "bI" = ( @@ -198,10 +204,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 +226,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 +251,7 @@ /obj/machinery/light_switch{ pixel_y = 20 }, +/obj/structure/railing, /turf/open/floor/plasteel/stairs{ dir = 8 }, @@ -424,6 +430,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/railing, /turf/open/floor/plasteel/stairs/right{ dir = 8 }, @@ -451,6 +458,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" = ( @@ -980,9 +988,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" }, @@ -1083,6 +1088,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" = ( @@ -1598,6 +1606,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/railing, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "nZ" = ( @@ -1942,6 +1951,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 }, +/obj/structure/railing/corner{ + dir = 1 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "qZ" = ( @@ -2203,9 +2215,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; @@ -2221,6 +2230,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" = ( @@ -2285,6 +2297,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" = ( @@ -2707,10 +2722,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 }, @@ -2718,6 +2729,9 @@ dir = 4 }, /obj/structure/rack, +/obj/structure/platform/ship_three{ + dir = 4 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "yK" = ( @@ -2908,9 +2922,9 @@ /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" = ( @@ -3020,6 +3034,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plasteel/stairs/left{ dir = 8 }, @@ -3079,10 +3096,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" = ( @@ -3521,6 +3537,9 @@ dir = 8; pixel_x = 20 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Fs" = ( @@ -3532,13 +3551,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" = ( @@ -3684,6 +3702,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" = ( @@ -3862,13 +3883,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" }, @@ -3881,6 +3895,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" = ( @@ -4227,6 +4247,9 @@ dir = 1; pixel_y = -20 }, +/obj/structure/railing{ + dir = 1 + }, /turf/open/floor/plasteel/stairs{ dir = 8 }, @@ -4749,6 +4772,9 @@ dir = 10 }, /obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/railing/corner{ + dir = 8 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Re" = ( @@ -4915,6 +4941,22 @@ "Td" = ( /turf/template_noop, /area/template_noop) +"Ti" = ( +/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) "Tu" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/coffee{ @@ -4935,9 +4977,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 @@ -4955,6 +4994,9 @@ dir = 4 }, /obj/structure/rack, +/obj/structure/platform/ship_three{ + dir = 4 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "TC" = ( @@ -4982,9 +5024,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" = ( @@ -6034,7 +6075,7 @@ hm Cc JJ zT -nX +Ti LI jG ml @@ -6067,7 +6108,7 @@ NG dO yy bh -nX +Ti LI Yt Io diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index 273085c61355..4f686d47da40 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{ @@ -1248,6 +1248,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" = ( @@ -1316,7 +1319,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{ @@ -1373,7 +1376,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 +1540,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 +1553,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, @@ -2150,8 +2156,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) @@ -2240,11 +2246,11 @@ /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" = ( @@ -2316,14 +2322,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 +2385,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" = ( From a3e348d8d498c4da0bd5fa1fbb0bab65b2724ea1 Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Fri, 22 Nov 2024 18:51:17 -0800 Subject: [PATCH 2/6] random ship numbers --- _maps/shuttles/inteq/inteq_colossus.dmm | 22 +++----- _maps/shuttles/inteq/inteq_talos.dmm | 22 +++----- _maps/shuttles/inteq/inteq_valor.dmm | 70 +++++++++++++++---------- _maps/shuttles/inteq/inteq_vaquero.dmm | 18 ++----- 4 files changed, 56 insertions(+), 76 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index 4486a20fc22f..a47bfd92b4bd 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -1384,10 +1384,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, @@ -3376,10 +3372,6 @@ }, /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{ dir = 4; @@ -3802,10 +3794,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; @@ -4599,7 +4587,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" = ( @@ -5183,7 +5173,7 @@ Sa Dq Dq Dq -pa +Yv "} (22,1,1) = {" XJ @@ -5205,7 +5195,7 @@ EI Dq MQ qQ -PV +Yv "} (23,1,1) = {" XJ @@ -5227,7 +5217,7 @@ VL Dq Xb DW -Le +Yv "} (24,1,1) = {" XJ diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index 805f3ac4d04a..b52aa9128c49 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" @@ -3218,10 +3214,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 @@ -4916,10 +4908,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{ @@ -6556,7 +6544,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" = ( @@ -9125,7 +9115,7 @@ Pt uI Ng CJ -Ff +QS sw sw sw @@ -9159,7 +9149,7 @@ TO uI uc rw -ts +QS sw sw sw @@ -9193,7 +9183,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 6ab99e8b8d1a..4cb6fb1a3c7f 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -1281,13 +1281,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); @@ -3707,6 +3700,12 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) +"Ht" = ( +/obj/structure/sign/number/random{ + pixel_y = -8 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/maintenance/starboard) "Hw" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/borderfloorblack{ @@ -4254,6 +4253,22 @@ dir = 8 }, /area/ship/cargo) +"Mi" = ( +/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) "Mn" = ( /obj/effect/turf_decal/industrial/traffic{ dir = 8 @@ -4925,6 +4940,12 @@ }, /turf/open/floor/carpet/black, /area/ship/crew/dorm) +"Sx" = ( +/obj/structure/sign/number/random{ + pixel_y = -8 + }, +/turf/closed/wall/mineral/plastitanium/nodiagonal, +/area/ship/medical/surgery) "SL" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/medical/surgery) @@ -4936,27 +4957,18 @@ icon_state = "0-2" }, /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" = ( /turf/template_noop, /area/template_noop) -"Ti" = ( -/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) "Tu" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/coffee{ @@ -5756,7 +5768,7 @@ pU ei HA lD -AD +Ht "} (5,1,1) = {" cu @@ -5789,7 +5801,7 @@ Dj Uz SX Dw -AD +Ht "} (6,1,1) = {" cu @@ -5822,7 +5834,7 @@ ko AD AD AD -AD +Ht "} (7,1,1) = {" Zu @@ -5855,7 +5867,7 @@ ns SL pC zD -SL +Sx "} (8,1,1) = {" Zu @@ -6075,7 +6087,7 @@ hm Cc JJ zT -Ti +Mi LI jG ml @@ -6108,7 +6120,7 @@ NG dO yy bh -Ti +Mi LI Yt Io diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index 4f686d47da40..26d7633a4b2d 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/shuttles/inteq/inteq_vaquero.dmm @@ -987,12 +987,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{ @@ -1044,12 +1038,6 @@ }, /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 @@ -1308,7 +1296,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, @@ -3867,7 +3855,7 @@ te hN oZ ba -pl +vo ox ww "} @@ -3907,7 +3895,7 @@ te gh CQ Bl -oQ +vo ww ww "} From 1346053c7a7f6a558b4df5f8f98489eee678ef3e Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Fri, 22 Nov 2024 19:08:31 -0800 Subject: [PATCH 3/6] handrails --- _maps/shuttles/inteq/inteq_colossus.dmm | 44 +++++++ _maps/shuttles/inteq/inteq_talos.dmm | 152 +++++++++++++++++++++--- _maps/shuttles/inteq/inteq_valor.dmm | 138 +++++++++++++++------ _maps/shuttles/inteq/inteq_vaquero.dmm | 41 ++++++- 4 files changed, 318 insertions(+), 57 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index a47bfd92b4bd..93bc3faba536 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -68,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" = ( @@ -323,6 +326,7 @@ /obj/effect/turf_decal/trimline/opaque/yellow/line{ dir = 1 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned/grid, /area/ship/hallway/fore) "dS" = ( @@ -789,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" = ( @@ -1253,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" = ( @@ -1507,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" = ( @@ -1647,6 +1660,9 @@ "rS" = ( /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) "rW" = ( @@ -1859,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" = ( @@ -1888,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" = ( @@ -2019,6 +2041,7 @@ pixel_x = 5; pixel_y = 21 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "uT" = ( @@ -2143,6 +2166,9 @@ dir = 6 }, /obj/machinery/light/directional/east, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "wm" = ( @@ -2177,6 +2203,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" = ( @@ -2570,6 +2599,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" = ( @@ -2666,6 +2698,9 @@ pixel_x = -5; pixel_y = -19 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Cu" = ( @@ -2959,6 +2994,7 @@ pixel_x = -5; pixel_y = 21 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Gl" = ( @@ -3137,6 +3173,9 @@ pixel_x = 5; pixel_y = -19 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "HG" = ( @@ -3370,6 +3409,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/hallway/port) "Ll" = ( @@ -4447,6 +4489,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" = ( @@ -4628,6 +4671,7 @@ /obj/effect/turf_decal/corner_techfloor_gray{ dir = 8 }, +/obj/structure/chair/handrail, /turf/open/floor/plating, /area/ship/maintenance/port) "Zc" = ( diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index b52aa9128c49..d499da1e3edf 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -299,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" = ( @@ -448,6 +451,9 @@ dir = 1; pixel_y = -19 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "cD" = ( @@ -874,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" = ( @@ -909,6 +916,9 @@ /obj/structure/sign/poster/contraband/twelve_gauge{ pixel_y = -32 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "fY" = ( @@ -918,6 +928,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" = ( @@ -963,6 +976,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" = ( @@ -1807,6 +1823,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" = ( @@ -1914,6 +1933,9 @@ dir = 10; layer = 2.030 }, +/obj/structure/chair/handrail{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/ship/storage) "mw" = ( @@ -2242,10 +2264,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" = ( @@ -2286,6 +2308,9 @@ pixel_y = -28 }, /obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "os" = ( @@ -3609,10 +3634,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" = ( @@ -3778,6 +3813,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" = ( @@ -3969,6 +4007,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" = ( @@ -4154,12 +4195,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" = ( @@ -4230,6 +4273,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" = ( @@ -4934,6 +4980,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" = ( @@ -5163,6 +5212,9 @@ dir = 8; pixel_x = 20 }, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/crew/canteen) "Gz" = ( @@ -5173,6 +5225,23 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/storage) +"GF" = ( +/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) "GG" = ( /obj/machinery/light/small/directional/west, /obj/structure/cable{ @@ -5181,6 +5250,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" = ( @@ -5369,6 +5441,13 @@ }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"Id" = ( +/obj/effect/turf_decal/box/corners{ + dir = 8 + }, +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/plasteel/patterned/cargo_one, +/area/ship/cargo) "If" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, @@ -5821,6 +5900,18 @@ }, /turf/open/floor/plating, /area/ship/bridge) +"Lh" = ( +/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) "Lm" = ( /obj/structure/cable{ icon_state = "1-2" @@ -5986,6 +6077,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" = ( @@ -6013,6 +6105,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" = ( @@ -6115,6 +6210,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" = ( @@ -6122,6 +6220,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" = ( @@ -6157,8 +6258,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" = ( @@ -6183,6 +6286,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" = ( @@ -6398,6 +6504,7 @@ dir = 8 }, /obj/machinery/firealarm/directional/north, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/tech/grid, /area/ship/engineering) "PL" = ( @@ -6525,6 +6632,9 @@ /obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/turf_decal/trimline/opaque/yellow/line, /obj/item/radio/intercom/directional/south, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "QD" = ( @@ -7056,6 +7166,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" = ( @@ -7088,20 +7201,10 @@ /obj/effect/turf_decal/box/corners{ 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, /obj/structure/platform/ship_three{ dir = 1 }, +/obj/structure/weightmachine/weightlifter, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) "Um" = ( @@ -7131,6 +7234,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" = ( @@ -7247,6 +7353,7 @@ /obj/structure/sign/warning/nosmoking{ pixel_x = -32 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/tech, /area/ship/engineering/engine) "Vp" = ( @@ -7353,6 +7460,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" = ( @@ -7421,6 +7529,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" = ( @@ -7661,6 +7772,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" = ( @@ -7850,6 +7962,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" = ( @@ -7873,6 +7986,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" = ( @@ -8557,7 +8673,7 @@ SS Bv wY nJ -SC +Lh SC mC iZ @@ -8694,7 +8810,7 @@ zh jc Lc uO -Ic +Id nY ua MW @@ -8905,7 +9021,7 @@ sN Nk hT DY -Rg +GF mK cR rJ diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index 4cb6fb1a3c7f..ba1f6cd2427c 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -130,6 +130,9 @@ "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" = ( @@ -502,6 +505,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 @@ -659,6 +668,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" = ( @@ -775,6 +787,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{ @@ -1040,6 +1058,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, @@ -1102,6 +1132,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" = ( @@ -1384,6 +1417,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" = ( @@ -1523,6 +1559,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" = ( @@ -1709,6 +1748,7 @@ /obj/structure/sign/warning/nosmoking/circle{ pixel_y = 32 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/dark, /area/ship/medical) "pj" = ( @@ -1803,6 +1843,7 @@ /obj/structure/cable{ icon_state = "0-6" }, +/obj/structure/chair/handrail, /turf/open/floor/plating, /area/ship/maintenance/port) "pO" = ( @@ -1947,6 +1988,9 @@ /obj/structure/railing/corner{ dir = 1 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "qZ" = ( @@ -1959,6 +2003,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" = ( @@ -1983,6 +2030,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) @@ -2461,6 +2514,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" = ( @@ -2912,6 +2966,7 @@ dir = 4; pixel_x = -20 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/dark, /area/ship/medical) "zT" = ( @@ -3585,6 +3640,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" = ( @@ -3700,12 +3756,6 @@ }, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) -"Ht" = ( -/obj/structure/sign/number/random{ - pixel_y = -8 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/maintenance/starboard) "Hw" = ( /obj/machinery/door/firedoor/border_only, /obj/effect/turf_decal/borderfloorblack{ @@ -3831,6 +3881,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 @@ -4253,22 +4319,6 @@ dir = 8 }, /area/ship/cargo) -"Mi" = ( -/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) "Mn" = ( /obj/effect/turf_decal/industrial/traffic{ dir = 8 @@ -4433,6 +4483,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" = ( @@ -4790,6 +4843,7 @@ /obj/structure/railing/corner{ dir = 8 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/tech/grid, /area/ship/cargo) "Re" = ( @@ -4910,6 +4964,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" = ( @@ -4940,12 +4997,6 @@ }, /turf/open/floor/carpet/black, /area/ship/crew/dorm) -"Sx" = ( -/obj/structure/sign/number/random{ - pixel_y = -8 - }, -/turf/closed/wall/mineral/plastitanium/nodiagonal, -/area/ship/medical/surgery) "SL" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ship/medical/surgery) @@ -5049,6 +5100,9 @@ /obj/structure/cable{ icon_state = "0-5" }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plating, /area/ship/maintenance/starboard) "Ui" = ( @@ -5528,6 +5582,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/chair/handrail{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/ship/medical/surgery) "YM" = ( @@ -5572,6 +5629,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; @@ -5605,6 +5666,7 @@ /obj/structure/sign/warning/incident{ pixel_y = 32 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "Zu" = ( @@ -5768,7 +5830,7 @@ pU ei HA lD -Ht +rw "} (5,1,1) = {" cu @@ -5801,7 +5863,7 @@ Dj Uz SX Dw -Ht +rw "} (6,1,1) = {" cu @@ -5834,7 +5896,7 @@ ko AD AD AD -Ht +rw "} (7,1,1) = {" Zu @@ -5867,7 +5929,7 @@ ns SL pC zD -Sx +en "} (8,1,1) = {" Zu @@ -5955,7 +6017,7 @@ OM OM OM Kz -ZF +gI SL jL jL @@ -6087,7 +6149,7 @@ hm Cc JJ zT -Mi +Iu LI jG ml @@ -6108,7 +6170,7 @@ tZ Qc AP HC -ou +Zb ou ou Hw @@ -6120,7 +6182,7 @@ NG dO yy bh -Mi +Iu LI Yt Io @@ -6141,7 +6203,7 @@ ME iN xl HC -ou +Zb ou gq xj @@ -6261,7 +6323,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 26d7633a4b2d..42b5a874b182 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/shuttles/inteq/inteq_vaquero.dmm @@ -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" = ( @@ -533,6 +539,7 @@ dir = 1 }, /obj/machinery/light/small/directional/north, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/dark, /area/ship/security) "id" = ( @@ -678,6 +685,7 @@ pixel_y = 22 }, /obj/machinery/firealarm/directional/north, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/tech, /area/ship/maintenance/starboard) "jB" = ( @@ -1126,6 +1134,9 @@ dir = 4 }, /obj/machinery/firealarm/directional/south, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/crew/cryo) "ro" = ( @@ -1295,6 +1306,18 @@ }, /turf/template_noop, /area/template_noop) +"vl" = ( +/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) "vo" = ( /obj/structure/sign/number/random{ pixel_y = -8 @@ -1339,6 +1362,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" = ( @@ -1943,6 +1969,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" = ( @@ -2231,6 +2260,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, +/obj/structure/chair/handrail, /turf/open/floor/plasteel/patterned/brushed, /area/ship/medical) "HS" = ( @@ -2267,6 +2297,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" = ( @@ -2288,6 +2321,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" = ( @@ -3367,6 +3403,9 @@ /obj/effect/turf_decal/industrial/caution{ dir = 1 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/patterned, /area/ship/cargo) "Zi" = ( @@ -3671,7 +3710,7 @@ pM dO Zv jO -jO +vl Cs jV gt From 94bff925402a87e4dae5f001321df13595fd2ee8 Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Fri, 22 Nov 2024 19:08:50 -0800 Subject: [PATCH 4/6] missed a couple --- _maps/shuttles/inteq/inteq_vaquero.dmm | 32 +++++++++++++++----------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_vaquero.dmm b/_maps/shuttles/inteq/inteq_vaquero.dmm index 42b5a874b182..3fa7b1e85dac 100644 --- a/_maps/shuttles/inteq/inteq_vaquero.dmm +++ b/_maps/shuttles/inteq/inteq_vaquero.dmm @@ -471,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" @@ -1044,6 +1056,9 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 }, +/obj/structure/chair/handrail{ + dir = 1 + }, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) "pM" = ( @@ -1210,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" = ( @@ -1306,18 +1324,6 @@ }, /turf/template_noop, /area/template_noop) -"vl" = ( -/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) "vo" = ( /obj/structure/sign/number/random{ pixel_y = -8 @@ -3710,7 +3716,7 @@ pM dO Zv jO -vl +hh Cs jV gt From 99739f92ebeccd9d4068c82bc2f48466344e534d Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Fri, 22 Nov 2024 19:25:55 -0800 Subject: [PATCH 5/6] handrails fix --- _maps/shuttles/inteq/inteq_colossus.dmm | 3 - _maps/shuttles/inteq/inteq_talos.dmm | 87 +++++++++++-------------- 2 files changed, 39 insertions(+), 51 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_colossus.dmm b/_maps/shuttles/inteq/inteq_colossus.dmm index 93bc3faba536..096f8d427098 100644 --- a/_maps/shuttles/inteq/inteq_colossus.dmm +++ b/_maps/shuttles/inteq/inteq_colossus.dmm @@ -2166,9 +2166,6 @@ dir = 6 }, /obj/machinery/light/directional/east, -/obj/structure/chair/handrail{ - dir = 8 - }, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "wm" = ( diff --git a/_maps/shuttles/inteq/inteq_talos.dmm b/_maps/shuttles/inteq/inteq_talos.dmm index d499da1e3edf..343f96e514b3 100644 --- a/_maps/shuttles/inteq/inteq_talos.dmm +++ b/_maps/shuttles/inteq/inteq_talos.dmm @@ -916,9 +916,6 @@ /obj/structure/sign/poster/contraband/twelve_gauge{ pixel_y = -32 }, -/obj/structure/chair/handrail{ - dir = 1 - }, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "fY" = ( @@ -2308,9 +2305,6 @@ pixel_y = -28 }, /obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/chair/handrail{ - dir = 1 - }, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "os" = ( @@ -5225,23 +5219,6 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/storage) -"GF" = ( -/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) "GG" = ( /obj/machinery/light/small/directional/west, /obj/structure/cable{ @@ -5441,13 +5418,6 @@ }, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) -"Id" = ( -/obj/effect/turf_decal/box/corners{ - dir = 8 - }, -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/plasteel/patterned/cargo_one, -/area/ship/cargo) "If" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/airless, @@ -5900,18 +5870,6 @@ }, /turf/open/floor/plating, /area/ship/bridge) -"Lh" = ( -/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) "Lm" = ( /obj/structure/cable{ icon_state = "1-2" @@ -6632,9 +6590,6 @@ /obj/effect/turf_decal/siding/thinplating/dark, /obj/effect/turf_decal/trimline/opaque/yellow/line, /obj/item/radio/intercom/directional/south, -/obj/structure/chair/handrail{ - dir = 1 - }, /turf/open/floor/plasteel/tech, /area/ship/security/armory) "QD" = ( @@ -7032,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, @@ -7552,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 @@ -7845,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{ @@ -8673,7 +8664,7 @@ SS Bv wY nJ -Lh +Wy SC mC iZ @@ -8810,7 +8801,7 @@ zh jc Lc uO -Id +YT nY ua MW @@ -9021,7 +9012,7 @@ sN Nk hT DY -GF +Tx mK cR rJ From b4ce1024f808dea5e6f2cfe5e956c0b149a6c32b Mon Sep 17 00:00:00 2001 From: Apogee-dev <60533805+Apogee-dev@users.noreply.github.com> Date: Fri, 22 Nov 2024 20:20:49 -0800 Subject: [PATCH 6/6] valor wall fix --- _maps/shuttles/inteq/inteq_valor.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_maps/shuttles/inteq/inteq_valor.dmm b/_maps/shuttles/inteq/inteq_valor.dmm index ba1f6cd2427c..8d40975c4a14 100644 --- a/_maps/shuttles/inteq/inteq_valor.dmm +++ b/_maps/shuttles/inteq/inteq_valor.dmm @@ -3167,7 +3167,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{ @@ -6066,8 +6066,8 @@ SL (12,1,1) = {" tZ BC -oO -oO +tZ +tZ gh zs fN