From a8cbb7717fbf6b6c2741a4faa678c660760295fc Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+AnArgonianLizardThatStealsPRs@users.noreply.github.com> Date: Mon, 13 Nov 2023 17:01:54 +0300 Subject: [PATCH] [MIRROR] you can no longer get stuck in tram cargo disposals if you cant lay down (silicon, etc.) [MDB IGNORE] (#589) * you can no longer get stuck in tram cargo disposals if you cant lay down (silicon, etc.) (#79644) --------- Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Co-authored-by: jimmyl <70376633+mc-oofert@users.noreply.github.com> --- _maps/map_files/tramstation/tramstation.dmm | 266 +++++++++++--------- 1 file changed, 146 insertions(+), 120 deletions(-) diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 398d8a8ab2b..b74643d3fe6 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -3302,6 +3302,10 @@ /obj/structure/sign/warning/no_smoking, /turf/closed/wall, /area/station/engineering/atmos) +"asT" = ( +/obj/machinery/air_sensor/engine_chamber, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "asY" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 4 @@ -4227,17 +4231,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"aCM" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 5 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit) "aCR" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/effect/turf_decal/tile/neutral{ @@ -5680,22 +5673,6 @@ }, /turf/open/floor/wood/tile, /area/station/service/chapel/office) -"aPi" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw, -/obj/effect/turf_decal/trimline/yellow/arrow_cw{ - dir = 1 - }, -/obj/structure/cable/layer1, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/engine_access, -/obj/effect/mapping_helpers/airalarm/link{ - chamber_id = "engine" - }, -/obj/effect/mapping_helpers/airalarm/tlv_no_checks, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "aPk" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -9783,6 +9760,17 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +"cnF" = ( +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 5 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/closet/firecloset, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit) "cnV" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -11047,6 +11035,17 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit) +"cJA" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit) "cJM" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/door/firedoor, @@ -13083,12 +13082,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison) -"duO" = ( -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/turf/closed/wall, -/area/station/hallway/secondary/exit) "dvc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -20678,6 +20671,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/brig) +"gob" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit) "gov" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -20690,14 +20690,6 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"goC" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, -/obj/machinery/firealarm/directional/north, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit) "goK" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot/left, @@ -21468,6 +21460,10 @@ }, /turf/open/floor/engine, /area/station/science/auxlab/firing_range) +"gEq" = ( +/obj/structure/disposalpipe/segment, +/turf/closed/wall, +/area/station/cargo/sorting) "gEs" = ( /obj/machinery/power/terminal{ dir = 1 @@ -25090,6 +25086,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/office) +"hYq" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit) "hYK" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/purple/visible, @@ -25706,10 +25709,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"ijQ" = ( -/obj/machinery/air_sensor/engine_chamber, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "ijR" = ( /obj/structure/table/reinforced, /turf/open/floor/iron/dark, @@ -30027,14 +30026,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/eva) -"jKb" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "cargoupperbelt" - }, -/obj/structure/plasticflaps, -/turf/open/floor/plating, -/area/station/cargo/sorting) "jKg" = ( /obj/effect/turf_decal/trimline/neutral/filled/line, /obj/machinery/light/directional/south, @@ -35456,6 +35447,22 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/iron/freezer, /area/station/science/lower) +"lBF" = ( +/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ + dir = 8 + }, +/obj/machinery/meter, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "ordnancefreezer" + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance) "lBP" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -36488,12 +36495,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/cargo/lobby) -"lSQ" = ( -/obj/structure/disposalpipe/sorting/wrap/flip{ - dir = 1 - }, -/turf/closed/wall, -/area/station/cargo/sorting) "lTc" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -48279,6 +48280,13 @@ /obj/effect/baseturf_helper/space, /turf/closed/wall/r_wall, /area/station/engineering/supermatter) +"qip" = ( +/obj/structure/disposalpipe/sorting/wrap/flip{ + dir = 1 + }, +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/station/cargo/sorting) "qiq" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -49319,6 +49327,22 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) +"qCG" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, +/obj/effect/turf_decal/trimline/yellow/arrow_ccw, +/obj/effect/turf_decal/trimline/yellow/arrow_cw{ + dir = 1 + }, +/obj/structure/cable/layer1, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "engine" + }, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "qCJ" = ( /obj/structure/sign/directions/evac{ dir = 4; @@ -51963,18 +51987,6 @@ }, /turf/open/floor/tram, /area/station/hallway/primary/tram/right) -"ryY" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/machinery/meter, -/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/arrow_cw, -/obj/structure/cable/layer1, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "rzt" = ( /obj/structure/rack, /obj/item/storage/box/gloves{ @@ -52407,6 +52419,18 @@ /obj/structure/sign/clock/directional/east, /turf/open/floor/iron/grimy, /area/station/hallway/secondary/entry) +"rJD" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/machinery/meter, +/obj/effect/turf_decal/trimline/yellow/arrow_ccw{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/arrow_cw, +/obj/structure/cable/layer1, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "rJE" = ( /obj/machinery/door/airlock/medical/glass{ name = "Medical Freezer" @@ -54072,6 +54096,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"smD" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/random/maintenance/three, +/turf/open/floor/plating, +/area/station/cargo/sorting) "smF" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -57099,26 +57129,6 @@ /obj/effect/mapping_helpers/airlock/access/any/service/chapel_office, /turf/open/floor/iron/smooth, /area/station/service/chapel/office) -"tpI" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/camera/directional/south{ - c_tag = "Science - Mixing Lab"; - network = list("ss13","rd") - }, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/mixingchamber_access, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airalarm/tlv_no_checks, -/obj/effect/mapping_helpers/airalarm/link{ - chamber_id = "ordnanceburn" - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "tpR" = ( /obj/machinery/vending/coffee, /obj/effect/turf_decal/siding/wood{ @@ -62223,6 +62233,26 @@ /obj/item/pen, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) +"uXn" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/camera/directional/south{ + c_tag = "Science - Mixing Lab"; + network = list("ss13","rd") + }, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "ordnanceburn" + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance) "uXv" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -65825,6 +65855,18 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron, /area/station/security/checkpoint/supply) +"wkO" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "cargoupperbelt" + }, +/obj/structure/plasticflaps, +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/plating, +/area/station/cargo/sorting) "wkQ" = ( /obj/machinery/door/airlock/hatch{ id_tag = "vacant_space"; @@ -67356,22 +67398,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) -"wQg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ - dir = 8 - }, -/obj/machinery/meter, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/machinery/airalarm/directional/west, -/obj/effect/mapping_helpers/airalarm/mixingchamber_access, -/obj/effect/mapping_helpers/airalarm/tlv_no_checks, -/obj/effect/mapping_helpers/airalarm/link{ - chamber_id = "ordnancefreezer" - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "wQm" = ( /turf/open/floor/iron, /area/station/engineering/atmos) @@ -101293,7 +101319,7 @@ nxT lfB ltq bWN -aPi +qCG hiB rZx lEf @@ -101554,7 +101580,7 @@ svA jBn bKt gqf -ijQ +asT dQn bKt frN @@ -102064,7 +102090,7 @@ pfG qHs bpZ fuj -ryY +rJD hDI oMc lEf @@ -120562,7 +120588,7 @@ dfz vqa uIk uIk -wQg +lBF vjT fjn mBW @@ -122104,7 +122130,7 @@ dfz vqO edP edP -tpI +uXn hBl hBl gkD @@ -185026,7 +185052,7 @@ pRM pRM pRM oWq -aCM +cJA vPB uCO fZS @@ -185279,12 +185305,12 @@ pRM skX fpU fpU -jKb -fpU -eos -lSQ -duO -goC +wkO +gEq +smD +qip +cnF +gob wxb fZS bMb @@ -185541,7 +185567,7 @@ uno uno uno lCy -vPB +hYq uCO aDK bMb