diff --git a/GainStation13/code/structures/chair.dm b/GainStation13/code/structures/chair.dm index 4a27a016c1..b139dffbbb 100644 --- a/GainStation13/code/structures/chair.dm +++ b/GainStation13/code/structures/chair.dm @@ -70,3 +70,20 @@ name = "GATO beanbag chair" desc = "A comfy beanbag chair. This one seems to a super duper cutesy GATO mascot." icon_state = "beanbag_gato" + + +//beanbag chair colors +/obj/structure/chair/beanbag/red + color = "#8b2e2e" + +/obj/structure/chair/beanbag/blue + color = "#345bbc" + +/obj/structure/chair/beanbag/green + color = "#76da4b" + +/obj/structure/chair/beanbag/purple + color = "#a83acf" + +/obj/structure/chair/beanbag/black + color = "#404040" diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 74af32021e..42d87aba9e 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -122,7 +122,7 @@ "acr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/plasteel/dark,/area/security/prison/upper) "acs" = (/obj/structure/table/reinforced,/obj/item/storage/box/firingpins{pixel_x = 6},/obj/item/storage/box/firingpins{pixel_x = -3},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory) "act" = (/obj/structure/table/reinforced,/obj/item/storage/box/chemimp{pixel_x = 6},/obj/item/storage/box/trackimp{pixel_x = -3},/obj/item/storage/lockbox/loyalty,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory) -"acu" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory) +"acu" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/structure/chair/beanbag/red,/obj/structure/chair/beanbag/red,/obj/structure/chair/beanbag/red,/obj/structure/chair/beanbag/red,/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory) "acv" = (/obj/vehicle/ridden/secway,/obj/item/key/security,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 4},/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory) "acw" = (/obj/structure/rack,/obj/item/gun/energy/ionrifle,/obj/item/gun/energy/temperature/security,/obj/item/clothing/suit/armor/laserproof,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 4},/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory) "acx" = (/obj/structure/closet/secure_closet/contraband/armory,/obj/effect/spawner/lootdrop/maintenance{lootcount = 8; name = "8maintenance loot spawner"},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/blue{dir = 1},/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue,/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory) @@ -950,8 +950,8 @@ "asq" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/turf/open/floor/wood,/area/service/lawoffice) "asr" = (/obj/structure/chair/office/dark,/obj/effect/landmark/start/lawyer,/turf/open/floor/wood,/area/service/lawoffice) "ass" = (/obj/machinery/light{dir = 4},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/fore) -"ast" = (/obj/structure/chair/stool{pixel_y = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 4},/turf/open/floor/carpet,/area/commons/dorms) -"asu" = (/obj/effect/landmark/xeno_spawn,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/carpet,/area/commons/dorms) +"ast" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 4},/obj/structure/chair/beanbag/red,/turf/open/floor/carpet,/area/commons/dorms) +"asu" = (/obj/effect/landmark/xeno_spawn,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/carpet/gato,/area/commons/dorms) "asv" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/carpet,/area/commons/dorms) "asw" = (/obj/machinery/light{dir = 8},/obj/structure/chair/sofa{color = "#c45c57"; dir = 4},/turf/open/floor/carpet,/area/crew_quarters/fitness) "asx" = (/obj/machinery/airalarm{pixel_y = 23},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/vending/autodrobe,/turf/open/floor/plasteel,/area/commons/dorms) @@ -1053,7 +1053,7 @@ "auq" = (/obj/machinery/power/apc{areastring = "/area/lawoffice"; dir = 1; name = "Law Office APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plating,/area/service/lawoffice) "aur" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/structure/cable{icon_state = "1-2"},/obj/effect/turf_decal/tile/red{dir = 1},/turf/open/floor/plasteel,/area/hallway/primary/fore) "aus" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/fore) -"aut" = (/obj/structure/bed,/obj/machinery/airalarm{pixel_y = 23},/obj/machinery/button/door{id = "Dorm3"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/effect/spawner/lootdrop/bedsheet,/turf/open/floor/carpet,/area/commons/dorms) +"aut" = (/obj/structure/bed,/obj/machinery/airalarm{pixel_y = 23},/obj/machinery/button/door{id = "Dorm3"; name = "Dorm Bolt Control"; normaldoorcontrol = 1; pixel_x = 25; specialfunctions = 4},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/item/bedsheet/gato,/turf/open/floor/carpet/gato,/area/commons/dorms) "auu" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/structure/closet/secure_closet/personal/cabinet,/turf/open/floor/wood,/area/commons/dorms) "auv" = (/obj/item/toy/poolnoodle/blue,/obj/structure/table,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/machinery/light{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness) "auw" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/structure/closet/wardrobe/pjs,/turf/open/floor/plasteel,/area/commons/dorms) @@ -1806,7 +1806,7 @@ "aIY" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/turf/open/floor/plasteel/cafeteria,/area/service/theater) "aIZ" = (/obj/structure/closet/secure_closet/freezer/cream_pie,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 1},/obj/machinery/airalarm{dir = 4; pixel_x = -22},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/turf/open/floor/plasteel,/area/service/theater) "aJa" = (/turf/open/floor/carpet/black,/area/hallway/primary/central) -"aJb" = (/obj/structure/chair/stool/bar,/turf/open/floor/carpet/black,/area/hallway/primary/central) +"aJb" = (/obj/structure/chair/beanbag/blue,/turf/open/floor/carpet/black,/area/hallway/primary/central) "aJc" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/effect/turf_decal/tile/blue{dir = 8},/obj/effect/landmark/start/clown,/turf/open/floor/plasteel,/area/service/theater) "aJd" = (/turf/closed/wall,/area/service/bar) "aJe" = (/obj/machinery/light{light_color = "#cee5d2"},/obj/effect/turf_decal/loading_area{icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/dark,/area/service/bar) @@ -1822,10 +1822,10 @@ "aJo" = (/obj/structure/table,/obj/machinery/reagentgrinder,/turf/open/floor/plasteel,/area/service/hydroponics) "aJp" = (/obj/structure/table,/obj/item/book/manual/hydroponics_pod_people,/obj/item/paper/guides/jobs/hydroponics,/obj/item/reagent_containers/glass/bottle/mutagen,/obj/item/reagent_containers/glass/bottle/mutagen,/obj/item/reagent_containers/glass/bottle/mutagen,/turf/open/floor/plasteel,/area/service/hydroponics) "aJq" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/turf/open/floor/wood,/area/service/library) -"aJr" = (/obj/structure/chair/office/dark{dir = 4},/turf/open/floor/carpet,/area/service/library) +"aJr" = (/obj/structure/chair/beanbag,/turf/open/floor/carpet,/area/service/library) "aJs" = (/obj/structure/table/wood,/obj/item/folder/yellow,/obj/item/pen,/turf/open/floor/carpet,/area/service/library) "aJt" = (/obj/structure/table/wood,/obj/structure/disposalpipe/segment,/turf/open/floor/carpet,/area/service/library) -"aJu" = (/obj/structure/chair/office/dark{dir = 8},/turf/open/floor/carpet,/area/service/library) +"aJu" = (/obj/structure/chair/beanbag/red{dir = 8},/turf/open/floor/carpet,/area/service/library) "aJv" = (/obj/machinery/newscaster{pixel_x = 30},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/turf/open/floor/wood,/area/service/library) "aJw" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 8},/turf/open/floor/plasteel/dark,/area/service/chapel/main) "aJx" = (/obj/structure/disposalpipe/segment,/obj/machinery/button/crematorium{id = "crematoriumChapel"; pixel_x = 25; req_access_txt = "27"},/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/dark,/area/service/chapel/main) @@ -1890,8 +1890,8 @@ "aKF" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel,/area/service/hydroponics) "aKG" = (/obj/structure/table,/obj/item/reagent_containers/spray/plantbgone{pixel_y = 3},/obj/item/reagent_containers/spray/plantbgone{pixel_x = 8; pixel_y = 8},/obj/item/reagent_containers/spray/plantbgone{pixel_x = 13; pixel_y = 5},/obj/item/watertank,/turf/open/floor/plasteel,/area/service/hydroponics) "aKH" = (/obj/machinery/airalarm{dir = 4; pixel_x = -22},/obj/machinery/light{dir = 8},/turf/open/floor/wood,/area/service/library) -"aKI" = (/obj/machinery/camera{c_tag = "Library North"},/obj/structure/chair/office/dark,/turf/open/floor/carpet,/area/service/library) -"aKJ" = (/obj/structure/chair/office/dark,/obj/effect/landmark/start/assistant,/turf/open/floor/carpet,/area/service/library) +"aKI" = (/obj/machinery/camera{c_tag = "Library North"},/obj/structure/chair/beanbag/green,/turf/open/floor/carpet,/area/service/library) +"aKJ" = (/obj/effect/landmark/start/assistant,/obj/structure/chair/beanbag/purple{dir = 8},/turf/open/floor/carpet,/area/service/library) "aKK" = (/obj/machinery/light{dir = 4},/turf/open/floor/wood,/area/service/library) "aKL" = (/obj/machinery/airalarm{dir = 4; pixel_x = -22},/obj/machinery/camera{c_tag = "Chapel Crematorium"; dir = 4},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/turf/open/floor/plasteel/dark,/area/service/chapel/main) "aKM" = (/obj/structure/disposalpipe/segment{dir = 5},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 8},/turf/open/floor/plasteel/dark,/area/service/chapel/main) @@ -1974,7 +1974,7 @@ "aMn" = (/obj/structure/disposalpipe/segment{dir = 10},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/service/hydroponics) "aMo" = (/obj/machinery/chem_master/condimaster,/turf/open/floor/plasteel,/area/service/hydroponics) "aMp" = (/turf/open/floor/wood,/area/service/library) -"aMq" = (/obj/structure/chair/office/dark{dir = 1},/turf/open/floor/carpet,/area/service/library) +"aMq" = (/obj/structure/chair/beanbag/red,/turf/open/floor/wood,/area/maintenance/bar) "aMr" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/wood,/area/service/library) "aMs" = (/obj/structure/bodycontainer/morgue,/turf/open/floor/plasteel/dark,/area/service/chapel/main) "aMt" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/turf/open/floor/plasteel/dark,/area/service/chapel/main) @@ -2040,7 +2040,7 @@ "aNB" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/public/glass{name = "Hydroponics"; req_access_txt = "35"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/service/hydroponics) "aNC" = (/obj/machinery/bookbinder,/turf/open/floor/wood,/area/service/library) "aND" = (/obj/structure/chair/comfy/black{dir = 8},/obj/structure/sign/painting/library{pixel_y = -32},/turf/open/floor/wood,/area/service/library) -"aNE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/chair/office/dark{dir = 4},/turf/open/floor/carpet,/area/service/library) +"aNE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/structure/chair/beanbag/blue,/turf/open/floor/carpet,/area/service/library) "aNF" = (/obj/machinery/door/airlock/public/glass{name = "Chapel Office"; req_access_txt = "22"},/turf/open/floor/plasteel/dark,/area/service/chapel/main) "aNG" = (/obj/machinery/door/morgue{name = "Confession Booth (Chaplain)"; req_access_txt = "22"},/turf/open/floor/plasteel/dark,/area/service/chapel/main) "aNH" = (/obj/item/radio/intercom{broadcasting = 1; frequency = 1480; name = "Confessional Intercom"; pixel_x = 25},/obj/structure/chair,/turf/open/floor/plasteel/dark,/area/service/chapel/main) @@ -2756,7 +2756,7 @@ "bbY" = (/obj/machinery/door/firedoor,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central) "bbZ" = (/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central) "bca" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/starboard) -"bcb" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/chair/office/dark{dir = 8},/turf/open/floor/carpet,/area/service/library) +"bcb" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/chair/beanbag/black{dir = 8},/turf/open/floor/carpet,/area/service/library) "bcc" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "bcd" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "bce" = (/obj/machinery/light_switch{pixel_y = 28},/obj/machinery/light{dir = 1; pixel_y = 16},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/wood,/area/command/meeting_room) @@ -3215,7 +3215,7 @@ "bkU" = (/obj/structure/flora/ausbushes/ywflowers,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/turf/open/floor/grass,/area/hallway/primary/central) "bkV" = (/obj/structure/flora/ausbushes/fullgrass,/obj/structure/flora/ausbushes/ppflowers,/obj/structure/window/reinforced,/turf/open/floor/grass,/area/hallway/primary/central) "bkW" = (/obj/structure/flora/ausbushes/grassybush,/obj/structure/flora/ausbushes/sunnybush,/obj/structure/window/reinforced,/turf/open/floor/grass,/area/hallway/primary/central) -"bkX" = (/obj/structure/disposalpipe/segment,/obj/structure/chair/office/dark{dir = 1},/turf/open/floor/carpet,/area/service/library) +"bkX" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 4},/obj/structure/chair/beanbag/gato,/turf/open/floor/carpet/gato,/area/commons/dorms) "bkY" = (/obj/effect/turf_decal/stripes/line{dir = 1},/obj/structure/table,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/hallway/secondary/exit) "bkZ" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/port) "bla" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/port) @@ -7203,7 +7203,9 @@ "djA" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/dark,/area/security/brig) "djR" = (/obj/effect/turf_decal/bot,/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central7"},/turf/open/floor/plasteel,/area/cargo/storage) "dkI" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/closet/secure_closet/brig{id = "Cell 3"; name = "Cell 3 Locker"},/obj/structure/cable{icon_state = "1-4"},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/turf/open/floor/plasteel,/area/security/brig) +"dlh" = (/obj/structure/chair/beanbag/red{dir = 1},/turf/open/floor/wood,/area/maintenance/bar) "dmF" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel/dark,/area/maintenance/starboard/aft) +"dqN" = (/obj/structure/chair/beanbag/purple{dir = 8},/turf/open/floor/carpet/black,/area/hallway/primary/central) "dqT" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/dark/side{dir = 4},/area/security/prison/upper) "dtz" = (/obj/structure/disposalpipe/segment{dir = 6},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/security/office) "duz" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/public{name = "Small Sauna #2 Bolts"; id_tag = "small_sauna_2"},/turf/open/floor/wood,/area/crew_quarters/fitness/sauna) @@ -7372,6 +7374,7 @@ "jts" = (/turf/open/floor/wood,/area/maintenance/port/fore) "jtZ" = (/obj/structure/closet/secure_closet/personal,/turf/open/floor/plasteel/dark/side{dir = 10},/area/crew_quarters/fitness/sauna) "juX" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/effect/turf_decal/stripes/corner{dir = 8},/turf/open/floor/plasteel,/area/hallway/secondary/entry) +"jvI" = (/obj/structure/table,/obj/machinery/light/small{dir = 8},/obj/item/book/lorebooks/welcome_to_gato,/turf/open/floor/carpet/gato,/area/commons/dorms) "jxw" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel,/area/security/brig) "jxX" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 10},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plating,/area/maintenance/fore/secondary) "jyS" = (/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central4"},/turf/open/floor/plasteel/yellowsiding{dir = 1},/area/crew_quarters/fitness) @@ -7548,6 +7551,7 @@ "pFC" = (/obj/structure/lattice,/obj/structure/grille,/obj/structure/grille/broken,/turf/open/space/basic,/area/space/nearstation) "pHs" = (/obj/structure/bed,/obj/effect/spawner/lootdrop/bedsheet,/obj/structure/mirror{pixel_y = 28; pixel_x = -3},/obj/item/restraints/handcuffs/fake/kinky,/turf/open/floor/wood,/area/maintenance/port/fore) "pNo" = (/obj/machinery/computer/security,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel/dark,/area/security/brig) +"pRY" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/carpet/gato,/area/commons/dorms) "pSh" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/closed/wall/r_wall,/area/security/execution/transfer) "pSx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/closed/wall/r_wall,/area/security/execution/transfer) "pTZ" = (/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 4},/turf/open/floor/plasteel,/area/security/prison/upper) @@ -7767,6 +7771,7 @@ "xiB" = (/obj/effect/landmark/start/warden,/turf/open/floor/plasteel/showroomfloor,/area/security/warden) "xkX" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel/dark,/area/maintenance/port/aft) "xlw" = (/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/landmark/start/prisoner,/obj/machinery/button/door{id = "permacells1"; name = "Privacy Shutters"; pixel_x = 25},/turf/open/floor/plasteel/dark,/area/security/prison/cells) +"xme" = (/obj/structure/closet/secure_closet/personal,/turf/open/floor/carpet/gato,/area/commons/dorms) "xmo" = (/obj/structure/sign/plaques/golden{pixel_y = 32},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/ai_monitored/security/armory) "xnZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/medical/glass{name = "Prison Forestry"; dir = 4},/turf/open/floor/plasteel/dark,/area/security/prison/upper) "xov" = (/obj/machinery/light{dir = 4},/turf/open/floor/grass,/area/security/courtroom) @@ -7899,8 +7904,8 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadamJanjanjanjanjanjanjanjanjanjaotaouaovaowamJaadaaeaaealzalzalzaoxaoyaozalzaaaaaaalzamianOanmamiaoAalzaadaadaadaaFaadaadaadaaFaaFalzamialzatJaaaaaaaaaaaaaaaaaaaaaaaaarjarjarjarjarjarjarjaoGaoHaoHaoHaoIaoHaoHaoHaoJaoKaoKaoKaoLaoKaoKaoMaoNaoOaoPanGaoQanGanGanGanGaoRanGaoSaoSaoSaoSaoTaoUaoVaoWaoXaoXaoYaoZaqGbjqbjeauDbjebjoaszarLaGharEarFjySarFarGarFbjrasBbiOaaaaaeaaeaaeaaaanIapdapeapfanIapgapgapgapgapgalualualualtaphsMlaosaltaltamIaltaltaltaltapialtaltaadmTUcsjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadamJanjanjanjanjanjanjanjanjanjanMapjapkaplamJaadalzapmalzapnapoamiappamialzakTakTalzapqanOanmapqalzalzalzaUtaUtaUtalzalzalzalzalzalzlotalzatJaaaaaaaaaaaaaaaaaaaaaaaaarjaqsaqsarjapsaqsadaaptaoHapuapvapwapxapwaoHapyaoKapzapAapBapCaoKamYanbapDapEapFapGapGapGapGapGapHapIapGapGapGapGapGapJapKapLapMapNapObjsaqGbjtbjebjubjvbjwbjxbjybjzbjybjybjAbjBbjCbjDbjDbjEbiOaadaluapValuapganIanIapWapXanIapYamIamIapZaltaqaamIaqbaltaqcamIamIaqdaltamIaltaqeaqfaltamIaqgaltatJaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadamJanjanjanjanjaqhanjanjanjaqiaqjapjapkaqkamJaadalzamialzaqlaqmanQaqnaqoalzaoEamiaqpbjaanOaqqamiamialzqmggzPwXUaDVawCalzxZrcgXvBbalzamiakTatJaaaaaaaaaaaaaaaaaaaaaaaaarjaqsaqsarjaqtaquarjaqvaoHaqwaqxaqyapwapwaoHapyaoKaqzapBaqAaqBaqCamYanbandapEaiEaomaomaomaomaomaqEaqFaomaomaomaomaomaomaomaomaomasGaqGaqIaqGatIayGbjFatIavMayHayHaEXayHayHaRiaJgaqGaqGaqGaqGaqGaaaaqLamIaluapgaqMaqNaqOaqPamIamIamIaltamIaltaqQamIamIaltamIaqRaqSaqTapiamIaltaqUaqValtbjGapZaltatJatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadamJanjanjanjanjanjanjanjanjanjanMaqWapkaqXamJalzalzaqYalzalzalzamPaqZaraaraarbarcardarcarearfargarhalzcgYaXhaXhaXhaXhlwTarielTarialzamiakTatJaaaaaaaaaaaaaaaaaaaaaarjarjaqsarjarjarjarjarjcpFaoHarkarlarmapwarnaoHapyaroarparqarrarsaqCamYanbartapEaiEaomaruarvautarxaryasxaomatBatCatGaomatHauuayzaomeKJaqGbjHauFauFauFauGauHaqJaqKaqKaqKaqKaqKaqJapRaEYbjIaadaadaadaadaluarNaluapgarOamImnybjJaoramIaltaltarQaltaltarRaltaltaqTarSarTamIaltamIarUarUarUarUarUarUarUarUarUatJatJatJatJatJfRxatJaaaaaaaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadamJanjanjanjanjanjanjanjanjanjanMarWapkarXamJarYarZasaasbasbasbasbasbasbascasdasealzalzalzalzamialzalztnQaXhaXhaXhuypalzalzalzalzalzamiakTatJaaaaaaaaaaaaaaaaadaadarjashasiarjasjaskaslarjcpFaoHapxasmapxasnapwaoHasoaspasqapBasrbjKaqCamYanbassapEaiEaomastasuasvavxattatuaomavyavAavBaomavyavCbjLaomavDaqGbjMavFapRayFavHavIaqJaqKaqKaqKaqKaqKaqJapRayDbjIaaaaaaaaaaaaaluamIapYapgasMaqTmnyamIasNasOasPapiamIamIamIamIamIamIamIarSasQamIatOamIarUasSasTasUarUasVasWasXarUlHkaaaaoBaoBaoBiWgaoBaoBaoBaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadamJanjanjanjanjanjanjanjanjanjanMaqWapkaqXamJalzalzaqYalzalzalzamPaqZaraaraarbarcardarcarearfargarhalzcgYaXhaXhaXhaXhlwTarielTarialzamiakTatJaaaaaaaaaaaaaaaaaaaaaarjarjaqsarjarjarjarjarjcpFaoHarkarlarmapwarnaoHapyaroarparqarrarsaqCamYanbartapEaiEaomjvIxmeautarxaryasxaomatBatCatGaomatHauuayzaomeKJaqGbjHauFauFauFauGauHaqJaqKaqKaqKaqKaqKaqJapRaEYbjIaadaadaadaadaluarNaluapgarOamImnybjJaoramIaltaltarQaltaltarRaltaltaqTarSarTamIaltamIarUarUarUarUarUarUarUarUarUatJatJatJatJatJfRxatJaaaaaaaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadamJanjanjanjanjanjanjanjanjanjanMarWapkarXamJarYarZasaasbasbasbasbasbasbascasdasealzalzalzalzamialzalztnQaXhaXhaXhuypalzalzalzalzalzamiakTatJaaaaaaaaaaaaaaaaadaadarjashasiarjasjaskaslarjcpFaoHapxasmapxasnapwaoHasoaspasqapBasrbjKaqCamYanbassapEaiEaombkXasupRYavxattatuaomavyavAavBaomavyavCbjLaomavDaqGbjMavFapRayFavHavIaqJaqKaqKaqKaqKaqKaqJapRayDbjIaaaaaaaaaaaaaluamIapYapgasMaqTmnyamIasNasOasPapiamIamIamIamIamIamIamIarSasQamIatOamIarUasSasTasUarUasVasWasXarUlHkaaaaoBaoBaoBiWgaoBaoBaoBaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaamJanjanjanjanjanjanjanjanjanjanMarWasYasZamJamiamiataatbatcatcatcatcatcatcatdateatfaaFatgalzamiathalzalzatinJVatjalzalzfLFatkpHsalzamiakTatJaaaaaaaaaaaaaaaarjarjarjaqsaqsarjaqsaqsaqsarjcpFaoHapxatlatmatnapxaoHapyatoaoKatpatqatraoKatsanbandapEaiEaomaomaomaomaomatAauwaomavyavAavKaombjNavAavLaomeKJaqGawRawTawUawUawVawWasKaqKaqKaqKaqKaqKaqJapRaEZbjIatJatJatJaadaluamIbjOapgatLamIatMrcbrcbatNrcbrcbrcbatPamIamIamIbjJamIamIamIamIaltamIarUatQatRatRarUatSatTatUarUaadaaaaoBaoBaoBiWgaoBaoBaoBaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadamJanjanjanjanjanjanjanjanjanjanMatVatWatXamJatYbjPauaaubanRaucaudaueaufalzteyateaaFauhatfakTamiasfalzcRrrQDjtsjtsjtstbqauibaoaVEarjaqsarjaqraqrarjaaeaaeaaeaujaukaulaqsaqsarjarjaumarjarjcpFaoHaoHaunaoHauoaoHaoHaupauqaoKaoKaoKaoKaoKauranbausapEaiEaomaruarvaytarxauxauyaomaomawZaqFaomaomaxaaqFaomauBaqGaxcatDaxdaxdaxeaxfatEaqKaqKaqKaqKaqKatFasHaFaaqGaltaltaltaltaltamIaltapgapgapgapgapgapgapgapgapgaltauMauNaltaltaltaltaltaltaltaltamIauOarUatRatRauPauQatQauRarUatJaaaaoBaoBaoBiWgaoBaoBaoBaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraGRaNMatJatJatJatJauSamJamJamJamJamJamJamJamJamJamJamJauTauUamJamJauValzataauWamiauXauYamiamialzteyateauZaadauZalzamiavaalzavbavcrGXvkTvrRavdaveaveaveaviqKsavgampampaviavfavfavfavgaviavgavgavhavgavjavhavkavlavmavnefGavoefGavpavnavnavqavrefGavnefGavnavsavtavuavuavvavwaomastasvasvazyauzauAauCauEauIavzavGawSawXawYaxbaxgatIayBatDayCaxdaxeaxfatIaqKaqKaqKaqKaqKatIauKauLaqGaFTaFSaltasLaqcamIavNaltavOaosavPavQaoraltatLaoraltavRamIaltavSamIaltavTavUavVkDmkDmavWawxavYavZawaawbawcawdarUatJatJatJatJatJatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG @@ -7909,12 +7914,12 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaat byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRFatJbhrbanaaaaaaaaaaaaaaaaweayVaweayUaBcayUayWaxBaxBayXayUaBcayUayYayZazaazbalzataauWalzalzalzalzazcazcazdazeazcazcazcazcazcaugawsaveaveaveaveaveazfaxRaoEawEaBMaBqaBqabFawEaeXaHzazhaHHawEaIDayaaAAazjaABaBwaCWayaaybaznazoazpazpazqazrazpazpazpazsaztaztazuazvayqazwanbazxahfafmaomastasvasvaDoaBPaBQaDraEHaEHaDraBRaBSaDpaDsaDtaDuatIaDAaDBaDCaDDaDKaDNayIaqKaqKaqKaqKaqKayJaltaltaltamIamIaltaltayKazOazPayKapZmnyaltazQfHRpkvaltphKaltazSazTaltazUamIaltapiapiaIpazVapiarUazWayOazXazYazXayOazZarUaadaadatJaadaadiWgaadaoBaoBaoBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhrbclbhPatJatJatJatJauSaAaauSaAbaRJayUaAcaAdaAeaAfayUaRJaAbayUauSaAgaAhalzaAiaAjaAkaAkaAkaAlazcaAmaAnaAoaApaAqaAraAmazcaAsaAtaAujilaAvaAvaAvaAvaAwarYawEaHIaBqaICaIYawEaIZaJcaHzaJfawEavXayaaCXaABaACaABaCYayaaAEaAFaAGaAHaAIaAJaAKaALaAMaANaAOaAPayoayoayoaAQazwanbaARahfafmaomaomaomaomaomaDvaDwaDxaEDaEGaEIaEJazFazFazFazFazFaITaGbaGcaAXaITaILaILayJaqKaqKaqKaqKaqKayJaltapZamIamIbjJaltaAYayKaAZaBaayKamIarPaltsFHmtgfHRaOYiFMaltarPamIaltbjUamIaltaBbbjJhbrayMaqTarUarUarUarUarUarUarUarUarUaCwatJaaaaaaaaaatJaoBaoBaoBaoBaaaaaaaaaaaaaoBaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaaaaaaaaaaaaaaaaaaaaaaayUaQJayUayUayUayUayUayUaQJayUaaamJZaBdazbaBeaBfaBgaBeaBeaBeaBhazcaAmaBiaBjaBkaBlaBmaAmazcaBnaBoaBnaBnaBnaBnaBnaBnaBpaBnawEaJRaBqfGeaJSawEaJTaHzaJVaJWawEavXayaaCXaBwaBxazjaCYayaaqsaBzaydaBAaBBaBCaBDaBEaAPaBFaBGayoayoaBHayoaAQazwanbazxahfafmaomaFVaFWaFXbjVaFHaFYazFazFazFazFaGdazFaGoaGfaGfazFaGpaHxbjWbjXaHAaHCaHDayJaqKaqKaqKaqKaqKayJaltaBYaDLaBZaCaaltaltayKaCbaCcayKaCdaCealtaltaltaltaltaltaCfaCgaChaCiaCiaCiaCjaCkaClaCmaCnaCoaCpaCqaCraCsaCtaCuaCvaCwaCwaCwaadaadaadaadaadaadatJiWgiWgiWgatJatJatJiWgiWgiWgaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauSayWaCxaBeaCyaCzaCAaCBaCCaCDazcaAmaCEaCGaCHaCIaCGaAmazcaCJaCKaCLaCMaCNaCOaCPaCQaEjaEmawEawEawEaxTawEawEawEaKhawEawEawEavXayaaCZaDabjYbjZbkaayaaqsaDbaydaDcaDdaDeayoaDfaDgaDhaDiaDjaAQayqaDkayqazwanbazxahfafmaomaGgaFZaHuaHvaGaaGeaDqaHEaIXaYYaZgaYWbavbcwaHLazFaHNaHObjWbjXaJaaJbaJbaBVaBWaBWaBWaBWaBWaBXaltaBYaDLaDEaDFaDGaDHayKaDIaDJayKarPamIaltaaaaltaFUaGvaGxaGyaGAjekjekjekbkbjekaDPaDQaDRaDSaDTaDTaDTaDUaVqaDWaDXaDYaDZaEaaEbaaaatJaaaaaaatJaaaaaaaaaatJaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauSayWaCxaBeaCyaCzaCAaCBaCCaCDazcaAmaCEaCGaCHaCIaCGaAmazcaCJaCKaCLaCMaCNaCOaCPaCQaEjaEmawEawEawEaxTawEawEawEaKhawEawEawEavXayaaCZaDabjYbjZbkaayaaqsaDbaydaDcaDdaDeayoaDfaDgaDhaDiaDjaAQayqaDkayqazwanbazxahfafmaomaGgaFZaHuaHvaGaaGeaDqaHEaIXaYYaZgaYWbavbcwaHLazFaHNaHObjWbjXaJaaJbdqNaBVaBWaBWaBWaBWaBWaBXaltaBYaDLaDEaDFaDGaDHayKaDIaDJayKarPamIaltaaaaltaFUaGvaGxaGyaGAjekjekjekbkbjekaDPaDQaDRaDSaDTaDTaDTaDUaVqaDWaDXaDYaDZaEaaEbaaaatJaaaaaaatJaaaaaaaaaatJaaaaaaaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRFatJbhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUayWaEcaBeaEdaEeaEfaEgaEhaEiazcaFraFsaFwaFxaFsaFwaFxaEkaGVaGYaGZaHaaGZaGZaGZaGZaIuaGVawEaKiaKjaKkaKkaGjaHyaKkaKpaKrawEaxZayaaEraEsaEtaEuaEvayaaqsaEwaydaydaDiaExaEyaEzaEAaydaydayoayoayqaEBayqazwanbazxahfafmaomaGgaHtbczbdwazAaGlaEKaEKaEKbkcaEMaEKbghbghbgiazFaITaJnaLMaLUaLXaJjaMgaCiaCiaCiaCiaCiaCiaCiaCibkdaltaltaltaEPaltayKaEQaERaESaETaEUaEVaEWaEVaHwaHBaHVaHWaHXaFbaFbaFbaFbaFbaFdaFeaCwaCwaCwaCwaCwaCwaCwaFfaFgaFhaCwaCwaCwaadaadaadaadaadaadaadaadaadaadatJatJatJatJatJatJaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUayWaFiaBeaFjaFkaFlaFmaFnaFoazcaIzaYjbfNbgTbkeaCFaFqazcaIvaIwaFtaFuaElaElaElaFvaIxaIyawEaLcaLgaKkaLhaLkaLlaKkaLnaLoawEaFDayaaFEaFFaEtaFGaENayaaqsaFIayqaFJayoaFKaFLaFMayoaFNayqaFOaFPayqaFLayqaFQaoNaFRahfafmaombkfbkgbkhbjVaHGaHJazFbaubaKbkibkjazFazFazFazFazFaNoaNyaNIaNUaOdaOmaOwaOxaGiaGkjekjekjekjekaGmaGnaLWaOCaOCaRlbkkbklaSuaCnaGqaGraGsaGtaGuaGtaHYaGwaFbaHZaIaaKIaKJaOMaGBaFbaGCaGDaCwaGEaGFaGGaGHaGIaGJaGKaGLaGMaGNaGOaGPaaaatJaaaaaaatJaaaaaaaaaatJaaaaaaaaaatJaaaaaaiWgaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyKbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaGQayUayWbkmaBeaBeaGSaGTaGUaGTaBeazcazcazcazcazcazcaGWaGXazcaIAaIBaJUaJUaJUaQKaJUaJUbknbkoawEaLpaLxaKkaLkaLSaLkaKkaLTaLZawEaxZayaaHdaHeaHfaHgaHhayaaqsaHiayqaHjayoaHkaFLaHlayoaHmayqaAQaAQayqaHnayqaHoaHpaHqahfanDaomaomaomaomaomaHraHsazFazFazFbjmbkpbkqbkqaLYaMcazFaSwbbVaNuaSJaJdaTTaJdbkraJdaVmaJdaJdaJiaJibksaHKaVnaHMaNvaHKaNxaWJaWLaHPaHQaHRamIaHSaHSaHSaHTaIoaFbaMraNEaOzbagbcbbktaFbaIbaIcaCwaIdaIeaIfaIgaGIaIhaFfaFgaDYaIiaIjaGPaaaatJaaaaaaatJaaaaaaaaaatJaaaaaaaaaatJaaaaaaiWgaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUayWaxBaIraIlaImaIlaInbkuaLfbkuaLqaLvbkvbkwaxYaCFbkxazcbkybkzbkAbkBbkCbkDbkEbkFbkGbkHawEaMaaMbaKkaKkaKkaKkaKkaMNaMaawEavXayaaIEaIFaIGaFGaIHayaaqsapyayqaIIbjTaFLaFLaFLaIJaIKayqbkIbkJaHFaIMaINaIOaIPbkKbkLaISaIQbkMbkNaITaOuaIVaIWazFbaubbpbkObbcbbcbbcbbcaOvazFaYlbbVaIPbaEaJdaYpaYqaYXaZSaZVbbbaJdaNraNrbbRaOcaKuaJkaJlaJiaJmaHSaHSbbXaHTaHSaHSaHSaJoaJpaHTsGRaFbaJqaJraJsaJtaJuaJvaFbaJwaJxaJyaJzaJAaJBaJCaJDaIhaFfaJEaDYaGNaJFaGPaaaatJaaaaaaatJaaaaMzaMzaMzaMzaMzaaaatJaaaaaaiWgaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRFatJbhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUayWaxBaJGaJHaJIaJHaJJaJHaJHaJHaJKaLObkPbkQaxYaJMaxYazcaJNaJOaJNaBnaBnaBnaBnaJNaJPaJQawEawEaMPaNjaNjaNkaNjaNjaNlawEawEaJXayaaJYayaaJZaKaaKbayaarjaoJayqayqayqaAQaKcaAQayqayqayqbkRbkSbkTaKdaIPaIPaIPaIPaIPaKebkUbkVbkWaITaWGaIVaKgazFazFazFazFazFazFazFazFaKqazFaITaPMaTSbcfaJdbcWaELaPLbdxbdHbdZaJdaDzaNsaNsaNsaOyaKvaKwaJiaKxaKyaKzaKAaKBaKCaKDaKEaKFaKGaHTsGRaFbaKHaOMaMqbkXaOMaKKaFbaKLaKMaKNaKOaKPaKQaKRaCwaCwaKSaFgaDYaIiaIjaGPaaaatJavJaQgaQgaQgaMybkYaNJaNLaMzaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaRFatJbhraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayUayWaxBaJGaJHaJIaJHaJJaJHaJHaJHaJKaLObkPbkQaxYaJMaxYazcaJNaJOaJNaBnaBnaBnaBnaJNaJPaJQawEawEaMPaNjaNjaNkaNjaNjaNlawEawEaJXayaaJYayaaJZaKaaKbayaarjaoJayqayqayqaAQaKcaAQayqayqayqbkRbkSbkTaKdaIPaIPaIPaIPaIPaKebkUbkVbkWaITaWGaIVaKgazFazFazFazFazFazFazFazFaKqazFaITaPMaTSbcfaJdbcWaELaPLbdxbdHbdZaJdaDzaNsaNsaNsaOyaKvaKwaJiaKxaKyaKzaKAaKBaKCaKDaKEaKFaKGaHTsGRaFbaKHaOMaOMaONaOMaKKaFbaKLaKMaKNaKOaKPaKQaKRaCwaCwaKSaFgaDYaIiaIjaGPaaaatJavJaQgaQgaQgaMybkYaNJaNLaMzaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauSaKTaxBaKUaKVaKWaKXaKYaKZhgAaLaaLbaxBaIraNXaNYaNYaNYaOaaNYbkZaNYaNYaNYaNYaNYaNYblaaObblbblcbldaNYaNYaNYaNYaNYbleaNYblfblgblhaLraLmaLsaLmaLtaMWaLuaOeaLwaLRaEEaIRaIRaIRaLNaLPaLPbljaLPaLPaIPaIPaIPaNfaIPaIPaIPaLPaLPblkaLHaLIaLJaLKaPJbcXaNKbllaLPblmblnbloaXUaYkbeMaZMaZMblpaJdaTTaJdbkrbgoaJdaJdaJdaJiaQGaRnaMdaKuaMeaMfaJiblqaMhaMhaMiaMjaMkaMlaMmaMnaMoaHTsGRaFbaGzblraOMaONaMpozRaFbaMsaMtaCwaMublsaKRaKRaCwaMvaMwaMxaDYaCwaCwaCwuzBuzBuzBaQkaQlbltaMybluaQjaOXaMzaaaatJaaaaaaatJaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaatJatJaaaaaaaaaaaaaaaaaaaaaaaaayUaRNayUayUayUayUayUayUaRNayUaaamJZaBdaMAaKUaMBaMCaMDaMEaMFaweaMGaLbaMHaIkaLdaMIaMJaMLaMKaMLaMMaLeaLeaLeaLeaLeaLeaLeaLiaLdaLeblvaLeaLeaPKaPOaMQaMRaMQaMRaMSaMQaMTaMQaMUaMQaMVaOnaMXaMYaMZmMXthejqfaIPaIPaIPaIPaIPotMthejqfaLAaLBaNcaLDaNeaLFaLGmMXthevtIaIPaNhaIPaIPaIPmMXthejqfaIPaNiaIPaIPaIPaWIaIPaIPaIPblwaJdblxblyaKsblzaPQaWKaQFaJiaJiaJiaJiaYuaNwaJiaJiaJiaJiaHSaNzaHSaHSaHSaNAaNBaNAaHTsGRaFbaFbaFbblAblBaFbaFbaFbaFbaFbaFbaFbaCwaCwaNFaCwaFfaFfaFgaDYaNGaNHaCwbrZaSZaRkazRkOhpVvaMyaQmaQjaOXaMzatJatJatJatJmoyaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabhraGRaNMatJatJatJatJauSaAaauSayUaRJayUaNNaNOaNPaNQayUaRJayUayUauSayWaxBaKUaNRaNSaMDaMEaMFaweaNTaLbaxBaPmaPnaPvblCaPwaPwaPwaPxaPyaQCaNVaNZaPwaPwaPwaQEblDaPwblEblFblFblGaSyaQIaOgaOfaOgaOhaOiaOjaOlaOkaQMaRPaWUaOoaOpaIPaOqaOqaOqaOraOqaOqaOqaOqaOsaOqaOqaNbaNaaNgaLEaOtaLCaNdaOqaOqaPPaOqaOqaOqaOqaOqaOqaOqaOqaIPaIPaIPbfQbfQaRfbfQbfQbfQblHaJdblIblJblKblLaJhaLQaLQbeLblMblNaOAaOBaODaWFaOEblOaJiaOFaOGaOHaOIaKmaOHaOJaOKaHTaHUaFbaOLaOLaOMaONaOOaOOaOPaFbaOQaORaOSaCwaFfaFfbpJaFfaFflbTaDYaCwaOWaCwaQnbamipqazRbcjaSWaMyaSXaOZaSYaMzaMzaMzaMzaMzaMzaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG @@ -7971,9 +7976,9 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGby byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaQaaQaaQaaQaaQaaQaaQaaQaaYaaQaaQaaQaaQaaQaaaaaabObbObbObbObbObbObcnObObbObbObbObcnPcnQcjlcmOclPcnRcnRcmOcmRbShbXTcilcnScnTcnUcnVcjqcmSapccnWaWYcnXcnYcnZcimcoacobcoccodcgscjFcoecnkcogcohcoicojcokcolbYdbZuconcjIcjIcjIcoobZucopcoqchBchCbZucdtcorcoscaBcaBcaBcaBaadccccotcoubOhcovcowcoxbXccoycozbOhcoAcoBcoCbOhcoDwEVbYwcoEbODckackebPWcoFckcbYzcfUbYzcfVcoGbPWbPWcfXbODcoHcmzcoIcoJcoKcoLcoMcoNcoOcmDcjfcnLcoPcoQcnLcnLcjfrWbbXEcoScoTccDbZYatJaaaatJaaaaaaaaahAVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaaaadaaaaadaaaaadaaaacfaaaaadaaaaadaaaaaQaadaadbObcoUcoVbTLcoWbTLbTLbTLbTLbXRbObcoXcoYcoZkJiclPcnRcnRjXNjXNbShxkXcilcpccpdcmUcmUcmUcpecpfcpgcphcpicpjcpkcimbObbObcplcpmcpncjFcjFcpobnZcohcprcprcprcprbYdcnncnocptcpucpvcpwcpxcpycpzclacgDcpAcjOclccnucpBcpCcpCcaBaadcccbLAnlTbOhbOhcpDbKtbOhcpEwKnbOhbOhcpGbOhbOhwKncpHbSXcpIbODbPWbPWbPWcpJcpKcePclrbYzcgRcpLcgTcgTcgUbODcmzcmzcpMcmzcmzcltcnJcnJcpNcpOcjfcnLcnLcpPcnLcnLcjfrWbbXEbXEbXEccDbXEaadaaaatJaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaacpQcpRcpSaaacpQcpRcpSaaacpQcpRcpSaaaaaQaaaaaabObcpTbTLcpUbObbObcpVbObbObbObbObckAcpWckAckAcjlcjlcjlcjlcjlbShbXTcilclScpXcpYcjqcpZclSclSckJcqackMcqbcqccqdcqecqfcqgcqhcqicqjcqkcqlcqmcqntDkcqpcqqcqrbYdcqtcqucqvceucqwcqxcgycqycgCcexchCcqzcdtcorcqAcqBcqCcqDcaBaadbOhbOhnlTcqEcqFcpDcqGbOhcpEcqHwEVcqIcqJcqKwEVcqLcqMbXGcqNbODbVYbVYbVYbVYchQcqOcfUcqPchQbVYbVYbVYbVYbODcltcltcltcltcltcltcqQcqQcqRcqScjfcjfcjfcjfcjfcjfcjfrWbbXEcqTgWmccDbXEaadaadlHkaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaadcpQcqVcpSaaacpQcqVcpSaaacpQcqVcpSaadaadaaaaaabObcqWbTLbTLbObcfibTLcqYccNcgjbObcqZcracrbckAclQcjlcjlclQclQbWFxkXcilcjqcrdcrecjqcrfcrgcjqckJcrhcricrjcrkcrlcrmcrncrocrpcrqcrrcrscrtcrucrvbFXcrxbnZcnkbYdcrzbZucpscgycrAcrBcrCcrDcrEbZtcrFcrGceCcntcnucrHcpCcpCcaBaadbOhbLAcrIcrJcrKcrLbYmbOhcrMcrNcrOcqMbOCcqMcpHcrPcrQbXGdmFbODciNcgTcgTcrSciPbYzcrTcePcrUcrVbPWbPWbPWbODcrWbZWcrXcrYcrYcltcrZcrZcqRcmDcltcnMcsacoScsbcscbXErWbbXEcsbcsbccDbXEbXEbXEaaeaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaadcpQcqVcpSaaacpQcqVcpSaaacpQcqVcpSaadaadaaaaaabObcqWbTLbTLbObcfibTLcqYccNcgjbObcqZcracrbckAaMqcjlcjlclQclQbWFxkXcilcjqcrdcrecjqcrfcrgcjqckJcrhcricrjcrkcrlcrmcrncrocrpcrqcrrcrscrtcrucrvbFXcrxbnZcnkbYdcrzbZucpscgycrAcrBcrCcrDcrEbZtcrFcrGceCcntcnucrHcpCcpCcaBaadbOhbLAcrIcrJcrKcrLbYmbOhcrMcrNcrOcqMbOCcqMcpHcrPcrQbXGdmFbODciNcgTcgTcrSciPbYzcrTcePcrUcrVbPWbPWbPWbODcrWbZWcrXcrYcrYcltcrZcrZcqRcmDcltcnMcsacoScsbcscbXErWbbXEcsbcsbccDbXEbXEbXEaaeaaaaaaaaaatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaacpQcqVcpSaadcpQcqVcpSaadcpQcqVcpSaaaaadaadaadbObaVjcqXcsdbObcselkWcsfcsgcfjbObcshneLcsickAcrccjlckBrCTcskbWFxkXcilcjqcslcsmcsncsocspcjqcsqcsrcsscstcsucimcsvcswcsxcsycszcsAcsBcsCcsDcpqcsEcohcsGixkcsIcsJbZucpscsKcsLbZubZucsKcsKcsKchCcsMcsNcorcoscaBcaBcaBcaBaadbOhcovcsOcsPcsQcsRcsSbOhbOhcsTcsUcsVbOCcsWcsXbOhbOhbXGdmFbODckabPWbPWcsYckcbYzcfUbYzcfVcsZbPWbPWcfXbODcsbctactbctcctdcltctectecqRcmDcltctfctgcthctictjctkctlcmIcmIcmIctmctnctoctpaaeaaeaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadcpQcqVcpSaaacpQcqVcpSaaacpQcqVcpSaadaadaaaaaabObctqctrctsbObcttctubObctvbObbObctwctxctyckAcpbcjlcjlcpbcpbbWFxkXcilcilcilcilcilcilcilcilcimcimcimcimcimcimbObctAbObbObctBctBctBctCctDctEctBctFctGctHbYdbZucdpctIcsKcpwcesbZucaychwcsKchCcsKbYdctJctKcjPaadaadaadaadctLctMctNctOctPctQctQctQctRctSctTcsVctUcsVcsVbOhctVbXGcrRbODbPWbPWbSZctWctXcePctYbYzcgRctZcgTcgTcgUbODbXEcuacubbXEbXEcltcltcltcuccudcltcuecsbcufccDcugbXEcoRbXEbXEcuhbXEbXEbXEbXEaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadcpQcqVcpSaaacpQcqVcpSaaacpQcqVcpSaadaadaaaaaabObctqctrctsbObcttctubObctvbObbObctwctxctyckAdlhcjlcjlcpbcpbbWFxkXcilcilcilcilcilcilcilcilcimcimcimcimcimcimbObctAbObbObctBctBctBctCctDctEctBctFctGctHbYdbZucdpctIcsKcpwcesbZucaychwcsKchCcsKbYdctJctKcjPaadaadaadaadctLctMctNctOctPctQctQctQctRctSctTcsVctUcsVcsVbOhctVbXGcrRbODbPWbPWbSZctWctXcePctYbYzcgRctZcgTcgTcgUbODbXEcuacubbXEbXEcltcltcltcuccudcltcuecsbcufccDcugbXEcoRbXEbXEcuhbXEbXEbXEbXEaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaQaaQaadaaacpQcqVcpSaaacpQcqVcpSaaacpQcqVcpSaaaaadaaaaaacuicujcujcujcujbObbObcukculbObbObbObbObbObbObbXSbXSbXSbXSbObcumcuncgmcuocupcuqcuqcuqcuqcuqcuqcuqcuqcuqcuqcuqcuqcurbTLcttctBcuscutcuucuvcuwctBcuxcuycuzbYdcuAcuBcezcuCcuDcuEcuFcuCcuFcuCcuGcsKbYdcuHcuIcuJcuKcuLcuMctMcuNcuOcuPcuQcuRcuScuTctQcuUbLAcuVcuWcuXcuYcuZbXobXocvacvbbODbODbODbODbODbODbODcvcbODbODbODbODbODbODbODcvdcveqFccvfcvgctkcvhcvicvjcvkbXEbXEbXEbXEcvlbXEbXEcvmbXEcvncvocsbbXEaaaaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaaaadaaaaaaaaacvpaaaaaaaaacvpaaaaaaaaacvpaaaaaaaadcuicuicuicvqcvrcvscvtcvubTLcvvcvwcvxchfchflkWchfchflkWlkWlkWlkWlkWlkWcvychlcvzcvAcyLcyLcyLcyLcyLcyLcyLcyLcyLcyLcyLcyLcyLcyLcyLctBctBcvBcvCcvDcvEcvFcvGcvHcvIbYdcuAcvJcvKcvLcvMcvNcvOcvPbZucvQcvRcvScvTcvUcvVcvWcvXcvYcvZcwacwbcwccwdcwecwfcwgcwhctQbLAbLAcsVcsVbKtcsVcwibLAbLAbXGcwjbZYaaaaaaaaaaaaaaabZYcwkbZYaaaaaaaaaaaaaaabZYcwlcwmcwncwocwpcwqcwrcwrcwscwtcwucwvcwwcwxcwycwzcwAcwBbXEcqUcsbcwCbXEaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaadcwDcwEcwEcwFcwGcwGcwGcwGcwGcwGcwGcwGcwGcwGcwGcwHcwIcwJcwKcwLcwMcwNcwOlkWlkWcwPccNbObbXSbXSbXSbXSbXSbXSbXSbXSbXSbObbObcwQcwRcwScwTcyLcwUcwUcwVcyLcyLcwWcwXcwYcwZcxacyLcxbcxccxdctBcxecxfcxgcxhcxicxjcxkcxlcxmbYdbYdcxnbZncxocxpcxqbZncxobZncdtbZncxrbYdcxscxscxtcxucxvcxwctQcxxcxycxzcxAcxBcxCcxDctQcxEbLAcqMcqMcxFcsVcqMbLAcxGbXGcwjbZYaaaaaaaaaaaaaaabZYcwkbZYaaaaaaaaaaaaaaabZYjUzbZUbXEcxHcnNbXEbXEbZYbZYbXEbXEcxIccDcxJcwncxKcxLcxMbXEbXEbXEbXEbXEaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 616d8530b3..e9a1dd473c 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -5066,10 +5066,8 @@ /turf/open/floor/plasteel, /area/security/office) "aiL" = ( -/obj/structure/chair{ - dir = 4 - }, /obj/effect/landmark/start/security_officer, +/obj/structure/chair/beanbag/red, /turf/open/floor/plasteel, /area/security/office) "aiM" = ( @@ -20628,7 +20626,7 @@ /obj/effect/landmark/start/assistant, /obj/structure/bed/double, /obj/item/bedsheet/double_gato, -/turf/open/floor/carpet/purple, +/turf/open/floor/carpet/gato, /area/commons/locker) "aJw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -33669,8 +33667,8 @@ /turf/open/floor/plasteel/dark, /area/science/storage) "beo" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/carpet/purple, +/obj/structure/chair/beanbag/gato, +/turf/open/floor/carpet/gato, /area/commons/locker) "bep" = ( /obj/effect/turf_decal/tile/purple, @@ -52690,7 +52688,7 @@ pixel_x = 1; pixel_y = 5 }, -/turf/open/floor/carpet/purple, +/turf/open/floor/carpet/gato, /area/commons/locker) "bKl" = ( /obj/structure/flora/rock/pile, @@ -58802,7 +58800,7 @@ /turf/closed/wall, /area/hallway/secondary/entry) "bUa" = ( -/turf/open/floor/carpet/purple, +/turf/open/floor/carpet/gato, /area/commons/locker) "bUb" = ( /obj/effect/turf_decal/tile/red, @@ -81189,7 +81187,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ dir = 1 }, -/obj/structure/chair/stool, +/obj/structure/chair/beanbag/red, /turf/open/floor/wood{ icon_state = "wood-broken" }, @@ -84076,6 +84074,12 @@ }, /turf/open/floor/plasteel/dark, /area/maintenance/starboard) +"sMB" = ( +/obj/structure/chair/beanbag/black{ + dir = 1 + }, +/turf/open/floor/wood, +/area/commons/vacant_room/office) "sNb" = ( /obj/machinery/door/airlock/public/glass{ dir = 4 @@ -85166,7 +85170,9 @@ /turf/open/space/basic, /area/solars/port/fore) "ykB" = ( -/obj/structure/chair/stool, +/obj/structure/chair/beanbag/red{ + dir = 8 + }, /turf/open/floor/wood, /area/commons/vacant_room/office) "ylS" = ( @@ -124147,9 +124153,9 @@ aqg fkk ppP qCS -ykB +aqg kXo -ykB +sMB diq bPJ bUN diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 8a87925a59..067d02df5e 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -50879,7 +50879,7 @@ /area/command/heads_quarters/ce) "fpF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/chair/bench/right, +/obj/structure/chair/pew/right, /turf/open/floor/plasteel/chapel{ dir = 4 }, @@ -51434,13 +51434,9 @@ /turf/open/floor/carpet/purple, /area/maintenance/port/fore) "fKu" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, -/turf/open/floor/plasteel/chapel{ - dir = 4 - }, -/area/service/chapel/main) +/obj/structure/chair/beanbag/black, +/turf/open/floor/wood, +/area/service/library) "fKv" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -52039,7 +52035,7 @@ /turf/open/floor/carpet/royalblue, /area/command/bridge) "gdi" = ( -/obj/structure/chair/bench/left, +/obj/structure/chair/pew/left, /turf/open/floor/plasteel/chapel{ dir = 8 }, @@ -55855,7 +55851,7 @@ /area/service/hydroponics) "iqU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/chair/bench/left, +/obj/structure/chair/pew/left, /turf/open/floor/plasteel/chapel{ dir = 8 }, @@ -58384,7 +58380,7 @@ /turf/open/floor/plasteel/dark, /area/security/office) "jMs" = ( -/obj/structure/chair/bench/left, +/obj/structure/chair/pew/left, /turf/open/floor/plasteel/chapel{ dir = 1 }, @@ -58828,7 +58824,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/obj/structure/chair/bench/right, +/obj/structure/chair/pew/right, /turf/open/floor/plasteel/chapel{ dir = 4 }, @@ -60718,9 +60714,7 @@ /turf/open/floor/plasteel, /area/commons/locker) "kZv" = ( -/obj/structure/chair/wood/normal{ - dir = 4 - }, +/obj/structure/chair/beanbag/gato, /turf/open/floor/carpet/gato, /area/commons/dorms) "kZR" = ( @@ -61284,7 +61278,7 @@ dir = 4 }, /obj/effect/landmark/event_spawn, -/obj/structure/chair/bench/left, +/obj/structure/chair/pew/left, /turf/open/floor/plasteel/chapel{ dir = 1 }, @@ -63989,7 +63983,7 @@ /area/maintenance/port/aft) "mWm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/chair/bench/right, +/obj/structure/chair/pew/right, /turf/open/floor/plasteel/chapel, /area/service/chapel/main) "mWy" = ( @@ -66788,7 +66782,7 @@ }, /area/engineering/break_room) "oJk" = ( -/obj/structure/chair/bench/right, +/obj/structure/chair/pew/right, /turf/open/floor/plasteel/chapel{ dir = 4 }, @@ -69451,9 +69445,6 @@ /area/commons/storage/primary) "qfP" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/chair/comfy/black{ - dir = 8 - }, /turf/open/floor/plasteel/chapel{ dir = 4 }, @@ -72698,13 +72689,13 @@ /turf/closed/wall, /area/commons/toilet/restrooms) "rVx" = ( -/obj/structure/chair/comfy/black{ - dir = 8 - }, /obj/machinery/camera{ c_tag = "Chapel - Starboard"; dir = 8 }, +/obj/structure/chair/bench{ + dir = 8 + }, /turf/open/floor/plasteel/chapel{ dir = 4 }, @@ -73430,7 +73421,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/command/storage/eva) "spZ" = ( -/obj/structure/chair/bench/right, +/obj/structure/chair/pew/right, /turf/open/floor/plasteel/chapel, /area/service/chapel/main) "sqe" = ( @@ -76721,7 +76712,7 @@ /area/security/prison) "urB" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/chair/bench/left, +/obj/structure/chair/pew/left, /turf/open/floor/plasteel/chapel{ dir = 1 }, @@ -80484,6 +80475,9 @@ name = "Station Intercom (General)"; pixel_x = 29 }, +/obj/structure/chair/bench/left{ + dir = 8 + }, /turf/open/floor/plasteel/chapel, /area/service/chapel/main) "wDM" = ( @@ -82038,8 +82032,10 @@ /turf/open/floor/plasteel, /area/commons/fitness/recreation) "xuF" = ( -/obj/structure/chair/comfy/black, /obj/effect/landmark/start/assistant, +/obj/structure/chair/beanbag/black{ + dir = 8 + }, /turf/open/floor/wood, /area/service/library) "xuP" = ( @@ -83448,6 +83444,12 @@ }, /turf/open/floor/plasteel, /area/commons/storage/primary) +"yeu" = ( +/obj/structure/chair/bench/right{ + dir = 8 + }, +/turf/open/floor/plasteel/chapel, +/area/service/chapel/main) "yeJ" = ( /obj/machinery/airalarm{ dir = 1; @@ -104373,7 +104375,7 @@ glc sqe txq glc -fEX +fKu yhY vfr iHr @@ -108287,10 +108289,10 @@ gcI fvo fvo qfP -qrc +yeu rVx wDJ -fKu +eRk fvo aaa aaa diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index ac2c85c77a..c4a6be612d 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -13714,20 +13714,14 @@ req_access_txt = "0" }, /obj/effect/spawner/lootdrop/bedsheet, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/commons/dorms) "aBN" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/structure/chair/beanbag/red{ + dir = 8 }, -/obj/structure/sign/plaques/deempisi{ - pixel_y = 28 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/plasteel/grimy, -/area/commons/dorms) +/turf/open/floor/plasteel/dark, +/area/service/library) "aBO" = ( /obj/machinery/button/door{ id = "Dorm1"; @@ -13741,7 +13735,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/commons/dorms) "aBP" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -14372,20 +14366,21 @@ "aDb" = ( /obj/structure/table/wood, /obj/item/storage/book/bible, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/commons/dorms) "aDc" = ( /obj/structure/chair/wood/normal{ dir = 8 }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/wood, /area/commons/dorms) "aDd" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/sign/painting/library{ + pixel_x = -32 }, -/turf/open/floor/plasteel/grimy, -/area/commons/dorms) +/obj/structure/chair/beanbag/green, +/turf/open/floor/plasteel/dark, +/area/service/library) "aDe" = ( /obj/structure/closet/secure_closet/security, /obj/item/radio/intercom{ @@ -55911,6 +55906,10 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine) +"ehP" = ( +/obj/structure/chair/beanbag/purple, +/turf/open/floor/plasteel/dark, +/area/service/library) "ekq" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 @@ -57022,9 +57021,7 @@ /obj/structure/light_construct/small{ dir = 8 }, -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/beanbag/black, /turf/open/floor/carpet, /area/maintenance/department/crew_quarters/dorms) "gxq" = ( @@ -58700,9 +58697,7 @@ /turf/open/floor/carpet, /area/service/lawoffice) "jTI" = ( -/obj/structure/chair/wood/normal{ - dir = 4 - }, +/obj/structure/chair/beanbag/red, /turf/open/floor/plasteel/dark, /area/service/chapel/main/monastery) "jUV" = ( @@ -59993,7 +59988,7 @@ /turf/open/floor/plating, /area/tcommsat/computer) "mEe" = ( -/obj/structure/chair/wood/normal{ +/obj/structure/chair/beanbag/red{ dir = 8 }, /turf/open/floor/plasteel/dark, @@ -63611,7 +63606,7 @@ /turf/open/floor/plasteel, /area/cargo/storage) "uaC" = ( -/obj/structure/chair/comfy/black{ +/obj/structure/chair/beanbag{ dir = 8 }, /turf/open/floor/carpet, @@ -65680,6 +65675,12 @@ }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) +"ygb" = ( +/obj/structure/chair/beanbag/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/service/library) "ygZ" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance{ @@ -80298,7 +80299,7 @@ crM cux ihQ yaJ -crg +ihQ aoa qdm qdm @@ -82123,8 +82124,8 @@ efY mIG tGK uTz -uTz -tGK +aDd +ehP czH tGK mUw @@ -83151,8 +83152,8 @@ tGK tGK tGK tGK -tGK -tGK +aBN +ygb tGK mum hDL @@ -103338,7 +103339,7 @@ mef ayk azs mef -aBN +avf aDc mef poI @@ -103596,7 +103597,7 @@ ayl azt mef aBO -aDd +beB mef aEU aFE diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 079880e918..e959887114 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -1630,7 +1630,7 @@ /turf/open/floor/plasteel/white, /area/fatlab) "bqq" = ( -/obj/structure/chair/comfy/black{ +/obj/structure/chair/beanbag/gato{ dir = 8 }, /turf/open/floor/carpet/gato, @@ -8108,6 +8108,12 @@ }, /turf/open/floor/plasteel/white, /area/centcom/holding) +"giQ" = ( +/obj/structure/chair/beanbag/black{ + dir = 8 + }, +/turf/open/floor/carpet/black, +/area/centcom/ferry) "gjk" = ( /obj/structure/sign/barsign{ pixel_y = 32 @@ -8165,6 +8171,9 @@ /obj/structure/window{ dir = 1 }, +/obj/structure/chair/beanbag/gato{ + dir = 8 + }, /turf/open/floor/carpet/black, /area/centcom/ferry) "gmG" = ( @@ -20611,9 +20620,7 @@ /turf/open/floor/plasteel/dark, /area/fatlab) "prT" = ( -/obj/structure/chair/comfy/black{ - dir = 4 - }, +/obj/structure/chair/beanbag/gato, /turf/open/floor/carpet/gato, /area/centcom/evac) "ptJ" = ( @@ -72725,7 +72732,7 @@ gao xIK wLr cnu -cnu +giQ cnu lSM eNU diff --git a/_maps/map_files/gs13/Fast_Food.dmm b/_maps/map_files/gs13/Fast_Food.dmm index 64c19a29fc..2443db542f 100644 --- a/_maps/map_files/gs13/Fast_Food.dmm +++ b/_maps/map_files/gs13/Fast_Food.dmm @@ -110,7 +110,7 @@ "dU" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "eb" = (/obj/machinery/door/airlock/public{name = "EMPLOYEE AREA"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/obj/machinery/door/poddoor/shutters/old/preopen{id = "fastfood_bar"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) "ef" = (/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) -"ei" = (/obj/machinery/jukebox{req_one_access = null},/obj/machinery/light{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"ei" = (/obj/machinery/jukebox{req_one_access = null},/obj/machinery/light{dir = 4},/obj/structure/sign/poster/official/gato_logo{pixel_y = -32},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "eq" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "et" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/wood,/area/ruin/space/has_grav/fastfood_employee) "eE" = (/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) @@ -127,7 +127,7 @@ "fA" = (/obj/structure/lattice/catwalk,/obj/machinery/light/small{dir = 1},/turf/open/floor/plating/airless,/area/ruin/space/has_grav/fastfood_employee) "fB" = (/obj/structure/closet/firecloset/full,/obj/machinery/light{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/turf_decal/tile/purple{dir = 1},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 4},/obj/effect/turf_decal/tile/purple,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "fD" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/wood,/area/ruin/space/has_grav/fastfood_employee) -"fF" = (/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola{pixel_x = 10},/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola{pixel_x = -10},/obj/structure/table/wood,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"fF" = (/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola{pixel_x = 10},/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola{pixel_x = -10},/obj/structure/table/plasmaglass,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "fN" = (/obj/structure/closet/emcloset/anchored,/obj/machinery/light/small{dir = 4},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 4},/obj/item/clothing/suit/space/eva,/obj/item/clothing/head/helmet/space/eva,/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "fR" = (/obj/machinery/power/terminal{dir = 1},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "fX" = (/obj/structure/lattice,/turf/open/space/basic,/area/space) @@ -264,7 +264,7 @@ "uZ" = (/obj/effect/turf_decal/tile/neutral,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "vb" = (/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/arrows/white{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "vq" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) -"vA" = (/obj/structure/chair/comfy/blue{dir = 8},/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"vA" = (/obj/effect/turf_decal/tile/purple,/obj/effect/turf_decal/tile/purple{dir = 4},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "vB" = (/obj/machinery/teleport/station,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/stripes{dir = 4},/obj/effect/turf_decal/stripes/white/line{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "vD" = (/obj/structure/table,/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/item/reagent_containers/food/condiment/enzyme{layer = 5; pixel_x = -5; pixel_y = 6},/obj/item/reagent_containers/food/condiment/enzyme{layer = 5; pixel_y = 6},/obj/item/reagent_containers/food/condiment/peppermill{pixel_x = 3},/obj/item/reagent_containers/food/condiment/saltshaker{pixel_x = 10},/obj/item/reagent_containers/food/condiment/peppermill{pixel_x = 3; pixel_y = 10},/obj/item/reagent_containers/food/condiment/saltshaker{pixel_x = 10; pixel_y = 10},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"; dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) "vG" = (/obj/structure/lattice/catwalk,/obj/machinery/light/small{dir = 4},/turf/open/space/basic,/area/ruin/space/has_grav/fastfood_main) @@ -278,7 +278,7 @@ "wG" = (/obj/structure/window/fulltile,/obj/structure/flora/ausbushes/brflowers,/turf/open/floor/grass,/area/ruin/space/has_grav/fastfood_main) "wJ" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/obj/structure/table/wood,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "wK" = (/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_employee) -"wN" = (/obj/structure/chair/comfy/black{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"wN" = (/obj/structure/chair/beanbag/gato{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "wR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) "wX" = (/obj/structure/window/fulltile,/obj/structure/flora/junglebush/c,/obj/structure/sign/poster/contraband/corn_oil{pixel_y = -32},/obj/machinery/light/floor,/turf/open/floor/grass,/area/ruin/space/has_grav/fastfood_main) "xa" = (/obj/item/reagent_containers/food/snacks/cracker,/obj/structure/table/wood,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) @@ -438,7 +438,7 @@ "Pl" = (/obj/machinery/computer/arcade,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/fastfood_main) "Pq" = (/obj/structure/flora/junglebush,/obj/structure/window/reinforced{dir = 8},/turf/open/floor/grass,/area/ruin/space/has_grav/fastfood_main) "PD" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/structure/sign/poster/contraband/robust_softdrinks{pixel_x = 32},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/open/floor/plasteel,/area/ruin/space/has_grav/fastfood_main) -"PF" = (/obj/structure/chair/comfy/black{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"PF" = (/obj/structure/chair/beanbag/gato{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "PK" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/loading_area{dir = 6; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/cafeteria,/area/ruin/space/has_grav/fastfood_employee) "PM" = (/obj/structure/rack,/obj/item/storage/bag/ore,/obj/item/t_scanner/adv_mining_scanner/lesser,/obj/item/pickaxe/mini,/obj/item/shovel,/obj/item/clothing/suit/space/eva,/obj/item/clothing/head/helmet/space/eva,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "PN" = (/obj/structure/window/fulltile,/obj/structure/flora/ausbushes/fernybush,/turf/open/floor/grass,/area/ruin/space/has_grav/fastfood_main) @@ -497,7 +497,7 @@ "Vd" = (/obj/machinery/light/small{dir = 8},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_employee) "Vm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable{icon_state = "0-4"},/obj/machinery/power/apc{name = "Customer APC"; pixel_y = 28},/turf/open/floor/plating,/area/ruin/space/has_grav/fastfood_main) "Vo" = (/obj/machinery/gibber,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_employee) -"Vt" = (/obj/item/trash/plate{pixel_x = -5; pixel_y = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) +"Vt" = (/obj/item/trash/plate{pixel_x = -5; pixel_y = 4},/obj/structure/table/wood/bar,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_main) "Vx" = (/obj/structure/sign/poster/official/cleanliness{pixel_x = 32},/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/fastfood_main) "Vy" = (/obj/structure/table,/obj/item/reagent_containers/food/condiment/mayonnaise,/obj/item/reagent_containers/food/condiment/sugar{pixel_x = -10},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/fastfood_employee) "Vz" = (/obj/structure/sign/barsign,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/closed/wall,/area/ruin/space/has_grav/fastfood_employee)