diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index a17db091e15..5cf9cd3e442 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -13559,6 +13559,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/tram/left) +"bei" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/chair/stool, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron, +/area/engineering/break_room) "bes" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14228,16 +14241,6 @@ /obj/item/folder, /turf/open/floor/iron/white, /area/science/lab) -"brV" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/chair/stool, -/turf/open/floor/iron/cafeteria, -/area/commons/locker) "bsd" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/carpet, @@ -14714,6 +14717,11 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/commons/lounge) +"bBw" = ( +/obj/structure/chair/stool, +/obj/effect/landmark/start/roboticist, +/turf/open/floor/iron/dark, +/area/science/robotics/lab) "bBA" = ( /turf/closed/wall, /area/maintenance/disposal) @@ -14874,6 +14882,23 @@ }, /turf/open/floor/iron, /area/security/brig) +"bEz" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/structure/chair/stool/bar{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/service/bar) "bEQ" = ( /obj/structure/railing, /turf/open/floor/glass/reinforced, @@ -15720,6 +15745,17 @@ }, /turf/open/floor/iron, /area/commons/storage/primary) +"bUE" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/landmark/start/assistant, +/obj/structure/chair/stool/bar{ + dir = 1 + }, +/turf/open/floor/iron, +/area/service/bar) "bUM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 10 @@ -15988,23 +16024,6 @@ }, /turf/open/floor/iron/dark, /area/science/genetics) -"bYo" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/structure/chair/stool/bar{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron, -/area/service/bar) "bYq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -16035,6 +16054,13 @@ /obj/machinery/portable_atmospherics/canister/toxins, /turf/open/floor/iron, /area/science/mixing) +"bZg" = ( +/obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/iron, +/area/security/prison) "bZi" = ( /obj/structure/closet/secure_closet/security/sec, /obj/effect/turf_decal/bot, @@ -16061,13 +16087,6 @@ }, /turf/open/floor/iron, /area/cargo/storage) -"bZY" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/iron, -/area/security/prison) "bZZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -16442,37 +16461,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) -"chr" = ( -/obj/structure/table, -/obj/machinery/ecto_sniffer{ - pixel_x = -4 - }, -/obj/item/assembly/flash/handheld{ - pixel_x = 6; - pixel_y = 13 - }, -/obj/item/assembly/flash/handheld{ - pixel_x = 6; - pixel_y = 13 - }, -/obj/item/assembly/flash/handheld{ - pixel_x = 6; - pixel_y = 13 - }, -/obj/item/assembly/flash/handheld{ - pixel_x = 6; - pixel_y = 13 - }, -/obj/item/assembly/flash/handheld{ - pixel_x = 6; - pixel_y = 13 - }, -/obj/item/assembly/flash/handheld{ - pixel_x = 6; - pixel_y = 13 - }, -/turf/open/floor/iron/dark, -/area/science/robotics/lab) "cht" = ( /obj/structure/table/reinforced, /obj/item/assembly/igniter{ @@ -16514,6 +16502,11 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/iron/dark, /area/engineering/supermatter/room) +"cid" = ( +/obj/structure/chair/stool, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/port/central) "cit" = ( /obj/structure/tank_dispenser/oxygen{ pixel_x = -1; @@ -16623,18 +16616,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/central/secondary) -"ckN" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/corner{ - dir = 8 - }, -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/service/kitchen) "ckR" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -17840,6 +17821,15 @@ }, /turf/open/floor/iron, /area/hallway/primary/tram/right) +"cMa" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/stool, +/obj/machinery/status_display/ai/directional/west, +/turf/open/floor/iron, +/area/service/bar) "cMn" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -18227,6 +18217,18 @@ /obj/structure/stairs/south, /turf/open/floor/iron/stairs/medium, /area/science/research) +"cTu" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/east, +/obj/structure/disposalpipe/segment, +/obj/structure/chair/stool/bar{ + dir = 1 + }, +/turf/open/floor/iron, +/area/service/bar) "cTA" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -19378,6 +19380,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/central) +"dqP" = ( +/obj/structure/chair/stool, +/obj/machinery/airalarm/directional/north, +/obj/effect/landmark/xeno_spawn, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/service/theater) "dqV" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20067,6 +20077,15 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/plating, /area/hallway/primary/tram/left) +"dEw" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/stool, +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron, +/area/service/bar) "dED" = ( /obj/machinery/computer/prisoner/gulag_teleporter_computer{ dir = 4 @@ -22071,6 +22090,21 @@ }, /turf/open/floor/iron, /area/hallway/secondary/construction/engineering) +"err" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/structure/chair/stool/bar{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/service/bar) "eru" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/neutral/corner{ @@ -22437,6 +22471,11 @@ }, /turf/open/floor/iron, /area/engineering/main) +"exR" = ( +/obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible, +/turf/open/floor/iron, +/area/engineering/atmos) "exW" = ( /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, @@ -22767,13 +22806,6 @@ }, /turf/open/floor/wood, /area/command/heads_quarters/hop) -"eFR" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/janitor, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron, -/area/service/janitor) "eGj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22960,6 +22992,11 @@ /obj/effect/spawner/lootdrop/food_packaging, /turf/open/floor/plating, /area/maintenance/port/aft) +"eLy" = ( +/obj/structure/chair/stool, +/obj/effect/landmark/start/hangover, +/turf/open/floor/carpet, +/area/hallway/secondary/entry) "eLO" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -23098,11 +23135,6 @@ }, /turf/open/floor/iron/dark, /area/science/xenobiology) -"eOo" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/roboticist, -/turf/open/floor/circuit/green, -/area/science/robotics/mechbay) "eOu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23614,6 +23646,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port/central) +"eZk" = ( +/obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/security/prison) "eZn" = ( /obj/effect/spawner/lootdrop/food_packaging, /obj/effect/decal/cleanable/dirt, @@ -23711,11 +23751,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron/dark, /area/command/bridge) -"faJ" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/scientist, -/turf/open/floor/iron, -/area/science/mixing) "faK" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -23778,17 +23813,6 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron, /area/engineering/atmos) -"fcp" = ( -/obj/machinery/light/directional/west, -/obj/structure/chair/stool, -/obj/effect/landmark/start/roboticist, -/obj/machinery/camera{ - c_tag = "Science - Mech Bay"; - dir = 5; - network = list("ss13","science") - }, -/turf/open/floor/circuit, -/area/science/robotics/mechbay) "fcH" = ( /obj/machinery/door/airlock/command{ name = "Captain's Quarters"; @@ -25052,6 +25076,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/central) +"fDh" = ( +/obj/structure/chair/stool, +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron, +/area/science/mixing) "fDq" = ( /obj/structure/railing/corner{ dir = 4 @@ -26681,6 +26710,13 @@ }, /turf/open/floor/iron, /area/commons/dorms) +"gju" = ( +/obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/landmark/start/janitor, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron, +/area/service/janitor) "gjC" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -27742,10 +27778,6 @@ }, /turf/open/floor/iron/dark, /area/service/hydroponics) -"gGh" = ( -/obj/structure/chair/stool, -/turf/open/floor/carpet, -/area/commons/dorms) "gGl" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ @@ -27804,6 +27836,16 @@ "gHd" = ( /turf/closed/wall, /area/engineering/storage/tech) +"gHv" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/obj/structure/chair/stool/bar{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/cafeteria, +/area/service/kitchen) "gHx" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 @@ -29732,18 +29774,6 @@ }, /turf/open/floor/iron, /area/engineering/main) -"hpl" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/east, -/obj/structure/disposalpipe/segment, -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/turf/open/floor/iron, -/area/service/bar) "hpp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -29838,16 +29868,6 @@ }, /turf/open/floor/iron, /area/hallway/secondary/entry) -"hqu" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 1 - }, -/obj/effect/turf_decal/siding/thinplating/corner, -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/service/kitchen) "hqG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -31132,6 +31152,15 @@ }, /turf/open/floor/iron, /area/cargo/sorting) +"hSk" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/obj/structure/chair/stool/bar{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/service/kitchen) "hTa" = ( /obj/machinery/vending/wardrobe/viro_wardrobe, /obj/effect/turf_decal/trimline/green/filled/line{ @@ -31771,16 +31800,6 @@ }, /turf/open/floor/iron, /area/cargo/storage) -"ihU" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 1 - }, -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/cafeteria, -/area/service/kitchen) "iif" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -32345,6 +32364,10 @@ /obj/structure/table, /turf/open/floor/iron/dark, /area/science/research) +"iuW" = ( +/obj/structure/chair/stool, +/turf/open/floor/iron, +/area/security/prison) "ivk" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/bed/roller, @@ -34066,14 +34089,6 @@ /obj/item/shovel, /turf/open/floor/plating/asteroid/airless, /area/mine/explored) -"iYO" = ( -/obj/structure/chair/stool, -/obj/machinery/airalarm/directional/north, -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/service/theater) "iZN" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -34384,6 +34399,15 @@ "jhk" = ( /turf/open/floor/engine/n2o, /area/engineering/atmos) +"jht" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/stool, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/service/bar) "jhv" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -34509,11 +34533,6 @@ dir = 5 }, /area/command/heads_quarters/rd) -"jkF" = ( -/obj/structure/chair/stool, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/security/prison) "jkO" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34588,6 +34607,16 @@ /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden, /turf/open/floor/iron/dark, /area/medical/treatment_center) +"jlj" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/corner, +/obj/structure/chair/stool/bar{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/service/kitchen) "jlo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 9 @@ -34836,14 +34865,6 @@ "jqw" = ( /turf/open/openspace, /area/security/checkpoint/supply) -"jqD" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/construction/mining/aux_base) "jqE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35377,6 +35398,16 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/maint) +"jCg" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/stool, +/obj/structure/noticeboard/directional/south, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/service/bar) "jCn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -36285,6 +36316,17 @@ /obj/machinery/rnd/experimentor, /turf/open/floor/engine, /area/science/explab) +"jUM" = ( +/obj/machinery/light/directional/west, +/obj/structure/chair/stool, +/obj/effect/landmark/start/roboticist, +/obj/machinery/camera{ + c_tag = "Science - Mech Bay"; + dir = 5; + network = list("ss13","science") + }, +/turf/open/floor/circuit, +/area/science/robotics/mechbay) "jUP" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/tile/brown{ @@ -38642,6 +38684,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/mixing) +"kJa" = ( +/obj/structure/chair/stool, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/turf/open/floor/carpet, +/area/commons/dorms) "kJo" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -38812,13 +38861,6 @@ }, /turf/open/floor/iron, /area/engineering/atmos) -"kMs" = ( -/obj/structure/chair/stool, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/central) "kNk" = ( /obj/effect/turf_decal/siding/thinplating{ dir = 8 @@ -38919,12 +38961,6 @@ }, /turf/open/floor/iron, /area/cargo/storage) -"kQq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/duct, -/mob/living/simple_animal/mouse/brown/tom, -/turf/open/floor/plating, -/area/security/prison) "kQy" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -39822,6 +39858,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/security/courtroom) +"lgs" = ( +/obj/structure/chair/stool, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/navbeacon/wayfinding/gateway, +/turf/open/floor/iron, +/area/command/gateway) "lgw" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 @@ -40012,6 +40056,11 @@ }, /turf/open/floor/iron/dark, /area/command/bridge) +"lkv" = ( +/obj/structure/chair/stool, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/security/prison) "lkD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -40805,6 +40854,18 @@ }, /turf/open/floor/iron, /area/maintenance/tram/left) +"lzY" = ( +/obj/effect/turf_decal/siding/thinplating{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating/corner{ + dir = 8 + }, +/obj/structure/chair/stool/bar{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/service/kitchen) "lAa" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -41154,6 +41215,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/security/prison) +"lFJ" = ( +/obj/effect/turf_decal/trimline/brown/filled/line, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/stool, +/turf/open/floor/iron, +/area/commons/vacant_room/commissary) "lGw" = ( /obj/machinery/door/airlock/security{ name = "Permanent Cell 5" @@ -41577,6 +41644,17 @@ /obj/item/stack/tile/wood, /turf/open/floor/wood, /area/commons/vacant_room/office) +"lPH" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/chair/stool/bar{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron, +/area/service/bar) "lPT" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 1 @@ -42267,17 +42345,6 @@ /obj/item/stock_parts/cell/high/plus, /turf/open/floor/iron, /area/engineering/main) -"miw" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron, -/area/service/bar) "miE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible{ dir = 4 @@ -43298,6 +43365,15 @@ /obj/structure/cable, /turf/open/floor/engine, /area/engineering/supermatter/room) +"mAN" = ( +/obj/structure/chair/stool, +/obj/machinery/light/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/prison) "mAT" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -43459,11 +43535,6 @@ "mGy" = ( /turf/closed/wall/r_wall, /area/hallway/primary/port) -"mGC" = ( -/obj/structure/chair/stool, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/maintenance/port/central) "mGV" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -45845,6 +45916,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/security/prison) +"nHT" = ( +/obj/structure/chair/stool, +/obj/effect/landmark/start/scientist, +/turf/open/floor/iron/cafeteria{ + dir = 5 + }, +/area/science/breakroom) "nIb" = ( /obj/structure/chair{ dir = 8; @@ -46635,15 +46713,6 @@ /obj/machinery/power/smes/engineering, /turf/open/floor/iron/dark, /area/ai_monitored/command/nuke_storage) -"nYv" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/stool, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron, -/area/service/bar) "nZR" = ( /obj/structure/disposalpipe/trunk/multiz/down, /turf/closed/wall, @@ -46810,13 +46879,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/engineering/main) -"odI" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/carpet, -/area/commons/dorms) "odW" = ( /obj/structure/disposalpipe/junction{ dir = 1 @@ -47080,13 +47142,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/maintenance/disposal) -"oil" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/scientist, -/turf/open/floor/iron/cafeteria{ - dir = 5 - }, -/area/science/breakroom) "oim" = ( /obj/structure/table/glass, /obj/machinery/reagentgrinder, @@ -48644,6 +48699,11 @@ }, /turf/open/floor/iron, /area/hallway/secondary/command) +"oLc" = ( +/obj/structure/chair/stool, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating, +/area/maintenance/central/secondary) "oLf" = ( /obj/effect/turf_decal/trimline/yellow/warning, /obj/structure/railing/corner{ @@ -48918,11 +48978,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/iron, /area/engineering/atmos) -"oRC" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/roboticist, -/turf/open/floor/iron/dark, -/area/science/robotics/lab) "oRE" = ( /obj/machinery/door/airlock/research{ glass = 1; @@ -49145,15 +49200,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/hallway/secondary/entry) -"oUA" = ( -/obj/effect/turf_decal/siding/thinplating{ - dir = 1 - }, -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/service/kitchen) "oUP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 @@ -49873,6 +49919,37 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/medical/medbay/central) +"pjl" = ( +/obj/structure/table, +/obj/machinery/ecto_sniffer{ + pixel_x = -4 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = 6; + pixel_y = 13 + }, +/turf/open/floor/iron/dark, +/area/science/robotics/lab) "pjm" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -51297,17 +51374,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, /area/engineering/atmos) -"pLi" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/landmark/start/assistant, -/obj/structure/chair/stool/bar{ - dir = 1 - }, -/turf/open/floor/iron, -/area/service/bar) "pLq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 @@ -51571,12 +51637,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/central/secondary) -"pQh" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/event_spawn, -/obj/effect/landmark/start/virologist, -/turf/open/floor/iron/white, -/area/medical/virology) "pQj" = ( /obj/structure/chair{ dir = 8 @@ -51734,6 +51794,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/hidden, /turf/open/floor/plating, /area/maintenance/central/secondary) +"pSJ" = ( +/obj/structure/chair/stool, +/obj/effect/landmark/start/roboticist, +/turf/open/floor/circuit/green, +/area/science/robotics/mechbay) "pSS" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -52626,14 +52691,6 @@ }, /turf/open/floor/engine/co2, /area/engineering/atmos) -"qoC" = ( -/obj/structure/chair/stool, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/navbeacon/wayfinding/gateway, -/turf/open/floor/iron, -/area/command/gateway) "qoJ" = ( /turf/open/floor/iron, /area/cargo/miningdock) @@ -52702,15 +52759,6 @@ }, /turf/open/floor/engine, /area/science/xenobiology) -"qpW" = ( -/obj/structure/chair/stool, -/obj/machinery/light/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/prison) "qqd" = ( /obj/machinery/light/small/directional/north, /turf/open/floor/engine, @@ -52868,21 +52916,6 @@ }, /turf/open/floor/plating, /area/hallway/primary/tram/right) -"quD" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/structure/chair/stool/bar{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/service/bar) "quT" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -53226,6 +53259,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/security/prison/safe) +"qAS" = ( +/obj/structure/chair/stool, +/turf/open/floor/carpet, +/area/commons/dorms) "qBk" = ( /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{ dir = 1 @@ -54718,10 +54755,6 @@ }, /turf/open/floor/glass/reinforced, /area/ai_monitored/turret_protected/aisat/hallway) -"rhA" = ( -/obj/structure/chair/stool, -/turf/open/floor/carpet, -/area/hallway/secondary/entry) "rhB" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -54808,13 +54841,6 @@ /obj/effect/turf_decal/trimline/green/filled/corner, /turf/open/floor/iron, /area/security/prison) -"rjG" = ( -/obj/structure/chair/stool, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/security/prison) "rjI" = ( /obj/structure/window/reinforced{ dir = 4 @@ -56835,16 +56861,6 @@ }, /turf/open/floor/iron, /area/security/prison) -"rXL" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/stool, -/obj/structure/noticeboard/directional/south, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron, -/area/service/bar) "rXN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -58793,19 +58809,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/science/robotics/lab) -"sLl" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/chair/stool, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 1 - }, -/turf/open/floor/iron, -/area/engineering/break_room) "sLq" = ( /obj/structure/cable, /turf/open/floor/iron/white, @@ -59261,6 +59264,11 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/command/bridge) +"sWo" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/mouse/brown/tom, +/turf/open/floor/iron, +/area/security/prison) "sWs" = ( /obj/structure/table/glass, /obj/structure/window/reinforced{ @@ -60798,11 +60806,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/security/prison) -"twX" = ( -/obj/structure/chair/stool, -/obj/effect/landmark/start/hangover, -/turf/open/floor/carpet, -/area/hallway/secondary/entry) "txf" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/yellow/warning, @@ -61368,11 +61371,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/hallway/secondary/exit) -"tHB" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/smart/manifold4w/violet/visible, -/turf/open/floor/iron, -/area/engineering/atmos) "tHL" = ( /obj/structure/table, /obj/machinery/recharger, @@ -62443,6 +62441,13 @@ }, /turf/open/space/basic, /area/space/nearstation) +"tZA" = ( +/obj/structure/chair/stool, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/maintenance/central) "tZB" = ( /obj/item/stack/cable_coil/cut, /turf/closed/mineral/random/stationside/asteroid, @@ -63475,12 +63480,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/cargo/miningdock) -"uwt" = ( -/obj/effect/turf_decal/trimline/brown/filled/line, -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/stool, -/turf/open/floor/iron, -/area/commons/vacant_room/commissary) "uwx" = ( /turf/open/floor/iron, /area/hallway/secondary/exit) @@ -64280,15 +64279,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/hallway/secondary/command) -"uOy" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/stool, -/obj/machinery/status_display/ai/directional/west, -/turf/open/floor/iron, -/area/service/bar) "uOF" = ( /obj/structure/chair/sofa/left{ dir = 8 @@ -64719,10 +64709,6 @@ }, /turf/open/floor/iron, /area/security/checkpoint/medical) -"uXH" = ( -/obj/structure/chair/stool, -/turf/open/floor/iron, -/area/security/prison) "uXO" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -64741,6 +64727,16 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron, /area/commons/dorms) +"uXU" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/chair/stool, +/turf/open/floor/iron/cafeteria, +/area/commons/locker) "uYj" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -64785,15 +64781,6 @@ }, /turf/open/floor/iron, /area/engineering/engine_smes) -"uYB" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/chair/stool, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron, -/area/service/bar) "uYR" = ( /obj/structure/table/glass, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -65726,17 +65713,12 @@ /obj/structure/cable, /turf/open/floor/iron, /area/engineering/atmos) -"vqo" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, +"vqq" = ( /obj/structure/chair/stool, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/cafeteria, -/area/commons/locker) +/obj/effect/landmark/event_spawn, +/obj/effect/landmark/start/virologist, +/turf/open/floor/iron/white, +/area/medical/virology) "vqs" = ( /obj/machinery/door/airlock/security/glass{ name = "Security Office"; @@ -65994,6 +65976,17 @@ }, /turf/open/floor/iron, /area/hallway/secondary/construction/engineering) +"vzC" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/chair/stool, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/cafeteria, +/area/commons/locker) "vzK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 1 @@ -66462,6 +66455,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/hallway/secondary/entry) +"vHj" = ( +/obj/structure/chair/stool, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/security/prison) "vHo" = ( /obj/machinery/conveyor{ dir = 4; @@ -68702,6 +68702,10 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/carpet, /area/cargo/miningdock) +"wwq" = ( +/obj/structure/chair/stool, +/turf/open/floor/carpet, +/area/hallway/secondary/entry) "wws" = ( /obj/effect/turf_decal/siding/thinplating/corner, /obj/item/banner/cargo/mundane, @@ -69772,14 +69776,6 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron, /area/tcommsat/computer) -"wOc" = ( -/obj/structure/chair/stool, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron, -/area/security/prison) "wOm" = ( /obj/structure/table, /obj/machinery/light/directional/north, @@ -70365,11 +70361,6 @@ }, /turf/open/floor/iron, /area/tcommsat/computer) -"xbo" = ( -/obj/structure/chair/stool, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/maintenance/central/secondary) "xbw" = ( /obj/structure/cable/multilayer/multiz, /obj/structure/sign/warning/electricshock{ @@ -73505,6 +73496,14 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/carpet, /area/cargo/miningdock) +"yjk" = ( +/obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/construction/mining/aux_base) "yjp" = ( /obj/machinery/door/airlock{ id_tag = "private_a"; @@ -93293,7 +93292,7 @@ mew muB fyx afq -iYO +dqP kKZ rZT afI @@ -94327,9 +94326,9 @@ dxK akg aeK abX -uYB -nYv -rXL +jht +dEw +jCg aej aej sPP @@ -94588,7 +94587,7 @@ etq ahV ahV aZE -uOy +cMa ulk ahV ayW @@ -94633,7 +94632,7 @@ cKs cKs cKs aUD -vqo +vzC aRW mHt aKl @@ -95099,8 +95098,8 @@ pQa bYq vpL cGH -bYo -quD +bEz +err ova ova kYt @@ -95616,7 +95615,7 @@ tdQ ahV ahV ayI -miw +lPH ulk ahV ahV @@ -95873,7 +95872,7 @@ lqo ahV qUt ayI -pLi +bUE ulk ahV aGN @@ -96130,7 +96129,7 @@ bIn ahV pkI szq -hpl +cTu wFF ahV anV @@ -96175,7 +96174,7 @@ aDH aDH aDH jdj -brV +uXU aRW mHt aKl @@ -97716,7 +97715,7 @@ aiU ckU aJo kfa -xbo +oLc neO bbb neO @@ -98432,7 +98431,7 @@ adt qDW adr acg -mGC +cid rKJ aaB aBM @@ -100496,7 +100495,7 @@ aGF vLw aGF sNQ -kMs +tZA wLX aGF agQ @@ -105645,7 +105644,7 @@ aBM aiF ahF spw -uwt +lFJ alf tHq uXw @@ -105668,7 +105667,7 @@ ttt qvZ qwN cEP -sLl +bei dvM vow ncj @@ -107403,8 +107402,8 @@ nTn jmi faK wob -jkF -wOc +lkv +eZk nhB ccM ccM @@ -107659,7 +107658,7 @@ aae nTn hxy fnk -lFy +sWo jld gOk gJE @@ -108172,10 +108171,10 @@ aae aae nTn upI -rjG +vHj qyr -uXH -bZY +iuW +bZg fSO ccM ccM @@ -108445,7 +108444,7 @@ aGF ccM abE acP -kQq +ooT ccM ljx oho @@ -108688,7 +108687,7 @@ aae aae nTn gsT -qpW +mAN jiI dLs ccM @@ -108770,7 +108769,7 @@ vaX vaX vaX bFU -tHB +exR xMR cuV soe @@ -116197,7 +116196,7 @@ adS vkh ifA aUf -oil +nHT rVF raq eMe @@ -118006,7 +118005,7 @@ ote cZl cbV ess -faJ +fDh axC neU nKT @@ -154730,7 +154729,7 @@ aQm aQm aor aJe -jqD +yjk aAV aBU oev @@ -154994,9 +154993,9 @@ kol aBa erb awt -rhA +wwq mqN -twX +eLy awt bqV aBa @@ -155508,9 +155507,9 @@ oev aBa erb awt -twX +eLy avy -rhA +wwq awt leR dwR @@ -160124,7 +160123,7 @@ vRt ltP aTQ abq -oUA +hSk ahD aBZ aBZ @@ -160381,7 +160380,7 @@ msi aTJ awv abq -ihU +gHv axl ayx aWs @@ -160638,7 +160637,7 @@ hmf aEU axa ayY -hqu +jlj aeH aUE aUE @@ -160661,13 +160660,13 @@ abY anW aJV amI -odI +kJa akE amI -odI +kJa akE amI -odI +kJa akE aGj kXD @@ -161152,7 +161151,7 @@ fAF anI axa aIj -ckN +lzY aPc aUE aUE @@ -161175,13 +161174,13 @@ abY aKM aJV azK -gGh +qAS akE azK -gGh +qAS akE azK -gGh +qAS akE aFG sjb @@ -161409,7 +161408,7 @@ jGO wDL awv abq -oUA +hSk abH aSF aLf @@ -161666,7 +161665,7 @@ qVG tzb aPk xzj -ihU +gHv awi aTu aTu @@ -163981,7 +163980,7 @@ aiD ahu aZQ ajl -eFR +gju vkZ aqE aZQ @@ -167831,7 +167830,7 @@ hmM wAL xYj wIc -qoC +lgs iHW wjp hkC @@ -174815,7 +174814,7 @@ aIF iCE ftr alm -pQh +vqq alm dud sQe @@ -177369,7 +177368,7 @@ aae aae dyg ist -chr +pjl ooo cVj dyg @@ -177627,7 +177626,7 @@ aae dyg sDu pHW -oRC +bBw xTV cnD voW @@ -178133,8 +178132,8 @@ aod aFI axR uZJ -eOo -fcp +pSJ +jUM wbP akA bdB diff --git a/code/game/objects/structures/industrial_lift.dm b/code/game/objects/structures/industrial_lift.dm index 410540b712b..c1278041e91 100644 --- a/code/game/objects/structures/industrial_lift.dm +++ b/code/game/objects/structures/industrial_lift.dm @@ -228,16 +228,44 @@ GLOBAL_LIST_EMPTY(lifts) destination = get_step_multiz(src, going) else destination = going + + if(istype(destination, /turf/closed/wall)) + var/turf/closed/wall/C = destination + do_sparks(2, FALSE, C) + C.dismantle_wall(devastated = TRUE) + for(var/mob/M in urange(8, src)) + shake_camera(M, 2, 3) + playsound(C, 'sound/effects/meteorimpact.ogg', 100, TRUE) + if(going == DOWN) for(var/mob/living/crushed in destination.contents) to_chat(crushed, span_userdanger("You are crushed by [src]!")) crushed.gib(FALSE,FALSE,FALSE)//the nicest kind of gibbing, keeping everything intact. + else if(going != UP) //can't really crush something upwards - for(var/obj/structure/anchortrouble in destination.contents) - if(!QDELETED(anchortrouble) && anchortrouble.anchored && (!istype(anchortrouble, /obj/structure/holosign)) && anchortrouble.layer >= GAS_PUMP_LAYER) //to avoid pipes, wires, etc + var/atom/throw_target = get_edge_target_turf(src, turn(going, pick(45, -45))) //finds a spot to throw the victim at for daring to be hit by a tram + for(var/obj/structure/victimstructure in destination.contents) + if(QDELETED(victimstructure)) + continue + if(!istype(victimstructure, /obj/structure/holosign) && victimstructure.layer >= LOW_OBJ_LAYER) + if(victimstructure.anchored && initial(victimstructure.anchored) == TRUE) + visible_message("[src] smashes through [victimstructure]!") + victimstructure.deconstruct(FALSE) + else + visible_message("[src] violently rams [victimstructure] out of the way!") + victimstructure.anchored = FALSE + victimstructure.take_damage(rand(20,25)) + victimstructure.throw_at(throw_target, 200, 4) + for(var/obj/machinery/victimmachine in destination.contents) + if(QDELETED(victimmachine)) + continue + if(istype(victimmachine, /obj/machinery/field)) //graceful break handles this scenario + continue + if(victimmachine.layer >= LOW_OBJ_LAYER) //avoids stuff that is probably flush with the ground playsound(src, 'sound/effects/bang.ogg', 50, TRUE) - visible_message(span_notice("[src] smashes through [anchortrouble]!")) - anchortrouble.deconstruct(FALSE) + visible_message("[src] smashes through [victimmachine]!") + qdel(victimmachine) + for(var/mob/living/collided in destination.contents) to_chat(collided, span_userdanger("[src] collides into you!")) playsound(src, 'sound/effects/splat.ogg', 50, TRUE) @@ -256,7 +284,6 @@ GLOBAL_LIST_EMPTY(lifts) collided.throw_at() //if going EAST, will turn to the NORTHEAST or SOUTHEAST and throw the ran over guy away - var/atom/throw_target = get_edge_target_turf(collided, turn(going, pick(45, -45))) collided.throw_at(throw_target, 200, 4) forceMove(destination) for(var/atom/movable/thing as anything in things2move) @@ -403,8 +430,7 @@ GLOBAL_LIST_EMPTY(lifts) smoothing_groups = null canSmoothWith = null //kind of a centerpiece of the station, so pretty tough to destroy - armor = list(MELEE = 80, BULLET = 80, LASER = 80, ENERGY = 80, BOMB = 100, BIO = 80, RAD = 80, FIRE = 100, ACID = 100) - resistance_flags = FIRE_PROOF | ACID_PROOF + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF ///set by the tram control console in late initialize var/travelling = FALSE var/travel_distance = 0