diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index b1b8d88c958..9766108598b 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -30,10 +30,10 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/structure/table, /obj/machinery/chem_dispenser/drinks/beer{ dir = 8 }, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "aai" = ( @@ -242,9 +242,6 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "abX" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Quartermaster's Office" - }, /obj/machinery/status_display/supply{ pixel_x = -32 }, @@ -353,7 +350,10 @@ "acN" = ( /obj/effect/landmark/start/hangover, /obj/structure/chair/stool/bar/directional/east, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, /area/station/service/bar) "acQ" = ( /obj/structure/table/wood, @@ -425,10 +425,11 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "ado" = ( -/obj/effect/landmark/start/hangover, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) +/obj/structure/table/wood/fancy, +/obj/effect/spawner/random/entertainment/cigarette, +/obj/effect/spawner/random/entertainment/lighter, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "adp" = ( /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/chapel{ @@ -436,8 +437,15 @@ }, /area/station/service/chapel) "adq" = ( -/obj/machinery/computer/slot_machine, -/turf/open/floor/wood, +/obj/structure/table/wood, +/obj/item/instrument/violin, +/obj/item/instrument/eguitar{ + pixel_x = 5 + }, +/obj/item/instrument/guitar{ + pixel_x = -7 + }, +/turf/open/floor/wood/large, /area/station/service/bar) "adr" = ( /obj/structure/sign/warning/vacuum/external/directional/west, @@ -613,6 +621,17 @@ /obj/structure/closet/firecloset, /turf/open/floor/iron/smooth_large, /area/station/engineering/main) +"aeG" = ( +/obj/item/cigarette/cigar, +/obj/item/toy/cards/deck, +/obj/effect/landmark/start/hangover, +/obj/structure/chair/sofa/left/brown, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/window/spawner/directional/north, +/turf/open/floor/wood, +/area/station/service/bar) "aeQ" = ( /obj/machinery/light/directional/east, /obj/structure/closet/radiation, @@ -1325,6 +1344,8 @@ /area/station/security/processing) "akJ" = ( /obj/machinery/light/directional/south, +/obj/effect/spawner/random/contraband/permabrig_weapon, +/obj/structure/closet/crate/bin, /turf/open/floor/iron/cafeteria, /area/station/security/prison) "akM" = ( @@ -1334,6 +1355,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/wood, /area/station/service/lawoffice) "akN" = ( @@ -1547,13 +1569,13 @@ dir = 1 }, /obj/machinery/light/small/directional/west, +/obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark, /area/station/security/brig) "amn" = ( /obj/structure/chair/office{ dir = 4 }, -/obj/effect/landmark/start/security_officer, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, @@ -1649,9 +1671,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/effect/turf_decal/vg_decals/department/med{ - dir = 1 - }, +/obj/effect/turf_decal/vg_decals/department/med, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "amK" = ( @@ -1692,9 +1712,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/vg_decals/department/mining{ - dir = 1 - }, +/obj/effect/turf_decal/vg_decals/department/mining, /turf/open/floor/iron, /area/station/cargo/office) "amT" = ( @@ -2522,19 +2540,11 @@ /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/nt_rep) "aqY" = ( -/obj/structure/closet/lawcloset, -/obj/item/storage/briefcase{ - pixel_x = 3; - pixel_y = 3 +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 }, -/obj/item/storage/briefcase/secure, -/obj/item/clothing/glasses/sunglasses/big{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/glasses/sunglasses, -/obj/machinery/newscaster/directional/west, -/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/wood, /area/station/service/lawoffice) "arf" = ( @@ -2703,6 +2713,10 @@ /obj/structure/chair/office{ dir = 8 }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, /turf/open/floor/wood, /area/station/service/lawoffice) "arT" = ( @@ -2726,6 +2740,9 @@ dir = 1 }, /obj/machinery/light/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/carpet/blue, /area/station/service/lawoffice) "asb" = ( @@ -3740,7 +3757,7 @@ /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/commons/toilet) "avD" = ( /turf/closed/wall/r_wall, @@ -3829,6 +3846,10 @@ /area/station/construction/mining/aux_base) "avQ" = ( /obj/structure/table/reinforced, +/obj/item/food/burger/orange{ + desc = "Made by those abandoned by society."; + name = "prison burger" + }, /turf/open/floor/iron/cafeteria, /area/station/security/prison) "avR" = ( @@ -4363,7 +4384,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, /area/station/service/bar) "axD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4874,9 +4898,10 @@ /turf/open/floor/iron/pool, /area/station/commons/fitness) "aze" = ( -/obj/structure/window/spawner/directional/west, -/turf/open/floor/plating, -/area/station/maintenance/fore) +/obj/effect/turf_decal/siding/wideplating_new, +/obj/structure/railing, +/turf/open/floor/grass, +/area/station/security/prison) "azg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 6 @@ -4915,8 +4940,8 @@ /obj/machinery/computer/security{ dir = 4 }, -/obj/machinery/computer/security/telescreen/prison, /obj/machinery/light/directional/west, +/obj/machinery/computer/security/telescreen/prison/directional/west, /turf/open/floor/iron/dark, /area/station/security/corrections_officer) "azw" = ( @@ -5323,13 +5348,16 @@ /turf/open/floor/iron, /area/station/service/hydroponics/garden) "aAR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 6 +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 6 }, -/turf/open/floor/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/turf/open/floor/stone, /area/station/service/bar) "aAS" = ( /obj/structure/sink/directional/south, @@ -5540,7 +5568,8 @@ dir = 9 }, /obj/machinery/restaurant_portal/bar, -/turf/open/floor/wood, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aBK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -5776,16 +5805,10 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) "aCG" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Diner" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/stool/bar/directional/north, +/obj/effect/turf_decal/siding/thinplating_new/light, /obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 6 - }, -/turf/open/floor/wood, +/turf/open/floor/eighties, /area/station/service/bar) "aCM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -6316,14 +6339,13 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/wood, /area/station/service/lawoffice) "aFj" = ( @@ -6388,15 +6410,10 @@ /turf/open/floor/wood, /area/station/command/meeting_room) "aFp" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/vg_decals/department/sci{ - dir = 1 - }, +/obj/effect/turf_decal/vg_decals/department/sci, +/obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "aFs" = ( @@ -7312,8 +7329,8 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/office) "aIC" = ( -/obj/effect/landmark/start/chaplain, /obj/structure/chair, +/obj/effect/landmark/start/chaplain, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) "aID" = ( @@ -7475,7 +7492,7 @@ }, /obj/effect/mapping_helpers/airlock/access/any/service/theatre, /obj/effect/landmark/navigate_destination, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/service/theater) "aJm" = ( /obj/structure/cable, @@ -7825,19 +7842,25 @@ /area/station/commons/storage/primary) "aKq" = ( /obj/machinery/camera/directional/north{ - c_tag = "Theater Stage" + c_tag = "Theater Stage"; + network = list("ss13","bar") }, -/obj/structure/chair/comfy/brown{ - dir = 4 +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 10 }, -/obj/effect/landmark/start/assistant, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/wood, +/obj/structure/railing, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood/large, /area/station/service/bar) "aKr" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/light/directional/north, -/turf/open/floor/wood, +/obj/structure/railing/corner/end{ + dir = 4 + }, +/turf/open/floor/iron/stairs/old{ + dir = 4 + }, /area/station/service/bar) "aKs" = ( /obj/structure/disposalpipe/segment, @@ -7885,15 +7908,21 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "aKI" = ( -/obj/structure/chair/stool/directional/west, -/turf/open/floor/wood, +/obj/structure/table/wood, +/obj/item/food/pie/cream, +/obj/item/clothing/head/costume/sombrero/green, +/obj/item/clothing/head/collectable/petehat, +/turf/open/floor/wood/large, /area/station/service/bar) "aKJ" = ( /obj/machinery/light_switch{ pixel_y = 28 }, +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, /obj/machinery/vending/coffee, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/service/bar) "aKM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -7902,15 +7931,21 @@ /turf/open/floor/iron, /area/station/cargo/storage) "aKN" = ( -/obj/structure/table/wood/fancy, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 6 + }, +/obj/structure/railing, +/turf/open/floor/wood/large, /area/station/service/bar) "aKO" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ dir = 8 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, +/turf/open/floor/stone, /area/station/service/bar) "aKP" = ( /obj/structure/disposalpipe/segment{ @@ -7919,7 +7954,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/wood, +/obj/effect/turf_decal/loading_area/white, +/turf/open/floor/wood/large, /area/station/service/bar) "aKQ" = ( /obj/machinery/reagentgrinder, @@ -8353,7 +8389,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/turf/open/floor/stone, /area/station/service/bar) "aMA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ @@ -8371,8 +8410,14 @@ /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "aMC" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, /obj/machinery/vending/cigarette, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/service/bar) "aMD" = ( /obj/machinery/icecream_vat, @@ -8608,7 +8653,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aNu" = ( /obj/structure/closet/secure_closet/bar, @@ -8635,30 +8680,37 @@ /turf/open/floor/wood, /area/station/service/bar) "aNF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ - dir = 8 +/obj/machinery/camera/directional/north{ + c_tag = "Disposal Mass Driver" }, -/obj/structure/chair/comfy/brown, -/obj/effect/landmark/start/hangover, -/turf/open/floor/wood, -/area/station/service/bar) +/turf/open/space/basic, +/area/space/nearstation) "aNH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, -/turf/open/floor/wood, +/obj/structure/chair/stool/directional/north, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, /area/station/service/bar) "aNI" = ( /obj/machinery/light/small/directional/east, /obj/machinery/status_display/evac/directional/east, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/spawner/random/vending/snackvend, +/turf/open/floor/stone, /area/station/service/bar) "aNJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, /area/station/service/bar) "aNL" = ( /obj/machinery/door/firedoor, @@ -8932,11 +8984,13 @@ /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen) "aOJ" = ( -/obj/structure/chair/comfy/brown{ +/obj/effect/turf_decal/siding/wood/corner{ dir = 8 }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/turf/open/floor/stone, /area/station/service/bar) "aOM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -8965,7 +9019,7 @@ dir = 8 }, /obj/structure/window/spawner/directional/west, -/obj/item/toy/plush/beeplushie, +/obj/structure/beebox, /turf/open/floor/grass, /area/station/service/hydroponics) "aOS" = ( @@ -9245,6 +9299,7 @@ /obj/effect/landmark/start/hangover, /obj/structure/chair/sofa/right/brown, /obj/structure/window/spawner/directional/north, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/open/floor/wood, /area/station/service/bar) "aQc" = ( @@ -9260,6 +9315,9 @@ }, /obj/effect/landmark/start/hangover, /obj/structure/window/spawner/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/wood, /area/station/service/bar) "aQg" = ( @@ -9382,14 +9440,14 @@ /turf/open/floor/iron, /area/station/commons/locker) "aQP" = ( -/obj/structure/reagent_dispensers/fueltank, /obj/machinery/light_switch{ pixel_y = 28 }, +/obj/machinery/vending/autodrobe/all_access, /turf/open/floor/iron, /area/station/commons/locker) "aQQ" = ( -/obj/structure/reagent_dispensers/watertank, +/obj/machinery/vending/dorms, /turf/open/floor/iron, /area/station/commons/locker) "aQR" = ( @@ -9397,7 +9455,7 @@ /turf/open/floor/iron, /area/station/commons/locker) "aQS" = ( -/obj/machinery/vending/autodrobe/all_access, +/obj/effect/spawner/random/vending/snackvend, /turf/open/floor/iron, /area/station/commons/locker) "aQT" = ( @@ -9495,8 +9553,8 @@ /obj/machinery/chem_dispenser/drinks{ dir = 8 }, -/obj/structure/table, /obj/machinery/digital_clock/directional/east, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "aRh" = ( @@ -9632,11 +9690,11 @@ dir = 1 }, /obj/effect/landmark/start/hangover, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aRx" = ( /obj/effect/spawner/random/entertainment/arcade, -/turf/open/floor/wood, +/turf/open/floor/eighties, /area/station/service/bar) "aRy" = ( /obj/structure/extinguisher_cabinet{ @@ -9840,17 +9898,16 @@ /turf/open/floor/plating, /area/station/commons/storage/emergency/port) "aSo" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/wood, +/obj/structure/chair/stool/directional/north, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, /area/station/service/bar) "aSq" = ( /obj/structure/chair/comfy/brown{ dir = 8 }, /obj/effect/landmark/start/hangover, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aSr" = ( /obj/effect/turf_decal/tile/yellow, @@ -9878,19 +9935,15 @@ /turf/open/floor/iron, /area/station/command/bridge) "aSv" = ( -/obj/structure/table/reinforced, -/obj/item/storage/briefcase/secure, -/obj/item/storage/box/ids, -/obj/item/storage/box/silver_ids{ - pixel_x = 4; - pixel_y = 6 +/obj/effect/turf_decal/tile/neutral{ + dir = 8 }, -/obj/item/storage/box/pdas{ - pixel_x = 4; - pixel_y = 4 +/obj/machinery/light/directional/west, +/obj/structure/sign/poster/timeclock_psa/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 8 }, -/turf/open/floor/iron, -/area/station/command/bridge) +/area/station/commons/dorms) "aSw" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -9986,7 +10039,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aSI" = ( /obj/machinery/door/airlock/public/glass{ @@ -10053,15 +10106,12 @@ /turf/open/floor/iron, /area/station/commons/storage/tools) "aSY" = ( -/obj/structure/table/reinforced, /obj/item/clothing/head/hats/tophat, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "aSZ" = ( @@ -10358,7 +10408,7 @@ "aUg" = ( /obj/structure/chair/comfy/brown, /obj/effect/landmark/start/hangover, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aUl" = ( /obj/effect/spawner/structure/window/reinforced, @@ -10507,6 +10557,7 @@ dir = 10 }, /obj/effect/landmark/generic_maintenance_landmark, +/obj/machinery/computer/security/telescreen/vault/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/nuke_storage) "aUQ" = ( @@ -10708,17 +10759,17 @@ /area/station/service/bar) "aVx" = ( /obj/machinery/holopad, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "aVy" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/item/storage/fancy/cigarettes/cigars{ + pixel_y = 4 }, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "aVz" = ( @@ -11353,14 +11404,10 @@ /turf/open/floor/wood, /area/station/service/bar) "aXj" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ pixel_x = 6; pixel_y = 7 @@ -11370,6 +11417,7 @@ pixel_x = -7 }, /obj/machinery/firealarm/directional/north, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "aXk" = ( @@ -11377,9 +11425,7 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, /obj/structure/window/spawner/directional/south, -/obj/structure/table/reinforced, /obj/item/book/manual/wiki/barman_recipes, /obj/item/reagent_containers/cup/rag{ pixel_x = -4 @@ -11387,6 +11433,7 @@ /obj/item/reagent_containers/cup/glass/shaker{ pixel_x = 8 }, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "aXm" = ( @@ -11551,7 +11598,10 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, /area/station/service/bar) "aXP" = ( /obj/structure/closet/crate, @@ -11995,11 +12045,15 @@ /area/station/maintenance/fore) "aZb" = ( /obj/machinery/camera/directional/south{ - c_tag = "Bar South" + c_tag = "Bar South"; + network = list("ss13","bar") }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/stone, /area/station/service/bar) "aZd" = ( /obj/machinery/firealarm/directional/south, @@ -12252,6 +12306,7 @@ dir = 1 }, /obj/effect/landmark/start/hangover, +/obj/machinery/firealarm/directional/south, /turf/open/floor/wood, /area/station/service/bar) "baa" = ( @@ -12259,12 +12314,17 @@ dir = 1 }, /obj/effect/landmark/start/hangover, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/open/floor/wood, /area/station/service/bar) "bab" = ( -/obj/machinery/light/directional/south, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, /area/station/service/bar) "bac" = ( /obj/structure/chair/sofa/right/brown{ @@ -12272,6 +12332,7 @@ }, /obj/effect/landmark/start/hangover, /obj/machinery/newscaster/directional/south, +/obj/machinery/light/directional/south, /turf/open/floor/wood, /area/station/service/bar) "bad" = ( @@ -12281,8 +12342,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/machinery/light/directional/south, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/stone, /area/station/service/bar) "bae" = ( /obj/effect/spawner/structure/window, @@ -12306,8 +12370,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/wood, +/obj/structure/chair/stool/directional/west{ + dir = 4 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/south, +/obj/machinery/light/directional/south, +/turf/open/floor/wood/parquet, /area/station/service/bar) "bah" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -12316,7 +12384,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, /area/station/service/bar) "bai" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -12329,7 +12400,8 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, -/turf/open/floor/wood, +/obj/machinery/computer/slot_machine, +/turf/open/floor/wood/parquet, /area/station/service/bar) "baj" = ( /obj/structure/table/reinforced, @@ -12658,10 +12730,10 @@ /area/station/command/heads_quarters/captain) "bbx" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Diner" +/obj/machinery/door/airlock/multi_tile/public/glass{ + name = "Atrium" }, -/turf/open/floor/wood, +/turf/open/floor/iron, /area/station/service/bar) "bby" = ( /obj/machinery/barsign, @@ -13037,16 +13109,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/item/paper{ - pixel_y = 7; - pixel_x = -4 - }, -/obj/item/pen/fourcolor{ - pixel_x = -5 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/item/paper{ + pixel_x = -1; + pixel_y = 5 + }, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/nt_rep) "bcH" = ( @@ -13907,7 +13976,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/machinery/computer/security/telescreen/cmo/directional/west, /obj/effect/landmark/start/chief_medical_officer, /obj/machinery/button/door{ id = "cmoprivacy"; @@ -13919,6 +13987,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, +/obj/machinery/computer/security/telescreen/cmo/directional/east, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "bfL" = ( @@ -13930,6 +13999,8 @@ /area/station/cargo/sorting) "bfO" = ( /obj/machinery/fishing_portal_generator, +/obj/item/fishing_line/reinforced, +/obj/item/fishing_rod/telescopic, /turf/open/floor/plating, /area/station/security/prison) "bfR" = ( @@ -13986,10 +14057,11 @@ "bfZ" = ( /obj/structure/sign/warning/secure_area/directional/south, /obj/effect/turf_decal/tile/purple, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/purple/opposingcorners, /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "bgc" = ( @@ -14095,7 +14167,8 @@ id = "packageSort2" }, /obj/machinery/camera/directional/west{ - c_tag = "Cargo Delivery Office" + c_tag = "Cargo Delivery Office"; + network = list("ss13","trash","Cargo") }, /obj/machinery/requests_console{ department = "Cargo Bay"; @@ -14113,7 +14186,6 @@ /area/station/cargo/sorting) "bgE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/airalarm/directional/west, /turf/open/floor/iron, /area/station/cargo/sorting) "bgF" = ( @@ -14854,7 +14926,8 @@ /area/station/command/heads_quarters/blueshield) "bjo" = ( /obj/machinery/camera/directional/north{ - c_tag = "Cargo Bay North" + c_tag = "Cargo Bay North"; + network = list("ss13","cargo") }, /obj/machinery/vending/wardrobe/cargo_wardrobe, /turf/open/floor/iron, @@ -15986,15 +16059,12 @@ /turf/closed/wall/r_wall, /area/station/science/robotics/mechbay) "bnd" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, /obj/structure/displaycase/forsale/kitchen, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "bne" = ( @@ -16272,9 +16342,9 @@ /turf/open/floor/iron, /area/station/command/heads_quarters/hop) "bnR" = ( -/obj/machinery/computer/security/telescreen/vault, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, +/obj/machinery/computer/security/telescreen/vault/directional/north, /turf/open/floor/iron, /area/station/command/heads_quarters/hop) "bnT" = ( @@ -16697,10 +16767,11 @@ /obj/structure/sign/painting/parting{ pixel_y = -32 }, -/obj/structure/closet/secure_closet/captains, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/item/bedsheet/captain, +/obj/structure/closet/secure_closet/captains, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/captain) "bpk" = ( @@ -17308,7 +17379,8 @@ }, /obj/effect/mapping_helpers/requests_console/supplies, /obj/machinery/camera/directional/west{ - c_tag = "Cargo Office" + c_tag = "Cargo Office"; + network = list("ss13","cargo") }, /obj/machinery/rnd/production/techfab/department/cargo, /turf/open/floor/iron, @@ -17723,6 +17795,7 @@ /area/station/medical/storage) "bsO" = ( /obj/structure/bodycontainer/morgue, +/obj/item/food/burger/roburger, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) "bsP" = ( @@ -19117,10 +19190,7 @@ dir = 1 }, /obj/effect/landmark/start/depsec/medical, -/obj/machinery/computer/security/telescreen/cmo/directional/east{ - desc = "Used for monitoring medbay to ensure patient safety."; - name = "Medbay Monitor" - }, +/obj/machinery/computer/security/telescreen/cmo/directional/west, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "bwH" = ( @@ -19152,6 +19222,12 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"bwS" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, +/area/station/service/bar) "bwV" = ( /obj/effect/landmark/start/shaft_miner, /obj/structure/cable, @@ -20023,7 +20099,8 @@ "bAP" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/directional/west{ - c_tag = "Atmospherics Incinerator" + c_tag = "Atmospherics Incinerator"; + network = list("ss13","engine") }, /obj/machinery/atmospherics/components/tank/plasma, /turf/open/floor/iron, @@ -20344,7 +20421,8 @@ pixel_x = -30 }, /obj/machinery/camera/directional/west{ - c_tag = "Mining Dock" + c_tag = "Mining Dock"; + network = list("ss13","cargo") }, /obj/machinery/conveyor_switch/oneway{ id = "boulderbelt" @@ -21031,7 +21109,8 @@ "bEn" = ( /obj/machinery/light/directional/north, /obj/machinery/camera/directional/north{ - c_tag = "Xenobiology Experimentation Cell" + c_tag = "Xenobiology Experimentation Cell"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -21415,7 +21494,7 @@ /area/station/medical/chemistry) "bFC" = ( /obj/structure/table/wood/poker, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "bFE" = ( /obj/effect/decal/cleanable/dirt, @@ -22020,7 +22099,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 8 }, -/turf/open/floor/wood, +/obj/structure/chair/stool/directional/north, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, /area/station/service/bar) "bHG" = ( /obj/structure/rack, @@ -22753,7 +22834,8 @@ /area/space/nearstation) "bKj" = ( /obj/machinery/camera/directional/east{ - c_tag = "Mining Dock External" + c_tag = "Mining Dock External"; + network = list("ss13","cargo") }, /obj/structure/reagent_dispensers/fueltank, /obj/effect/turf_decal/stripes/line, @@ -22863,10 +22945,10 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/landmark/start/depsec/engineering, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/effect/landmark/start/depsec/engineering, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "bKI" = ( @@ -23998,7 +24080,7 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "bPe" = ( -/obj/machinery/photocopier, +/obj/structure/aquarium/lawyer, /turf/open/floor/wood, /area/station/service/lawoffice) "bPf" = ( @@ -24829,6 +24911,10 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) +"bTe" = ( +/obj/effect/turf_decal/vg_decals/numbers/eight, +/turf/open/floor/iron/airless, +/area/space/nearstation) "bTh" = ( /obj/machinery/holopad, /turf/open/floor/iron/smooth_large, @@ -26590,7 +26676,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "caI" = ( -/obj/item/toy/plush/bigdeer, +/obj/item/toy/plush/bigdeer{ + name = "turbine deer" + }, /turf/open/floor/plating, /area/space/nearstation) "caK" = ( @@ -27334,7 +27422,6 @@ "cee" = ( /obj/structure/table, /obj/item/book/manual/wiki/tcomms, -/obj/item/radio/off, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -27342,6 +27429,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 8 }, +/obj/item/radio/off, /turf/open/floor/iron, /area/station/tcommsat/computer) "ceg" = ( @@ -27374,10 +27462,10 @@ /obj/machinery/computer/station_alert{ dir = 4 }, -/obj/machinery/computer/security/telescreen/ce/directional/east, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 8 }, +/obj/machinery/computer/security/telescreen/ce/directional/west, /turf/open/floor/iron/white/corner{ dir = 4 }, @@ -27574,7 +27662,9 @@ /turf/open/floor/engine, /area/station/engineering/atmos) "cfo" = ( -/obj/machinery/camera/autoname/directional/west, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","xeno") + }, /turf/open/floor/circuit/telecomms, /area/station/science/xenobiology) "cfp" = ( @@ -28020,9 +28110,10 @@ "chR" = ( /obj/effect/spawner/random/entertainment/arcade, /obj/machinery/camera/directional/west{ - c_tag = "Bar West" + c_tag = "Bar West"; + network = list("ss13","bar") }, -/turf/open/floor/wood, +/turf/open/floor/eighties, /area/station/service/bar) "chS" = ( /obj/machinery/door/airlock/engineering{ @@ -28682,9 +28773,13 @@ /turf/open/floor/engine/o2, /area/station/engineering/atmos) "clX" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, /obj/effect/landmark/event_spawn, /obj/effect/spawner/xmastree, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/service/bar) "clZ" = ( /turf/open/floor/engine/air, @@ -30742,6 +30837,9 @@ /obj/effect/turf_decal/siding/wood{ dir = 9 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, /turf/open/floor/carpet/blue, /area/station/service/lawoffice) "cxx" = ( @@ -31031,7 +31129,10 @@ /area/station/cargo/storage) "czP" = ( /obj/effect/landmark/event_spawn, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, /area/station/service/bar) "czS" = ( /obj/structure/cable, @@ -32149,7 +32250,8 @@ /area/station/engineering/main) "cFl" = ( /obj/machinery/camera/directional/west{ - c_tag = "Cargo - Bitrunning Den" + c_tag = "Cargo - Bitrunning Den"; + network = list("ss13","cargo") }, /obj/effect/decal/cleanable/cobweb, /obj/structure/table, @@ -32910,6 +33012,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, +/obj/machinery/computer/security/telescreen/disposals/directional/north, /turf/open/floor/iron, /area/station/cargo/sorting) "cNN" = ( @@ -33341,7 +33444,7 @@ "cTP" = ( /obj/effect/landmark/start/hangover, /obj/structure/table/wood/poker, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "cTQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -33637,7 +33740,7 @@ dir = 4 }, /obj/effect/landmark/start/hangover, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "dfw" = ( /obj/machinery/light_switch{ @@ -33843,6 +33946,10 @@ /obj/item/clothing/neck/pauldron, /turf/open/floor/iron/dark, /area/station/security/office) +"dlW" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/iron, +/area/station/service/bar) "dlY" = ( /obj/structure/sink/directional/south, /obj/structure/mirror/directional/north, @@ -33853,12 +33960,12 @@ /obj/machinery/computer/records/security{ dir = 8 }, -/obj/machinery/computer/security/telescreen/engine/directional/west, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 4 }, /obj/effect/turf_decal/tile/neutral, +/obj/machinery/computer/security/telescreen/engine/directional/east, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "dnc" = ( @@ -33986,6 +34093,16 @@ }, /turf/open/floor/iron, /area/station/science/cytology) +"drV" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, +/area/station/service/bar) "dsd" = ( /obj/machinery/computer/records/security{ dir = 1 @@ -34051,7 +34168,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/computer/security/telescreen/engine/directional/west, +/obj/machinery/computer/security/telescreen/engine/directional/east, /turf/open/floor/iron/smooth_large, /area/station/engineering/engine_smes) "dul" = ( @@ -34275,9 +34392,9 @@ /turf/open/floor/plating, /area/station/maintenance/fore/lesser) "dDX" = ( -/obj/machinery/computer/security/telescreen/prison/directional/north, /obj/structure/filingcabinet/employment, /obj/machinery/firealarm/directional/east, +/obj/machinery/computer/security/telescreen/prison/directional/south, /turf/open/floor/carpet/blue, /area/station/service/lawoffice) "dEq" = ( @@ -35098,18 +35215,19 @@ /obj/item/reagent_containers/spray/cleaner{ pixel_x = 2 }, -/obj/item/storage/pill_bottle/mutadone{ - pixel_x = 11; - pixel_y = 7 - }, -/obj/item/clothing/gloves/latex{ - pixel_y = 3 - }, /obj/item/radio/headset/headset_medsci{ pixel_x = -7; pixel_y = 4 }, /obj/machinery/light/directional/south, +/obj/item/clothing/gloves/latex{ + pixel_y = 3 + }, +/obj/item/storage/pill_bottle/monkeydone, +/obj/item/storage/pill_bottle/mutadone{ + pixel_x = 11; + pixel_y = 7 + }, /turf/open/floor/iron/dark/textured, /area/station/science/genetics) "eiK" = ( @@ -35279,11 +35397,12 @@ "epT" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, -/obj/structure/chair/comfy/brown{ +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/turf/open/floor/iron/stairs/old{ dir = 8 }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/wood, /area/station/service/bar) "eqj" = ( /obj/machinery/porta_turret/ai{ @@ -35560,7 +35679,8 @@ "eCg" = ( /obj/effect/turf_decal/delivery, /obj/machinery/camera/directional/south{ - c_tag = "Cargo Bay South" + c_tag = "Cargo Bay South"; + network = list("ss13","cargo") }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 @@ -35683,7 +35803,11 @@ /area/station/engineering/main) "eIf" = ( /obj/structure/noticeboard/directional/east, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/jukebox, +/turf/open/floor/stone, /area/station/service/bar) "eIo" = ( /obj/structure/cable, @@ -35737,6 +35861,13 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology) +"eJQ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/stone, +/area/station/service/bar) "eJR" = ( /obj/structure/chair/pew/right{ dir = 1 @@ -35849,6 +35980,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/science/ordnance) +"eOm" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/loading_area/white, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "eOx" = ( /obj/structure/railing{ dir = 8 @@ -36061,6 +36199,10 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, +/obj/item/radio/off, +/obj/item/screwdriver{ + pixel_y = 10 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "eYQ" = ( @@ -36403,9 +36545,7 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 1 }, -/obj/machinery/computer/security/telescreen/isolation{ - name = "isolation room monitor" - }, +/obj/machinery/computer/security/telescreen/isolation/directional/north, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) "fiD" = ( @@ -36472,6 +36612,8 @@ dir = 4 }, /obj/effect/turf_decal/bot, +/obj/effect/spawner/random/contraband/prison, +/obj/structure/closet/crate/trashcart, /turf/open/floor/iron/kitchen{ dir = 1 }, @@ -37077,7 +37219,6 @@ pixel_x = -26; pixel_y = 6 }, -/obj/item/clothing/head/hats/warden/drill/nanotrasen, /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/nt_rep) "fJv" = ( @@ -37225,6 +37366,18 @@ }, /turf/open/floor/iron/white, /area/station/service/barber) +"fNG" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "fNJ" = ( /obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -37376,6 +37529,15 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/office) +"fTS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/structure/chair/comfy/brown{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "fUa" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -37521,7 +37683,6 @@ dir = 1 }, /obj/machinery/light/directional/south, -/obj/item/storage/briefcase/central_command, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/nt_rep) "fYZ" = ( @@ -38193,11 +38354,11 @@ /area/station/maintenance/port/aft) "gzQ" = ( /obj/structure/table, -/obj/effect/spawner/random/engineering/tool, /obj/effect/spawner/random/engineering/tool{ pixel_x = 16; pixel_y = -3 }, +/obj/item/bot_assembly/ed209, /turf/open/floor/iron/dark, /area/station/security/mechbay) "gzV" = ( @@ -38932,7 +39093,7 @@ idSelf = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -24; - req_access = list("virology"); + req_access = list("medical"); pixel_y = 6 }, /obj/effect/mapping_helpers/airlock/access/any/medical/general, @@ -39384,10 +39545,6 @@ }, /area/station/science/server) "huk" = ( -/obj/item/screwdriver{ - pixel_y = 10 - }, -/obj/item/radio/off, /obj/machinery/light_switch/directional/west, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -39406,6 +39563,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/effect/landmark/start/engineering_guard, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "huA" = ( @@ -39744,7 +39902,7 @@ "hGf" = ( /obj/machinery/camera/directional/south{ c_tag = "Prison - Isolation B"; - network = list("ss13","prison") + network = list("ss13","prison","isolation") }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -39964,7 +40122,8 @@ }, /obj/structure/disposaloutlet, /obj/machinery/camera/directional/west{ - c_tag = "Xenobiology Cell 6" + c_tag = "Xenobiology Cell 6"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -39991,7 +40150,6 @@ /area/station/service/chapel) "hQn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/clothing/under/rank/prisoner/classic, /turf/open/floor/plating, /area/station/security/prison) "hQu" = ( @@ -40343,6 +40501,10 @@ /area/station/hallway/primary/starboard) "ibl" = ( /obj/structure/flora/bush/flowers_pp, +/obj/effect/turf_decal/siding/wideplating_new{ + dir = 4 + }, +/obj/structure/flora/bush/grassy, /turf/open/floor/grass, /area/station/security/prison) "ibI" = ( @@ -40545,7 +40707,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/landmark/start/engineering_guard, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "iiz" = ( @@ -40576,7 +40737,7 @@ /area/station/hallway/primary/fore) "iiD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, -/obj/machinery/computer/security/telescreen/research, +/obj/machinery/computer/security/telescreen/xeno/directional/north, /turf/open/floor/iron/white, /area/station/science/xenobiology) "iiZ" = ( @@ -40804,6 +40965,16 @@ /obj/machinery/drone_dispenser, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"iqu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 + }, +/obj/item/kirbyplants/organic/plant11, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "iqK" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -41241,8 +41412,8 @@ /turf/open/floor/iron/smooth_large, /area/station/engineering/break_room) "iHH" = ( -/obj/machinery/light/floor, -/turf/open/floor/wood, +/obj/structure/table/wood/fancy, +/turf/open/floor/wood/parquet, /area/station/service/bar) "iHT" = ( /obj/machinery/biogenerator, @@ -41300,10 +41471,16 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "iKp" = ( -/obj/structure/musician/piano{ - icon_state = "piano" +/obj/structure/chair/comfy/black{ + dir = 8 }, -/turf/open/floor/wood, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 1 + }, +/turf/open/floor/wood/large, /area/station/service/bar) "iKz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ @@ -41357,11 +41534,11 @@ pixel_x = -6; pixel_y = 9 }, -/obj/machinery/computer/security/telescreen/rd/directional/west, /obj/item/stamp/coderbus/closed, /obj/item/stamp/coderbus/merged{ pixel_x = 9 }, +/obj/machinery/computer/security/telescreen/rd/directional/east, /turf/open/floor/iron/cafeteria, /area/station/command/heads_quarters/rd) "iMH" = ( @@ -41572,7 +41749,7 @@ name = "Virology Access Console"; pixel_x = 7; pixel_y = 26; - req_access = list("virology") + req_access = list("medical") }, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -41661,15 +41838,16 @@ /turf/open/floor/catwalk_floor/iron, /area/station/science/explab) "iYy" = ( -/obj/structure/table/wood, -/obj/item/instrument/guitar{ - pixel_x = -7 +/obj/structure/musician/piano{ + icon_state = "piano" }, -/obj/item/instrument/eguitar{ - pixel_x = 5 +/obj/structure/railing{ + dir = 1 }, -/obj/item/instrument/violin, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/thinplating_new/light{ + dir = 1 + }, +/turf/open/floor/wood/large, /area/station/service/bar) "iYO" = ( /obj/effect/decal/cleanable/dirt, @@ -41872,13 +42050,20 @@ /area/station/maintenance/aft) "jeQ" = ( /obj/structure/chair/office, -/obj/effect/landmark/start/research_director, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 10 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/research_director, /turf/open/floor/iron/cafeteria, /area/station/command/heads_quarters/rd) +"jgc" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/service/bar) "jgi" = ( /obj/machinery/light/directional/north, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -42138,6 +42323,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/command/heads_quarters/blueshield) +"jnq" = ( +/obj/effect/landmark/start/assistant, +/obj/structure/chair/comfy/brown{ + dir = 4 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "jnH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42344,7 +42536,7 @@ idDoor = "virology_airlock_exterior"; idSelf = "virology_airlock_control"; name = "Virology Access Button"; - req_access = list("virology"); + req_access = list("medical"); pixel_x = -24 }, /obj/effect/mapping_helpers/airlock/access/any/medical/general, @@ -42441,15 +42633,12 @@ /turf/open/floor/iron/dark, /area/station/security/corrections_officer) "juQ" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /obj/effect/spawner/random/food_or_drink/refreshing_beverage, +/obj/structure/table/wood, /turf/open/floor/iron, /area/station/service/bar) "jvb" = ( @@ -42877,7 +43066,6 @@ /area/station/security/prison/safe) "jMI" = ( /obj/structure/table, -/obj/machinery/computer/security/telescreen/research, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -42887,6 +43075,10 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/item/radio/off, +/obj/item/screwdriver{ + pixel_y = 10 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) "jMY" = ( @@ -43261,10 +43453,10 @@ /area/station/security/prison/safe) "jYM" = ( /obj/structure/chair/office, -/obj/effect/landmark/start/depsec/engineering, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ dir = 9 }, +/obj/effect/landmark/start/depsec/engineering, /turf/open/floor/iron/dark, /area/station/security/checkpoint/engineering) "jZE" = ( @@ -43322,6 +43514,12 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"kcx" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "kcz" = ( /obj/machinery/plate_press{ pixel_y = 4 @@ -43470,6 +43668,10 @@ }, /turf/open/floor/iron/dark/textured, /area/station/hallway/primary/central) +"kfR" = ( +/obj/machinery/barsign, +/turf/closed/wall, +/area/station/service/theater) "kgE" = ( /obj/item/reagent_containers/cup/glass/bottle/whiskey{ pixel_x = -5; @@ -43660,7 +43862,10 @@ "kmD" = ( /obj/effect/landmark/start/assistant, /obj/structure/chair/stool/bar/directional/east, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, /area/station/service/bar) "kmR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43805,7 +44010,7 @@ /obj/machinery/door/airlock/command{ name = "Gateway" }, -/obj/effect/mapping_helpers/airlock/access/any/cent_com/rep_door, +/obj/effect/mapping_helpers/airlock/access/any/command/gateway, /turf/open/floor/iron/dark/textured, /area/station/command/gateway) "ktt" = ( @@ -44761,7 +44966,10 @@ /area/station/service/hydroponics/garden/abandoned) "lcd" = ( /obj/structure/chair/stool/bar/directional/east, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, /area/station/service/bar) "lcp" = ( /obj/machinery/light/directional/north, @@ -44908,6 +45116,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/purple/half/contrasted, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "liF" = ( @@ -44966,6 +45175,11 @@ /obj/item/clothing/neck/pauldron, /turf/open/floor/iron/dark, /area/station/security/office) +"lno" = ( +/obj/effect/landmark/start/assistant, +/obj/structure/chair/comfy/brown, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "log" = ( /obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/wood, @@ -45147,6 +45361,7 @@ /turf/open/floor/iron/dark/corner, /area/station/commons/dorms) "lwn" = ( +/obj/effect/turf_decal/vg_decals/numbers/two, /turf/open/floor/iron/airless, /area/space/nearstation) "lwp" = ( @@ -45209,8 +45424,11 @@ /turf/open/floor/iron/white, /area/station/medical/break_room) "lyz" = ( -/obj/structure/reagent_dispensers/watertank/high, -/turf/open/floor/grass, +/obj/effect/turf_decal/siding/white{ + dir = 10 + }, +/obj/structure/railing, +/turf/open/water, /area/station/security/prison) "lzf" = ( /obj/machinery/door/window/right/directional/east{ @@ -46158,6 +46376,8 @@ /area/station/medical/storage) "mez" = ( /obj/machinery/light/directional/north, +/obj/item/clothing/gloves/boxing/yellow, +/obj/structure/closet/crate/bin, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -46340,13 +46560,23 @@ }, /turf/open/floor/iron, /area/station/command/meeting_room) +"moN" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, +/area/station/service/bar) "moU" = ( /obj/structure/disposalpipe/trunk{ dir = 4 }, /obj/structure/disposaloutlet, /obj/machinery/camera/directional/west{ - c_tag = "Xenobiology Cell 7" + c_tag = "Xenobiology Cell 7"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -46362,10 +46592,6 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "mql" = ( -/obj/item/screwdriver{ - pixel_y = 10 - }, -/obj/item/radio/off, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8 @@ -46375,6 +46601,7 @@ }, /obj/effect/turf_decal/tile/neutral, /obj/machinery/light/directional/south, +/obj/machinery/computer/security/telescreen/research/directional/south, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) "mqS" = ( @@ -46398,6 +46625,7 @@ }, /obj/item/restraints/handcuffs, /obj/item/radio/off, +/obj/machinery/computer/security/telescreen/normal/directional/south, /turf/open/floor/iron/dark, /area/station/security/brig) "mrg" = ( @@ -46448,7 +46676,9 @@ dir = 5; network = list("ss13","prison") }, -/obj/structure/flora/bush/grassy, +/obj/effect/turf_decal/siding/wideplating_new{ + dir = 4 + }, /obj/machinery/biogenerator, /turf/open/floor/grass, /area/station/security/prison) @@ -46529,9 +46759,15 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 10 }, -/obj/structure/closet/crate/hydroponics, /obj/structure/window/spawner/directional/south, /obj/structure/window/spawner/directional/west, +/obj/item/bee_smoker, +/obj/item/clothing/head/utility/beekeeper_head, +/obj/item/clothing/suit/hooded/bee_costume, +/obj/item/clothing/mask/animal/small/bee, +/obj/item/clothing/suit/utility/beekeeper_suit, +/obj/item/melee/flyswatter, +/obj/structure/closet/crate/hydroponics, /turf/open/floor/grass, /area/station/service/hydroponics) "muH" = ( @@ -46805,6 +47041,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron, /area/station/commons/locker) "mFY" = ( @@ -46883,6 +47120,8 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, +/obj/item/reagent_containers/cup/glass/bottle/rootbeer, +/obj/structure/closet/crate/bin, /turf/open/floor/iron/kitchen{ dir = 1 }, @@ -47025,6 +47264,14 @@ /obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot, /turf/open/floor/iron, /area/station/maintenance/starboard) +"mPx" = ( +/obj/effect/turf_decal/siding/white, +/obj/effect/turf_decal/siding/white/corner{ + dir = 4 + }, +/obj/structure/railing, +/turf/open/water, +/area/station/security/prison) "mQo" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -47296,9 +47543,11 @@ /turf/open/floor/iron/dark, /area/station/security/office) "nah" = ( -/obj/structure/table/wood/fancy, -/obj/machinery/pollution_scrubber, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/stone, /area/station/service/bar) "naT" = ( /obj/effect/turf_decal/tile/red{ @@ -47440,7 +47689,8 @@ }, /obj/structure/disposaloutlet, /obj/machinery/camera/directional/west{ - c_tag = "Xenobiology Cell 8" + c_tag = "Xenobiology Cell 8"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -47488,14 +47738,16 @@ /turf/open/floor/iron/dark, /area/station/security/checkpoint/escape) "nhI" = ( -/obj/structure/chair/comfy/black{ +/obj/structure/railing/corner/end{ + dir = 8 + }, +/turf/open/floor/iron/stairs/old{ dir = 8 }, -/turf/open/floor/wood, /area/station/service/bar) "nhM" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 4 }, /turf/open/floor/wood, /area/station/service/lawoffice) @@ -47600,6 +47852,9 @@ /area/station/medical/pharmacy) "nlQ" = ( /obj/structure/trash_pile, +/obj/item/storage/box/monkeycubes{ + pixel_x = -5 + }, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) "nlW" = ( @@ -47656,6 +47911,10 @@ /obj/item/toy/plush/slimeplushie, /turf/open/floor/engine, /area/station/science/xenobiology) +"npz" = ( +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood/large, +/area/station/service/bar) "npG" = ( /turf/open/floor/iron/textured, /area/station/security/prison) @@ -47717,6 +47976,18 @@ /obj/item/clothing/head/wizard/fake, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"ntB" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/stone, +/area/station/service/bar) "ntP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/smooth_large, @@ -47973,7 +48244,8 @@ /area/station/security/office) "nDM" = ( /obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Cell 2" + c_tag = "Xenobiology Cell 2"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -48161,6 +48433,10 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/dark/textured, /area/station/command/gateway) +"nJF" = ( +/obj/machinery/computer/security/telescreen/bar/directional/east, +/turf/open/floor/wood, +/area/station/service/bar) "nJL" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/broken_floor, @@ -48210,6 +48486,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/science/research) +"nLX" = ( +/obj/structure/bed, +/obj/machinery/light/small/directional/north, +/obj/effect/spawner/random/contraband/prison, +/turf/open/floor/plating, +/area/station/security/prison) "nMc" = ( /obj/machinery/firealarm/directional/south, /obj/machinery/light/directional/south, @@ -48296,8 +48578,8 @@ /area/station/science/xenobiology) "nOt" = ( /obj/machinery/camera/directional/south{ - c_tag = "Prison - Cell 2"; - network = list("ss13","prison") + c_tag = "Prison - Cell A"; + network = list("ss13","prison","isolation") }, /obj/machinery/airalarm/directional/south, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -48391,6 +48673,10 @@ /obj/structure/weightmachine/weightlifter, /turf/open/floor/iron/dark/side, /area/station/security/prison) +"nQv" = ( +/obj/effect/turf_decal/vg_decals/numbers/one, +/turf/open/floor/plating/airless, +/area/space/nearstation) "nQD" = ( /obj/structure/sign/warning/pods/directional/north, /turf/open/floor/iron/white/corner{ @@ -48459,7 +48745,6 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/service/bar) "nRA" = ( @@ -48531,6 +48816,12 @@ }, /turf/open/floor/wood, /area/station/service/library) +"nTG" = ( +/obj/effect/turf_decal/siding/white{ + dir = 9 + }, +/turf/open/water, +/area/station/security/prison) "nTO" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -49533,6 +49824,17 @@ /obj/structure/grille, /turf/open/space/basic, /area/space/nearstation) +"oFR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/stone, +/area/station/service/bar) "oGX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/burgerstation/odd, @@ -49644,10 +49946,13 @@ /obj/structure/table, /obj/effect/spawner/random/engineering/tool{ pixel_y = 6; - pixel_x = 1 + pixel_x = 7 }, /obj/item/poster/random_official, /obj/machinery/airalarm/directional/south, +/obj/effect/spawner/random/engineering/tool{ + pixel_x = -7 + }, /turf/open/floor/iron/dark, /area/station/security/mechbay) "oNd" = ( @@ -49912,10 +50217,11 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "oXU" = ( -/obj/structure/closet/secure_closet/chief_medical, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/item/circuitboard/machine/fat_sucker, +/obj/structure/closet/secure_closet/chief_medical, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/cmo) "oYb" = ( @@ -50601,6 +50907,10 @@ dir = 10 }, /area/station/science/research) +"pxR" = ( +/obj/effect/turf_decal/loading_area/white, +/turf/open/floor/wood/large, +/area/station/service/bar) "pxV" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -50991,6 +51301,10 @@ dir = 5; id = "garbage" }, +/obj/machinery/camera/directional/west{ + network = list("ss13","trash"); + c_tag = "Disposal" + }, /turf/open/floor/plating, /area/station/maintenance/disposal) "pLA" = ( @@ -51047,7 +51361,10 @@ /turf/open/floor/iron/dark, /area/station/security/prison) "pOz" = ( -/obj/machinery/camera/directional/east, +/obj/machinery/camera/directional/east{ + network = list("ss13","engine"); + c_tag = "Atmospherics HFR Room" + }, /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 }, @@ -51198,6 +51515,20 @@ }, /turf/open/floor/iron/smooth_half, /area/station/engineering/main) +"pRx" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/pdas{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/storage/box/silver_ids{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/storage/box/ids, +/obj/item/storage/briefcase/secure, +/turf/open/floor/iron, +/area/station/command/bridge) "pSb" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ @@ -51208,7 +51539,10 @@ /area/station/medical/virology) "pSg" = ( /obj/effect/landmark/start/hangover, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, /area/station/service/bar) "pSk" = ( /turf/closed/wall, @@ -51437,8 +51771,12 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "qbv" = ( -/obj/machinery/jukebox, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/stone, /area/station/service/bar) "qby" = ( /obj/machinery/light/directional/south, @@ -51791,6 +52129,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/dark_blue/filled/warning, +/obj/item/stamp/law, /turf/open/floor/iron/dark, /area/station/security/processing) "qqr" = ( @@ -52593,6 +52932,11 @@ }, /turf/open/floor/engine, /area/station/science/cytology) +"qRE" = ( +/obj/structure/table, +/obj/item/pai_card, +/turf/open/floor/wood, +/area/station/service/bar) "qSS" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron/white, @@ -52624,12 +52968,12 @@ /turf/open/floor/iron/dark/textured_large, /area/station/service/hydroponics) "qTr" = ( -/obj/item/food/burger/orange{ - desc = "Made by those abandoned by society."; - name = "prison burger" - }, -/turf/open/floor/plating, -/area/station/security/prison) +/obj/structure/bed, +/obj/structure/cable, +/obj/item/radio/intercom/prison/directional/north, +/obj/item/clothing/under/rank/prisoner/classic, +/turf/open/floor/iron, +/area/station/security/prison/safe) "qTC" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -52924,6 +53268,16 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) +"rbD" = ( +/obj/effect/turf_decal/siding/wood/corner, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/open/floor/stone, +/area/station/service/bar) "rbH" = ( /obj/machinery/camera/directional/west{ c_tag = "Atmospherics Central" @@ -53057,6 +53411,8 @@ /area/station/science/ordnance/storage) "rfY" = ( /obj/structure/flora/bush/sparsegrass, +/obj/effect/turf_decal/siding/wideplating_new/corner, +/obj/structure/railing/corner, /turf/open/floor/grass, /area/station/security/prison) "rgu" = ( @@ -53072,7 +53428,10 @@ "rgF" = ( /obj/effect/landmark/start/bouncer, /obj/structure/chair/stool/bar/directional/east, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/stone, /area/station/service/bar) "rgU" = ( /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, @@ -53277,6 +53636,12 @@ /obj/structure/plant_tank, /turf/open/floor/grass, /area/station/service/hydroponics) +"rqb" = ( +/obj/machinery/pollution_scrubber, +/obj/structure/chair/comfy/brown, +/obj/effect/landmark/start/hangover, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "rqi" = ( /turf/open/floor/wood, /area/station/command/heads_quarters/hop) @@ -53305,7 +53670,8 @@ /area/station/security/corrections_officer) "rqY" = ( /obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Cell 4" + c_tag = "Xenobiology Cell 4"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -54176,6 +54542,16 @@ }, /turf/open/floor/wood, /area/station/security/prison) +"rUy" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/turf/open/floor/stone, +/area/station/service/bar) "rVc" = ( /obj/structure/toilet{ dir = 4 @@ -54326,6 +54702,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison/safe) +"sbi" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/wood/parquet, +/area/station/service/bar) "sbQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -54431,11 +54813,8 @@ /obj/item/plant_analyzer, /obj/item/secateurs, /obj/item/secateurs, -/obj/item/wrench, -/obj/item/crowbar, /obj/item/storage/bag/plants, /obj/item/hatchet, -/obj/item/wirecutters, /obj/item/reagent_containers/cup/bucket, /obj/item/cultivator, /obj/item/cultivator, @@ -54448,6 +54827,11 @@ /obj/item/reagent_containers/cup/bucket{ pixel_x = -4 }, +/obj/item/wirecutters/makeshift, +/obj/item/fish_analyzer, +/obj/item/fishing_hook/magnet, +/obj/item/fishing_line/bouncy, +/obj/item/fishing_rod, /turf/open/floor/grass, /area/station/security/prison) "sfV" = ( @@ -54763,6 +55147,11 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/machinery/camera/directional/east{ + c_tag = "Security - Isolation Cell"; + network = list("ss13","prison","Isolation"); + view_range = 5 + }, /turf/open/floor/mineral/titanium/tiled/white{ name = "Padded tile" }, @@ -54796,10 +55185,6 @@ id = "briggate"; name = "Security Shutters" }, -/obj/machinery/computer/security/telescreen/normal/directional/north{ - desc = "Used to access the various cameras on the station."; - name = "Security Camera Monitor" - }, /obj/machinery/door/window/right/directional/south{ req_access = list("brig"); name = "Brig Desk" @@ -54850,7 +55235,8 @@ }, /obj/structure/disposaloutlet, /obj/machinery/camera/directional/west{ - c_tag = "Xenobiology Cell 5" + c_tag = "Xenobiology Cell 5"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -55378,6 +55764,36 @@ }, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/storage/part_replacer, +/obj/item/circuitboard/machine/telecomms/receiver, +/obj/item/circuitboard/machine/telecomms/broadcaster, +/obj/item/circuitboard/machine/telecomms/hub, +/obj/item/circuitboard/machine/telecomms/processor, +/obj/item/circuitboard/machine/telecomms/bus, /turf/open/floor/iron, /area/station/tcommsat/computer) "sOI" = ( @@ -55407,6 +55823,13 @@ /obj/structure/mirror/directional/east, /turf/open/floor/iron/freezer, /area/station/maintenance/starboard/fore) +"sPj" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/siding/wood/end{ + dir = 8 + }, +/turf/open/floor/stone, +/area/station/service/bar) "sPq" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -56248,12 +56671,13 @@ }, /area/station/security/prison/safe) "twl" = ( -/obj/machinery/door/poddoor/preopen{ - id = "barShutters"; - name = "Privacy Shutters" +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/bar, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2{ + dir = 6 }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, /area/station/service/bar) "twO" = ( /obj/effect/turf_decal/tile/dark_blue{ @@ -56732,7 +57156,10 @@ /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "tPg" = ( -/turf/open/floor/grass, +/obj/effect/turf_decal/siding/white{ + dir = 5 + }, +/turf/open/water, /area/station/security/prison) "tPr" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -56858,6 +57285,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"tTE" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "packageSort2" + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/plating, +/area/station/cargo/sorting) "tTF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/orange/visible, @@ -57776,6 +58211,16 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"uGq" = ( +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/vg_decals/department/hop{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "uGw" = ( /obj/structure/bed/double, /obj/item/bedsheet/ce/double, @@ -58346,6 +58791,11 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) +"vbq" = ( +/obj/machinery/newscaster/directional/west, +/obj/machinery/photocopier, +/turf/open/floor/wood, +/area/station/service/lawoffice) "vbw" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -58819,6 +59269,10 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay) +"vrk" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/turf/open/floor/iron/dark, +/area/station/service/bar) "vsA" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -59074,6 +59528,7 @@ dir = 4 }, /obj/structure/flora/bush/flowers_pp, +/obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/grass, /area/station/security/prison) "vCF" = ( @@ -59343,7 +59798,7 @@ dir = 1 }, /obj/effect/landmark/start/assistant, -/turf/open/floor/wood, +/turf/open/floor/wood/parquet, /area/station/service/bar) "vHR" = ( /obj/machinery/door/airlock{ @@ -59455,13 +59910,18 @@ /turf/open/floor/plating, /area/station/security/prison) "vLI" = ( -/obj/structure/beebox, +/obj/machinery/hydroponics/soil/soilbin, +/obj/item/toy/plush/beeplushie, /turf/open/floor/grass, /area/station/service/hydroponics) "vLX" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"vNt" = ( +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "vNL" = ( /obj/machinery/door/window/brigdoor/right/directional/west, /obj/effect/decal/cleanable/dirt, @@ -59482,11 +59942,11 @@ /turf/open/floor/wood, /area/station/maintenance/abandon_cafeteria) "vOt" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/tile/purple/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/iron, /area/station/hallway/primary/starboard) "vOC" = ( @@ -59499,11 +59959,21 @@ /turf/open/floor/iron, /area/station/security/prison/visit) "vOH" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, /obj/machinery/airalarm/directional/west, /obj/machinery/light/directional/west, +/obj/item/fish_feed, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/clothing/glasses/sunglasses, +/obj/item/clothing/glasses/sunglasses/big{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/briefcase/secure, +/obj/item/storage/briefcase{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/structure/closet/lawcloset, /turf/open/floor/wood, /area/station/service/lawoffice) "vOK" = ( @@ -59832,7 +60302,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/computer/security/telescreen/ordnance/directional/west, +/obj/machinery/computer/security/telescreen/ordnance/directional/east, /turf/open/floor/iron, /area/station/science/ordnance/bomb) "wed" = ( @@ -59908,7 +60378,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral, -/obj/machinery/newscaster/directional/south, +/obj/machinery/computer/security/telescreen/cargo_sec/directional/south, /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) "wfh" = ( @@ -59979,9 +60449,6 @@ /area/station/commons/dorms) "wik" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/item/storage/toolbox/fishing/small, -/obj/item/storage/toolbox/fishing/small, -/obj/item/storage/toolbox/fishing/small, /turf/open/floor/plating, /area/station/security/prison) "wiW" = ( @@ -60212,6 +60679,15 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/science/explab) +"wrY" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/iron, +/area/station/commons/locker) "wso" = ( /obj/machinery/light/small/directional/south, /obj/structure/mirror{ @@ -60282,7 +60758,8 @@ /area/station/command/heads_quarters/ce) "wuD" = ( /obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Cell 3" + c_tag = "Xenobiology Cell 3"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -60698,6 +61175,11 @@ "wIx" = ( /obj/machinery/keycard_auth/directional/west, /obj/machinery/pdapainter/supply, +/obj/machinery/computer/security/telescreen/cargo/directional/north, +/obj/machinery/camera/directional/west{ + c_tag = "Quartermaster's Office"; + network = list("ss13","cargo") + }, /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/qm) "wIK" = ( @@ -61398,7 +61880,7 @@ name = "Service Hall" }, /obj/effect/mapping_helpers/airlock/access/all/service/general, -/turf/open/floor/wood, +/turf/open/floor/stone, /area/station/hallway/secondary/service) "xgf" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ @@ -61502,6 +61984,8 @@ /area/station/construction) "xhX" = ( /obj/structure/flora/bush/leafy, +/obj/effect/turf_decal/siding/wideplating_new, +/obj/structure/railing, /turf/open/floor/grass, /area/station/security/prison) "xiy" = ( @@ -61741,6 +62225,9 @@ /obj/item/toy/cards/deck{ pixel_y = 4 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /turf/open/floor/wood, /area/station/service/bar) "xqs" = ( @@ -61835,7 +62322,6 @@ /turf/open/floor/iron/dark/textured_large, /area/station/cargo/miningdock) "xtO" = ( -/obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/rank/centcom/officer, /obj/item/clothing/under/rank/centcom/officer_skirt, /obj/item/clothing/under/rank/centcom/intern, @@ -61849,6 +62335,8 @@ /obj/item/clothing/suit/armor/centcom_formal/nt_consultant, /obj/item/clothing/suit/armor/centcom_formal, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/item/clothing/head/hats/warden/drill/nanotrasen, +/obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/nt_rep) "xuc" = ( @@ -61969,7 +62457,8 @@ /area/station/maintenance/disposal) "xyR" = ( /obj/machinery/camera/directional/east{ - c_tag = "Xenobiology Cell 1" + c_tag = "Xenobiology Cell 1"; + network = list("ss13","xeno") }, /turf/open/floor/engine, /area/station/science/xenobiology) @@ -62017,12 +62506,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/storage) -"xAH" = ( -/obj/structure/chair/comfy/brown{ - dir = 4 - }, -/obj/effect/landmark/start/assistant, +"xAG" = ( +/obj/structure/sink/directional/south, /turf/open/floor/wood, +/area/station/security/prison) +"xAH" = ( +/turf/open/floor/wood/parquet, /area/station/service/bar) "xBJ" = ( /obj/structure/cable, @@ -62202,7 +62691,10 @@ "xJJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, /area/station/service/bar) "xKb" = ( /obj/machinery/atmospherics/components/unary/portables_connector/layer4{ @@ -62374,10 +62866,11 @@ /turf/open/floor/wood, /area/station/security/prison) "xPm" = ( -/obj/structure/closet/secure_closet/nanotrasen_consultant, /obj/item/clothing/accessory/medal/gold/ordom, /obj/item/clothing/accessory/medal/gold/nanotrasen_consultant, /obj/item/clothing/accessory/medal/silver/bureaucracy, +/obj/item/storage/briefcase/central_command, +/obj/structure/closet/secure_closet/nanotrasen_consultant, /turf/open/floor/carpet/royalblack, /area/station/command/heads_quarters/nt_rep) "xPq" = ( @@ -62700,6 +63193,18 @@ /obj/machinery/computer/mecha, /turf/open/floor/carpet, /area/station/command/heads_quarters/rd) +"xYM" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/turf/open/floor/stone, +/area/station/service/bar) "xZn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -76126,7 +76631,7 @@ beO beO beO beO -xzh +aNF xzh xzh xzh @@ -80991,7 +81496,7 @@ aLE avJ aOp aPA -aQR +aQV axi aTz aTz @@ -82019,7 +82524,7 @@ aLE avJ aOl aPE -aQV +aQR axy aSi aQN @@ -82217,13 +82722,13 @@ aaJ ikZ rTk abz -ikZ +qTr oLv abz jYu iBu abz -ikZ +qTr oLv abz ikZ @@ -82510,7 +83015,7 @@ xzh ali anK ali -uRx +nQv xzh alU alU @@ -82541,7 +83046,7 @@ nJN nmV szO vpS -vpS +wrY bbs aPA kYP @@ -82767,7 +83272,7 @@ xzh alU amC alU -uRx +nQv xzh xzh uRx @@ -83281,7 +83786,7 @@ xzh ali amC ali -lwn +bTe uRx xzh xzh @@ -85291,7 +85796,7 @@ bJc sUX aai xFA -qTr +hnO wOx acd acd @@ -86399,7 +86904,7 @@ mjF bcH jwX avD -aZH +tTE bnL cNJ cNJ @@ -88169,8 +88674,8 @@ dFo dFo dFo dFo +dFo aNS -aze axt jtw aph @@ -88210,7 +88715,7 @@ bqw aJq aJq aYl -aKF +uGq oXL lfF ova @@ -88382,7 +88887,7 @@ jgi vDw hXx riN -tPg +cZy eFj acd kZJ @@ -88425,8 +88930,8 @@ dFo air aqY vOH +vbq dFo -arP aqR btX bwI @@ -88895,8 +89400,8 @@ aai ulw cer qMW -tPg -cZy +aze +nTG lyz acd hXd @@ -89146,15 +89651,15 @@ sUX bJc xzh aai -hhR +nLX mam aai -ulw +xAG pmM nNA xhX tPg -lyz +mPx acd vJW sCd @@ -90757,8 +91262,8 @@ aJq gSY aOE aPT +pRx aRj -aSv aTV aVl aWP @@ -94343,7 +94848,7 @@ atj azc azc atj -aAX +aSv azc qgF aFe @@ -96921,13 +97426,13 @@ aGp aAh dlY avC -aKR +pxR adq aQb dPy aRu chR -aKR +aCG iYy aXi aPZ @@ -97178,19 +97683,19 @@ xfZ aAh aAh aAh -aKR +sPj aKI rFQ aPY xXl aRx -aKR +aCG iKp rFQ aPY aZZ aJC -aYV +vNt iKz aYV bfF @@ -97435,19 +97940,19 @@ aGD aHZ aCr aKJ -aKR -pSg -aVw +rUy +npz +aeG xqe aQd aRx -aKR +aCG nhI aVw -aPZ +qRE bac aJC -aYV +hXL iKz aYV bfF @@ -97691,20 +98196,20 @@ aFj aGr aHI aJk -aKR -aKR -aNt -aKR -aKR -aKR -aKR -aKR -aKR -aKR -aKR +pxR +aOJ +xYM +rbD +moN +moN +moN +drV +bwS +moN +moN bab -aJC -ado +aQg +aYV iKz ber bfF @@ -97949,19 +98454,19 @@ xNR aHK aCr aKr -aKR +vrk bHF -dfp +qbv xAH -aKR -aSo -clX +jnq +sbi +qbv aVx dfp -aKR -aKR +xAH +eJQ bbx -aYV +alu iKz aYV bfF @@ -98204,21 +98709,21 @@ aCr vmC aCr aCr -aCr +kfR aKq aSo -aNF +aNH nah -aKN +rqb iHH -aSG -aKR +fTS +clX aUg cTP aRw -aKR +ntB twl -alu +aDe dCL bes bfF @@ -98463,19 +98968,19 @@ aGz aIb aJC aKN -aSG +aSo aNH -aOJ -aSq -aKR -aSG -aKR +nah +lno +ado +fTS +nah aUg bFC vHL aAR -aCG -aDe +bby +aYV oOF bet bfH @@ -98720,18 +99225,18 @@ aGy aIa aJC epT -aSG +jgc aNH -aKR -aKR -aKR +qbv +xAH +aSq aSG qbv -aKR +xAH aSq aNt bad -bby +aJC uly ilO bet @@ -98979,16 +99484,16 @@ xge aKP aMx aNJ -xJJ +oFR xJJ xJJ axz -xJJ +oFR xJJ xJJ aXO aZb -aJC +bbx hXL iKz bet @@ -99237,16 +99742,16 @@ aKO aMC aNI eIf -aKR +bwS rgF acN lcd kmD -aKR +bwS pSg bah -twl -bcr +dlW +aYV iKz bet bvk @@ -99500,9 +100005,9 @@ aVy aSY juQ bnd -aKR -bah -twl +kcx +iqu +aQg aYV cTQ amJ @@ -100014,10 +100519,10 @@ aSF aQc leX nRz -aKR +eOm bai aJC -aYV +bcr iKz bet bfH @@ -100271,7 +100776,7 @@ aQc aac aQc aXk -aAR +fNG aBJ aJC hLC @@ -100776,7 +101281,7 @@ tve aIg lNN aKR -aKR +nJF aJC aOP aJI