From 56e1bf49f7bf7752daf7d43919a5754c5d317037 Mon Sep 17 00:00:00 2001 From: PiroMage Date: Sat, 26 Oct 2024 11:56:40 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=B0=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1) Добавлены мостики по краям коридоров у карго и сб отделов. 2) Перемещены карго-телепады на более удобные места. 3) Добавлен карго-телепад в медотдел (Хранилище). --- _maps/map_files/nova/nova.dmm | 718 ++++++++++++++++++++++------------ 1 file changed, 474 insertions(+), 244 deletions(-) diff --git a/_maps/map_files/nova/nova.dmm b/_maps/map_files/nova/nova.dmm index 0aa70570d12..8892bace2bd 100644 --- a/_maps/map_files/nova/nova.dmm +++ b/_maps/map_files/nova/nova.dmm @@ -1225,6 +1225,10 @@ name = "east station intercom (General)"; pixel_x = 28 }, +/obj/machinery/camera{ + c_tag = "Central Ring Hallway West 1"; + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -1276,7 +1280,7 @@ scrub_Toxins = 1 }, /turf/simulated/floor/plasteel{ - dir = 1 + icon_state = "red" }, /area/security/lobby) "ajJ" = ( @@ -4730,12 +4734,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/landmark/start/botanist, /turf/simulated/floor/plasteel{ - dir = 0; + dir = 6; icon_state = "green" }, /area/hydroponics) @@ -7977,6 +7978,9 @@ "bhW" = ( /obj/structure/closet/bombcloset, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/sign/poster/official/random{ + pixel_x = -32 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -8190,6 +8194,11 @@ /obj/effect/decal/cleanable/dust, /turf/simulated/floor/wood, /area/maintenance/fsmaint) +"bjD" = ( +/obj/effect/decal/cleanable/dust, +/obj/effect/decal/cleanable/spiderling_remains, +/turf/simulated/floor/wood, +/area/maintenance/library) "bjG" = ( /obj/structure/cable{ icon_state = "4-8" @@ -11456,6 +11465,10 @@ "bFK" = ( /obj/item/hand_labeler, /obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_x = 1; + pixel_y = 3 + }, /turf/simulated/floor/plasteel{ dir = 1 }, @@ -11877,6 +11890,7 @@ /turf/simulated/floor/wood, /area/maintenance/library) "bIH" = ( +/obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner"; tag = "icon-whitebluecorner" @@ -12716,6 +12730,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/wrench, /obj/effect/spawner/random_spawners/rodent, +/obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plasteel, /area/maintenance/medroom) "bPt" = ( @@ -16259,6 +16274,7 @@ dir = 4; tag = "icon-bulb1 (EAST)" }, +/obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -16830,6 +16846,14 @@ }, /turf/simulated/floor/plating, /area/bridge/checkpoint/south) +"ctD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/spiderling_remains, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "barber" + }, +/area/maintenance/medroom) "ctE" = ( /obj/machinery/vending/cola, /obj/effect/decal/warning_stripes/red/hollow, @@ -18950,10 +18974,6 @@ "cKm" = ( /obj/structure/table, /obj/item/aiModule/freeform, -/obj/machinery/camera/motion{ - c_tag = "AI Upload Chamber"; - dir = 8 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -24296,6 +24316,7 @@ /area/medical/cmo) "dzH" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/wood{ icon_state = "wood-broken" }, @@ -26745,7 +26766,7 @@ pixel_y = -30 }, /turf/simulated/floor/plasteel{ - dir = 1 + icon_state = "red" }, /area/security/lobby) "dSt" = ( @@ -27018,6 +27039,13 @@ slowdown = -0.3 }, /area/hallway/primary/starboard/south) +"dUZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/spiderling_remains, +/turf/simulated/floor/plasteel{ + icon_state = "tranquillite" + }, +/area/maintenance/trading) "dVa" = ( /obj/structure/window/reinforced{ dir = 1 @@ -27799,6 +27827,18 @@ icon_state = "green" }, /area/hallway/secondary/exit) +"ebq" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 1 + }, +/area/quartermaster/lobby) "ebr" = ( /obj/structure/window/reinforced{ dir = 8; @@ -31647,6 +31687,7 @@ /area/crew_quarters/fitness) "eCB" = ( /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plasteel{ icon_state = "whiteblue"; tag = "icon-whitehall (WEST)" @@ -34498,6 +34539,15 @@ name = "Officer Rightsky"; desc = "It's Officer Rightsky! Powered by a potato and a shot of whiskey." }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 1 }, @@ -35141,6 +35191,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plasteel, /area/maintenance/apmaint) "fev" = ( @@ -35575,8 +35626,7 @@ c_tag = "Mining Lobby West" }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" + dir = 1 }, /area/quartermaster/lobby) "fhz" = ( @@ -39342,7 +39392,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/junction/reversed{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -40873,6 +40923,11 @@ id = "AI"; pixel_y = -27 }, +/obj/machinery/camera/motion{ + c_tag = "AI Upload Chamber"; + dir = 1; + pixel_x = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42038,8 +42093,7 @@ c_tag = "Mining Lobby East" }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" + dir = 1 }, /area/quartermaster/lobby) "gdP" = ( @@ -45512,7 +45566,7 @@ }, /obj/structure/cable, /turf/simulated/floor/plasteel{ - dir = 1 + icon_state = "red" }, /area/security/lobby) "gFE" = ( @@ -46597,6 +46651,20 @@ icon_state = "neutral" }, /area/crew_quarters/serviceyard) +"gND" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/plasteel{ + dir = 1 + }, +/area/quartermaster/lobby) "gNJ" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -50829,7 +50897,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 9; + dir = 1; icon_state = "brown" }, /area/quartermaster/lobby) @@ -54390,6 +54458,13 @@ /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, /area/maintenance/fore) +"hZu" = ( +/obj/effect/decal/cleanable/dust, +/obj/effect/decal/cleanable/spiderling_remains, +/turf/simulated/floor/plasteel{ + icon_state = "tranquillite" + }, +/area/maintenance/trading) "hZx" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -55258,11 +55333,14 @@ }, /area/security/prisonlockers) "ifd" = ( +/obj/machinery/camera{ + c_tag = "Central Ring Hallway South 6"; + dir = 10 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "browncorner" + icon_state = "neutral" }, -/area/quartermaster/lobby) +/area/hallway/primary/central/sw) "ifo" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/fernybush, @@ -57351,6 +57429,16 @@ icon_state = "neutral" }, /area/hallway/primary/central/se) +"itY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 1 + }, +/area/quartermaster/lobby) "iub" = ( /obj/structure/table, /obj/random/plushie, @@ -57462,6 +57550,21 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/engineering/controlroom) +"iuS" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "red" + }, +/area/hallway/primary/central/second/west) "iuU" = ( /obj/effect/decal/warning_stripes/southwest, /obj/machinery/r_n_d/protolathe{ @@ -62202,7 +62305,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/mining/glass{ +/obj/machinery/door/airlock/mining{ name = "Cargo Bay"; req_access = list(31) }, @@ -62885,7 +62988,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - dir = 1 + icon_state = "red" }, /area/security/lobby) "jmH" = ( @@ -63954,9 +64057,17 @@ }, /area/hallway/primary/central/second/east) "juQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "browncorner" + dir = 1 }, /area/quartermaster/lobby) "juU" = ( @@ -65189,7 +65300,8 @@ "jEX" = ( /obj/machinery/floodlight, /turf/simulated/floor/plasteel{ - dir = 5 + dir = 4; + icon_state = "blue" }, /area/hydroponics) "jFa" = ( @@ -65331,13 +65443,15 @@ }, /area/hallway/primary/central/second/west) "jFO" = ( -/obj/structure/railing, -/obj/machinery/door/firedoor/border_only, +/obj/machinery/camera{ + c_tag = "Second Floor Central Ring South Hallway 2"; + dir = 2 + }, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "brown" + dir = 1; + icon_state = "red" }, -/area/hallway/primary/central/second/east) +/area/hallway/primary/central/second/west) "jFP" = ( /obj/machinery/alarm{ pixel_y = 22 @@ -68222,6 +68336,11 @@ icon_state = "redcorner" }, /area/security/prison/cell_block/A) +"kct" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/spiderling_remains, +/turf/simulated/floor/plating, +/area/maintenance/gambling_den) "kcG" = ( /obj/machinery/firealarm{ dir = 1; @@ -70861,10 +70980,6 @@ /area/engineering/mechanic_workshop/hangar) "kxH" = ( /obj/machinery/light, -/obj/machinery/camera{ - c_tag = "Second Floor Central Ring South Hallway 2"; - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 1 }, @@ -72949,6 +73064,24 @@ icon_state = "bluecorner" }, /area/hallway/primary/fore) +"kPp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 1 + }, +/area/security/lobby) "kPq" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=A37"; @@ -73823,6 +73956,7 @@ }, /obj/item/rcs, /obj/structure/table/reinforced, +/obj/item/rcs, /turf/simulated/floor/plasteel{ dir = 1 }, @@ -75266,6 +75400,10 @@ icon_state = "bluefull" }, /area/hallway/primary/fore) +"lgM" = ( +/obj/effect/decal/cleanable/spiderling_remains, +/turf/simulated/floor/carpet/red, +/area/maintenance/backstage) "lgR" = ( /turf/simulated/floor/plasteel{ icon_state = "red" @@ -79219,16 +79357,12 @@ }, /area/medical/biostorage) "lOv" = ( -/obj/machinery/disposal, /obj/machinery/vending/wallmed{ pixel_x = -25 }, -/obj/effect/decal/warning_stripes/yellow, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "green" }, /area/hydroponics) "lOz" = ( @@ -80258,9 +80392,9 @@ }, /area/maintenance/fsmaint3) "lWn" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 1 + dir = 1; + icon_state = "redcorner" }, /area/security/lobby) "lWo" = ( @@ -80515,6 +80649,7 @@ }, /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/dust, +/obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plasteel, /area/maintenance/medroom) "lXP" = ( @@ -81155,8 +81290,8 @@ pixel_x = -26 }, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "blue" + icon_state = "blue"; + dir = 8 }, /area/hydroponics) "mcM" = ( @@ -81271,6 +81406,10 @@ pixel_x = -4; pixel_y = 4 }, +/obj/machinery/recharger{ + pixel_x = 1; + pixel_y = 3 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, @@ -83428,7 +83567,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "blue" + }, /area/hydroponics) "muB" = ( /obj/structure/window/reinforced{ @@ -86105,9 +86247,7 @@ "mOm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, -/turf/simulated/floor/plasteel{ - icon_state = "darkgrey" - }, +/turf/simulated/floor/plating, /area/maintenance/gambling_den) "mOA" = ( /obj/effect/decal/cleanable/dirt, @@ -87075,6 +87215,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -93784,6 +93925,13 @@ icon_state = "darkblue" }, /area/hallway/secondary/exit) +"nUf" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plasteel{ + dir = 1 + }, +/area/security/lobby) "nUl" = ( /obj/effect/turf_decal/siding/yellow{ dir = 8 @@ -95672,7 +95820,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 1 + icon_state = "red" }, /area/security/lobby) "ojE" = ( @@ -96272,11 +96420,13 @@ /area/hallway/secondary/entry/eastarrival) "ooP" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/reagent_dispensers/watertank/high, -/obj/item/reagent_containers/glass/bucket, /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -97275,6 +97425,9 @@ /obj/item/tank/internals/oxygen, /obj/item/radio, /obj/item/clothing/mask/breath, +/obj/structure/sign/poster/contraband/missing_gloves{ + pixel_y = -32 + }, /turf/simulated/floor/plating, /area/maintenance/apmaint) "ovY" = ( @@ -102842,8 +102995,7 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" + dir = 1 }, /area/quartermaster/lobby) "plN" = ( @@ -102880,6 +103032,18 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel/airless, /area/toxins/test_area) +"pmm" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 1 + }, +/area/security/lobby) "pmo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, @@ -103912,18 +104076,10 @@ }, /area/security/main) "pvk" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/camera{ - c_tag = "Central Ring Hallway West 1"; - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" + icon_state = "red" }, -/area/hallway/primary/central/west) +/area/security/lobby) "pvn" = ( /obj/structure/bed, /obj/item/bedsheet/medical{ @@ -104570,6 +104726,8 @@ }, /area/hallway/secondary/entry/additional) "pzD" = ( +/obj/machinery/telepad_cargo, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -104910,6 +105068,10 @@ icon_state = "darkyellow" }, /area/bridge) +"pBJ" = ( +/obj/structure/sign/poster/contraband/random, +/turf/simulated/wall, +/area/maintenance/apmaint) "pBK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -106485,6 +106647,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/sign/poster/contraband/random{ + pixel_y = -32 + }, /turf/simulated/floor/plating, /area/maintenance/apmaint) "pNR" = ( @@ -107754,6 +107919,14 @@ icon_state = "red" }, /area/hallway/primary/central/second/west) +"pWF" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/spiderling_remains, +/turf/simulated/floor/plating, +/area/maintenance/gambling_den) "pWK" = ( /turf/simulated/wall, /area/crew_quarters/fitness) @@ -108588,11 +108761,6 @@ }, /area/security/range) "qcz" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable{ icon_state = "1-4" }, @@ -108603,6 +108771,17 @@ codes_txt = "patrol;next_patrol=L8"; location = "L7" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ dir = 1 }, @@ -109637,6 +109816,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/mob/living/simple_animal/hostile/killertomato{ + desc = "Прирученный ботаниками томат-убийца. Не подпускать к Сане."; + faction = list("plants","neutral","hostile"); + name = "Витамин" + }, /turf/simulated/floor/plasteel{ dir = 5 }, @@ -109958,13 +110142,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/mining/glass{ - name = "Disposal Bay"; - req_access = list(31) - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/mining{ + name = "Cargo Bay"; + req_access = list(31) + }, /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "qod" = ( @@ -110271,7 +110455,6 @@ /turf/simulated/floor/plating, /area/maintenance/tourist) "qrC" = ( -/obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; pixel_y = 26 @@ -110805,11 +110988,12 @@ }, /area/security/permabrig) "quw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/structure/cable{ + icon_state = "4-8" }, /turf/simulated/floor/plasteel{ dir = 1 @@ -111061,6 +111245,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/telepad_cargo, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" @@ -111632,6 +111817,16 @@ /obj/structure/closet/secure_closet/chaplain, /turf/simulated/floor/carpet, /area/chapel/office) +"qAM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 1 + }, +/area/security/lobby) "qAN" = ( /obj/structure/cable{ d1 = 4; @@ -112735,7 +112930,7 @@ pixel_y = -25 }, /turf/simulated/floor/plasteel{ - dir = 1 + icon_state = "red" }, /area/security/lobby) "qJQ" = ( @@ -117388,7 +117583,7 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - dir = 1 + icon_state = "red" }, /area/security/lobby) "ruz" = ( @@ -117988,6 +118183,7 @@ pixel_x = 32 }, /obj/effect/decal/cleanable/dirt, +/obj/item/suppressor, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "darkredalt" @@ -118589,17 +118785,13 @@ }, /area/atmos) "rCn" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/structure/sign/cargo{ pixel_x = 32 }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - dir = 5; + dir = 4; icon_state = "brown" }, /area/quartermaster/lobby) @@ -119576,6 +119768,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plating, /area/maintenance/backstage) "rJB" = ( @@ -119594,18 +119787,10 @@ }, /area/hallway/primary/central/east) "rJG" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - dir = 1; + dir = 8; icon_state = "red" }, /area/security/lobby) @@ -119677,8 +119862,7 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" + dir = 1 }, /area/quartermaster/lobby) "rKj" = ( @@ -119922,10 +120106,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "greencorner" + dir = 5 }, /area/hydroponics) "rMb" = ( @@ -120748,6 +120930,21 @@ icon_state = "dark" }, /area/chapel/office) +"rRp" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 8 + }, +/obj/structure/chair/office{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "brown" + }, +/area/hallway/primary/central/second/east) "rRu" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/ywflowers, @@ -122631,12 +122828,10 @@ /turf/space, /area/space) "seH" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/telepad_cargo, -/turf/simulated/floor/plasteel{ - dir = 1 - }, -/area/quartermaster/office) +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/spiderling_remains, +/turf/simulated/floor/plasteel, +/area/maintenance/apmaint) "seM" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -123153,6 +123348,7 @@ dir = 1; pixel_y = 24 }, +/obj/item/rcs, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -123204,7 +123400,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "greencorner" + }, /area/hydroponics) "sjZ" = ( /obj/structure/sign/comand{ @@ -123378,9 +123577,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/effect/landmark/start/botanist, /turf/simulated/floor/plasteel{ icon_state = "blue" @@ -124484,10 +124680,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/mining/glass{ - name = "Disposal Bay"; - req_access = list(31) - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -124496,6 +124688,10 @@ opacity = 0 }, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/mining{ + name = "Cargo Bay"; + req_access = list(31) + }, /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "sud" = ( @@ -126021,6 +126217,7 @@ dir = 1; pixel_y = -24 }, +/obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plasteel{ icon_state = "tranquillite" }, @@ -129045,16 +129242,19 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=R8"; location = "R7" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ dir = 1 }, @@ -129955,6 +130155,12 @@ }, /turf/simulated/floor/carpet, /area/library) +"thc" = ( +/obj/effect/decal/cleanable/spiderling_remains, +/turf/simulated/floor/plasteel{ + icon_state = "tranquillite" + }, +/area/maintenance/trading) "thg" = ( /obj/effect/spawner/window/reinforced, /obj/structure/barricade/wooden/crude, @@ -130447,17 +130653,23 @@ /turf/space, /area/space) "tku" = ( -/obj/structure/railing{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/flasher{ + desc = "A floor-mounted flashbulb device."; + id = "brigkpp"; + layer = 5; + pixel_y = 0; + range = 3; + pixel_x = -55 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "brown" + dir = 1 }, -/area/quartermaster/lobby) +/area/hallway/primary/central/second/west) "tkE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2{ @@ -134442,7 +134654,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 1 + icon_state = "red" }, /area/security/lobby) "tOl" = ( @@ -138365,6 +138577,7 @@ dir = 4; pixel_x = -24 }, +/obj/machinery/telepad_cargo, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -139241,6 +139454,7 @@ name = "Труба на фильтрацию" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/spiderling_remains, /turf/simulated/floor/plating, /area/maintenance/atmospherics) "uzb" = ( @@ -139892,6 +140106,8 @@ }, /area/bridge/meeting_room) "uEd" = ( +/obj/machinery/telepad_cargo, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteblue"; @@ -143274,8 +143490,7 @@ pixel_y = 32 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" + dir = 1 }, /area/quartermaster/lobby) "vdY" = ( @@ -143997,8 +144212,7 @@ }, /area/medical/genetics) "vkn" = ( -/obj/machinery/telepad_cargo, -/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -144197,6 +144411,9 @@ /obj/machinery/computer/guestpass{ pixel_y = 32 }, +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/glass/bucket, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "green" @@ -148928,11 +149145,13 @@ /turf/simulated/floor/plating, /area/maintenance/apmaint) "vXK" = ( -/obj/structure/railing, -/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "red" + dir = 1 }, /area/hallway/primary/central/second/west) "vXR" = ( @@ -149989,7 +150208,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 6 }, /turf/simulated/floor/plasteel, /area/hydroponics) @@ -150911,6 +151130,15 @@ codes_txt = "patrol;next_patrol=R2"; location = "R1" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 1 }, @@ -153183,12 +153411,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hologram/holopad, /obj/effect/landmark/event/lightsout, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "blue" + dir = 5 }, /area/hydroponics) "wDq" = ( @@ -154877,17 +155101,15 @@ /turf/simulated/floor/plasteel, /area/atmos) "wRE" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "brown" + dir = 1 }, -/area/quartermaster/lobby) +/area/hallway/primary/central/second/east) "wRL" = ( /obj/effect/spawner/random_spawners/rodent, /obj/effect/decal/cleanable/dirt, @@ -157606,6 +157828,11 @@ /obj/effect/landmark/start/civilian, /turf/simulated/floor/wood, /area/crew_quarters/arcade) +"xnc" = ( +/obj/effect/decal/cleanable/dust, +/obj/effect/decal/cleanable/spiderling_remains, +/turf/simulated/floor/wood, +/area/maintenance/livingcomplex) "xnd" = ( /obj/structure/table, /obj/machinery/door/window{ @@ -162653,6 +162880,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 1 }, @@ -162884,8 +163114,7 @@ pixel_y = 24 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" + dir = 1 }, /area/quartermaster/lobby) "yau" = ( @@ -164122,6 +164351,7 @@ /obj/item/clothing/gloves/combat, /obj/item/clothing/mask/gas/syndicate, /obj/item/kitchen/knife/combat/survival, +/obj/item/suppressor, /turf/simulated/floor/plating, /area/maintenance/apmaint) "yip" = ( @@ -187547,7 +187777,7 @@ kVT svF dAF dAF -pvk +cLB dAF lxp lRf @@ -188586,7 +188816,7 @@ tkq thy gQA wmY -sfN +ifd gOM qnW blF @@ -250475,7 +250705,7 @@ yev khC lRC vpN -lFD +pWF jtj dcL jtj @@ -251510,7 +251740,7 @@ lUo rJp sJt lRC -rCY +kct yev yev yev @@ -253091,14 +253321,14 @@ uGl mvk jaa mvk -vXK -arE -arE -arE +mvk +mvk +mvk +mvk rJG lWn fJq -cqZ +pvk fBg fBg fBg @@ -253347,15 +253577,15 @@ iyd rXH iyd qcz -fnc -lpF -arE -arE -arE -lFo -ivW -ugJ -ivW +vXK +vXK +vXK +tku +vXK +pmm +qAM +kPp +qJP fBg qQY iwb @@ -253605,14 +253835,14 @@ cGn qGE aop fnc -lpF -arE -arE -arE -lFo +fnc +fnc +fnc +fnc +nUf ivW ugJ -ivW +pvk qub uMk gtN @@ -253863,13 +254093,13 @@ mHk aop mrC gAz -ejy -arE -tGl +iuS +iuS +iuS jFd wTS oGz -ivW +pvk csh xDx uHJ @@ -254126,7 +254356,7 @@ arE lFo ivW vmf -ivW +pvk aFr jeV fpz @@ -254897,7 +255127,7 @@ arE jFd uDc ugJ -ivW +pvk fBg rOC rCX @@ -255154,7 +255384,7 @@ arE lFo ivW ugJ -ivW +pvk fBg ryM lgx @@ -255668,7 +255898,7 @@ arE lFo ivW ugJ -ivW +pvk bXo aeK xyr @@ -256182,7 +256412,7 @@ arE lFo ivW pUd -ivW +pvk bXo apH fvM @@ -256696,7 +256926,7 @@ arE lFo ivW ugJ -ivW +pvk bXo mCQ kJp @@ -257210,7 +257440,7 @@ arE lFo ivW ugJ -ivW +pvk baL baL baL @@ -257724,7 +257954,7 @@ arE lFo ivW ugJ -ivW +pvk lWG mgf aPP @@ -257971,7 +258201,7 @@ tqz tuW tuW tuW -mHk +jFO aop kxH gAz @@ -257981,7 +258211,7 @@ tGl jFd rIc ugJ -ivW +pvk lWG deS fCq @@ -258495,7 +258725,7 @@ tMg lFo ivW ugJ -ivW +pvk odS ybD qKH @@ -258752,7 +258982,7 @@ tMg lFo ivW ugJ -ivW +pvk odS mgf aPP @@ -259009,7 +259239,7 @@ tMg jFd oZE ugJ -ivW +pvk wGw deS gaj @@ -259266,7 +259496,7 @@ tMg lFo ivW ugJ -ivW +pvk baL baL baL @@ -259523,7 +259753,7 @@ tMg lFo ivW kds -ivW +cqZ gjd sOJ hTz @@ -262605,9 +262835,9 @@ tMg tMg tMg hug -ifd +ukK khN -juQ +ukK wwZ azk sOJ @@ -263375,7 +263605,7 @@ jKC tMg tMg tMg -tku +gec ukK ngs gmY @@ -263415,7 +263645,7 @@ fYa aSx fKh ijm -ijm +seH hVn aKO bkc @@ -263889,7 +264119,7 @@ jKC tMg tMg tMg -wRE +gec ukK ngs cWq @@ -264403,7 +264633,7 @@ jKC sJR sJR sJR -tku +gec ukK ngs gmY @@ -264917,7 +265147,7 @@ jKC sJR sJR sJR -wRE +gec ukK inq wqk @@ -265431,7 +265661,7 @@ jKC sJR sJR sJR -tku +gec ukK eHI gmY @@ -265722,7 +265952,7 @@ eMm hfz uxP lTd -pAZ +ctD dHw jLH trW @@ -265945,7 +266175,7 @@ jKC sJR sJR sJR -wRE +gec ukK eHI gmY @@ -266459,7 +266689,7 @@ jKC sJR sJR sJR -tku +gec ukK ioI hAJ @@ -266973,7 +267203,7 @@ jKC sJR sJR sJR -wRE +gec ukK buw gmY @@ -267487,7 +267717,7 @@ jKC sJR sJR sJR -tku +gec ukK buw gmY @@ -268001,7 +268231,7 @@ jKC sJR sJR sJR -wRE +gec ukK xYI grf @@ -268032,7 +268262,7 @@ rwK fDO dHw tQW -pAZ +ctD eaz lHs iXR @@ -268515,7 +268745,7 @@ jKC sJR sJR sJR -tku +gec ukK eZN uui @@ -268769,9 +268999,9 @@ ajv xqA cvg uMt -vXd -sJR -dGn +rRp +rRp +rRp hXg rKb wmX @@ -269025,13 +269255,13 @@ aaj slZ xqA fEy -jKC -sJR -sJR -sJR -wRE -ukK +fEy +fEy +fEy +fEy +sVv ukK +juQ gmY jFL bRX @@ -269281,15 +269511,15 @@ dHG cdB dHG tbm -fEy -jKC -sJR -sJR -sJR -gec -ukK -ukK -gmY +wRE +wRE +wRE +wRE +wRE +ebq +itY +gND +awK jFL kDD kMo @@ -269317,14 +269547,14 @@ sBh sBh qkA sBh -sBh +pBJ sBh sBh sBh dQn uoz sBh -sBh +pBJ sBh uoz sBh @@ -269539,10 +269769,10 @@ rDj dMD dMD dMD -jFO -sJR -sJR -sJR +dMD +dMD +dMD +dMD rCn xfV xfV @@ -270259,7 +270489,7 @@ upm eYK gTN xgf -mjT +lgM gIS efu cFH @@ -272872,7 +273102,7 @@ wBY bQg klB mmn -seH +cqJ cqJ cSB cSB @@ -277222,7 +277452,7 @@ bio wXI pci dvK -dvK +dUZ pci dvK uNw @@ -277473,7 +277703,7 @@ xBD sld hBP bio -pNb +bjD eVl jkv bIC @@ -277485,7 +277715,7 @@ xkK tJJ pci pLd -vuF +thc dvK pci dvK @@ -279532,7 +279762,7 @@ tdn jmQ iqW fVo -pbq +xnc flP gzl uUw @@ -279541,7 +279771,7 @@ dvK tpe vuF pci -pci +hZu vuF lMA uUw