diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm index 976f24cbc43..e3eb9d988cf 100644 --- a/maps/groundbase/groundbase_areas.dm +++ b/maps/groundbase/groundbase_areas.dm @@ -213,12 +213,6 @@ lightswitch = 1 /area/groundbase/security/processing name = "Security Processing" -/area/groundbase/security/halls - name = "Security South Hallway" - lightswitch = 1 -/area/groundbase/security/halle - name = "Security East Hallway" - lightswitch = 1 /area/groundbase/security/hall2 name = "Security Second Floor Hallway" lightswitch = 1 @@ -242,10 +236,18 @@ name = "Internal Affairs East Office" /area/groundbase/security/detective name = "Detective's Office" +/area/groundbase/security/showers + name = "Security Showers" +/area/groundbase/security/breakroom + name = "Security Break Room" + lightswitch = 1 /area/groundbase/security/hos name = "Head of Security's Office" /area/prison/cell_block/gb name = "Brig" +/area/prison/cell_block/gb/abandonedbrig + name = "Derelict GenPop" + lightswitch = 0 /area/groundbase/medical name = "Medical" @@ -628,4 +630,5 @@ excluded |= /area/groundbase/hotspring/water excluded |= /area/groundbase/medical/geneticslab excluded |= /area/groundbase/engineering/pumpingstation + excluded |= /area/prison/cell_block/gb/abandonedbrig ..() diff --git a/maps/groundbase/groundbase_defines.dm b/maps/groundbase/groundbase_defines.dm index da6efccd8f7..58b6740400a 100644 --- a/maps/groundbase/groundbase_defines.dm +++ b/maps/groundbase/groundbase_defines.dm @@ -178,7 +178,8 @@ /area/groundbase/hotspring, /area/groundbase/hotspring/water, /area/groundbase/medical/geneticslab, - /area/groundbase/engineering/pumpingstation + /area/groundbase/engineering/pumpingstation, + /area/prison/cell_block/gb/abandonedbrig ) unit_test_exempt_from_atmos = list() diff --git a/maps/groundbase/rp-z1.dmm b/maps/groundbase/rp-z1.dmm index 93ebf17a8e8..59e73d65747 100644 --- a/maps/groundbase/rp-z1.dmm +++ b/maps/groundbase/rp-z1.dmm @@ -27,7 +27,13 @@ /area/groundbase/level1/nw) "aef" = ( /obj/structure/railing/grey{ - dir = 4 + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) @@ -68,13 +74,6 @@ "afR" = ( /turf/simulated/floor/outdoors/mud, /area/groundbase/level1/ne) -"agl" = ( -/obj/effect/landmark/start/security, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) "agK" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/meter, @@ -175,7 +174,7 @@ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "akb" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -377,6 +376,22 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/engineering/breakroom) +"asO" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/security/showers) "atn" = ( /obj/effect/floor_decal/milspec/color/blue/half{ dir = 8 @@ -428,6 +443,9 @@ /obj/item/weapon/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) "ayv" = ( @@ -458,21 +476,11 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) "aze" = ( -/obj/structure/table/marble, -/obj/machinery/chemical_dispenser/bar_soft/full{ - dir = 8 - }, /obj/structure/noticeboard{ pixel_y = -32 }, -/turf/simulated/floor/lino{ - edge_blending_priority = 0.1 - }, +/turf/simulated/floor/lino, /area/groundbase/civilian/kitchen) -"azm" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) "azv" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -624,12 +632,6 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/hall) -"aHD" = ( -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 10 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) "aHL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, @@ -707,17 +709,8 @@ /turf/simulated/floor/wood, /area/groundbase/civilian/bar) "aKZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/carpet/gaycarpet, -/area/groundbase/civilian/clown) +/turf/simulated/wall, +/area/groundbase/civilian/janitor) "aLt" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -794,7 +787,20 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/command/meeting) "aNu" = ( -/obj/structure/filingcabinet, +/obj/structure/closet{ + name = "Forensics Gear" + }, +/obj/item/weapon/storage/box/gloves, +/obj/item/weapon/storage/box/evidence, +/obj/item/weapon/storage/box/bodybags, +/obj/item/weapon/storage/briefcase/crimekit, +/obj/item/weapon/storage/briefcase/crimekit, +/obj/machinery/firealarm{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /obj/effect/floor_decal/milspec/color/red/half{ dir = 4 }, @@ -873,25 +879,28 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/or2) -"aUp" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, +"aSI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) +"aUp" = ( +/obj/structure/janitorialcart, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "aUt" = ( /obj/structure/disposalpipe/trunk, /obj/machinery/disposal, @@ -1009,6 +1018,15 @@ "bat" = ( /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs, /area/groundbase/level1/nw) +"baX" = ( +/obj/effect/floor_decal/milspec/color/purple/half, +/obj/machinery/alarm{ + dir = 1 + }, +/obj/structure/table/standard, +/obj/random/soap, +/turf/simulated/floor/tiled/white, +/area/groundbase/science/lockerroom) "bbe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1018,21 +1036,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals5, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) -"bcx" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) "bcK" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/structure/cable/yellow{ @@ -1080,16 +1083,6 @@ }, /turf/simulated/floor, /area/groundbase/level1/nw) -"beA" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/carpet/sblucarpet, -/area/groundbase/security/hos) "bfm" = ( /obj/effect/floor_decal/milspec/color/orange/half{ dir = 1 @@ -1125,16 +1118,6 @@ }, /turf/simulated/floor, /area/groundbase/science/rnd) -"bgi" = ( -/obj/structure/janitorialcart, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) "bgC" = ( /obj/structure/closet/secure_closet/engineering_chief, /obj/item/device/radio{ @@ -1166,6 +1149,7 @@ /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, +/obj/structure/cable/yellow, /turf/simulated/floor/plating, /area/groundbase/engineering/techstorage) "bhf" = ( @@ -1408,20 +1392,17 @@ /turf/simulated/floor, /area/groundbase/level1/sw) "buc" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/simulated/floor/outdoors/sidewalk/slab, -/area/groundbase/level1/nw) -"bum" = ( -/obj/machinery/light{ - dir = 4 +/obj/structure/sink/kitchen{ + pixel_y = 22 }, -/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{ - grass_chance = 0; - outdoors = 0; - snow_chance = 0 +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 1 }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) +"bum" = ( +/obj/structure/sign/department/bar, +/turf/simulated/wall, /area/groundbase/civilian/bar) "bup" = ( /obj/machinery/telecomms/server/presets/science, @@ -1465,17 +1446,6 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/meeting) -"bwi" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/folder/red_hos, -/obj/item/weapon/stamp/hos, -/obj/item/device/flashlight/lamp/green{ - pixel_x = -14; - pixel_y = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/carpet/sblucarpet, -/area/groundbase/security/hos) "bxW" = ( /obj/structure/window/reinforced/full, /obj/structure/grille, @@ -1600,16 +1570,6 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) -"bDi" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/firealarm{ - dir = 4 - }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) "bDB" = ( /obj/machinery/power/apc{ dir = 1 @@ -1746,7 +1706,7 @@ /area/groundbase/civilian/kitchen) "bIl" = ( /turf/simulated/wall/r_wall, -/area/groundbase/security/hos) +/area/groundbase/security/breakroom) "bJS" = ( /obj/structure/flora/pottedplant/orientaltree, /obj/effect/floor_decal/milspec/color/blue/half{ @@ -1789,6 +1749,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "bLQ" = ( @@ -1935,21 +1898,9 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/civilian/gateway) "bPC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 4 +/obj/machinery/vending/wardrobe/janidrobe, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 1 }, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) @@ -2038,6 +1989,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "bTX" = ( @@ -2051,9 +2015,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/lino{ - edge_blending_priority = 0.1 - }, +/turf/simulated/floor/lino, /area/groundbase/civilian/kitchen) "bUQ" = ( /obj/machinery/status_display{ @@ -2072,17 +2034,6 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/meeting) -"bVT" = ( -/obj/structure/janitorialcart, -/obj/machinery/newscaster{ - layer = 3.3; - pixel_x = -27 - }, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) "bVW" = ( /obj/machinery/door/blast/angled_shutter/open{ dir = 2; @@ -2099,10 +2050,13 @@ /turf/simulated/floor, /area/groundbase/science/xenobot) "bWq" = ( -/obj/machinery/photocopier, /obj/effect/floor_decal/milspec/color/red/half{ dir = 1 }, +/obj/structure/reagent_dispensers/peppertank{ + pixel_y = 32 + }, +/obj/structure/table/reinforced, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "bWI" = ( @@ -2185,13 +2139,6 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/nw) -"bZn" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/milspec/color/red/half, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) "bZs" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -2246,12 +2193,12 @@ }, /area/groundbase/command/tcomms/chamber) "ccP" = ( -/obj/machinery/suit_cycler/prototype, -/obj/machinery/light{ - dir = 1 +/obj/structure/bed/chair/sofa/corner, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "cdF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -2331,15 +2278,10 @@ }, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) -"cgy" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) +"cgZ" = ( +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/outdoors/newdirt, +/area/groundbase/level1/nw) "chC" = ( /obj/effect/floor_decal/industrial/danger, /obj/structure/cable/yellow{ @@ -2370,6 +2312,11 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) +"cio" = ( +/obj/effect/floor_decal/rust, +/obj/structure/table/bench/steel, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "ciz" = ( /obj/structure/sink/kitchen{ pixel_y = 20 @@ -2441,7 +2388,19 @@ }, /area/groundbase/command/tcomms/chamber) "cnH" = ( -/obj/effect/floor_decal/milspec/color/red/corner, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "cnI" = ( @@ -2513,6 +2472,22 @@ }, /turf/simulated/floor, /area/groundbase/level1/sw) +"cqm" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/obj/machinery/shower{ + dir = 1; + pixel_y = -2 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/security/showers) "cqP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2544,12 +2519,11 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/engineering/storage) "crU" = ( -/obj/structure/janitorialcart, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 8 - }, +/obj/effect/floor_decal/rust, +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet/orange, /turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) +/area/prison/cell_block/gb/abandonedbrig) "crX" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -2575,46 +2549,15 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "ctu" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/armor/vest/alt{ - pixel_x = -4; - pixel_y = -6 - }, -/obj/item/clothing/suit/armor/vest/alt{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/item/clothing/suit/armor/vest/alt{ - pixel_x = -4; - pixel_y = 6 - }, -/obj/item/clothing/suit/armor/vest/alt{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/clothing/glasses/hud/security, -/obj/item/clothing/glasses/hud/security, -/obj/item/clothing/glasses/hud/security, -/obj/machinery/power/apc{ +/obj/effect/floor_decal/milspec/color/red/half{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/floor_decal/milspec/color/red/half{ +/obj/machinery/firealarm{ dir = 8 }, +/obj/machinery/suit_cycler/security, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "ctG" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/outdoors/newdirt_nograss{ @@ -2624,6 +2567,12 @@ "ctT" = ( /turf/simulated/wall/r_wall, /area/groundbase/command/tcomms/chamber) +"cvk" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "cvK" = ( /obj/structure/bed/chair/sofa/bench/left{ dir = 1 @@ -2636,18 +2585,6 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/rnd) -"cwo" = ( -/obj/machinery/power/apc{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) "cwF" = ( /obj/structure/bed/chair/sofa/bench/left, /turf/simulated/floor/outdoors/newdirt_nograss, @@ -2681,8 +2618,17 @@ /area/groundbase/civilian/hydroponics) "cxB" = ( /obj/structure/stairs/spawner/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + icon_state = "16-0" + }, +/obj/structure/disposalpipe/up, +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, +/obj/machinery/atmospherics/pipe/zpipe/up/supply, /obj/structure/railing/grey{ - dir = 4 + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) @@ -2725,6 +2671,21 @@ }, /turf/simulated/floor/reinforced, /area/groundbase/civilian/redgate) +"cze" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/obj/machinery/door/window/eastright{ + dir = 1 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/security/showers) "czm" = ( /obj/structure/disposalpipe/junction/yjunction, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -2768,16 +2729,23 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/command/captain) "czP" = ( +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ - pixel_y = 7 +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 20 }, -/obj/item/weapon/pen/blue{ - pixel_y = 8 +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 28 }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 1 +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 36 }, +/obj/item/weapon/storage/box/donut, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "cAQ" = ( @@ -2816,21 +2784,34 @@ "cDA" = ( /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/foyer) +"cDJ" = ( +/obj/structure/closet/secure_closet/security, +/obj/item/device/holowarrant, +/obj/item/device/ticket_printer, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) +"cDN" = ( +/obj/machinery/door/airlock{ + id_tag = "z1scistall1"; + name = "Restroom Stall" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/science/xenohall) "cEy" = ( /turf/simulated/floor/tiled/white, /area/groundbase/medical/office) "cES" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "cFr" = ( /obj/machinery/recharge_station, /turf/simulated/floor/tiled/white, @@ -2998,18 +2979,12 @@ /turf/simulated/floor, /area/groundbase/level1/ne) "cMH" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "cMN" = ( @@ -3024,7 +2999,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/vending/wardrobe/scidrobe, +/obj/structure/closet/secure_closet/scientist, /turf/simulated/floor/tiled/white, /area/groundbase/science/lockerroom) "cNU" = ( @@ -3165,6 +3140,11 @@ outdoors = 0 }, /area/groundbase/medical/geneticslab) +"cXF" = ( +/obj/effect/floor_decal/rust, +/obj/structure/reagent_dispensers/watertank/high, +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "cYE" = ( /obj/machinery/suspension_gen, /obj/effect/floor_decal/milspec/color/purple/half, @@ -3247,12 +3227,18 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/turf/simulated/floor/bmarble, +/turf/simulated/floor/outdoors/sidewalk/slab{ + outdoors = 0 + }, /area/groundbase/civilian/bar) "dcE" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -30 + }, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) "dcH" = ( @@ -3305,6 +3291,16 @@ }, /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) +"def" = ( +/obj/structure/closet/l3closet/janitor, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "deE" = ( /obj/machinery/door/firedoor, /obj/structure/grille, @@ -3352,6 +3348,10 @@ /obj/effect/floor_decal/milspec/color/purple/half{ dir = 6 }, +/obj/machinery/power/apc, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) "dfK" = ( @@ -3365,14 +3365,12 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/toolstorage) "dfP" = ( -/obj/machinery/alarm{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 +/obj/structure/table/bench/padded, +/obj/effect/landmark/start/entertainer, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 }, -/turf/simulated/floor/tiled/white, -/area/groundbase/science/lockerroom) +/area/groundbase/civilian/bar) "dgg" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/weapon/reagent_containers/glass/bucket, @@ -3382,6 +3380,9 @@ /obj/effect/floor_decal/milspec/color/purple/half, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) +"dgl" = ( +/turf/simulated/mineral/cave, +/area/prison/cell_block/gb/abandonedbrig) "dgo" = ( /obj/machinery/suit_cycler/captain, /obj/machinery/keycard_auth{ @@ -3421,12 +3422,34 @@ "dhF" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/tcomms/chamber) +"diQ" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "z1barstall1"; + pixel_x = 26; + pixel_y = 11; + specialfunctions = 4 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/security/showers) "diX" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, /turf/simulated/floor, /area/groundbase/civilian/hydroponics) +"djf" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/rust, +/obj/machinery/light/small, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "djB" = ( /turf/simulated/wall/r_wall, /area/groundbase/command/captain) @@ -3675,12 +3698,6 @@ /obj/machinery/gear_painter, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) -"dvs" = ( -/obj/structure/sign/department/bar{ - pixel_x = 32 - }, -/turf/simulated/floor/outdoors/grass/seasonal, -/area/groundbase/level1/nw) "dvu" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3774,19 +3791,11 @@ /turf/simulated/floor, /area/groundbase/cargo/mining) "dBG" = ( -/obj/structure/grille, /obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full{ - id = "hosoffice" - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, +/obj/structure/grille, +/obj/structure/window/reinforced/full, /turf/simulated/floor, -/area/groundbase/security/hos) +/area/groundbase/security/breakroom) "dBV" = ( /obj/effect/map_effect/portal/master/side_a/gb_wilds/east{ dir = 8 @@ -3806,25 +3815,12 @@ /turf/simulated/floor/tiled/white, /area/groundbase/engineering/showers) "dCD" = ( -/obj/machinery/vending/wardrobe/secdrobe, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light{ - dir = 4 - }, /obj/effect/floor_decal/milspec/color/red/half{ - dir = 5 + dir = 1 }, +/obj/machinery/alarm, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) -"dCF" = ( -/obj/random/vendorall, -/obj/machinery/camera/network/civilian{ - dir = 8 - }, -/turf/simulated/floor/lino{ - edge_blending_priority = 0.1 - }, -/area/groundbase/civilian/kitchen) +/area/groundbase/security/lobby) "dCZ" = ( /obj/structure/sign/department/ass, /turf/simulated/wall, @@ -4136,11 +4132,11 @@ /area/groundbase/level1/ne) "dQL" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) -"dRQ" = ( -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) "dSo" = ( /turf/simulated/floor/outdoors/newdirt{ outdoors = 0 @@ -4164,6 +4160,11 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) +"dSV" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "dSX" = ( /obj/effect/landmark/start/xenobot, /turf/simulated/floor/tiled, @@ -4188,6 +4189,20 @@ /obj/effect/landmark/start/chef, /turf/simulated/floor/carpet/geo, /area/groundbase/civilian/kitchen/backroom) +"dUC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/outdoors/sidewalk/slab{ + outdoors = 0 + }, +/area/groundbase/security/lobby) "dUK" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -4258,9 +4273,14 @@ /turf/simulated/floor, /area/groundbase/level1/sw) "dYB" = ( -/obj/structure/barricade/cutout/clown, -/turf/simulated/floor/carpet/gaycarpet, -/area/groundbase/civilian/clown) +/obj/structure/closet/l3closet/janitor, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/firealarm, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "dYC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4347,28 +4367,6 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) -"edw" = ( -/obj/structure/table/woodentable, -/obj/item/clothing/accessory/permit/gun{ - desc = "An example of a card indicating that the owner is allowed to carry a firearm. There's a note saying to fax CentCom if you want to order more blank permits."; - name = "sample weapon permit"; - owner = 1 - }, -/obj/item/weapon/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/weapon/pen/multi, -/obj/item/device/megaphone, -/obj/item/clothing/accessory/permit/gun, -/obj/item/clothing/accessory/permit/gun, -/obj/item/clothing/accessory/permit/gun, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/carpet/sblucarpet, -/area/groundbase/security/hos) "edD" = ( /obj/machinery/alarm{ dir = 8 @@ -4417,7 +4415,10 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) "eik" = ( -/obj/effect/landmark/start/janitor, +/obj/structure/janitorialcart, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "eiI" = ( @@ -4428,17 +4429,8 @@ /turf/simulated/floor/tiled/monotile, /area/groundbase/engineering/atmos) "eje" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/outdoors/sidewalk/side, -/area/groundbase/civilian/mime) +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "eju" = ( /obj/structure/cable{ icon_state = "0-4" @@ -4474,26 +4466,22 @@ dir = 1; pixel_y = 32 }, -/turf/simulated/floor/outdoors/grass/seasonal, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level1/nw) "ekx" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/tiled/monotile, /area/groundbase/engineering/atmos) "ekT" = ( -/obj/structure/bookcase, -/obj/item/weapon/book/manual/security_space_law, -/obj/item/weapon/book/manual/standard_operating_procedure, -/obj/item/weapon/book/manual/command_guide, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/machinery/light{ + dir = 4 }, -/obj/machinery/light, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "elC" = ( /obj/machinery/door/firedoor, /obj/structure/grille, @@ -4528,6 +4516,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/engine) +"emG" = ( +/obj/structure/bed/chair/backed_red{ + dir = 8 + }, +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "enh" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -4620,6 +4614,12 @@ }, /turf/simulated/floor, /area/groundbase/level1/ne) +"erw" = ( +/obj/item/clothing/head/welding, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 + }, +/area/groundbase/level1/nw) "esC" = ( /obj/structure/table/standard, /obj/item/weapon/storage/firstaid/surgery, @@ -4687,6 +4687,9 @@ temperature = 80 }, /area/groundbase/command/tcomms/chamber) +"evE" = ( +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "evW" = ( /obj/structure/window/reinforced{ dir = 4 @@ -4778,6 +4781,25 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) +"eyO" = ( +/obj/machinery/door/airlock/security{ + name = "Showers" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/security/lobby) "eyQ" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -4862,11 +4884,11 @@ /turf/simulated/floor, /area/groundbase/engineering/storage) "eEz" = ( -/obj/machinery/synthesizer{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/simulated/floor/outdoors/grass/seasonal, -/area/groundbase/civilian/bar) +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "eEF" = ( /obj/effect/floor_decal/milspec/color/orange/corner{ dir = 1 @@ -4931,6 +4953,12 @@ }, /turf/simulated/floor, /area/groundbase/level1/sw) +"eHL" = ( +/obj/structure/bed/chair/sofa{ + dir = 8 + }, +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "eHP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -4968,12 +4996,14 @@ }, /turf/simulated/floor, /area/groundbase/civilian/arrivals) -"eIq" = ( -/obj/effect/landmark/start/security, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +"eIC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "eJO" = ( /obj/effect/landmark/start/roboticist, /obj/structure/bed/chair/office/light{ @@ -5220,13 +5250,15 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/toolstorage) "eTJ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/machinery/requests_console{ + department = "Janitorial"; + dir = 8; + pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 4 }, -/obj/effect/landmark/start/janitor, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "eUn" = ( @@ -5266,6 +5298,13 @@ }, /turf/simulated/wall/r_wall, /area/groundbase/security/lobby) +"eVn" = ( +/obj/machinery/seed_storage/brig{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "eVP" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -5471,9 +5510,7 @@ "fcO" = ( /obj/machinery/recharge_station, /obj/machinery/light, -/turf/simulated/floor/lino{ - edge_blending_priority = 0.1 - }, +/turf/simulated/floor/lino, /area/groundbase/civilian/kitchen) "fcU" = ( /obj/structure/cable/yellow{ @@ -5485,6 +5522,15 @@ }, /turf/simulated/floor/wood, /area/groundbase/civilian/kitchen/backroom) +"fcX" = ( +/obj/structure/mirror{ + pixel_y = 37 + }, +/obj/structure/sink{ + pixel_y = 20 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/bar) "fdK" = ( /obj/effect/floor_decal/techfloor/orange, /obj/effect/landmark{ @@ -5499,8 +5545,9 @@ /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs, /area/groundbase/level1/se) "ffi" = ( -/obj/structure/table/reinforced, -/obj/effect/floor_decal/milspec/color/red/half, +/obj/machinery/computer/security{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "fft" = ( @@ -5532,7 +5579,6 @@ /turf/simulated/floor, /area/maintenance/groundbase/substation/sci) "ffC" = ( -/obj/structure/closet/firecloset/full, /turf/simulated/floor/tiled/dark, /area/groundbase/science/xenohall) "ffG" = ( @@ -5565,6 +5611,15 @@ /obj/machinery/holoplant, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/chamber) +"fil" = ( +/obj/machinery/alarm{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/security/showers) "fiX" = ( /obj/structure/bed/chair/sofa/bench/left{ dir = 4 @@ -5613,6 +5668,17 @@ /obj/effect/floor_decal/milspec/color/purple/half, /turf/simulated/floor/tiled, /area/groundbase/science/xenohall) +"fmg" = ( +/obj/structure/janitorialcart, +/obj/machinery/newscaster{ + layer = 3.3; + pixel_x = -27 + }, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "fml" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -5686,15 +5752,7 @@ /turf/simulated/floor/wood, /area/groundbase/civilian/gameroom) "fsc" = ( -/obj/machinery/requests_console{ - department = "Janitorial"; - dir = 8; - pixel_x = 32 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 4 - }, +/obj/effect/landmark/start/janitor, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "fss" = ( @@ -5726,6 +5784,21 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor, /area/groundbase/engineering/storage) +"ftm" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/level1/nw) "ftw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -5767,6 +5840,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "fwn" = ( @@ -5775,11 +5849,6 @@ }, /turf/simulated/floor, /area/groundbase/level1/nw) -"fwC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) "fwU" = ( /obj/machinery/atmospherics/omni/atmos_filter{ name = "Phoron Filter"; @@ -5798,30 +5867,22 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) +"fyc" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "fyG" = ( -/obj/machinery/computer/security{ - dir = 4 +/obj/structure/table/reinforced, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 10 }, /obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 10 - }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) -"fze" = ( -/obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/machinery/alarm{ - dir = 4 - }, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) "fzo" = ( /obj/effect/landmark/start/chef, /turf/simulated/floor/tiled/freezer/cold, @@ -5887,6 +5948,15 @@ /obj/structure/sign/department/engine, /turf/simulated/wall/r_wall, /area/groundbase/engineering/engine) +"fDC" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/groundbase/level1/nw) "fDN" = ( /obj/machinery/atmospherics/omni/atmos_filter{ name = "CO2 Filter"; @@ -6039,14 +6109,10 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/office) "fIk" = ( -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, +/obj/effect/landmark/start/janitor, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "fJx" = ( @@ -6126,16 +6192,6 @@ "fOi" = ( /turf/simulated/floor/wood, /area/groundbase/civilian/gameroom) -"fOB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -30 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) "fON" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -6269,10 +6325,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 }, -/obj/structure/table/standard, -/obj/item/weapon/towel, -/obj/item/weapon/towel, -/obj/item/weapon/reagent_containers/spray/cleaner, /obj/machinery/light_switch{ pixel_y = 30 }, @@ -6283,11 +6335,17 @@ /turf/simulated/floor/outdoors/sidewalk, /area/groundbase/level1/se) "fWY" = ( -/obj/effect/floor_decal/milspec/color/red/half{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 30 + }, +/obj/effect/floor_decal/milspec/color/emerald/half{ dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) +/obj/structure/table/steel, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "fYC" = ( /obj/machinery/vending/loadout/uniform, /obj/effect/floor_decal/milspec/color/purple/half{ @@ -6304,6 +6362,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/outdoors/sidewalk, /area/groundbase/level1/nw) +"fYJ" = ( +/obj/structure/sign/department/bar, +/turf/simulated/wall, +/area/groundbase/civilian/kitchen) "fZu" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -6388,11 +6450,10 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/ce) "gem" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, /obj/effect/floor_decal/milspec/color/red/half{ dir = 4 }, +/obj/machinery/papershredder, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "gfi" = ( @@ -6506,9 +6567,17 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) "ghR" = ( -/obj/machinery/vending/wardrobe/mimedrobe, -/turf/simulated/floor/carpet/bcarpet, -/area/groundbase/civilian/mime) +/obj/structure/mopbucket, +/obj/item/weapon/mop, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "gir" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/floor_decal/milspec/color/purple/half{ @@ -6530,9 +6599,7 @@ /area/groundbase/civilian/gameroom) "giQ" = ( /obj/machinery/hologram/holopad, -/turf/simulated/floor/lino{ - edge_blending_priority = 0.1 - }, +/turf/simulated/floor/lino, /area/groundbase/civilian/kitchen) "gjy" = ( /obj/structure/cable/yellow{ @@ -6546,6 +6613,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"gjX" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "gkb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6579,6 +6652,15 @@ }, /turf/simulated/floor, /area/groundbase/engineering/ce) +"gls" = ( +/obj/machinery/door/window/eastright{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/security/showers) "gmm" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -6592,19 +6674,10 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/engine) "gmX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/outdoors/sidewalk/side, +/turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "gnk" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -6613,14 +6686,17 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) "gnQ" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/glasses/goggles, -/obj/item/clothing/glasses/goggles, -/obj/item/clothing/glasses/goggles, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/milspec/color/red/half{ dir = 4 }, +/obj/structure/table/reinforced, +/obj/item/weapon/paper_bin{ + pixel_y = 7 + }, +/obj/item/weapon/pen/blue{ + pixel_y = 8 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "got" = ( @@ -6802,11 +6878,13 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "guU" = ( -/obj/machinery/light{ - dir = 4 +/obj/random/vendorall, +/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{ + grass_chance = 0; + outdoors = 0; + snow_chance = 0 }, -/turf/simulated/floor/tiled/eris/cafe, -/area/groundbase/civilian/kitchen) +/area/groundbase/civilian/bar) "gvo" = ( /obj/item/weapon/material/shard{ icon_state = "medium"; @@ -6857,8 +6935,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "Security"; + sortType = "Security" }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) @@ -6874,19 +6954,19 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/meeting) -"gxG" = ( +"gxj" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-8" }, +/turf/simulated/floor/tiled, +/area/groundbase/engineering/techstorage) +"gxG" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/junction, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 + icon_state = "1-2" }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/nw) @@ -6967,6 +7047,9 @@ req_access = list(19,23); req_one_access = null }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/engineering/techstorage) "gFb" = ( @@ -7181,7 +7264,13 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenohall) "gOI" = ( -/obj/effect/floor_decal/milspec/color/emerald/half, +/obj/effect/landmark/start/janitor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "gQg" = ( @@ -7234,18 +7323,21 @@ }, /area/groundbase/medical/lhallway) "gSA" = ( -/obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp/clown{ - pixel_x = -4; - pixel_y = 6 +/obj/effect/landmark/start/janitor, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/item/weapon/bikehorn{ - pixel_x = -2; - pixel_y = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/alarm, -/turf/simulated/floor/carpet/gaycarpet, -/area/groundbase/civilian/clown) +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) +"gST" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "gTa" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 8; @@ -7360,6 +7452,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) +"gWM" = ( +/obj/structure/table/steel, +/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/weapon/soap/nanotrasen, +/obj/item/weapon/soap/nanotrasen, +/obj/item/weapon/soap/nanotrasen, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "gXb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -7477,6 +7589,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) "gZH" = ( @@ -7534,12 +7649,6 @@ /obj/effect/floor_decal/milspec/color/purple/half, /turf/simulated/floor/tiled, /area/groundbase/science/circuits) -"hdo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) "hdB" = ( /obj/structure/disposalpipe/up{ dir = 8 @@ -7565,11 +7674,10 @@ /turf/simulated/floor/wood, /area/groundbase/civilian/gameroom) "heQ" = ( -/obj/effect/floor_decal/milspec/color/red/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) +/obj/structure/table/marble, +/obj/machinery/chemical_dispenser/bar_soft/full, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/civilian/bar) "heW" = ( /obj/effect/floor_decal/milspec/color/purple/half, /obj/random/vendorall, @@ -7595,10 +7703,13 @@ /turf/simulated/floor, /area/groundbase/engineering/storage) "hgM" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/mopbucket, +/obj/item/weapon/mop, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/machinery/alarm{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/milspec/color/emerald/half{ dir = 8 }, /turf/simulated/floor/tiled, @@ -7665,10 +7776,7 @@ /turf/simulated/floor/bmarble, /area/groundbase/science/hall) "hks" = ( -/obj/machinery/vending/wallmed1/public{ - pixel_y = 28 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) "hkB" = ( @@ -8138,8 +8246,10 @@ /area/groundbase/command/tcomms/chamber) "hFz" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "hFP" = ( @@ -8160,6 +8270,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) +"hHd" = ( +/obj/machinery/door/airlock{ + id_tag = "z1barstall1"; + name = "Restroom Stall" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/security/showers) "hIq" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -8313,6 +8430,9 @@ "hTU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) "hUY" = ( @@ -8370,6 +8490,11 @@ /obj/structure/sign/biohazard, /turf/simulated/wall/r_wall, /area/groundbase/medical/geneticslab) +"hWW" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "hXE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, @@ -8517,17 +8642,17 @@ /turf/simulated/floor/tiled, /area/groundbase/command/tcomms/foyer) "ido" = ( -/obj/machinery/door/airlock/multi_tile/glass/polarized{ - dir = 2; - name = "Equipment Storage"; - req_one_access = list(1) +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/steel_ridged, -/area/groundbase/security/equipment) +/obj/structure/closet/secure_closet/security, +/obj/item/device/holowarrant, +/obj/item/device/ticket_printer, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "idK" = ( /obj/machinery/computer/atmoscontrol, /obj/machinery/power/apc{ @@ -8644,16 +8769,16 @@ /turf/simulated/floor/tiled, /area/groundbase/science/hall) "ilb" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/washing_machine, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/machinery/firealarm{ + dir = 4 }, -/obj/machinery/power/apc{ +/obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/firealarm{ - dir = 4 +/obj/machinery/disposal/wall/cleaner{ + desc = "Automatically cleans and transports items to the local auto-resleeving facilities."; + name = "auto-resleeving equipment deposit" }, /turf/simulated/floor/tiled/white, /area/groundbase/science/lockerroom) @@ -8693,6 +8818,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/groundbase/command/meeting) +"imA" = ( +/obj/structure/table/glass, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, +/area/groundbase/civilian/bar) "imG" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -8726,9 +8858,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/machinery/power/apc{ + dir = 4 }, +/obj/structure/cable/yellow, /obj/effect/floor_decal/milspec/color/red/half{ dir = 4 }, @@ -8739,11 +8872,29 @@ /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) "inR" = ( -/obj/machinery/firealarm{ - dir = 8 +/obj/structure/table/marble, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ + pixel_x = -11 }, -/turf/simulated/floor/tiled/eris/cafe, -/area/groundbase/civilian/kitchen) +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ + pixel_x = -2 + }, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ + pixel_x = 7 + }, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ + pixel_x = 9; + pixel_y = 5 + }, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ + pixel_x = -9; + pixel_y = 5 + }, +/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ + pixel_y = 5 + }, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/civilian/bar) "ioh" = ( /obj/effect/floor_decal/milspec/color/purple/half, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -9041,9 +9192,16 @@ /turf/simulated/wall, /area/groundbase/level1/nw) "ivU" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/outdoors/sidewalk/slab, -/area/groundbase/level1/nw) +/obj/machinery/newscaster{ + layer = 3.3; + pixel_x = -27 + }, +/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{ + grass_chance = 0; + outdoors = 0; + snow_chance = 0 + }, +/area/groundbase/civilian/bar) "ivX" = ( /obj/machinery/door/airlock/freezer{ name = "Kitchen"; @@ -9106,6 +9264,11 @@ }, /turf/simulated/floor/tiled/monotile, /area/groundbase/engineering/atmos) +"iyM" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/rnd, +/turf/simulated/floor, +/area/maintenance/groundbase/substation/sci) "iAF" = ( /obj/machinery/appliance/mixer/cereal, /turf/simulated/floor/tiled/eris/cafe, @@ -9212,10 +9375,10 @@ /turf/simulated/floor, /area/groundbase/engineering/storage) "iEb" = ( -/obj/structure/table/bench/padded, /obj/item/device/radio/intercom{ pixel_y = -24 }, +/obj/structure/table/bench/padded, /turf/simulated/floor/outdoors/newdirt{ outdoors = 0 }, @@ -9431,6 +9594,14 @@ "iRM" = ( /turf/simulated/floor/carpet/blucarpet, /area/groundbase/command/captain) +"iSc" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/obj/item/tape/police, +/turf/simulated/floor/tiled/dark, +/area/groundbase/unexplored/rock) "iTf" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -9853,17 +10024,22 @@ }, /turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level1/nw) +"jmq" = ( +/obj/structure/mirror{ + pixel_y = 37 + }, +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/white, +/area/groundbase/security/showers) "jnu" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor, /area/groundbase/engineering/storage) -"jop" = ( -/obj/machinery/vending/security, -/obj/effect/floor_decal/milspec/color/red/half, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) "joO" = ( /obj/machinery/door/airlock/maintenance/medical, /obj/structure/cable/yellow{ @@ -9912,8 +10088,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) @@ -9961,6 +10136,11 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) +"jtl" = ( +/obj/effect/floor_decal/rust, +/obj/structure/table/bench/steel, +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "jtL" = ( /obj/structure/kitchenspike, /turf/simulated/floor/tiled/freezer/cold, @@ -9973,7 +10153,6 @@ /area/groundbase/civilian/toolstorage) "juN" = ( /obj/structure/table/marble, -/obj/machinery/chemical_dispenser/bar_soft/full, /turf/simulated/floor/wood, /area/groundbase/civilian/bar) "jvb" = ( @@ -9995,24 +10174,11 @@ /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) "jwB" = ( -/obj/machinery/door/airlock/glass_security/polarized{ - id_tag = "detdoor"; - id_tint = "detoffice"; - name = "Detective"; - req_access = list(4) - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-8" }, -/turf/simulated/floor/tiled/steel_ridged, -/area/groundbase/security/detective) +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "jwF" = ( /obj/machinery/conveyor_switch/oneway{ id = "recycling"; @@ -10080,11 +10246,6 @@ /obj/machinery/power/apc, /turf/simulated/floor, /area/maintenance/groundbase/substation/cargo) -"jye" = ( -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) "jys" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance, @@ -10237,6 +10398,7 @@ /obj/effect/floor_decal/milspec/color/purple/half{ dir = 6 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/groundbase/science/xenohall) "jGM" = ( @@ -10265,6 +10427,9 @@ }, /turf/simulated/floor/outdoors/grass/seasonal, /area/groundbase/level1/nw) +"jHg" = ( +/turf/simulated/wall/r_wall, +/area/groundbase/science/lockerroom) "jIk" = ( /obj/structure/sign/painting/public{ pixel_x = 30 @@ -10402,18 +10567,13 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/science/rnd) "jOr" = ( -/obj/structure/table/steel, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/soap/nanotrasen, -/obj/effect/floor_decal/milspec/color/emerald/half, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "jON" = ( @@ -10734,13 +10894,23 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) "kdy" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/toilet{ + dir = 4 + }, +/obj/machinery/button/remote/airlock{ + id = "z1scistall1"; + pixel_x = 10; + pixel_y = 27; + specialfunctions = 4 }, +/obj/machinery/light/small, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, /area/groundbase/science/xenohall) "kdL" = ( /obj/structure/table/reinforced, @@ -10802,11 +10972,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/science/xenohall) +/turf/simulated/wall/r_wall, +/area/groundbase/science/lockerroom) "keJ" = ( /obj/machinery/light/small{ dir = 8 @@ -10845,6 +11012,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "kgn" = ( @@ -10895,17 +11065,14 @@ /turf/simulated/wall, /area/groundbase/level1/ne) "khz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/mopbucket, +/obj/item/weapon/mop, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 10 }, -/turf/simulated/floor/outdoors/sidewalk/side, -/area/groundbase/civilian/clown) +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "khJ" = ( /obj/machinery/r_n_d/server/robotics, /obj/machinery/atmospherics/unary/vent_pump{ @@ -10969,6 +11136,15 @@ }, /turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level1/ne) +"kkR" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/security/showers) "kkY" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10980,7 +11156,9 @@ /area/groundbase/engineering/engine) "klF" = ( /obj/structure/table/marble, -/obj/machinery/chemical_dispenser/bar_coffee/full, +/obj/machinery/chemical_dispenser/bar_coffee/full{ + dir = 8 + }, /turf/simulated/floor/wood, /area/groundbase/civilian/bar) "klM" = ( @@ -11034,11 +11212,11 @@ }, /area/groundbase/level1/se) "kqd" = ( -/obj/machinery/computer/security{ - dir = 1 +/obj/structure/bed/chair/sofa/left{ + dir = 8 }, -/turf/simulated/floor/carpet/sblucarpet, -/area/groundbase/security/hos) +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "kql" = ( /obj/structure/table/marble, /obj/machinery/door/blast/gate/thin{ @@ -11052,13 +11230,11 @@ /turf/simulated/wall/r_wall, /area/groundbase/engineering/pumpingstation) "kqV" = ( -/obj/machinery/door/airlock/multi_tile/glass/polarized{ - dir = 2; - id_tag = "BrigFoyer"; - name = "Security"; +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/metal{ + dir = 1; req_one_access = list(38,63) }, -/obj/machinery/door/firedoor, /turf/simulated/floor/bmarble, /area/groundbase/security/lobby) "krj" = ( @@ -11117,6 +11293,15 @@ "ksX" = ( /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs, /area/groundbase/level1/ne) +"ktd" = ( +/obj/structure/mirror{ + pixel_y = 37 + }, +/obj/structure/sink{ + pixel_y = 20 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/security/showers) "ktC" = ( /obj/structure/table/steel, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -11186,6 +11371,10 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) +"kuZ" = ( +/obj/machinery/firealarm, +/turf/simulated/floor/tiled/eris/cafe, +/area/groundbase/civilian/kitchen) "kvh" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -11325,21 +11514,16 @@ pixel_x = 3; pixel_y = -3 }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) "kBc" = ( -/obj/effect/landmark/start/clown, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/carpet/gaycarpet, -/area/groundbase/civilian/clown) +/obj/machinery/light, +/obj/effect/floor_decal/milspec/color/emerald/half, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "kBO" = ( /obj/structure/cable{ icon_state = "2-8" @@ -11359,13 +11543,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/effect/floor_decal/milspec/color/red/half{ dir = 4 }, +/obj/machinery/photocopier, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "kCe" = ( @@ -11412,35 +11593,14 @@ /turf/simulated/wall, /area/groundbase/level1/se) "kEu" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 - }, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/security, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/security, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/security, -/obj/item/clothing/mask/breath, -/obj/item/clothing/head/helmet/space/void/security, -/obj/item/device/gps/security{ - pixel_y = 3 - }, -/obj/item/device/gps/security{ - pixel_x = -3 - }, +/obj/effect/floor_decal/milspec/color/red/half, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 6 - }, +/obj/structure/table/rack/shelf/steel, +/obj/item/device/personal_shield_generator/security/loaded, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "kEK" = ( /obj/machinery/alarm{ dir = 8 @@ -11464,22 +11624,18 @@ /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/storage) "kGN" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Temple of Silence"; - req_access = list(138) +/obj/effect/floor_decal/milspec/color/emerald/half, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + icon_state = "1-2" }, -/turf/simulated/floor/bmarble, -/area/groundbase/civilian/mime) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "kHu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -11500,6 +11656,12 @@ edge_blending_priority = -1 }, /area/groundbase/medical/lhallway) +"kIW" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block/gb/abandonedbrig) "kJs" = ( /obj/structure/disposaloutlet{ dir = 4 @@ -11509,6 +11671,11 @@ }, /turf/simulated/floor, /area/maintenance/groundbase/trashpit) +"kJF" = ( +/obj/effect/floor_decal/rust, +/obj/item/weapon/tool/wrench, +/turf/simulated/floor/tiled/white, +/area/prison/cell_block/gb/abandonedbrig) "kKj" = ( /obj/structure/cable{ icon_state = "1-4" @@ -11546,6 +11713,25 @@ /obj/item/weapon/phone, /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/robot) +"kLB" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "kLC" = ( /obj/structure/closet/crate, /obj/item/stack/material/phoron{ @@ -11572,13 +11758,6 @@ /obj/effect/floor_decal/milspec/color/orange/half, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) -"kMT" = ( -/obj/structure/closet/secure_closet/hos, -/obj/machinery/firealarm{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) "kNn" = ( /obj/structure/closet/secure_closet/engineering_electrical/double, /obj/item/clothing/gloves/yellow, @@ -11611,12 +11790,26 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) "kPv" = ( -/obj/effect/landmark/vermin, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "kPC" = ( /obj/machinery/light/small/fairylights, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, @@ -11647,6 +11840,10 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/circuits) +"kQn" = ( +/obj/structure/table/bench/wooden, +/turf/simulated/floor/outdoors/newdirt, +/area/groundbase/level1/nw) "kQq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 10 @@ -11676,11 +11873,15 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "kRZ" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/turf/simulated/floor/outdoors/newdirt, -/area/groundbase/civilian/mime) +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/level1/nw) "kSi" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/access_button{ @@ -11715,26 +11916,16 @@ /turf/simulated/wall/r_wall, /area/groundbase/engineering/ce) "kTr" = ( -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/oxygen, -/obj/machinery/door/window/brigdoor/eastleft{ - name = "Protosuit Storage"; - req_access = list(58) +/obj/structure/table/reinforced, +/obj/item/weapon/storage/box/donut, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/void/security/prototype, -/obj/item/clothing/head/helmet/space/void/security/prototype, /obj/machinery/light{ - dir = 1 + dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/groundbase/security/hos) +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "kTx" = ( /turf/unsimulated/wall/planetary/normal{ desc = "It's quite impassable"; @@ -11779,11 +11970,14 @@ /turf/simulated/floor/tiled, /area/groundbase/science/circuits) "kUO" = ( -/obj/structure/closet/l3closet/janitor, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/firealarm, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 5 +/obj/effect/floor_decal/milspec/color/emerald/half, +/obj/structure/table/steel, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -30 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) @@ -11841,6 +12035,12 @@ /obj/machinery/mining/brace, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) +"kYo" = ( +/obj/machinery/door/window/eastright{ + dir = 1 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/security/showers) "kYy" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/camera/network/mining{ @@ -11874,14 +12074,13 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) "kZE" = ( -/obj/machinery/power/apc{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/machinery/light, +/obj/effect/floor_decal/milspec/color/emerald/half, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/carpet/gaycarpet, -/area/groundbase/civilian/clown) +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "kZV" = ( /obj/structure/cable{ icon_state = "1-8" @@ -11900,17 +12099,12 @@ /turf/simulated/floor/tiled, /area/groundbase/command/tcomms/foyer) "lbf" = ( -/obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, -/obj/machinery/camera/network/security{ - dir = 4 - }, -/obj/item/device/ticket_printer, /obj/effect/floor_decal/milspec/color/red/half{ dir = 8 }, +/obj/machinery/vending/wardrobe/secdrobe, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "ldc" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/highsecurity{ @@ -11926,22 +12120,20 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/command/ai/upload) "ldI" = ( -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/cell/high{ - charge = 100; - maxcharge = 15000 - }, -/obj/item/weapon/cell/high{ - charge = 100; - maxcharge = 15000 +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/security, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/void/security, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/void/security, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/helmet/space/void/security, +/obj/item/device/gps/security{ + pixel_y = 3 }, -/obj/structure/closet/walllocker_double/security/south{ - pixel_y = -28 +/obj/item/device/gps/security{ + pixel_x = -3 }, -/obj/item/weapon/storage/box/nifsofts_security, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -11949,21 +12141,20 @@ dir = 9 }, /obj/effect/floor_decal/milspec/color/red/half, +/obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "ldS" = ( /turf/simulated/floor/tiled/techmaint, /area/groundbase/command/tcomms/storage) "len" = ( /obj/item/weapon/stool/padded, -/turf/simulated/floor/lino{ - edge_blending_priority = 0.1 - }, +/turf/simulated/floor/lino, /area/groundbase/civilian/kitchen) "lfg" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/nifsofts_engineering, /obj/item/device/retail_scanner/engineering, +/obj/item/weapon/storage/box/nifsofts_engineering, /obj/machinery/requests_console/preset/engineering{ pixel_x = 30 }, @@ -12031,9 +12222,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/steel_ridged, -/area/groundbase/security/equipment) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "lkj" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -12075,12 +12275,15 @@ }, /area/groundbase/level1/sw) "llu" = ( -/obj/structure/barricade/cutout/mime, -/obj/machinery/alarm{ - dir = 4 +/obj/machinery/disposal, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 6 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 }, -/turf/simulated/floor/carpet/bcarpet, -/area/groundbase/civilian/mime) +/turf/simulated/floor/tiled, +/area/groundbase/civilian/janitor) "lly" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -12114,13 +12317,12 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) "lof" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/ears/earmuffs, -/obj/item/clothing/ears/earmuffs, /obj/effect/floor_decal/milspec/color/red/half{ dir = 1 }, +/obj/machinery/status_display{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "lok" = ( @@ -12145,11 +12347,8 @@ /area/groundbase/engineering/workshop) "lpy" = ( /obj/machinery/station_map{ - pixel_y = 32 - }, -/obj/machinery/newscaster{ - layer = 3.3; - pixel_x = -27 + dir = 4; + pixel_x = -32 }, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow{ grass_chance = 0; @@ -12258,7 +12457,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/outdoors/sidewalk/side{ +/turf/simulated/floor/outdoors/sidewalk/slab{ outdoors = 0 }, /area/groundbase/civilian/bar) @@ -12331,14 +12530,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) +"lxP" = ( +/obj/machinery/synthesizer{ + dir = 1 + }, +/turf/simulated/floor/lino, +/area/groundbase/civilian/kitchen) "lyI" = ( /obj/machinery/station_map{ pixel_y = 32 }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 4 +/turf/simulated/floor/outdoors/sidewalk/slab{ + outdoors = 0 }, -/turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "lyN" = ( /obj/structure/table/standard, @@ -12500,6 +12704,11 @@ }, /turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level1/se) +"lFH" = ( +/obj/effect/floor_decal/rust, +/obj/random/tool/powermaint, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "lFO" = ( /obj/machinery/atmospherics/omni/atmos_filter{ name = "N2/O2 Filter"; @@ -12549,15 +12758,6 @@ }, /turf/simulated/floor, /area/groundbase/level1/ne) -"lHM" = ( -/obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) "lIn" = ( /obj/machinery/botany/extractor, /obj/effect/floor_decal/milspec/color/purple/half{ @@ -12640,9 +12840,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "lMS" = ( /obj/structure/closet/toolcloset, /obj/item/weapon/pickaxe, @@ -12660,6 +12868,13 @@ /obj/effect/floor_decal/industrial/warning/color/tile, /turf/simulated/floor/tiled/monotile, /area/groundbase/engineering/atmos) +"lNr" = ( +/obj/machinery/shower{ + dir = 1; + pixel_y = -2 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/security/showers) "lNy" = ( /obj/machinery/r_n_d/protolathe{ dir = 1 @@ -13230,57 +13445,20 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/simulated/floor/tiled/monotile, /area/groundbase/engineering/atmos) -"moj" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/armor/vest/wolftaur{ - pixel_x = 4; - pixel_y = 7 - }, -/obj/item/clothing/suit/armor/vest/wolftaur{ - pixel_x = -8; - pixel_y = -4 - }, -/obj/item/weapon/storage/lockbox, -/obj/machinery/status_display{ - pixel_x = 32 - }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) "moD" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command{ - id_tag = "HoSdoor"; - name = "Head of Security"; - req_access = list(58) - }, +/obj/machinery/door/airlock/glass_security, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_ridged, -/area/groundbase/security/hos) +/turf/simulated/floor/bmarble, +/area/groundbase/security/breakroom) "moS" = ( -/obj/structure/bed/chair/comfy/black, -/obj/effect/landmark/start/hos, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "briglockdown"; - name = "Brig Lockdown"; - pixel_x = 24; - pixel_y = -21; - req_access = list(2) - }, -/obj/machinery/button/windowtint/multitint{ - id = "hosoffice"; - pixel_x = -17; - pixel_y = -25 - }, -/turf/simulated/floor/carpet/sblucarpet, -/area/groundbase/security/hos) +/obj/structure/table/reinforced, +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "mpd" = ( /obj/effect/floor_decal/industrial/danger{ dir = 4 @@ -13318,6 +13496,16 @@ }, /turf/simulated/floor, /area/groundbase/level1/se) +"msc" = ( +/obj/structure/mirror{ + pixel_y = 37 + }, +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/white, +/area/groundbase/security/showers) "msi" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -13479,6 +13667,12 @@ /obj/structure/closet/firecloset/full, /turf/simulated/floor, /area/maintenance/groundbase/trashpit) +"mAe" = ( +/obj/effect/floor_decal/rust, +/obj/item/clothing/under/color/orange, +/obj/item/clothing/shoes/orange, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "mAQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -13495,6 +13689,18 @@ /obj/machinery/appliance/mixer/candy, /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) +"mBM" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "oldbrigdoor1"; + name = "bolt control"; + pixel_x = 27; + pixel_y = 2; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "mCb" = ( /obj/structure/bed/chair/office/dark, /obj/machinery/button/windowtint/multitint{ @@ -13514,21 +13720,22 @@ }, /area/groundbase/civilian/bar) "mDR" = ( -/obj/structure/table/bench/padded, -/obj/effect/landmark/start/visitor, -/turf/simulated/floor/outdoors/newdirt{ - outdoors = 0 - }, +/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, /area/groundbase/civilian/bar) "mEs" = ( -/obj/machinery/power/apc{ - dir = 8 +/obj/machinery/door/airlock{ + name = "Custodial Closet"; + req_access = list(26) }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ - icon_state = "0-4" + icon_state = "1-2" }, -/turf/simulated/floor/carpet/bcarpet, -/area/groundbase/civilian/mime) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/janitor) "mFL" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 6 @@ -13578,6 +13785,7 @@ /obj/structure/cable/yellow{ icon_state = "16-0" }, +/obj/structure/railing/grey, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "mJV" = ( @@ -13616,13 +13824,6 @@ /obj/effect/floor_decal/milspec/color/purple/half, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) -"mLi" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/floor_decal/milspec/color/red/half, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) "mLM" = ( /obj/effect/floor_decal/industrial/danger/corner, /obj/machinery/computer/guestpass{ @@ -13749,7 +13950,7 @@ /area/groundbase/engineering/workshop) "mSu" = ( /obj/effect/floor_decal/milspec/color/purple/half, -/obj/machinery/vending/wardrobe/robodrobe, +/obj/structure/closet/secure_closet/scientist, /turf/simulated/floor/tiled/white, /area/groundbase/science/lockerroom) "mSE" = ( @@ -13843,6 +14044,12 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor, /area/groundbase/engineering/storage) +"mZd" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/groundbase/unexplored/rock) "mZp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/common, @@ -13860,6 +14067,13 @@ }, /turf/simulated/floor/carpet, /area/groundbase/command/captainq) +"nac" = ( +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable/yellow, +/turf/simulated/floor/tiled/white, +/area/groundbase/security/showers) "nat" = ( /obj/machinery/media/jukebox, /obj/machinery/light{ @@ -13991,14 +14205,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/science/hall) -"nfI" = ( -/obj/item/device/radio/intercom{ - dir = 1; - name = "Station Intercom (General)"; - pixel_y = 24 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) "nfV" = ( /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor/tiled/monotile, @@ -14013,29 +14219,28 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "ngF" = ( /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs, /area/groundbase/civilian/hydroponics/out) "ngP" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/bed/chair/office/dark{ + dir = 4 }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "ngX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/effect/landmark/start/janitor, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/outdoors/sidewalk{ + outdoors = 0 + }, +/area/groundbase/level1/nw) "nhl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/reinforced, @@ -14074,12 +14279,19 @@ /turf/simulated/mineral/floor, /area/groundbase/level1/ne) "njQ" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/landmark/start/janitor, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/outdoors/sidewalk{ + outdoors = 0 + }, +/area/groundbase/level1/nw) "nkh" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -14312,12 +14524,6 @@ }, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) -"ntj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) "ntk" = ( /obj/effect/floor_decal/milspec/color/orange/half{ dir = 4 @@ -14497,18 +14703,6 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/rd) -"nBf" = ( -/obj/structure/cable/yellow{ - icon_state = "16-0" - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, -/obj/machinery/atmospherics/pipe/zpipe/up/supply, -/obj/structure/disposalpipe/up, -/turf/simulated/wall/r_wall, -/area/groundbase/security/lobby) "nCj" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/outdoors/sidewalk, @@ -14534,9 +14728,7 @@ dir = 4 }, /obj/random/vendorall, -/turf/simulated/floor/lino{ - edge_blending_priority = 0.1 - }, +/turf/simulated/floor/lino, /area/groundbase/civilian/kitchen) "nCX" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -14570,12 +14762,6 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/meeting) -"nFv" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) "nFV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -14643,7 +14829,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/effect/floor_decal/milspec/color/red/corner{ +/obj/machinery/recharger, +/obj/effect/floor_decal/milspec/color/red/half{ dir = 8 }, /turf/simulated/floor/tiled/dark, @@ -14778,8 +14965,10 @@ /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/robot) "nSt" = ( -/turf/simulated/wall, -/area/groundbase/civilian/janitor) +/obj/effect/floor_decal/rust, +/obj/item/clothing/shoes/orange, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "nSI" = ( /obj/machinery/washing_machine, /obj/random/coin/sometimes, @@ -14983,13 +15172,27 @@ /turf/simulated/wall/r_wall, /area/groundbase/science/rnd) "ocT" = ( -/obj/machinery/alarm, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/cell/high{ + charge = 100; + maxcharge = 15000 + }, +/obj/item/weapon/cell/high{ + charge = 100; + maxcharge = 15000 + }, +/obj/item/weapon/storage/box/nifsofts_security, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/structure/table/steel, /obj/effect/floor_decal/milspec/color/red/half{ dir = 1 }, +/obj/structure/closet/walllocker_double/security/north, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "odg" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8 @@ -15194,11 +15397,10 @@ /turf/simulated/floor, /area/groundbase/engineering/storage) "ooV" = ( -/obj/machinery/power/apc, +/obj/effect/floor_decal/milspec/color/purple/half, /obj/structure/cable/yellow{ - icon_state = "0-8" + icon_state = "4-8" }, -/obj/effect/floor_decal/milspec/color/purple/half, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) "opg" = ( @@ -15219,9 +15421,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/lino{ - edge_blending_priority = -1 - }, +/turf/simulated/floor/lino, /area/groundbase/civilian/kitchen) "oqS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -15263,23 +15463,20 @@ }, /area/groundbase/level1/se) "otl" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.6 +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 10 }, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/device/personal_shield_generator/security/loaded, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/dispenser{ + phorontanks = 0 + }, /obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 10 - }, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "otz" = ( /obj/machinery/power/apc{ dir = 4; @@ -15365,14 +15562,20 @@ /turf/simulated/floor, /area/groundbase/level1/se) "oye" = ( -/obj/structure/bed/chair/comfy/yellow{ +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/light{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/carpet/gaycarpet, -/area/groundbase/civilian/clown) +/turf/simulated/floor/outdoors/sidewalk/side, +/area/groundbase/level1/nw) "oyy" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 @@ -15490,6 +15693,25 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) +"oCM" = ( +/obj/machinery/door/airlock/glass_security/polarized{ + id_tag = "detdoor"; + id_tint = "detoffice"; + name = "Detective"; + req_access = list(4) + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/groundbase/security/detective) "oDi" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -15747,17 +15969,12 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/office) "oMW" = ( -/obj/structure/table/woodentable, -/obj/machinery/photocopier/faxmachine{ - department = "Head of Security"; - pixel_y = 6 - }, -/obj/item/device/radio/intercom/department/security{ - dir = 1; - pixel_y = 24 +/obj/structure/bed/chair/sofa/right, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "oNz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 6 @@ -15893,29 +16110,13 @@ }, /area/groundbase/science/picnic) "oSd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/outdoors/sidewalk/slab, +/turf/simulated/floor/outdoors/sidewalk, /area/groundbase/level1/nw) "oSF" = ( /obj/machinery/power/apc{ @@ -15999,6 +16200,32 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/hall) +"oVY" = ( +/obj/structure/table/rack/shelf/steel, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 4 + }, +/obj/item/clothing/suit/armor/vest/alt{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/suit/armor/vest/alt{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/clothing/suit/armor/vest/alt{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/clothing/suit/armor/vest/alt{ + pixel_x = -4; + pixel_y = -6 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "oWm" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/foyer) @@ -16018,15 +16245,30 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/pumpingstation) "oWy" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 30 +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" }, -/turf/simulated/floor/carpet/bcarpet, -/area/groundbase/civilian/mime) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/level1/nw) "oWI" = ( /obj/structure/undies_wardrobe, /obj/machinery/power/apc{ @@ -16121,25 +16363,13 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) "pat" = ( -/obj/machinery/door/airlock{ - name = "Custodial Closet"; - req_access = list(26) - }, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/rust, +/obj/structure/toilet/prison, +/obj/machinery/light/small{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/bmarble, -/area/groundbase/civilian/janitor) +/turf/simulated/floor/tiled/white, +/area/prison/cell_block/gb/abandonedbrig) "paB" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -16231,10 +16461,6 @@ }, /turf/simulated/floor/reinforced, /area/groundbase/engineering/engine) -"peR" = ( -/obj/structure/table/standard, -/turf/simulated/floor/tiled/eris/cafe, -/area/groundbase/civilian/kitchen) "pfv" = ( /obj/machinery/alarm{ dir = 8 @@ -16332,6 +16558,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/outdoors/sidewalk, /area/groundbase/civilian/foodplace) +"pju" = ( +/obj/structure/sign/directions/security/brig{ + dir = 1; + pixel_x = 2; + pixel_y = -9 + }, +/turf/simulated/wall/r_wall, +/area/prison/cell_block/gb/abandonedbrig) "pjz" = ( /obj/machinery/firealarm, /turf/simulated/floor/carpet/geo, @@ -16356,6 +16590,11 @@ /obj/effect/decal/remains/tajaran, /turf/simulated/floor/reinforced, /area/groundbase/medical/geneticslab) +"pjZ" = ( +/obj/machinery/door/airlock/glass_security, +/obj/machinery/door/firedoor, +/turf/simulated/floor/bmarble, +/area/groundbase/security/lobby) "pkz" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, @@ -16407,12 +16646,10 @@ /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) "pnd" = ( -/obj/machinery/computer/security{ - dir = 8 - }, /obj/machinery/light{ dir = 4 }, +/obj/structure/table/reinforced, /obj/effect/floor_decal/milspec/color/red/half{ dir = 6 }, @@ -16456,6 +16693,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/white, /area/groundbase/science/lockerroom) "ppp" = ( @@ -16473,6 +16713,15 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/hall) +"ppv" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/wall/r_wall, +/area/groundbase/science/lockerroom) "ppw" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_medical{ @@ -16617,41 +16866,15 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/medical/resleeving) "pts" = ( -/obj/structure/table/steel, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/tool/crowbar, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/flashlight, -/obj/item/device/holowarrant, -/obj/item/device/holowarrant, -/obj/item/device/holowarrant, -/obj/item/device/holowarrant, -/obj/item/device/retail_scanner/security, -/obj/item/device/retail_scanner/security, -/obj/item/clothing/accessory/badge/holo/cord, -/obj/item/clothing/accessory/badge/holo/cord, -/obj/item/clothing/accessory/badge/holo, -/obj/item/clothing/accessory/badge/holo, -/obj/item/clothing/accessory/badge/holo, -/obj/item/clothing/accessory/badge/holo, -/obj/item/clothing/accessory/badge/holo, -/obj/item/clothing/accessory/badge/holo, -/obj/structure/closet/walllocker_double/security/west{ - pixel_x = -28 +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -24 }, /obj/effect/floor_decal/milspec/color/red/half{ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "pub" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -16706,6 +16929,14 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/groundbase/level1/ne) +"pxd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "pxg" = ( /obj/structure/salvageable/console{ dir = 4 @@ -16727,7 +16958,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/detective) "pxL" = ( @@ -16752,8 +16985,18 @@ /turf/simulated/floor/carpet, /area/groundbase/command/captainq) "pxN" = ( -/turf/simulated/wall, -/area/groundbase/civilian/mime) +/obj/effect/floor_decal/rust, +/obj/machinery/shower{ + pixel_y = 16 + }, +/obj/machinery/door/window{ + dir = 2 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/milspec, +/area/prison/cell_block/gb/abandonedbrig) "pxU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -16762,18 +17005,6 @@ }, /turf/simulated/floor/wood, /area/groundbase/civilian/gameroom) -"pyJ" = ( -/obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, -/obj/machinery/firealarm{ - dir = 4 - }, -/obj/item/device/ticket_printer, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) "pyM" = ( /obj/machinery/telecomms/hub/preset/groundbase, /obj/machinery/atmospherics/pipe/manifold/hidden/black{ @@ -16890,6 +17121,12 @@ }, /turf/simulated/floor, /area/maintenance/groundbase/substation/aiciv) +"pGG" = ( +/obj/item/weapon/weldingtool/mini/two, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 + }, +/area/groundbase/level1/nw) "pGT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -16966,11 +17203,15 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/lobby) "pJX" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/effect/floor_decal/rust, +/obj/machinery/shower{ + pixel_y = 16 }, -/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs, -/area/groundbase/civilian/janitor) +/obj/machinery/door/window{ + dir = 2 + }, +/turf/simulated/floor/tiled/milspec, +/area/prison/cell_block/gb/abandonedbrig) "pKf" = ( /obj/machinery/computer/security/wooden_tv, /turf/simulated/floor/carpet, @@ -17037,12 +17278,11 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) "pNi" = ( -/obj/structure/filingcabinet, -/obj/machinery/alarm{ +/obj/machinery/vending/cola{ dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "pNp" = ( /turf/simulated/floor/outdoors/grass/seasonal/dark, /area/groundbase/level2/sw) @@ -17157,8 +17397,11 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) "pSO" = ( -/turf/simulated/wall, -/area/groundbase/civilian/clown) +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/rust, +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled/white, +/area/prison/cell_block/gb/abandonedbrig) "pSX" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -17181,8 +17424,14 @@ /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/nw) "pTB" = ( -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) +/obj/structure/bed/chair/backed_red{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "pTJ" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -17196,18 +17445,6 @@ dir = 1; icon_state = "pipe-c" }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/milspec/color/red/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) -"pTQ" = ( -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 8 - }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "pTV" = ( @@ -17217,6 +17454,12 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) +"pTY" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/turf/simulated/floor/lino, +/area/groundbase/civilian/kitchen) "pUG" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -17270,22 +17513,14 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) "pWh" = ( -/obj/structure/closet{ - name = "Forensics Gear" - }, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/storage/briefcase/crimekit, -/obj/item/weapon/storage/briefcase/crimekit, -/obj/machinery/firealarm{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/detective) @@ -17460,12 +17695,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) -"qbx" = ( -/obj/machinery/papershredder, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) "qbN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17734,19 +17968,6 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/engineering/showers) -"qqB" = ( -/obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 30 - }, -/obj/item/device/ticket_printer, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) "qqT" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Science Substation Bypass" @@ -17767,7 +17988,6 @@ /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/foyer) "qsj" = ( -/obj/machinery/hologram/holopad, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -17902,17 +18122,12 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/engine) "qzg" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/rust, +/obj/structure/closet/secure_closet/brig{ + id = "Cell A" }, -/turf/simulated/floor/carpet/bcarpet, -/area/groundbase/civilian/mime) +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "qAx" = ( /obj/machinery/computer/guestpass{ pixel_y = 23 @@ -17998,12 +18213,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/steel_ridged, /area/maintenance/groundbase/trashpit) -"qCx" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) "qCJ" = ( /obj/machinery/button/remote/blast_door{ id = "GateShut"; @@ -18054,6 +18263,18 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/sw) +"qEW" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "qGj" = ( /obj/machinery/camera/network/engine, /turf/simulated/wall/r_wall, @@ -18233,13 +18454,12 @@ /turf/simulated/floor, /area/maintenance/groundbase/substation/sec) "qMY" = ( -/obj/machinery/vending/wardrobe/clowndrobe, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 30 +/obj/effect/floor_decal/rust, +/obj/machinery/light/small{ + dir = 1 }, -/turf/simulated/floor/carpet/gaycarpet, -/area/groundbase/civilian/clown) +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "qND" = ( /obj/structure/extinguisher_cabinet{ dir = 1; @@ -18285,7 +18505,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/simulated/floor/bmarble, +/turf/simulated/floor/outdoors/sidewalk/slab{ + outdoors = 0 + }, /area/groundbase/civilian/bar) "qRb" = ( /obj/structure/cable/yellow{ @@ -18306,23 +18528,9 @@ /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) "qRy" = ( -/obj/machinery/door/airlock{ - name = "Giggledome"; - req_access = list(136) - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/item/weapon/bananapeel, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/bmarble, -/area/groundbase/civilian/clown) +/obj/structure/girder/reinforced, +/turf/simulated/floor/plating, +/area/prison/cell_block/gb/abandonedbrig) "qSa" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -18377,22 +18585,27 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/foodplace) "qTB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 30 - }, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/white, +/area/prison/cell_block/gb/abandonedbrig) "qTF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/meeting) +"qTG" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/security/showers) "qUf" = ( /obj/structure/table/rack{ dir = 8; @@ -18451,7 +18664,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/outdoors/sidewalk/slab{ + outdoors = 0 + }, /area/groundbase/security/lobby) "qWC" = ( /obj/machinery/light{ @@ -18465,6 +18680,18 @@ }, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs, /area/groundbase/level1/sw) +"qXu" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "qXM" = ( /obj/machinery/atmospherics/binary/pump{ dir = 4 @@ -18545,6 +18772,23 @@ }, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs, /area/groundbase/civilian/foodplace) +"rau" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/wall/cleaner{ + desc = "Automatically cleans and transports items to the local auto-resleeving facilities."; + name = "auto-resleeving equipment deposit" + }, +/obj/structure/table/reinforced, +/obj/random/soap, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 30 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/security/showers) "raC" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -18818,26 +19062,32 @@ /turf/simulated/floor, /area/groundbase/civilian/redgate) "rir" = ( -/obj/structure/mirror{ - pixel_y = 37 - }, -/obj/structure/sink{ - pixel_y = 20 +/obj/effect/floor_decal/rust, +/obj/structure/closet/secure_closet/brig{ + id = "Cell A" }, -/turf/simulated/floor/tiled/white, -/area/groundbase/civilian/bar) +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "riL" = ( /obj/machinery/light, -/turf/simulated/floor/lino{ - edge_blending_priority = 0.1 - }, +/turf/simulated/floor/lino, /area/groundbase/civilian/kitchen) "riX" = ( /obj/machinery/light{ dir = 1 }, /obj/effect/floor_decal/milspec/color/red/half{ - dir = 9 + dir = 1 + }, +/obj/machinery/light_switch{ + pixel_y = 30 + }, +/obj/effect/landmark/vermin, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) @@ -18857,6 +19107,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/closet/firecloset/full, /turf/simulated/floor/tiled/dark, /area/groundbase/science/xenohall) "rkm" = ( @@ -18956,12 +19210,6 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/sw) -"rnw" = ( -/obj/effect/floor_decal/milspec/color/red/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) "rnD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19111,9 +19359,19 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) +"ruL" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/outdoors/sidewalk/slab{ + outdoors = 0 + }, +/area/groundbase/security/lobby) "rvc" = ( -/turf/simulated/floor/outdoors/newdirt, -/area/groundbase/civilian/mime) +/obj/effect/floor_decal/rust, +/obj/item/clothing/under/color/orange, +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "rvu" = ( /obj/structure/reagent_dispensers/acid{ pixel_x = 32 @@ -19131,26 +19389,27 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) "rwy" = ( -/obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "ryc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) +"ryq" = ( +/obj/effect/floor_decal/rust, +/obj/structure/table/steel, +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "rys" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -19257,22 +19516,12 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) "rBP" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/nw) "rBQ" = ( @@ -19326,12 +19575,13 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/pumpingstation) "rDd" = ( -/obj/item/weapon/bedsheet/mimedouble, -/obj/structure/bed/double/padded, -/obj/structure/curtain/black, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/carpet/bcarpet, -/area/groundbase/civilian/mime) +/obj/effect/floor_decal/rust, +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet/orange, +/obj/item/seeds/ambrosiavulgarisseed, +/obj/item/seeds/ambrosiavulgarisseed, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "rDm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor, @@ -19359,11 +19609,6 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) -"rEm" = ( -/obj/machinery/light, -/obj/effect/floor_decal/milspec/color/emerald/half, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) "rEU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -19402,6 +19647,7 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/railing/grey, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "rHL" = ( @@ -19502,22 +19748,16 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/hall) +"rLg" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/obj/effect/floor_decal/rust, +/obj/machinery/light/small, +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "rLk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/foyer) -"rLH" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) "rLV" = ( /obj/structure/closet/wardrobe/genetics_white, /obj/effect/decal/cleanable/cobweb2, @@ -19577,6 +19817,13 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) +"rNl" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "rNw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -19651,18 +19898,12 @@ /turf/simulated/floor/tiled/monotile, /area/groundbase/engineering/atmos) "rOV" = ( -/obj/effect/landmark/start/mime, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/effect/landmark/start/entertainer, +/obj/structure/table/bench/padded, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 }, -/turf/simulated/floor/carpet/bcarpet, -/area/groundbase/civilian/mime) +/area/groundbase/civilian/bar) "rPD" = ( /obj/machinery/door/window/brigdoor/southright{ req_access = list(77); @@ -19696,11 +19937,11 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) "rQn" = ( -/obj/structure/sign/department/bar{ - pixel_x = -32 +/obj/structure/table/bench/padded, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 }, -/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, -/area/groundbase/level1/nw) +/area/groundbase/civilian/bar) "rQR" = ( /obj/structure/cryofeed{ dir = 2 @@ -20078,6 +20319,16 @@ }, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) +"sfj" = ( +/obj/structure/mirror{ + pixel_y = 37 + }, +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/bar) "sfz" = ( /obj/machinery/recharge_station, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -20113,12 +20364,14 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/autoresleeving) "sgm" = ( -/obj/machinery/vending/wardrobe/janidrobe, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 1 +/obj/effect/floor_decal/rust, +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 }, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) +/turf/simulated/floor/tiled/white, +/area/prison/cell_block/gb/abandonedbrig) "sit" = ( /obj/structure/table/steel, /obj/item/device/integrated_electronics/debugger{ @@ -20134,21 +20387,49 @@ /turf/simulated/floor/tiled, /area/groundbase/science/circuits) "six" = ( -/obj/structure/reagent_dispensers/peppertank{ - pixel_y = 32 - }, -/obj/structure/dispenser{ - phorontanks = 0 +/obj/structure/table/steel, +/obj/item/weapon/tool/crowbar, +/obj/item/weapon/tool/crowbar, +/obj/item/weapon/tool/crowbar, +/obj/item/weapon/tool/crowbar, +/obj/item/weapon/tool/crowbar, +/obj/item/weapon/tool/crowbar, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/item/device/flashlight, +/obj/item/device/holowarrant, +/obj/item/device/holowarrant, +/obj/item/device/holowarrant, +/obj/item/device/holowarrant, +/obj/item/device/retail_scanner/security, +/obj/item/device/retail_scanner/security, +/obj/item/clothing/accessory/badge/holo/cord, +/obj/item/clothing/accessory/badge/holo/cord, +/obj/item/clothing/accessory/badge/holo, +/obj/item/clothing/accessory/badge/holo, +/obj/item/clothing/accessory/badge/holo, +/obj/item/clothing/accessory/badge/holo, +/obj/item/clothing/accessory/badge/holo, +/obj/item/clothing/accessory/badge/holo, +/obj/item/clothing/glasses/hud/security, +/obj/item/clothing/glasses/hud/security, +/obj/item/clothing/glasses/hud/security, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/light{ - dir = 8 - }, /obj/effect/floor_decal/milspec/color/red/half{ dir = 9 }, +/obj/structure/closet/walllocker_double/security/north, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "siQ" = ( /obj/machinery/light/small{ dir = 1 @@ -20156,13 +20437,8 @@ /turf/simulated/floor/outdoors/grass/seasonal/notrees, /area/groundbase/level1/se) "siZ" = ( -/obj/structure/mirror{ - pixel_y = 37 - }, -/obj/structure/sink{ - pixel_y = 20 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/reinforced, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) "sjk" = ( @@ -20204,9 +20480,6 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/ne) -"skl" = ( -/turf/simulated/floor/carpet/sblucarpet, -/area/groundbase/security/hos) "skA" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20331,22 +20604,19 @@ }, /area/groundbase/level1/nw) "sum" = ( +/obj/structure/bed/chair/office/dark, /obj/machinery/button/remote/airlock{ - dir = 4; + dir = 8; id = "BrigFoyer"; name = "Brig Foyer"; - pixel_x = -24; - pixel_y = 4; + pixel_x = 24; + pixel_y = 5; req_access = list(1) }, -/obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start/security, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "svD" = ( -/turf/simulated/floor/lino{ - edge_blending_priority = 0.1 - }, +/turf/simulated/floor/lino, /area/groundbase/civilian/kitchen) "swR" = ( /obj/structure/table/fancyblack, @@ -20523,7 +20793,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/outdoors/sidewalk/slab, +/turf/simulated/floor/outdoors/sidewalk, /area/groundbase/level1/nw) "sHs" = ( /obj/structure/cable/yellow{ @@ -20543,6 +20813,16 @@ name = "impassable rock" }, /area/groundbase/level1/nw) +"sII" = ( +/obj/effect/floor_decal/rust, +/obj/structure/table/steel, +/obj/random/maintenance, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) +"sIP" = ( +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "sIS" = ( /obj/machinery/button/remote/blast_door{ id = "xenobotshutters"; @@ -20563,6 +20843,7 @@ /turf/simulated/floor/outdoors/sidewalk, /area/groundbase/level1/sw) "sJE" = ( +/obj/effect/landmark/start/intern, /obj/structure/table/bench/padded, /turf/simulated/floor/outdoors/newdirt{ outdoors = 0 @@ -20724,17 +21005,10 @@ /turf/simulated/floor, /area/maintenance/groundbase/substation/civ) "sOL" = ( -/obj/structure/table/woodentable, -/obj/item/toy/figure/clown, -/obj/item/weapon/pen/crayon/marker/rainbow, -/obj/machinery/firealarm{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/carpet/gaycarpet, -/area/groundbase/civilian/clown) +/obj/effect/floor_decal/rust, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/white, +/area/prison/cell_block/gb/abandonedbrig) "sOT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -20830,16 +21104,6 @@ /obj/machinery/atmospherics/pipe/simple/visible/green, /turf/simulated/floor/tiled/monotile, /area/groundbase/engineering/atmos) -"sSt" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) -"sSG" = ( -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) "sSV" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -20870,9 +21134,6 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/office) -"sWa" = ( -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) "sWn" = ( /obj/effect/floor_decal/milspec/color/green/half{ dir = 4 @@ -21028,13 +21289,16 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance/sec, /turf/simulated/floor, -/area/maintenance/groundbase/substation/sec) +/area/groundbase/security/lobby) +"tbD" = ( +/obj/structure/table/glass, +/obj/machinery/light, +/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, +/area/groundbase/civilian/bar) "tbL" = ( -/obj/machinery/door/airlock/maintenance/rnd, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -21044,7 +21308,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor, +/turf/simulated/wall/r_wall, /area/maintenance/groundbase/substation/sci) "tbQ" = ( /turf/simulated/wall/r_wall, @@ -21085,9 +21349,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, @@ -21100,6 +21361,10 @@ /obj/effect/floor_decal/milspec/color/purple/corner{ dir = 1 }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled, /area/groundbase/science/xenohall) "tdZ" = ( @@ -21235,16 +21500,6 @@ "tmX" = ( /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs, /area/groundbase/civilian/foodplace) -"tnm" = ( -/obj/machinery/requests_console/preset/hos{ - pixel_y = 32 - }, -/obj/structure/table/woodentable, -/obj/machinery/computer/skills{ - pixel_y = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) "tom" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -21431,14 +21686,13 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/robot) "tzI" = ( -/obj/structure/curtain/black{ - color = "#361447" +/obj/effect/floor_decal/rust, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, -/obj/item/weapon/bedsheet/clowndouble, -/obj/structure/bed/double/padded, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/carpet/gaycarpet, -/area/groundbase/civilian/clown) +/turf/simulated/floor/tiled/white, +/area/prison/cell_block/gb/abandonedbrig) "tzP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -21509,6 +21763,13 @@ }, /turf/simulated/floor/outdoors/newdirt_nograss, /area/groundbase/level1/ne) +"tCL" = ( +/obj/machinery/vending/hydronutrients/brig{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "tDY" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -21589,10 +21850,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Security"; - sortType = "Security" +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) @@ -21643,8 +21903,6 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/pumpingstation) "tLw" = ( -/obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donut, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "tMa" = ( @@ -21701,20 +21959,23 @@ /turf/simulated/floor/tiled/monotile, /area/groundbase/engineering/atmos) "tNc" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 20 +/obj/item/weapon/storage/box/holowarrants, +/obj/item/weapon/storage/box/flashbangs{ + pixel_x = -2; + pixel_y = -2 }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 30 +/obj/item/weapon/storage/box/handcuffs{ + pixel_x = 6; + pixel_y = -2 }, -/obj/machinery/suit_cycler/security, +/obj/item/weapon/storage/box/evidence, +/obj/structure/table/steel, /obj/effect/floor_decal/milspec/color/red/half{ dir = 1 }, +/obj/structure/closet/walllocker_double/security/north, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "tNh" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -21843,35 +22104,29 @@ /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/upload) "tTk" = ( -/obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/laser/practice{ - pixel_y = 9 - }, -/obj/item/weapon/gun/energy/laser/practice, -/obj/item/weapon/gun/energy/laser/practice{ - pixel_y = -9 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 20 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 28 - }, -/obj/machinery/recharger/wallcharger{ - pixel_x = 4; - pixel_y = 36 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/floor_decal/milspec/color/red/half{ dir = 5 }, +/obj/structure/table/reinforced, +/obj/machinery/photocopier/faxmachine{ + department = "Security" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) +"tUO" = ( +/obj/machinery/computer/secure_data{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "tUS" = ( -/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs, -/area/groundbase/civilian/clown) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "tVb" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -22146,8 +22401,16 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/groundbase/science/hall) +"ucm" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block/gb/abandonedbrig) "ucp" = ( /obj/machinery/light/floortube{ dir = 8; @@ -22256,6 +22519,14 @@ outdoors = 0 }, /area/groundbase/medical/geneticslab) +"ufI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "ufL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -22362,7 +22633,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/outdoors/sidewalk/slab{ + outdoors = 0 + }, /area/groundbase/security/lobby) "ujr" = ( /obj/structure/table/glass, @@ -22418,8 +22691,23 @@ /turf/simulated/floor/outdoors/grass/seasonal/dark, /area/groundbase/science/picnic) "ulz" = ( -/turf/simulated/wall/r_wall, -/area/groundbase/security/equipment) +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 20 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 30 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "umP" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -22491,19 +22779,20 @@ /turf/simulated/floor/tiled/white, /area/groundbase/engineering/showers) "uqH" = ( -/obj/structure/table/reinforced, -/obj/machinery/photocopier/faxmachine{ - department = "Security" - }, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/floor_decal/milspec/color/red/half{ dir = 1 }, +/obj/structure/disposalpipe/trunk, +/obj/structure/table/reinforced, +/obj/machinery/disposal/wall, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) +"urN" = ( +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 + }, +/area/prison/cell_block/gb/abandonedbrig) "urU" = ( /obj/structure/sign/directions/medical{ dir = 1; @@ -22624,27 +22913,15 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/lobby) "uwR" = ( -/obj/structure/table/woodentable, -/obj/machinery/recharger{ - pixel_y = 4 - }, -/obj/item/device/radio/off, -/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ - pixel_x = -9; - pixel_y = -2 - }, -/obj/item/device/taperecorder{ - pixel_x = 10 +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -30 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/vending/snack{ dir = 4 }, -/obj/machinery/light, -/obj/machinery/newscaster/security_unit{ - pixel_x = -27 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "uyt" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -22709,16 +22986,18 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/engineering/workshop) "uzT" = ( -/obj/machinery/power/apc, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/firealarm{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 6 }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/structure/filingcabinet, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, +/obj/machinery/power/apc, +/obj/structure/cable/yellow, /turf/simulated/floor/tiled/dark, /area/groundbase/security/detective) "uAa" = ( @@ -22737,6 +23016,10 @@ /area/groundbase/science/xenobot) "uAp" = ( /obj/effect/floor_decal/milspec/color/purple/half, +/obj/machinery/alarm{ + dir = 1 + }, +/obj/machinery/vending/wardrobe/robodrobe, /turf/simulated/floor/tiled/white, /area/groundbase/science/lockerroom) "uAP" = ( @@ -22847,15 +23130,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/science/robotics) -"uHs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +"uHp" = ( +/obj/machinery/vending/wallmed1/public{ + pixel_y = 28 }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/bar) +"uHs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/structure/cable/yellow{ - icon_state = "1-4" + icon_state = "4-8" }, /turf/simulated/floor/tiled/white, /area/groundbase/science/lockerroom) @@ -22879,6 +23166,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/groundbase/science/lockerroom) "uHV" = ( @@ -22887,10 +23180,10 @@ /area/groundbase/civilian/toolstorage) "uKc" = ( /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "1-2" }, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "uKm" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22954,14 +23247,8 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) "uPu" = ( -/obj/structure/sink/kitchen{ - pixel_y = 22 - }, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) +/turf/simulated/wall/r_wall, +/area/prison/cell_block/gb/abandonedbrig) "uPv" = ( /obj/structure/cable{ icon_state = "2-8" @@ -22995,14 +23282,23 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/engineering/workshop) "uPO" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/tagger{ + dir = 8; + name = "package tagger - Resleeving"; + sort_tag = "Resleeving" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, -/obj/effect/floor_decal/milspec/color/red/half{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "uQU" = ( /obj/machinery/alarm{ dir = 4 @@ -23048,6 +23344,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 4 + }, /obj/effect/floor_decal/milspec/color/red/half{ dir = 4 }, @@ -23101,6 +23400,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/command/tcomms/chamber) +"uWe" = ( +/obj/effect/floor_decal/rust, +/obj/structure/closet/crate/hydroponics/prespawned, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "uWG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -23126,6 +23433,12 @@ pixel_x = 3; pixel_y = -3 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) "uZc" = ( @@ -23193,6 +23506,11 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/se) +"vbU" = ( +/obj/effect/floor_decal/milspec/color/purple/half, +/obj/structure/closet/wardrobe/robotics_black, +/turf/simulated/floor/tiled/white, +/area/groundbase/science/lockerroom) "vdN" = ( /obj/machinery/turretid/lethal{ ailock = 1; @@ -23217,6 +23535,7 @@ /obj/effect/floor_decal/milspec/color/red/half{ dir = 4 }, +/obj/machinery/recharger, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "vec" = ( @@ -23447,7 +23766,14 @@ /area/groundbase/science/robotics) "vot" = ( /obj/effect/floor_decal/milspec/color/purple/half, -/obj/structure/closet/secure_closet/scientist, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table/standard, +/obj/item/weapon/towel, +/obj/item/weapon/towel, +/obj/item/weapon/towel, +/obj/item/weapon/reagent_containers/spray/cleaner, /turf/simulated/floor/tiled/white, /area/groundbase/science/lockerroom) "voB" = ( @@ -23483,15 +23809,14 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) "vpA" = ( -/obj/structure/closet/l3closet/janitor, -/obj/machinery/light{ - dir = 1 +/obj/item/weapon/stool/baystool/padded{ + dir = 4 }, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 1 +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 }, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) +/area/groundbase/civilian/bar) "vpG" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Medical Substation Bypass" @@ -23527,6 +23852,25 @@ /obj/effect/floor_decal/arrivals/right, /turf/simulated/floor/tiled/techfloor, /area/groundbase/civilian/arrivals) +"vrj" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 6 + }, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/suit/armor/vest/wolftaur{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/clothing/suit/armor/vest/wolftaur{ + pixel_x = -8; + pixel_y = -4 + }, +/obj/item/weapon/storage/lockbox, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "vry" = ( /obj/machinery/door/airlock/multi_tile/glass/polarized{ id_tag = null; @@ -23556,7 +23900,9 @@ /area/groundbase/science/server) "vsY" = ( /obj/effect/floor_decal/milspec/color/purple/half, -/obj/structure/closet/wardrobe/robotics_black, +/obj/machinery/vending/wardrobe/scidrobe, +/obj/machinery/power/apc, +/obj/structure/cable/yellow, /turf/simulated/floor/tiled/white, /area/groundbase/science/lockerroom) "vtv" = ( @@ -23564,17 +23910,14 @@ /turf/simulated/wall, /area/groundbase/medical/lhallway) "vtN" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 8 +/obj/effect/floor_decal/rust, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + id_tag = "oldbrigdoor1"; + name = "Brig (CONDEMNED)" }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/lobby) +/obj/item/tape/police, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "vtS" = ( /obj/machinery/light/floortube{ dir = 8; @@ -23605,6 +23948,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) +"vxh" = ( +/obj/machinery/computer/security{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "vxi" = ( /obj/effect/floor_decal/industrial/danger{ dir = 8 @@ -23662,6 +24011,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/upload) +"vAZ" = ( +/obj/machinery/computer/secure_data{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "vBN" = ( /obj/structure/table/steel, /obj/item/device/integrated_circuit_printer, @@ -23684,6 +24039,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/table/reinforced, /turf/simulated/floor/tiled/white, /area/groundbase/civilian/bar) "vCg" = ( @@ -23896,9 +24252,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/structure/sign/department/bar{ - pixel_x = -32 - }, /turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, /area/groundbase/civilian/bar) "vLT" = ( @@ -24195,18 +24548,19 @@ /area/groundbase/engineering/engine) "wcw" = ( /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/milspec/color/red/half, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/outdoors/sidewalk/slab{ + outdoors = 0 + }, /area/groundbase/security/lobby) "wcS" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/turf/simulated/floor/carpet/sblucarpet, -/area/groundbase/security/hos) +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "wdT" = ( /turf/simulated/floor/outdoors/grass/seasonal, /area/groundbase/science/xenobot) @@ -24316,6 +24670,14 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) +"wma" = ( +/obj/structure/disposalpipe/tagger{ + dir = 1; + name = "package tagger - Resleeving"; + sort_tag = "Resleeving" + }, +/turf/simulated/wall/r_wall, +/area/groundbase/science/xenohall) "wmQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -24563,8 +24925,9 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) "wyD" = ( -/obj/effect/floor_decal/milspec/color/red/half, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/outdoors/sidewalk/slab{ + outdoors = 0 + }, /area/groundbase/security/lobby) "wyN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -24651,7 +25014,6 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) "wAH" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -24661,6 +25023,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/bmarble, /area/groundbase/security/lobby) "wAT" = ( @@ -24712,6 +25075,24 @@ }, /turf/simulated/floor/tiled/techfloor, /area/groundbase/civilian/arrivals) +"wCg" = ( +/obj/effect/floor_decal/rust, +/obj/structure/table/steel, +/obj/item/toy/figure/prisoner, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) +"wCs" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/security/showers) "wDK" = ( /obj/structure/bed/chair/sofa/left/black{ dir = 8 @@ -24876,17 +25257,16 @@ /turf/simulated/floor/tiled, /area/groundbase/science/rnd) "wKa" = ( +/obj/structure/bed/chair/office/dark, +/obj/structure/disposalpipe/segment, /obj/machinery/button/remote/airlock{ - dir = 8; + dir = 4; id = "BrigFoyer"; name = "Brig Foyer"; - pixel_x = 24; - pixel_y = 5; + pixel_x = -24; + pixel_y = 4; req_access = list(1) }, -/obj/structure/bed/chair/office/dark, -/obj/effect/landmark/start/security, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "wKw" = ( @@ -24945,9 +25325,9 @@ /area/groundbase/command/hall) "wND" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "1-8" }, -/turf/simulated/floor/outdoors/sidewalk, +/turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level1/nw) "wOi" = ( /turf/simulated/wall/r_wall, @@ -24970,18 +25350,15 @@ /turf/simulated/floor/tiled, /area/groundbase/engineering/techstorage) "wOE" = ( -/obj/structure/closet/secure_closet/security, -/obj/item/device/holowarrant, -/obj/item/device/ticket_printer, -/obj/item/device/radio/intercom{ - dir = 8; - pixel_x = -24 - }, /obj/effect/floor_decal/milspec/color/red/half{ dir = 8 }, +/obj/machinery/vending/security, +/obj/machinery/camera/network/security{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "wPc" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_research{ @@ -25034,11 +25411,11 @@ /turf/simulated/floor/tiled/techmaint, /area/groundbase/command/tcomms/storage) "wRI" = ( -/obj/structure/table/bench/padded, -/obj/effect/landmark/start/entertainer, -/turf/simulated/floor/outdoors/newdirt{ - outdoors = 0 +/obj/structure/table/marble, +/obj/machinery/chemical_dispenser/bar_soft/full{ + dir = 4 }, +/turf/simulated/floor/wood, /area/groundbase/civilian/bar) "wRL" = ( /obj/structure/table/reinforced, @@ -25257,15 +25634,14 @@ /turf/simulated/wall, /area/groundbase/level1/sw) "xcA" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/item/weapon/stool/baystool/padded{ + dir = 8 }, -/obj/machinery/disposal, -/obj/effect/floor_decal/milspec/color/emerald/half{ - dir = 6 +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 }, -/turf/simulated/floor/tiled, -/area/groundbase/civilian/janitor) +/area/groundbase/civilian/bar) "xcM" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -25280,25 +25656,13 @@ /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) "xdA" = ( -/obj/structure/closet/walllocker_double/security/south{ - pixel_y = -28 - }, -/obj/item/weapon/storage/box/holowarrants, -/obj/item/weapon/storage/box/flashbangs{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/weapon/storage/box/handcuffs{ - pixel_x = 6; - pixel_y = -2 - }, -/obj/item/weapon/storage/box/evidence, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/effect/floor_decal/milspec/color/red/half, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "xdU" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -25477,8 +25841,7 @@ /obj/machinery/vending/wallmed1/public{ pixel_y = 28 }, -/obj/random/soap, -/obj/structure/table/standard, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/groundbase/science/lockerroom) "xoi" = ( @@ -25508,16 +25871,9 @@ /turf/simulated/floor/tiled/freezer/cold, /area/groundbase/civilian/kitchen/freezer) "xoT" = ( -/obj/item/toy/figure/mime, -/obj/item/weapon/pen/crayon/marker/mime, -/obj/item/weapon/pen/crayon/mime, -/obj/structure/table/standard, -/obj/machinery/light, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/carpet/bcarpet, -/area/groundbase/civilian/mime) +/obj/structure/table/glass, +/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs_lowsnow, +/area/groundbase/civilian/bar) "xpn" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -25745,6 +26101,16 @@ "xxV" = ( /turf/simulated/floor/outdoors/grass/seasonal/dark, /area/groundbase/level1/ne) +"xyk" = ( +/obj/structure/table/reinforced, +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "xza" = ( /obj/machinery/computer/guestpass{ dir = 8; @@ -25917,6 +26283,16 @@ }, /turf/simulated/floor/tiled, /area/groundbase/command/tcomms/foyer) +"xGB" = ( +/obj/structure/stairs/spawner/north, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable{ + icon_state = "16-0" + }, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block/gb/abandonedbrig) "xGF" = ( /obj/effect/floor_decal/milspec/color/orange/half{ dir = 1 @@ -25947,8 +26323,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/floor_decal/milspec/color/red/half, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/detective) "xGX" = ( @@ -26085,6 +26463,9 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/robot) +"xMF" = ( +/turf/simulated/wall/r_wall, +/area/groundbase/security/showers) "xMT" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -26092,30 +26473,40 @@ /obj/structure/table/rack, /turf/simulated/floor/tiled/monotile, /area/groundbase/civilian/redgate) -"xOg" = ( -/obj/structure/table/bench/padded, -/obj/effect/landmark/start/intern, -/turf/simulated/floor/outdoors/newdirt{ - outdoors = 0 +"xNZ" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/door/airlock/multi_tile/metal/mait{ + id_tag = "oldbrigdoor1"; + name = "Brig (CONDEMNED)" }, -/area/groundbase/civilian/bar) +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) +"xOg" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "xOn" = ( /turf/simulated/floor/outdoors/sidewalk/slab{ outdoors = 0 }, /area/groundbase/science/robotics) "xOo" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs, -/area/groundbase/civilian/clown) +/obj/effect/floor_decal/rust, +/obj/item/tape/police, +/turf/simulated/floor/tiled, +/area/prison/cell_block/gb/abandonedbrig) "xOq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/tcomms/chamber) +"xOP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "xPb" = ( /obj/structure/closet/secure_closet/RD, /obj/item/device/aicard, @@ -26264,6 +26655,11 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) +"xUL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "xVF" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26362,34 +26758,26 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/foyer) "xZT" = ( -/obj/structure/closet/secure_closet/hos2, -/obj/machinery/power/apc{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/structure/table/reinforced, +/obj/machinery/alarm{ + dir = 4 }, -/obj/random/paicard, -/obj/item/device/ticket_printer, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hos) +/turf/simulated/floor/carpet/retro_red, +/area/groundbase/security/breakroom) "yad" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/bench/steel, +/obj/effect/landmark/start/security, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/equipment) +/area/groundbase/security/lobby) "ybp" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 - }, -/obj/machinery/firealarm{ - dir = 8 +/obj/effect/landmark/start/visitor, +/obj/structure/table/bench/padded, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 }, -/turf/simulated/floor/carpet/bcarpet, -/area/groundbase/civilian/mime) +/area/groundbase/civilian/bar) "ycp" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -26397,7 +26785,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/milspec/color/red/corner, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) "ycP" = ( @@ -26420,6 +26807,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bmarble, /area/groundbase/science/hall) +"ydi" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/lobby) "ydP" = ( /obj/machinery/camera/network/civilian{ dir = 4 @@ -26629,6 +27032,15 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) +"yjL" = ( +/obj/item/weapon/stool/baystool/padded{ + dir = 1 + }, +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 + }, +/area/groundbase/civilian/bar) "yjS" = ( /obj/structure/cable{ icon_state = "1-4" @@ -27726,7 +28138,7 @@ awx awx awx awx -awx +eHS bed xDB xDB @@ -28162,10 +28574,10 @@ awx awx awx awx +awx eHS -eHS -eHS -eHS +erw +pGG eHS awx awx @@ -28179,8 +28591,8 @@ awx awx awx awx -eHS -eHS +awx +awx sjT eHS awx @@ -28303,17 +28715,18 @@ awx awx awx awx -eHS -eHS -eHS -eHS -eHS -awx -awx -awx -awx -awx awx +uPu +uPu +qRy +qRy +uPu +uPu +uPu +uPu +uPu +uPu +uPu awx awx awx @@ -28322,7 +28735,6 @@ awx awx awx awx -eHS sjT eHS awx @@ -28444,19 +28856,19 @@ awx awx awx awx -eHS -eHS -eHS -eHS -eHS -awx -awx -awx -awx -awx -awx awx awx +uPu +pxN +kJF +sgm +uPu +cXF +eVn +tCL +tUS +hWW +uPu awx awx awx @@ -28577,22 +28989,6 @@ awx awx awx awx -eHS -eHS -eHS -awx -awx -awx -awx -eHS -eHS -eHS -eHS -eHS -awx -awx -awx -awx awx awx awx @@ -28604,6 +29000,22 @@ awx awx awx awx +uPu +pJX +qTB +qTB +uPu +rNl +tUS +tUS +tUS +hWW +uPu +uPu +uPu +uPu +uPu +uPu awx awx awx @@ -28719,18 +29131,6 @@ awx awx awx awx -eHS -eHS -eHS -eHS -awx -eHS -eHS -eHS -eHS -awx -awx -awx awx awx awx @@ -28742,14 +29142,26 @@ awx awx awx awx -awx -awx -awx -awx -awx -awx -awx -jfH +uPu +pJX +qTB +qTB +xOg +tUS +tUS +tUS +rwy +djf +uPu +xGB +kIW +ucm +iSc +fyc +fyc +mZd +mZd +fDC xDB xDB xDB @@ -28863,28 +29275,6 @@ awx awx awx awx -eHS -eHS -eHS -eHS -eHS -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx awx awx awx @@ -28893,12 +29283,34 @@ awx awx awx awx +uPu +uPu +uPu +qTB +sOL +uPu +tUS +jtl +ryq +rwy +hWW +uPu +uPu +uPu +uPu +pju +urN +urN +dMt +dMt +eHS +kyu +kyu +kyu kyu kyu kyu kyu -eHS -eHS oeu oeu oeu @@ -29005,23 +29417,6 @@ awx awx awx awx -eHS -eHS -eHS -eHS -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx awx awx awx @@ -29030,13 +29425,30 @@ awx awx awx awx +uPu +pat +pSO +qTB +tzI +uPu +tUS +cio +sII +tUS +tUS +xNZ +tUS +tUS +vtN +tUS +tUS +urN +dMt kyu kyu kyu kyu kyu -egG -egG kyu kyu oeu @@ -29148,23 +29560,6 @@ awx awx awx awx -eHS -eHS -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx -awx awx awx awx @@ -29172,11 +29567,28 @@ awx awx awx awx +uPu +uPu +uPu +uPu +uPu +uPu +tUS +cio +sII +tUS +tUS +tUS +tUS +tUS +xOo +mBM +lFH +tUS +kyu kyu kyu kyu -egG -egG egG egG egG @@ -29298,26 +29710,26 @@ awx awx awx awx +uPu +qzg +rir +qzg +uPu +tUS +cio +wCg +tUS +dSV +uPu +uPu +uPu +uPu +uPu +uPu +dgl kyu kyu kyu -kyu -kyu -kyu -kyu -kyu -kyu -kyu -kyu -kyu -awx -awx -awx -awx -kyu -kyu -egG -egG egG egG egG @@ -29439,6 +29851,18 @@ awx awx awx awx +awx +uPu +qMY +rvc +tUS +xOg +tUS +tUS +tUS +tUS +rLg +uPu kyu kyu kyu @@ -29448,30 +29872,18 @@ kyu kyu kyu kyu -kyu -kyu -kyu -kyu -kyu -kyu -kyu -kyu -kyu -egG -egG -egG -egG -egG -egG -egG -egG -egG -egG -egG egG egG egG egG +xMF +xMF +xMF +xMF +xMF +xMF +xMF +xMF egG oeu oeu @@ -29576,21 +29988,23 @@ awx awx awx awx -kyu -kyu -kyu -kyu -kyu -kyu -kyu -nSt -nSt -nSt -nSt -nSt -nSt -nSt +awx +awx +awx +awx +awx +awx +uPu nSt +tUS +tUS +uPu +rNl +tUS +tUS +tUS +hWW +uPu kyu kyu kyu @@ -29604,16 +30018,14 @@ egG egG egG egG -egG -egG -egG -egG -egG -egG -egG -egG -egG -egG +xMF +msc +wCs +fil +nac +hHd +diQ +xMF egG oeu oeu @@ -29718,21 +30130,23 @@ awx awx awx awx -kyu -kyu -kyu -kyu -kyu -kyu -kyu -nSt -bgi +awx +awx +awx +awx +awx +awx +uPu +crU crU -bVT +rDd +uPu rwy -fze -lHM -nSt +uWe +rwy +mAe +hWW +uPu kyu kyu kyu @@ -29742,18 +30156,16 @@ kyu kyu egG egG -egG -egG oeu egG egG egG -egG -egG -egG -egG -egG -tNT +xMF +ktd +kkR +cze +cqm +xMF tNT tNT tNT @@ -29858,31 +30270,31 @@ awx awx awx awx -kyu -kyu -kyu -kyu -kyu -kyu -kyu -kyu -kyu -nSt +awx +awx +awx +awx +awx +awx +awx +awx +uPu +uPu +uPu +uPu +uPu +uPu +uPu +uPu +uPu +uPu uPu -dRQ -dRQ -hdo -dRQ -rEm -nSt -kyu -kyu kyu kyu kyu kyu kyu -egG +oeu oeu oeu oeu @@ -29890,12 +30302,12 @@ oeu oeu egG egG -oeu -oeu -oeu -oeu -oeu -tNT +xMF +jmq +qTG +kYo +lNr +xMF wZg qMD vec @@ -30000,34 +30412,29 @@ awx awx awx awx +awx +awx +awx +awx +awx +awx +awx +awx +kyu +kyu +kyu +kyu +kyu +kyu +kyu +kyu +kyu +kyu kyu kyu kyu -pxN -pxN -pxN -pxN -pxN kyu -nSt -sgm -dRQ -eik -ngX -dRQ -jOr -nSt kyu -pSO -pSO -pSO -pSO -pSO -oeu -oeu -oeu -oeu -oeu oeu oeu oeu @@ -30037,7 +30444,12 @@ oeu oeu oeu oeu -tNT +xMF +rau +asO +gls +lNr +xMF cUC vOy xxM @@ -30142,29 +30554,29 @@ awx awx awx awx +awx +awx +awx +awx +awx +awx +awx +awx kyu kyu kyu -pxN -llu -mEs -ybp -pxN -oeu -nSt -cNZ -hFz -njQ -eTJ -dRQ -gOI -nSt kyu -pSO -gSA -kZE -dYB -pSO +kyu +kyu +kyu +kyu +kyu +kyu +kyu +oeu +oeu +oeu +oeu oeu oeu noM @@ -30175,15 +30587,15 @@ dLd dLd noM noM -ulz -ulz -ulz -ulz -tNT +rtZ +eyO +rtZ +rtZ +rtZ tbv -tNT -tNT -tNT +rtZ +rtZ +rtZ oeu xhI oeu @@ -30277,6 +30689,14 @@ awx awx awx awx +aKZ +aKZ +aKZ +aKZ +aKZ +aKZ +aKZ +aKZ awx awx awx @@ -30287,26 +30707,18 @@ awx kyu kyu kyu -pxN -rDd -rOV -xoT -pxN -oeu -nSt -vpA -dRQ -dRQ -hgM -dRQ -rEm -nSt kyu -pSO -tzI -kBc -sOL -pSO +kyu +kyu +kyu +kyu +kyu +bat +oeu +oeu +oeu +oeu +oeu oeu oeu noM @@ -30325,7 +30737,7 @@ wOE ajT ctu otl -ulz +rtZ oeu xhI oeu @@ -30419,6 +30831,14 @@ awx awx awx awx +aKZ +aUp +eik +fmg +ghR +hgM +khz +aKZ awx awx awx @@ -30429,26 +30849,18 @@ awx kyu kyu kyu -pxN -ghR -qzg -oWy -pxN -oeu -nSt -kUO -fsc -qTB -bPC -fIk -xcA -nSt kyu -pSO -qMY -aKZ -oye -pSO +bat +cgZ +cgZ +cgZ +bat +bat +oeu +oeu +oeu +oeu +oeu oeu oeu noM @@ -30462,12 +30874,12 @@ noM tNc kPv uKc -agl -agl +uKc +uKc cES -qCx +tLw xdA -ulz +rtZ oeu xhI oeu @@ -30561,36 +30973,36 @@ awx awx awx awx -awx -awx -awx -awx -awx -awx -awx +aKZ +buc +eje +eje +gmX +eje +kBc +aKZ +kyu +kyu +kyu +kyu +kyu +kyu kyu kyu kyu -pxN -pxN -kGN -pxN -pxN -oeu -nSt -nSt -nSt -nSt -pat -nSt -nSt -nSt bat -pSO -pSO -qRy -pSO -pSO +bat +bat +kQn +kQn +kQn +bat +bat +oeu +oeu +oeu +oeu +oeu oeu oeu noM @@ -30604,12 +31016,12 @@ noM ocT ryc yad -eIq -eIq -fwC -fwC +yad +yad +yad +xUL ldI -ulz +rtZ oeu xhI oeu @@ -30703,35 +31115,35 @@ awx awx awx awx -awx -awx -awx -awx -awx -awx -awx -kyu -kyu -kyu -kyu -kRZ +aKZ +bPC eje -rvc +fsc +gOI +hFz +kGN +mEs +ngX +njQ +ngX +kRZ +oeu +oeu oeu oeu bat bat bat -pJX -gmX -pJX bat bat +xhI bat bat -tUS -khz -xOo +bat +oeu +oeu +oeu +oeu oeu oeu oeu @@ -30745,13 +31157,13 @@ xGJ noM dCD lMR -nFv -qqB -pyJ -moj -bDi +tLw +tLw +tLw +tLw +tLw kEu -ulz +rtZ oeu aNc teO @@ -30845,19 +31257,19 @@ awx awx awx awx -awx -awx -awx -awx -awx -awx -awx -kyu +aKZ +cNZ +eEz +fIk +gSA +jwB +kUO +aKZ iuY iuY iuY +oye oeu -plG oeu oeu oeu @@ -30865,14 +31277,14 @@ oeu oeu oeu oeu -tMa +bat +xhI oeu oeu oeu oeu oeu oeu -plG oeu oeu oeu @@ -30888,12 +31300,12 @@ noM ulz lji ido -ulz -ulz -ulz -ulz -ulz -ulz +ido +cDJ +cDJ +oVY +vrj +rtZ oeu cKZ oeu @@ -30987,18 +31399,18 @@ awx awx awx awx -awx -awx -awx -awx -awx -awx -awx -kyu +aKZ +def +eje +eje +gST +eje +kZE +aKZ iuY sKv jiO -jiO +oWy oSd jiO jiO @@ -31024,17 +31436,17 @@ noM noM noM noM +oCM noM -jwB noM riX bTS -ipl -pTQ -cwo -pTQ -cgy -aHD +ydi +qXu +qXu +qXu +qEW +qEW rtZ oeu cKZ @@ -31129,19 +31541,19 @@ awx awx awx awx -awx -awx -awx -awx -awx -awx -awx +aKZ +dYB +eTJ +fWY +gWM +jOr +llu tpV tpV tpV tpV eku -hGk +oeu oeu oeu jKz @@ -31159,24 +31571,24 @@ oeu oeu oeu jKz -hIq -oeu -rtZ -rtZ -rtZ -rtZ -nBf -bcx -aUp -vtN +ftm +aih +pjZ +tLw +gjX +tLw +tLw +kLB +ycp +ycp pTJ bLI cMH -ycp +aSI inb uTH dBx -rnw +tLw rtZ oeu cKZ @@ -31271,19 +31683,19 @@ awx awx awx awx -awx -awx -awx -awx -awx -awx -awx +aKZ +aKZ +aKZ +aKZ +aKZ +aKZ +aKZ tpV xir jJL faR wND -buc +oeu oeu oeu oeu @@ -31309,12 +31721,12 @@ rtZ cxB aef cnH -fWY -heQ +gjX +tLw dvu ufO -qbx -jop +tLw +rtZ rtZ rtZ wAH @@ -31455,13 +31867,13 @@ bIl bWq ipl xsv -jye +tLw nKI fyG deE -xsv -sWa -mLi +dUC +wyD +wyD lOz cKZ oeu @@ -31589,8 +32001,8 @@ hIq oeu bIl kTr -kMT xZT +xyk pNi uwR bIl @@ -31603,7 +32015,7 @@ sum gUu qWs uji -bZn +uji sHr xTz oeu @@ -31729,24 +32141,24 @@ oeu oeu hIq oeu -bIl -nfI -pTB -sSt +dBG pTB -ntj +emG +cvk +evE +evE bIl czP ipl xsv -tLw -sSG +sIP +tUO ffi deE -sWa -sWa wyD -qGW +wyD +wyD +aih sos oeu gsf @@ -31871,24 +32283,24 @@ oeu oeu hIq oeu -bIl -tnm -skl -edw -beA -rLH +dBG +wcS +xOP +ufI +eIC +pxd moD kgi ngu jpZ -sSG -sSG -ffi +sIP +vAZ +vxh deE -sWa -sWa wyD -qGW +wyD +wyD +aih sos oeu tJF @@ -32013,12 +32425,12 @@ oeu oeu hIq oeu -bIl +dBG oMW moS -bwi -wcS -fOB +moS +evE +evE bIl lof ngP @@ -32027,10 +32439,10 @@ vCx qpx wKa dmC -azm -azm wcw -ivU +wcw +wcw +teO akL oeu sfb @@ -32143,7 +32555,7 @@ hGk oeu oeu oeu -oeu +iuY pDQ pDQ pDQ @@ -32157,9 +32569,9 @@ hIq oeu bIl ccP -skl +eHL kqd -skl +evE ekT bIl tTk @@ -32169,9 +32581,9 @@ gem vdY pnd deE -sWa -sWa wyD +wyD +ruL lOz bYI lOz @@ -32285,8 +32697,8 @@ hGk oeu oeu oeu -oeu -pDQ +iuY +sfj siZ vBZ pDQ @@ -32312,7 +32724,7 @@ rtZ rtZ rtZ lyI -fWY +wyD eVe oeu jTn @@ -32427,9 +32839,9 @@ hGk oeu oeu oeu -oeu -pDQ -rir +iuY +fcX +rMl ycP pDQ nhv @@ -32569,9 +32981,9 @@ hGk oeu oeu oeu -oeu -pDQ -rir +iuY +fcX +rMl oZU rMl rMl @@ -32706,13 +33118,13 @@ egG oeu oeu oeu -dvs +oeu hGk oeu oeu oeu -eEz -pDQ +iuY +uHp hks rDZ gbn @@ -32848,12 +33260,12 @@ egG oeu oeu oeu -pDQ +bum pjP dVI -sJE -wRI -mDR +dVI +dVI +bum pDQ pDQ sXG @@ -32990,164 +33402,164 @@ egG egG oeu oeu -ydP -cLi +ydP +cLi +sJE +mDC +dVI +dVI +hkB +lpy +ipV +tPI +ivU +dVI +ydP +dVI +oeu +oeu +oeu +kPC +oeu +oeu +tMa +oeu +oeu +kPC +oeu +oeu +oeu +oeu +kPC +oeu +oeu +oeu +oeu +oeu +oeu +lKQ +oeu +asd +jDY +giy +nxC +gzu +iYt +isN +fOi +lTL +sfb +sfb +bfA +bfA +bfA +bfA +bfA +bfA +bfA +bfA +bfA +bfA +bfA +bfA +bfA +bfA +bfA +aay +aay +aay +aay +aay +aay +aay +raF +raF +raF +sfb +cyw +sfb +kUt +kUt +kUt +kUt +kUt +kUt +kUt +kUt +kUt +kUt +kUt +vmM +sfb +sfb +sfb +rOt +rOt +rOt +rOt +rOt +rOt +awx +awx +awx +awx +awx +awx +awx +awx +kTx +"} +(46,1,1) = {" +sHH +awx +awx +awx +awx +awx +awx +awx +awx +awx +sjT +eHS +awx +awx +awx +awx +awx +awx +awx +kyu +kyu +kyu +kyu +kyu +kyu +egG +egG +egG +egG +egG +egG +egG +oeu +oeu dVI +cLi +rOV mDC -mDC -mDC -pDQ -lpy -ipV -tPI -dVI -dVI -ydP dVI -oeu -oeu -oeu -kPC -oeu -oeu -tMa -oeu -oeu -kPC -oeu -oeu -oeu -oeu -kPC -oeu -oeu -oeu -oeu -oeu -oeu -lKQ -oeu -asd -jDY -giy -nxC -gzu -iYt -isN -fOi -lTL -sfb -sfb -bfA -bfA -bfA -bfA -bfA -bfA -bfA -bfA -bfA -bfA -bfA -bfA -bfA -bfA -bfA -aay -aay -aay -aay -aay -aay -aay -raF -raF -raF -sfb -cyw -sfb -kUt -kUt -kUt -kUt -kUt -kUt -kUt -kUt -kUt -kUt -kUt -vmM -sfb -sfb -sfb -rOt -rOt -rOt -rOt -rOt -rOt -awx -awx -awx -awx -awx -awx -awx -awx -kTx -"} -(46,1,1) = {" -sHH -awx -awx -awx -awx -awx -awx -awx -awx -awx -sjT -eHS -awx -awx -awx -awx -awx -awx -awx -kyu -kyu -kyu -kyu -kyu -kyu -egG -egG -egG -egG -egG -egG -egG -oeu -oeu dVI -cLi dVI -mDR -xOg -sJE -hkB dVI qbN dVI -sJE +rQn xgn iEb pBY pBY -pBY +fYJ pBY bNl bNl @@ -33274,19 +33686,19 @@ egG egG egG oeu -dVI +guU cLi -dVI -dVI +rQn +mDC dVI dVI dVI dVI pfZ dVI -sJE +dfP hzC -sJE +rQn nCM fcO pBY @@ -33426,9 +33838,9 @@ hoO fck vWm bYh -sJE +dfP mDC -sJE +rQn svD len gge @@ -33561,10 +33973,10 @@ oeu pDQ xKO soW +vpA jTj jTj -jTj -jTj +vpA dVI dVI eGl @@ -33769,7 +34181,7 @@ iWw oyy gnk ooV -cRt +iyM rWX xYo qqT @@ -33845,12 +34257,12 @@ oeu pDQ aKS jiP -jiP +wRI jiP fcn nJC kql -dtj +yjL czm pES pES @@ -34051,9 +34463,9 @@ aay aay aay aay -oVa -oVa -cRt +jHg +jHg +jHg tbL cRt cRt @@ -34193,7 +34605,7 @@ bfA hlN rSh rjg -rjg +ppv kdy kex lML @@ -34335,9 +34747,9 @@ wzl tPB flt oVa -oVa -oVa -oVa +jHg +cDN +jHg boq boq boq @@ -34418,7 +34830,7 @@ jiP fcn mhV kql -dtj +yjL xSy dVI dVI @@ -34478,7 +34890,7 @@ gNV kQz oVa szS -dfP +cHP vot boq fEI @@ -34621,7 +35033,7 @@ brg oVa szS cHP -vot +baX boq gjy xHb @@ -34697,10 +35109,10 @@ oeu pDQ nat soW +xcA aix aix -aix -aix +xcA dVI dVI luL @@ -34849,7 +35261,7 @@ rzN sKW eoc rGZ -dCF +svD aze pBY plU @@ -34978,7 +35390,7 @@ oeu gXF oeu oeu -dVI +guU neL dVI dVI @@ -34991,8 +35403,8 @@ dVI fHG jal mJB -pBY -pBY +svD +pTY pBY qbk wtC @@ -35046,8 +35458,8 @@ aqv bGO oVa jPR -uHN -uAp +uHs +vbU wrG grR ike @@ -35124,19 +35536,19 @@ dVI neL dVI mDR -xOg -wRI -dVI mDR -xOg -wRI +mDR +mDR +mDR +mDR +mDR eYS pDQ pDQ +svD +lxP pBY -peR -inR -vSM +kuZ vSM vSM mAQ @@ -35188,7 +35600,7 @@ kvh kQz oVa jPR -uHN +uHs mSu wrG sEP @@ -35265,19 +35677,19 @@ oeu cLw neL dVI -mDC -mDC -mDC -bum -mDC -mDC -mDC +rQn +ybp +rQn +soW +rQn +ybp +rQn vJo pDQ -pDQ +heQ +svD +riL pBY -peR -guU vSM vSM pfz @@ -35328,7 +35740,7 @@ unQ bZC tcI jGm -oVa +wma ilb uHs cNk @@ -35404,22 +35816,22 @@ lWL oeu oeu oeu -pDQ +bum neL dVI -sJE -sJE -sJE -pDQ -sJE -sJE -sJE -pDQ -pDQ +xoT +xoT +tbD +bum +imA +xoT +xoT +bum pDQ -pBY -pBY -pBY +inR +svD +svD +fYJ cUb cUb pBY @@ -35552,15 +35964,15 @@ pDI pDI pDI pDI -rQn pDI pDI pDI -rQn -eAs pDI pDI -bat +eAs +pDI +xhI +xhI bat lOz lOz @@ -35701,8 +36113,8 @@ bat bat bat bat -bat -bat +xhI +xhI bat lOz lOz @@ -40445,7 +40857,7 @@ cKq cKq jEd cKq -cKq +gxj dQL gEK qbs diff --git a/maps/groundbase/rp-z2.dmm b/maps/groundbase/rp-z2.dmm index c1929974904..207ebdef503 100644 --- a/maps/groundbase/rp-z2.dmm +++ b/maps/groundbase/rp-z2.dmm @@ -25,15 +25,19 @@ /turf/simulated/floor/outdoors/grass/seasonal/dark/notrees, /area/groundbase/unexplored/outdoors) "ag" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/gloves/arm_guard/bulletproof, -/obj/item/clothing/shoes/leg_guard/bulletproof, -/obj/item/clothing/suit/armor/bulletproof/alt, -/obj/item/clothing/head/helmet/bulletproof, -/obj/item/clothing/gloves/arm_guard/bulletproof, -/obj/item/clothing/shoes/leg_guard/bulletproof, -/obj/item/clothing/suit/armor/bulletproof/alt, -/obj/item/clothing/head/helmet/bulletproof, +/obj/structure/table/rack/shelf/steel, +/obj/item/ammo_magazine/ammo_box/b12g/stunshell{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/ammo_magazine/ammo_box/b12g/flash{ + pixel_x = -1; + pixel_y = 2 + }, +/obj/item/ammo_magazine/ammo_box/b12g/beanbag{ + pixel_x = -5; + pixel_y = 7 + }, /obj/machinery/light{ dir = 4 }, @@ -64,6 +68,12 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/groundbase/engineering/shuttlepad) +"ar" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/mineral/cave, +/area/groundbase/level2/nw) "as" = ( /obj/machinery/computer/prisoner{ dir = 8 @@ -321,11 +331,13 @@ /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "bb" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 5 +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled/white, -/area/groundbase/medical/lobby) +/obj/effect/floor_decal/milspec/monotile, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block/gb/abandonedbrig) "bc" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -368,6 +380,15 @@ /obj/structure/disposalpipe/segment, /turf/simulated/wall, /area/groundbase/cargo/office) +"bh" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/bar) "bj" = ( /obj/structure/table/woodentable, /obj/machinery/microwave, @@ -430,12 +451,29 @@ /turf/simulated/floor/outdoors/grass/seasonal/dark, /area/groundbase/level2/se) "bu" = ( -/obj/machinery/light, -/obj/effect/floor_decal/corner/paleblue{ - dir = 10 +/obj/structure/closet/firecloset/full, +/obj/effect/floor_decal/corner/paleblue/full, +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/newscaster{ - pixel_y = -28 +/turf/simulated/floor/tiled/white, +/area/groundbase/medical/lobby) +"bw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/alarm{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/holodeck_control) +"bz" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/machinery/camera/network/medbay{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) @@ -501,6 +539,13 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) +"bI" = ( +/obj/item/weapon/bedsheet/mimedouble, +/obj/structure/bed/double/padded, +/obj/structure/curtain/black, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "bL" = ( /turf/simulated/wall/r_wall, /area/groundbase/command/hop) @@ -583,14 +628,6 @@ "cc" = ( /turf/simulated/wall/r_wall, /area/groundbase/dorms/bathroom) -"ce" = ( -/obj/effect/landmark{ - name = "maint_pred" - }, -/turf/simulated/floor/outdoors/newdirt{ - outdoors = 0 - }, -/area/groundbase/level2/nw) "cg" = ( /obj/effect/floor_decal/chapel, /obj/structure/disposalpipe/segment, @@ -1337,15 +1374,6 @@ }, /turf/simulated/floor/wood, /area/groundbase/civilian/library) -"ei" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/outdoors/grass/seasonal, -/area/groundbase/level2/ne) "ek" = ( /obj/effect/floor_decal/chapel{ dir = 1 @@ -1452,6 +1480,10 @@ /obj/item/weapon/storage/backpack, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) +"eD" = ( +/obj/structure/table/glass, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/level2/se) "eE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -1485,19 +1517,29 @@ }, /turf/simulated/floor/tiled/monotile, /area/groundbase/engineering/shuttlepad) +"eL" = ( +/obj/structure/sign/department/medbay, +/turf/simulated/wall, +/area/groundbase/medical/lobby) "eM" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/gunbox{ - pixel_y = 6 - }, -/obj/item/gunbox{ - pixel_y = -3 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /obj/machinery/camera/network/security{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/cell/device/weapon{ + pixel_y = -8 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = -2 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = 4 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = 10 }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) @@ -1710,7 +1752,13 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/command/bridge) "ft" = ( -/turf/simulated/wall, +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/bmarble, /area/groundbase/civilian/bar) "fv" = ( /turf/simulated/floor/tiled{ @@ -1979,9 +2027,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) +"gm" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block/gb/abandonedbrig) "gn" = ( /turf/simulated/wall, /area/groundbase/dorms/room8) +"gp" = ( +/obj/structure/cable{ + icon_state = "32-1" + }, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block/gb/abandonedbrig) "gq" = ( /obj/structure/easel, /turf/simulated/floor/tiled{ @@ -2005,6 +2066,10 @@ /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level2/ne) "gt" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Holodeck" + }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -2014,7 +2079,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/steel_ridged, /area/holodeck_control) "gu" = ( /obj/machinery/button/remote/blast_door{ @@ -2491,11 +2556,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level2/ne) @@ -2542,11 +2607,11 @@ /turf/simulated/floor/carpet, /area/groundbase/civilian/chapel) "is" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) @@ -2674,6 +2739,9 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"iI" = ( +/turf/simulated/wall, +/area/groundbase/civilian/clown) "iJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, @@ -2729,9 +2797,11 @@ /turf/simulated/floor/tiled, /area/groundbase/security/processing) "iX" = ( -/turf/simulated/floor/tiled{ - edge_blending_priority = -1; - outdoors = 1 +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 }, /area/groundbase/level2/nw) "iY" = ( @@ -3064,6 +3134,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/groundbase/medical/Chemistry) +"jU" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/prison/cell_block/gb/abandonedbrig) "jV" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -3444,7 +3520,10 @@ /obj/effect/floor_decal/corner/paleblue/full{ dir = 1 }, -/obj/machinery/medical_kiosk, +/obj/machinery/station_map{ + dir = 8; + pixel_x = 32 + }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "li" = ( @@ -3744,6 +3823,11 @@ /obj/structure/handrail, /turf/simulated/shuttle/floor/yellow, /area/shuttle/groundbase/engineering) +"mt" = ( +/obj/effect/floor_decal/milspec/monotile, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block/gb/abandonedbrig) "mu" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -3774,8 +3858,9 @@ /turf/simulated/floor/tiled, /area/prison/cell_block/gb) "mE" = ( -/turf/simulated/floor/tiled, -/area/holodeck_control) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block/gb/abandonedbrig) "mG" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -4198,6 +4283,12 @@ "of" = ( /turf/simulated/floor/outdoors/sidewalk, /area/groundbase/level2/ne) +"og" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/prison/cell_block/gb/abandonedbrig) "oh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -4273,15 +4364,14 @@ /turf/simulated/floor/plating, /area/groundbase/command/bridge) "oz" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_medical{ - name = "Medical"; - req_one_access = null +/obj/structure/railing/grey{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/bmarble, -/area/groundbase/medical/lobby) +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/prison/cell_block/gb/abandonedbrig) "oB" = ( /obj/machinery/power/apc, /obj/structure/cable/yellow{ @@ -4399,20 +4489,23 @@ /obj/structure/railing/grey{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "32-8" - }, -/obj/machinery/atmospherics/pipe/zpipe/down/supply{ +/obj/structure/disposalpipe/up{ dir = 8 }, -/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ +/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/down{ +/obj/machinery/atmospherics/pipe/zpipe/up/supply{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/cable/yellow{ + icon_state = "16-0" + }, /turf/simulated/floor/tiled/dark, -/area/groundbase/security/hall2) +/area/space) "oQ" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -4881,6 +4974,14 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/bridge) +"qm" = ( +/obj/machinery/vending/wardrobe/clowndrobe, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 30 + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "qn" = ( /obj/structure/table/bench/sifwooden/padded, /obj/structure/cable/yellow{ @@ -5147,6 +5248,15 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/dorms/room5) +"re" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/barricade, +/turf/simulated/floor/outdoors/newdirt{ + outdoors = 0 + }, +/area/groundbase/level2/nw) "rf" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -5254,6 +5364,21 @@ }, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) +"rx" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hall2) "rB" = ( /turf/simulated/floor/reinforced{ name = "Holodeck Projector Floor" @@ -5325,23 +5450,17 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "rM" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/storage/vest/heavy/officer{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/item/clothing/suit/storage/vest/heavy/officer{ - pixel_x = -4; - pixel_y = -6 - }, -/obj/item/clothing/suit/storage/vest/heavy/officer{ - pixel_x = 5; - pixel_y = -6 - }, -/obj/item/clothing/suit/storage/vest/heavy/officer{ - pixel_x = 5; - pixel_y = 4 - }, +/obj/structure/table/rack/steel, +/obj/item/clothing/gloves/arm_guard/riot, +/obj/item/clothing/shoes/leg_guard/riot, +/obj/item/clothing/suit/armor/riot/alt, +/obj/item/clothing/head/helmet/riot, +/obj/item/weapon/shield/riot, +/obj/item/clothing/gloves/arm_guard/riot, +/obj/item/clothing/shoes/leg_guard/riot, +/obj/item/clothing/suit/armor/riot/alt, +/obj/item/clothing/head/helmet/riot, +/obj/item/weapon/shield/riot, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) "rN" = ( @@ -5559,7 +5678,19 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/chapel) -"sz" = ( +"sy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) +"sz" = ( /obj/structure/railing{ dir = 4 }, @@ -5971,9 +6102,23 @@ }, /area/groundbase/level2/ne) "tJ" = ( -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled, -/area/holodeck_control) +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/power/apc{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/random/maintenance/security, +/obj/structure/table/steel, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 9 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/milspec, +/area/prison/cell_block/gb/abandonedbrig) "tK" = ( /turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level2/ne) @@ -6565,12 +6710,18 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "vz" = ( -/obj/machinery/computer/HolodeckControl, -/obj/machinery/light{ +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 30 + }, +/obj/random/maintenance/security, +/obj/structure/table/steel, +/obj/effect/floor_decal/milspec/color/red/half{ dir = 1 }, -/turf/simulated/floor, -/area/holodeck_control) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/milspec, +/area/prison/cell_block/gb/abandonedbrig) "vA" = ( /obj/machinery/door/firedoor, /obj/structure/window/reinforced/full, @@ -6632,9 +6783,18 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "vH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/machinery/alarm{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "vK" = ( @@ -6648,6 +6808,24 @@ outdoors = 1 }, /area/groundbase/civilian/bar) +"vM" = ( +/obj/machinery/door/airlock{ + name = "Giggledome"; + req_access = list(136) + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/item/weapon/bananapeel, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/clown) "vN" = ( /obj/structure/bookcase, /obj/item/weapon/book/manual/anomaly_spectroscopy, @@ -6682,23 +6860,23 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, /obj/effect/floor_decal/milspec/color/red/half{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall2) +"vQ" = ( +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "vR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -7050,6 +7228,19 @@ /obj/structure/catwalk, /turf/simulated/open, /area/groundbase/level2/nw) +"wV" = ( +/obj/effect/landmark/start/clown, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "wZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -7058,17 +7249,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall2) -"xa" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/gate/thin{ - dir = 8; - id = "Cafe"; - layer = 3.3 - }, -/turf/simulated/floor, -/area/groundbase/civilian/cafe) "xc" = ( /obj/structure/bed/chair/sofa/corp/left, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -7110,16 +7290,6 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/dorms/room7) -"xi" = ( -/obj/machinery/door/firedoor, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/blast/gate/thin{ - id = "Cafe"; - layer = 3.3 - }, -/turf/simulated/floor, -/area/groundbase/civilian/cafe) "xj" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -7228,17 +7398,21 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"xE" = ( +/obj/structure/table/bench/marble, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/level2/se) "xH" = ( /obj/structure/cable/yellow{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/bmarble, @@ -7298,14 +7472,29 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) "xP" = ( -/obj/structure/bed/chair{ +/obj/structure/catwalk, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/open, +/area/prison/cell_block/gb/abandonedbrig) +"xR" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Temple of Silence"; + req_access = list(138) + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/groundbase/medical/lobby) +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/mime) "xS" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -7373,11 +7562,18 @@ /turf/simulated/floor/wood, /area/groundbase/dorms/room1) "xZ" = ( -/obj/machinery/alarm{ - dir = 8 +/obj/machinery/light/small{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/holodeck_control) +/obj/machinery/alarm, +/obj/random/maintenance/security, +/obj/structure/table/steel, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 5 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/milspec, +/area/prison/cell_block/gb/abandonedbrig) "ya" = ( /obj/machinery/alarm{ dir = 4 @@ -7463,17 +7659,12 @@ /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/groundbase/engineering) "yq" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/machinery/camera/network/medbay{ +/obj/structure/catwalk, +/obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/groundbase/medical/lobby) +/turf/simulated/open, +/area/prison/cell_block/gb/abandonedbrig) "yr" = ( /obj/structure/table/rack, /obj/item/clothing/mask/breath, @@ -7483,6 +7674,16 @@ /obj/machinery/door/window/brigdoor, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) +"yt" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/vending/nifsoft_shop, +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/medical/lobby) "yu" = ( /obj/machinery/computer/communications, /obj/structure/cable/green{ @@ -7618,12 +7819,24 @@ /obj/item/weapon/gun/energy/ionrifle/pistol, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) +"yQ" = ( +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "yS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/milspec/color/red/half{ dir = 8 }, +/obj/machinery/alarm{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall2) "yU" = ( @@ -7662,6 +7875,12 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"zd" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/mineral/cave, +/area/groundbase/level2/nw) "ze" = ( /obj/machinery/power/apc, /obj/structure/cable/yellow, @@ -7759,6 +7978,12 @@ "zw" = ( /turf/simulated/floor/carpet, /area/groundbase/civilian/library) +"zx" = ( +/obj/machinery/door/airlock/glass_security, +/obj/structure/barricade, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block/gb/abandonedbrig) "zy" = ( /obj/structure/table/woodentable, /obj/machinery/computer/med_data/laptop{ @@ -7841,17 +8066,29 @@ /turf/simulated/floor/tiled, /area/groundbase/cargo/office) "zY" = ( -/obj/machinery/light{ - dir = 8 +/obj/machinery/door/airlock/glass_security, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/bmarble, -/area/holodeck_control) +/obj/structure/barricade, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block/gb/abandonedbrig) "zZ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall2) +"Aa" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/open, +/area/prison/cell_block/gb/abandonedbrig) "Ab" = ( /obj/structure/sign/directions/command{ dir = 6; @@ -7900,6 +8137,13 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall2) +"Af" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block/gb/abandonedbrig) "Ag" = ( /turf/simulated/wall/r_wall, /area/medical/virology) @@ -8006,9 +8250,17 @@ /turf/simulated/floor/carpet, /area/groundbase/civilian/library) "Ax" = ( -/obj/structure/sign/department/medbay, -/turf/simulated/wall, -/area/groundbase/medical/lobby) +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/bar) "Ay" = ( /obj/structure/toilet{ dir = 8 @@ -8252,6 +8504,12 @@ }, /turf/simulated/floor, /area/groundbase/medical/psych) +"Bn" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/level2/se) "Bp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ @@ -8361,15 +8619,10 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/warden) "BI" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/vending/nifsoft_shop, -/obj/effect/floor_decal/corner/paleblue/full{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/groundbase/medical/lobby) +/obj/structure/catwalk, +/obj/machinery/light/small, +/turf/simulated/open, +/area/prison/cell_block/gb/abandonedbrig) "BK" = ( /obj/structure/bed/chair/sofa/corp/right, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -8403,6 +8656,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall2) "BQ" = ( @@ -8823,9 +9077,13 @@ /turf/simulated/shuttle/floor/yellow, /area/shuttle/groundbase/engineering) "Dq" = ( -/obj/machinery/light/small, -/turf/simulated/floor/outdoors/newdirt, -/area/groundbase/level2/ne) +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/bar) "Du" = ( /obj/machinery/door/firedoor, /obj/machinery/door/window/brigdoor/southleft{ @@ -8852,18 +9110,44 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/prison/cell_block/gb) -"DB" = ( -/obj/machinery/light, -/obj/machinery/vending/blood, -/obj/effect/floor_decal/corner/paleblue/full, -/turf/simulated/floor/tiled/white, -/area/groundbase/medical/triage) -"DC" = ( -/turf/simulated/floor/wood, -/area/groundbase/dorms/room6) -"DE" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" +"Dz" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/bar) +"DA" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/obj/machinery/firealarm{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/medical/lobby) +"DB" = ( +/obj/machinery/light, +/obj/machinery/vending/blood, +/obj/effect/floor_decal/corner/paleblue/full, +/turf/simulated/floor/tiled/white, +/area/groundbase/medical/triage) +"DC" = ( +/turf/simulated/floor/wood, +/area/groundbase/dorms/room6) +"DD" = ( +/turf/simulated/wall, +/area/groundbase/civilian/mime) +"DE" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" }, /turf/simulated/floor/wood, /area/groundbase/civilian/cafe) @@ -8974,7 +9258,9 @@ /turf/simulated/floor/tiled/white, /area/groundbase/dorms/bathroom) "Ea" = ( -/obj/machinery/light, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/bmarble, /area/holodeck_control) "Ed" = ( @@ -9008,6 +9294,9 @@ }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/groundbase/engineering) +"Ei" = ( +/turf/simulated/wall/r_wall, +/area/prison/cell_block/gb/abandonedbrig) "Ej" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9057,11 +9346,7 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) "Es" = ( -/obj/structure/catwalk, -/turf/simulated/floor{ - edge_blending_priority = -1; - outdoors = 1 - }, +/turf/simulated/floor/bmarble, /area/groundbase/level2/nw) "Et" = ( /obj/effect/floor_decal/industrial/warning{ @@ -9070,20 +9355,11 @@ /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level3/escapepad) "Eu" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, -/area/groundbase/medical/lobby) +/turf/simulated/mineral/cave, +/area/groundbase/level2/nw) "Ew" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/industrial/outline/yellow, @@ -9182,6 +9458,15 @@ /obj/item/weapon/storage/box/PDAs, /turf/simulated/floor/tiled, /area/groundbase/command/hop) +"EQ" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/medical/lobby) "ER" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -9234,13 +9519,18 @@ }, /turf/simulated/floor/tiled, /area/groundbase/security/processing) +"Fc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/firealarm{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/holodeck_control) "Ff" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/machinery/computer/transhuman/designer{ - dir = 8 - }, +/obj/machinery/medical_kiosk, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "Fg" = ( @@ -9253,6 +9543,10 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"Fi" = ( +/obj/structure/bed/chair, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/level2/se) "Fj" = ( /obj/structure/table/glass, /obj/item/device/radio{ @@ -9669,19 +9963,15 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/command/bridge) "GJ" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/ammo_magazine/ammo_box/b12g/stunshell{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/ammo_magazine/ammo_box/b12g/flash{ - pixel_x = -1; - pixel_y = 2 - }, -/obj/item/ammo_magazine/ammo_box/b12g/beanbag{ - pixel_x = -5; - pixel_y = 7 - }, +/obj/structure/table/rack/steel, +/obj/item/clothing/gloves/arm_guard/bulletproof, +/obj/item/clothing/shoes/leg_guard/bulletproof, +/obj/item/clothing/suit/armor/bulletproof/alt, +/obj/item/clothing/head/helmet/bulletproof, +/obj/item/clothing/gloves/arm_guard/bulletproof, +/obj/item/clothing/shoes/leg_guard/bulletproof, +/obj/item/clothing/suit/armor/bulletproof/alt, +/obj/item/clothing/head/helmet/bulletproof, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) "GK" = ( @@ -9758,17 +10048,21 @@ /area/groundbase/civilian/bar) "GU" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/weapon/cell/device/weapon{ - pixel_y = -2 +/obj/item/clothing/suit/storage/vest/heavy/officer{ + pixel_x = -4; + pixel_y = 4 }, -/obj/item/weapon/cell/device/weapon{ - pixel_y = -8 +/obj/item/clothing/suit/storage/vest/heavy/officer{ + pixel_x = -4; + pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ - pixel_y = 4 +/obj/item/clothing/suit/storage/vest/heavy/officer{ + pixel_x = 5; + pixel_y = -6 }, -/obj/item/weapon/cell/device/weapon{ - pixel_y = 11 +/obj/item/clothing/suit/storage/vest/heavy/officer{ + pixel_x = 5; + pixel_y = 4 }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) @@ -9998,17 +10292,11 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/command/bridge) "HC" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/machinery/firealarm{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, -/area/groundbase/medical/lobby) +/turf/simulated/wall/r_wall, +/area/prison/cell_block/gb/abandonedbrig) "HD" = ( /obj/machinery/door/blast/regular{ id = "xenobiodiv3"; @@ -10079,6 +10367,12 @@ "HP" = ( /turf/simulated/floor/outdoors/newdirt, /area/groundbase/cargo/office) +"HT" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/outdoors/sidewalk, +/area/groundbase/level2/ne) "HU" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -10089,11 +10383,23 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall2) "HW" = ( -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/groundbase/medical/lobby) +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/bar) "HX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10295,18 +10601,17 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/lobby) "IA" = ( -/obj/machinery/station_map{ - dir = 4; - pixel_x = -32 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/structure/bed/chair{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/groundbase/medical/lobby) +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/bar) "IB" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder, @@ -10368,6 +10673,15 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) +"II" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "IJ" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -10798,6 +11112,16 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/bridge) +"JV" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass_medical{ + name = "Medical"; + req_one_access = null + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/bmarble, +/area/groundbase/medical/lobby) "JX" = ( /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall2) @@ -11031,27 +11355,30 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/cable/yellow{ - icon_state = "1-4" +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 8 }, /obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/milspec/color/red/half{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall2) +"KL" = ( +/obj/structure/railing, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/bar) "KO" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -11075,6 +11402,10 @@ }, /turf/simulated/floor/wood, /area/groundbase/civilian/library) +"KT" = ( +/obj/structure/table/steel, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/bar) "KU" = ( /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/outdoors/grass/seasonal/notrees, @@ -11094,6 +11425,18 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) +"Lb" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/wmarble, +/area/groundbase/civilian/bar) "Lc" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -11271,6 +11614,13 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) +"LD" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block/gb/abandonedbrig) "LE" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -11379,11 +11729,19 @@ /turf/simulated/floor/bmarble, /area/groundbase/civilian/bar) "LT" = ( -/obj/machinery/firealarm{ +/obj/machinery/computer{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/holodeck_control) +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -30 + }, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 10 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/milspec, +/area/prison/cell_block/gb/abandonedbrig) "LU" = ( /obj/structure/mirror{ pixel_y = 37 @@ -11445,6 +11803,19 @@ }, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) +"Ml" = ( +/obj/effect/landmark/start/mime, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "Mm" = ( /obj/machinery/light, /obj/effect/floor_decal/corner/paleblue{ @@ -11503,18 +11874,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/groundbase/engineering/shuttlepad) -"Mv" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/outdoors/grass/seasonal, -/area/groundbase/level2/ne) "Mw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -11544,6 +11903,17 @@ outdoors = 1 }, /area/groundbase/level2/ne) +"MB" = ( +/obj/item/toy/figure/mime, +/obj/item/weapon/pen/crayon/marker/mime, +/obj/item/weapon/pen/crayon/mime, +/obj/structure/table/standard, +/obj/machinery/light, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "MD" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -11659,6 +12029,11 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) +"MZ" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor, +/area/prison/cell_block/gb/abandonedbrig) "Na" = ( /obj/machinery/door/airlock{ id_tag = null; @@ -11908,6 +12283,10 @@ /obj/structure/stairs/spawner/north, /turf/simulated/floor/outdoors/sidewalk, /area/groundbase/level2/ne) +"NK" = ( +/obj/machinery/light/small, +/turf/simulated/floor/outdoors/newdirt, +/area/groundbase/level2/ne) "NL" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -11931,6 +12310,10 @@ /obj/structure/table/marble, /turf/simulated/floor/wood, /area/groundbase/civilian/cafe) +"NP" = ( +/obj/structure/barricade/cutout/clown, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "NQ" = ( /obj/machinery/power/apc{ dir = 8 @@ -11952,6 +12335,13 @@ /obj/structure/cable/yellow, /turf/simulated/floor/wood, /area/groundbase/dorms/room7) +"NV" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/railing/grey, +/turf/simulated/open, +/area/prison/cell_block/gb/abandonedbrig) "NY" = ( /obj/structure/railing{ dir = 4 @@ -11976,6 +12366,18 @@ }, /turf/simulated/floor/wood, /area/groundbase/civilian/cafe) +"Ob" = ( +/obj/structure/table/woodentable, +/obj/item/toy/figure/clown, +/obj/item/weapon/pen/crayon/marker/rainbow, +/obj/machinery/firealarm{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "Oc" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -12384,6 +12786,12 @@ }, /turf/simulated/floor/wood, /area/groundbase/dorms/room8) +"OY" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/prison/cell_block/gb/abandonedbrig) "OZ" = ( /obj/machinery/camera/network/medbay{ dir = 4 @@ -12400,6 +12808,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) +"Pb" = ( +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/prison/cell_block/gb/abandonedbrig) "Pc" = ( /obj/machinery/light{ dir = 4 @@ -12534,6 +12949,19 @@ /obj/machinery/light, /turf/simulated/floor/tiled/white, /area/groundbase/dorms/bathroom) +"Py" = ( +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp/clown{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/weapon/bikehorn{ + pixel_x = -2; + pixel_y = 11 + }, +/obj/machinery/alarm, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "Pz" = ( /obj/structure/closet/walllocker_double/cargo/north, /obj/item/weapon/cartridge/quartermaster{ @@ -12574,6 +13002,10 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +"PD" = ( +/obj/machinery/vending/wardrobe/mimedrobe, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "PE" = ( /obj/structure/sign/painting/library_secure{ pixel_x = -30 @@ -12613,22 +13045,11 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) "PL" = ( -/obj/structure/cable/yellow{ - icon_state = "16-0" - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/zpipe/up/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ - dir = 8 - }, -/obj/structure/disposalpipe/up{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, -/turf/simulated/wall/r_wall, +/turf/simulated/floor/tiled/dark, /area/groundbase/security/hall2) "PM" = ( /obj/structure/table/bench/steel, @@ -12876,6 +13297,7 @@ "Qy" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/camera/network/civilian, +/obj/machinery/computer/HolodeckControl, /turf/simulated/floor/tiled, /area/holodeck_control) "Qz" = ( @@ -13151,6 +13573,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level2/ne) +"Rt" = ( +/turf/simulated/open, +/area/prison/cell_block/gb/abandonedbrig) "Rv" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -13174,11 +13599,6 @@ /obj/machinery/door/firedoor, /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/machinery/door/blast/gate/thin{ - dir = 2; - id = "Cafe"; - layer = 3.3 - }, /turf/simulated/floor, /area/groundbase/civilian/cafe) "Rx" = ( @@ -13339,6 +13759,16 @@ }, /turf/simulated/floor/bmarble, /area/holodeck_control) +"RX" = ( +/obj/machinery/computer{ + dir = 8 + }, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 6 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/milspec, +/area/prison/cell_block/gb/abandonedbrig) "RZ" = ( /obj/structure/railing{ dir = 4 @@ -13362,11 +13792,8 @@ /turf/simulated/floor/outdoors/grass/seasonal/notrees, /area/groundbase/level2/ne) "Sd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) @@ -13392,6 +13819,18 @@ /obj/structure/railing/grey{ dir = 4 }, +/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/zpipe/down/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/down{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "32-4" + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall2) "Sj" = ( @@ -13494,6 +13933,9 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor, /area/prison/cell_block/gb) "Sw" = ( @@ -13540,6 +13982,12 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) +"SB" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/level2/se) "SD" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ @@ -13559,6 +14007,12 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level2/nw) +"SI" = ( +/turf/simulated/floor{ + edge_blending_priority = -1; + outdoors = 1 + }, +/area/groundbase/civilian/bar) "SL" = ( /obj/effect/floor_decal/milspec/color/purple/half, /turf/simulated/floor/tiled, @@ -13704,6 +14158,15 @@ /obj/machinery/door/firedoor, /turf/simulated/floor, /area/groundbase/medical/lobby) +"Tg" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/bar) "Th" = ( /obj/structure/extinguisher_cabinet{ dir = 4; @@ -13723,6 +14186,18 @@ }, /turf/simulated/floor/tiled/white, /area/medical/virology) +"Tl" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "Tm" = ( /obj/structure/table/steel, /obj/structure/railing, @@ -14096,6 +14571,10 @@ /obj/effect/floor_decal/milspec/color/red/half{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall2) "Us" = ( @@ -14199,6 +14678,12 @@ }, /turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level2/ne) +"UC" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/mineral/cave, +/area/groundbase/level2/nw) "UD" = ( /obj/structure/table/steel, /obj/item/weapon/storage/box/lights/mixed, @@ -14312,22 +14797,21 @@ }, /turf/simulated/floor/tiled, /area/groundbase/cargo/office) -"UR" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Holodeck" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"UQ" = ( +/obj/structure/bed/chair/comfy/yellow{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/holodeck_control) +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) +"UR" = ( +/obj/structure/bed/chair/office/dark, +/obj/effect/floor_decal/milspec/color/red/half, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/milspec, +/area/prison/cell_block/gb/abandonedbrig) "UT" = ( /obj/machinery/light, /obj/effect/floor_decal/milspec_sterile/green/half, @@ -14426,6 +14910,13 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/bridge) +"Vh" = ( +/obj/structure/barricade/cutout/mime, +/obj/machinery/alarm{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "Vj" = ( /turf/simulated/open, /area/groundbase/civilian/bar) @@ -14507,6 +14998,13 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"Vz" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/dark, +/area/prison/cell_block/gb/abandonedbrig) "VA" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, @@ -14535,10 +15033,17 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/Chemistry) "VK" = ( -/obj/structure/closet/firecloset/full, -/obj/effect/floor_decal/corner/paleblue/full, -/turf/simulated/floor/tiled/white, -/area/groundbase/medical/lobby) +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/bar) "VM" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -14667,6 +15172,10 @@ }, /turf/simulated/open, /area/groundbase/level2/se) +"Wp" = ( +/obj/structure/catwalk, +/turf/simulated/open, +/area/prison/cell_block/gb/abandonedbrig) "Wq" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet, @@ -14782,6 +15291,18 @@ }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/level3/escapepad) +"WK" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/level2/ne) "WM" = ( /obj/item/weapon/bedsheet/green, /obj/structure/bed/padded, @@ -14974,7 +15495,9 @@ "Xw" = ( /obj/machinery/door/firedoor, /obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced/polarized/full{ + id = "sec_processing" + }, /obj/structure/window/reinforced{ dir = 1 }, @@ -15030,17 +15553,13 @@ /turf/simulated/floor/tiled, /area/prison/cell_block/gb) "XK" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/gloves/arm_guard/riot, -/obj/item/clothing/shoes/leg_guard/riot, -/obj/item/clothing/suit/armor/riot/alt, -/obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, -/obj/item/clothing/gloves/arm_guard/riot, -/obj/item/clothing/shoes/leg_guard/riot, -/obj/item/clothing/suit/armor/riot/alt, -/obj/item/clothing/head/helmet/riot, -/obj/item/weapon/shield/riot, +/obj/structure/table/rack/shelf/steel, +/obj/item/gunbox{ + pixel_y = 6 + }, +/obj/item/gunbox{ + pixel_y = -3 + }, /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 }, @@ -15389,6 +15908,15 @@ }, /turf/simulated/floor/wood, /area/groundbase/dorms/room6) +"YQ" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/bar) "YR" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -15420,11 +15948,34 @@ }, /turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level2/se) +"YW" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 30 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/groundbase/civilian/mime) "YX" = ( /turf/simulated/floor/outdoors/newdirt{ outdoors = 0 }, /area/groundbase/unexplored/rock) +"YY" = ( +/obj/structure/railing/grey, +/turf/simulated/open, +/area/prison/cell_block/gb/abandonedbrig) +"Za" = ( +/obj/structure/curtain/black{ + color = "#361447" + }, +/obj/item/weapon/bedsheet/clowndouble, +/obj/structure/bed/double/padded, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/carpet/gaycarpet, +/area/groundbase/civilian/clown) "Zd" = ( /obj/machinery/alarm, /obj/effect/floor_decal/milspec/color/red/half{ @@ -15437,7 +15988,6 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "Zg" = ( -/obj/structure/table/steel_reinforced, /obj/item/ammo_magazine/m45/rubber{ pixel_y = 9 }, @@ -15448,6 +15998,7 @@ /obj/item/ammo_magazine/m45/rubber{ pixel_y = -3 }, +/obj/structure/table/rack/shelf/steel, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) "Zh" = ( @@ -15499,7 +16050,9 @@ "Zl" = ( /obj/machinery/door/firedoor, /obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced/polarized/full{ + id = "sec_processing" + }, /obj/structure/window/reinforced{ dir = 8 }, @@ -16213,8 +16766,8 @@ rh rh rh rh -rh -rh +bG +bG bG bG bG @@ -16347,15 +16900,15 @@ rh rh rh rh -rh -rh -rh -rh -rh -rh -rh -rh -rh +bG +bG +bG +bG +bG +bG +bG +bG +bG bG bG bG @@ -16488,19 +17041,19 @@ rh rh rh rh -rh -rh -rh -rh -rh -rh -rh -rh -rh +bG +bG +iX +bG +bG +bG bG bG bG bG +bG +gc +gc LX LX LX @@ -16630,6 +17183,9 @@ rh rh rh rh +bG +bG +rh rh rh rh @@ -16638,9 +17194,6 @@ rh rh rh bG -bG -bG -bG gc gc gc @@ -16771,6 +17324,10 @@ rh rh rh rh +hZ +wR +wR +hZ rh rh rh @@ -16778,11 +17335,7 @@ rh rh rh rh -rh -bG -bG -bG -rh +YX rh rh rh @@ -16913,6 +17466,10 @@ rh rh rh rh +hZ +wR +wR +hZ rh rh rh @@ -16920,13 +17477,9 @@ rh rh rh rh -bG -bG -bG -rh -rh -rh -rh +YX +YX +YX rh rh rh @@ -17055,6 +17608,10 @@ rh rh rh rh +hZ +wR +wR +hZ rh rh rh @@ -17062,14 +17619,10 @@ rh rh rh rh -bG -bG -bG -rh -rh -rh rh rh +YX +YX rh rh rh @@ -17198,24 +17751,8 @@ rh rh rh rh -rh -rh -rh -rh -rh -rh -bG bG bG -bG -rh -rh -rh -rh -rh -rh -rh -rh rh rh rh @@ -17227,6 +17764,22 @@ gc gc gc gc +bG +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc gc gc gc @@ -17340,27 +17893,27 @@ rh rh rh rh -rh -rh -rh -rh -rh -rh -bG -bG -bG -bG -rh -rh bG bG rh rh rh rh -rh -rh -rh +gc +gc +ar +zd +zd +zd +zd +re +zd +zd +zd +zd +zd +zd +UC gc gc gc @@ -17482,31 +18035,31 @@ rh rh rh rh -rh -rh -rh -rh -rh -rh -rh -bG -bG -bG bG bG -bG -bG -bG -rh -rh rh rh rh rh gc gc +Vz +mE +mE +Wp +Wp +Wp +Wp +xP +Wp +Wp +Wp +Wp +Eu +gc +gc +gc gc -WB WB WB WB @@ -17624,28 +18177,30 @@ rh rh rh rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -bG -bG bG bG -bG -bG -bG -rh rh rh rh rh gc +mE +Vz +gm +mE +Wp +Aa +OY +OY +OY +OY +OY +NV +Wp +HC +Ei +Ei +Ei gc WB WB @@ -17659,8 +18214,6 @@ WB WB WB WB -WB -WB TH TH TH @@ -17765,32 +18318,32 @@ rh rh rh rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -bG bG bG bG -bG -rh rh rh rh rh +Ei +Ei +zY +Ei +Ei +Wp +og +Rt +Rt +Rt +Rt +Rt +YY +Wp +Af +gp +Rt +Ei gc -gc -WB -WB WB WB WB @@ -17907,32 +18460,32 @@ rh rh rh rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -bG bG bG -ce rh rh rh rh rh +Ei +tJ +bb +LT +MZ +Wp +og +Rt +Rt +Rt +Rt +Rt +YY +Wp +Ei +Ei +Ei +Ei gc -gc -gc -WB WB WB WB @@ -18049,21 +18602,6 @@ gc gc gc gc -rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -bG -bG bG bG rh @@ -18071,6 +18609,21 @@ rh rh rh rh +Ei +vz +mt +UR +MZ +Wp +og +Rt +Rt +Rt +Rt +Rt +YY +Wp +gc gc gc gc @@ -18081,8 +18634,8 @@ WB WB WB WB -TH -TH +WB +WB WB WB TH @@ -18191,20 +18744,6 @@ gc gc gc gc -rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -rh -bG -bG -bG bG bG rh @@ -18212,7 +18751,21 @@ rh rh rh rh -rh +Ei +vz +mt +UR +MZ +Wp +og +Rt +Rt +Rt +Rt +Rt +YY +BI +gc gc gc gc @@ -18221,8 +18774,8 @@ WB WB WB WB -TH -TH +WB +WB TH TH TH @@ -18333,28 +18886,28 @@ gc gc gc gc -rh -rh -rh -rh -rh -rh -rh bG bG -bG -bG -bG -bG -bG -bG -rh -rh rh rh rh rh rh +Ei +xZ +mt +RX +MZ +Wp +og +Rt +Rt +Rt +Rt +Rt +YY +Wp +gc gc gc gc @@ -18362,8 +18915,8 @@ WB WB WB WB -TH -TH +WB +WB TH TH TH @@ -18475,27 +19028,27 @@ gc gc gc gc -gc -gc -gc -bG -bG -bG -bG -bG -bG -bG -bG -bG bG bG -gc -gc -gc -gc -gc -gc -gc +rh +rh +rh +rh +rh +Ei +Ei +zx +Ei +Ei +Wp +og +Rt +Rt +Rt +Rt +Rt +YY +Wp gc gc gc @@ -18503,21 +19056,21 @@ WB WB WB WB +WB +WB +WB TH TH TH TH -TH -TH -TH -TH -TH -TH -TH -TH -TH -TH -TH +Wf +Wf +Wf +Wf +Wf +Wf +Wf +Wf TH TH TH @@ -18617,27 +19170,27 @@ Xv Xv Xv gc -gc -gc -bG -bG bG bG -bG -bG -bG -bG -bG -gc -gc -gc -gc -gc -gc -gc -gc -gc +rh +rh +rh +rh +rh gc +mE +mE +LD +mE +Wp +oz +jU +jU +jU +jU +jU +Pb +Wp gc gc WB @@ -18645,21 +19198,21 @@ WB WB WB WB +WB +WB TH TH TH TH TH -TH -TH -TH -TH -TH -TH -TH -TH -TH -TH +Wf +Wf +Wf +Wf +Wf +Wf +Wf +Wf TH TH TH @@ -18759,46 +19312,46 @@ xN xh Xv gc -gc bG bG bG +rh +rh +rh +rh gc gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc +mE +mE +mE +Wp +Wp +Wp +Wp +yq +Wp +Wp +Wp +Wp gc gc WB WB WB WB +WB +WB TH TH TH TH TH TH -TH -TH -TH -TH -TH -TH -TH +Wf +Wf +Wf +Wf +Wf Wf Wf Wf @@ -18904,8 +19457,10 @@ gc gc bG bG -bG -gc +rh +rh +rh +rh gc gc gc @@ -18926,13 +19481,6 @@ WB WB WB WB -WB -WB -TH -TH -TH -TH -TH TH TH TH @@ -18946,6 +19494,11 @@ Wf Wf Wf Wf +Wf +Wf +Wf +Wf +Wf TH TH TH @@ -19059,16 +19612,16 @@ gc gc gc gc -gc +WB +WB +WB gc gc gc WB -Wf -Wf -Wf -Wf -Wf +WB +WB +WB TH TH Zz @@ -19078,11 +19631,11 @@ Zz Zl Zl Zz -TH -TH -TH -TH -TH +Wf +Wf +Wf +Wf +Wf Wf Wf Wf @@ -19195,22 +19748,22 @@ gc gc gc gc -Wf -TH -Wf -iX -iX -iX -iX -iX -iX -Wf WB -Wf -iX -iX -iX -Wf +WB +WB +WB +WB +WB +WB +WB +WB +WB +WB +WB +WB +TH +TH +TH TH TH Xw @@ -19336,23 +19889,23 @@ gc gc gc gc -iX -Wf -TH -Wf -iX -iX -iX -iX -iX -iX -Wf WB -Wf -iX -iX -iX -Wf +WB +WB +WB +WB +WB +WB +WB +WB +WB +WB +TH +TH +TH +TH +TH +TH TH TH Xw @@ -19477,24 +20030,24 @@ gc gc gc gc -iX -iX -Wf -TH -Wf -iX -iX -iX -iX -iX -iX -Wf WB -Wf -iX -iX -iX -Wf +WB +WB +WB +WB +WB +WB +TH +TH +TH +TH +TH +TH +TH +TH +TH +TH +TH TH TH Zz @@ -19618,25 +20171,25 @@ gc gc gc gc -Wf -Wf -Wf -Wf +WB +WB +WB +WB +WB +WB +TH +TH +TH +TH +TH +TH +TH +TH +TH +TH +TH TH -Wf -Wf -Wf -Wf -Wf -Wf -Wf -Wf TH -Wf -Wf -Wf -Wf -Wf TH TH Xw @@ -19760,7 +20313,7 @@ WB gc gc WB -WB +TH TH TH TH @@ -20209,10 +20762,10 @@ TH TH Iw be -JX +Xa PI oP -PL +Iw Rv yS wZ @@ -20351,7 +20904,7 @@ TH TH Iw oe -JX +PL Si Le gD @@ -20494,7 +21047,7 @@ TH Iw gU rs -hb +rx nJ hb uR @@ -21189,15 +21742,15 @@ TH TH TH TH -TH -Wf -Wf -Wf -Wf -Wf -Wf -Wf -Wf +iI +iI +iI +iI +DD +DD +DD +DD +DD TH TH TH @@ -21331,15 +21884,15 @@ TH TH TH TH -TH -Wf -Wf -Wf -Wf -Wf -Wf -Wf -Wf +iI +Py +yQ +NP +DD +Vh +vQ +II +DD TH TH TH @@ -21473,15 +22026,15 @@ TH TH TH TH -TH -Wf -Wf -Wf -Wf -Wf -Wf -Wf -Wf +iI +Za +wV +Ob +DD +bI +Ml +MB +DD TH TH TH @@ -21615,15 +22168,15 @@ TH TH TH TH -TH -Wf -Wf -Wf -Wf -Wf -Wf -Wf -Wf +iI +qm +sy +UQ +DD +PD +Tl +YW +DD TH TH TH @@ -21757,15 +22310,15 @@ TH TH TH TH -TH -Wf -Wf -Wf -Wf -Wf -Wf -Wf -Wf +iI +iI +vM +iI +DD +DD +xR +DD +DD TH TH TH @@ -21899,15 +22452,15 @@ Wf Wf Wf Wf -Wf -Wf -Wf -Wf -Wf -Wf -Wf -Wf -Wf +Tg +Vn +Ax +Dz +Dq +HW +VK +KL +SI TH TH TH @@ -22041,15 +22594,15 @@ kG TQ VP OD -kG -kG -TQ -VP -OD -kG -kG -ft -Wf +Vn +Vn +Ft +KT +gA +IA +Vn +WF +SI TH TH TH @@ -22188,7 +22741,7 @@ Vn Ft Lt gA -Vn +IA Vn WF mQ @@ -22330,7 +22883,7 @@ Gn Gn Gn Gn -Gn +Lb QV th mQ @@ -22472,7 +23025,7 @@ xI xI xI SR -Gn +Lb Lt Tm mQ @@ -22614,7 +23167,7 @@ Vj Vj Vj JO -Gn +Lb kv MJ mQ @@ -22756,7 +23309,7 @@ Vj Vj Vj JO -Gn +Lb Vn WF mQ @@ -22898,7 +23451,7 @@ Vj Vj Vj JO -Gn +Lb Vn WF mQ @@ -23040,7 +23593,7 @@ Vj Vj Vj JO -Gn +Lb QV th mQ @@ -23182,7 +23735,7 @@ Vj Vj Vj JO -Gn +Lb LS Tm mQ @@ -23324,7 +23877,7 @@ Vj Vj Vj JO -Gn +Lb kv MJ mQ @@ -23466,7 +24019,7 @@ Vj Vj Vj JO -Gn +Lb Vn WF mQ @@ -23608,7 +24161,7 @@ Vj Vj Vj JO -Gn +Lb Vn WF mQ @@ -23750,7 +24303,7 @@ Vj Vj Vj JO -Gn +Lb Yv SR mQ @@ -23892,7 +24445,7 @@ Ed Ed Ed OI -Gn +Lb Go JO mQ @@ -23903,8 +24456,8 @@ Qx Qx Wl cZ -cZ -cZ +bw +Fc Sj mQ dF @@ -24034,7 +24587,7 @@ Gn Gn Gn Gn -Gn +Lb qy dQ mQ @@ -24042,12 +24595,12 @@ mQ mQ mQ mQ -vz +mQ gt -mE -xZ -LT -tJ +mQ +mQ +mQ +mQ mQ dF dF @@ -24176,21 +24729,21 @@ Vn Ft Lt gA -Vn -Vn +Ax +Dq xH fT fT RW Ea -mQ -mQ -UR -mQ -mQ -mQ -mQ -mQ +UF +UF +UF +UF +UF +Ea +UF +UF dF dF ai @@ -24308,7 +24861,7 @@ TH TH TH TH -ft +YQ kq Hl Zn @@ -24320,7 +24873,7 @@ Zn gO kq kq -ft +bh it it NY @@ -24328,11 +24881,11 @@ RJ RJ RJ XQ -zY +UF UF it it -kq +it RO RO RZ @@ -25321,9 +25874,9 @@ bR ua CL cb -Zx -Zx -Zx +Gy +Gy +Gy LW CL CL @@ -29311,14 +29864,14 @@ Ie Ng Ng pi -Mv -ei +Ng +Ng bR bR pp pp pp -zJ +dg mL Et Et @@ -29453,18 +30006,18 @@ Ie Ng Ng Jv -of -bR +pC +yI bR bR pp pp +pp +pp zJ zJ zJ -zJ -zJ -zJ +Sa aH aH aH @@ -29595,17 +30148,17 @@ Ng Ng Ng Jv -of -bR -bR -bR -zJ -zJ -zJ -zJ +HT +Cs +Cs +Cs +jM +jM +jM +jM +jM KF KF -zJ Hu pp pp @@ -29737,15 +30290,15 @@ Yk ZF MR Jv -pC -pC -pC -pC -jj -jj -jj -jj -jj +of +of +GB +GB +xE +xE +xE +Hu +Hu jj jj Hu @@ -29880,14 +30433,14 @@ li HP pi Ng -Ng -Ng -Ng -zJ -zJ -zJ -zJ zJ +SB +Hu +Hu +Hu +Hu +Hu +SB zJ zJ zJ @@ -30022,15 +30575,15 @@ Uv ep Jv Ng -Ax -Tf -Tf -Tf -Tf -Vx -Vx -Vx -Vx +zJ +eD +Bn +Hu +Hu +Hu +Fi +eD +zJ Qi Qi Bl @@ -30163,16 +30716,16 @@ Tc fK sK XW -Tb +Ng +eL Tf -BI -HW -yq -xP -Eu -HC -IA -VK +Tf +Tf +Tf +Tf +Tf +Tf +Vx Qi BT jl @@ -30305,15 +30858,15 @@ Sw pT ep ih -DW -oz -XO +Tb +Tf +yt Sd -TM -TM +bz +EQ vH -TM -TM +DA +EQ bu Qi qp @@ -30446,10 +30999,10 @@ sX Sw pT ep -vD -Dq -Tf -bb +WK +DW +JV +Ma is MY XO @@ -30589,7 +31142,7 @@ QE pT ep vD -Ng +NK Tf lh iP @@ -31999,12 +32552,12 @@ GR GR fX fX -xa -xa +Rw +Rw eb -xa -xa -xa +Rw +Rw +Rw fX fX Ng @@ -32281,7 +32834,7 @@ tP tP GR GR -xi +Rw ov Fu ll @@ -32423,7 +32976,7 @@ tP tP GR GR -xi +Rw NO Fu DE @@ -32565,7 +33118,7 @@ tP tP GR GR -xi +Rw qV Qc Sb diff --git a/maps/groundbase/rp-z3.dmm b/maps/groundbase/rp-z3.dmm index 299e77c601b..f08d9cd4433 100644 --- a/maps/groundbase/rp-z3.dmm +++ b/maps/groundbase/rp-z3.dmm @@ -83,6 +83,18 @@ outdoors = 1 }, /area/groundbase/cargo/bay) +"aZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/closet/secure_closet/hos2, +/obj/machinery/alarm{ + dir = 1 + }, +/obj/item/device/ticket_printer, +/obj/random/paicard, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "bj" = ( /obj/structure/table/glass, /obj/item/weapon/paper_bin, @@ -114,7 +126,13 @@ /turf/simulated/open, /area/groundbase/level3/nw) "bG" = ( -/obj/effect/floor_decal/milspec/color/red/half, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall3) "bQ" = ( @@ -245,10 +263,10 @@ /turf/simulated/floor/carpet/sblucarpet, /area/groundbase/security/iaa1) "cN" = ( -/obj/structure/fence/corner{ - dir = 8 +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 10 }, -/turf/simulated/floor/outdoors/sidewalk/slab, +/turf/simulated/floor/tiled/dark, /area/groundbase/security/hall3) "cW" = ( /obj/structure/table/glass, @@ -299,6 +317,12 @@ "dU" = ( /turf/simulated/wall, /area/groundbase/medical/patient3) +"dV" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/groundbase/security/hos) "dY" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 1 @@ -338,6 +362,19 @@ }, /turf/simulated/floor/tiled/eris/dark/panels, /area/shuttle/groundbase/exploration) +"fh" = ( +/obj/structure/table/steel_reinforced, +/obj/item/clothing/glasses/goggles, +/obj/item/clothing/glasses/goggles, +/obj/item/clothing/glasses/goggles, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/security/hall3) +"fi" = ( +/obj/machinery/firealarm{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "fk" = ( /obj/structure/bed/chair/comfy/blue, /turf/simulated/floor/wood, @@ -393,10 +430,16 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/iaa2) "fQ" = ( -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 5 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/turf/simulated/floor/outdoors/sidewalk/slab, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/milspec/color/red/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/groundbase/security/hall3) "fU" = ( /obj/structure/cable/cyan{ @@ -426,11 +469,17 @@ /turf/simulated/floor/bmarble, /area/groundbase/civilian/pilot) "gh" = ( -/obj/effect/floor_decal/milspec/color/red/corner{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/turf/simulated/floor/outdoors/sidewalk/slab, -/area/groundbase/security/hall3) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "gk" = ( /obj/structure/hull_corner, /turf/simulated/floor/reinforced{ @@ -527,6 +576,21 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient2) +"hr" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/power/apc, +/obj/structure/filingcabinet, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/yellow, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "hu" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -557,15 +621,17 @@ }, /area/groundbase/exploration/shuttlepad) "hK" = ( -/obj/machinery/seed_extractor, -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/outdoors/sidewalk/slab, -/area/groundbase/security/hall3) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "hL" = ( /obj/structure/railing/grey{ dir = 1 @@ -701,6 +767,27 @@ outdoors = 1 }, /area/groundbase/level3/ne) +"js" = ( +/obj/structure/table/woodentable, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/item/device/radio/off, +/obj/item/weapon/reagent_containers/food/drinks/flask/barflask{ + pixel_x = -9; + pixel_y = -2 + }, +/obj/item/device/taperecorder{ + pixel_x = 10 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "jx" = ( /turf/simulated/floor/outdoors/sidewalk/side, /area/groundbase/level3/se) @@ -767,6 +854,12 @@ "kB" = ( /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/command/hop) +"kH" = ( +/obj/machinery/computer/security{ + dir = 1 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/groundbase/security/hos) "kJ" = ( /obj/machinery/light{ dir = 8 @@ -824,9 +917,25 @@ /obj/machinery/suit_cycler/pilot, /turf/simulated/floor/tiled, /area/groundbase/civilian/pilot) +"lq" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/folder/red_hos, +/obj/item/weapon/stamp/hos, +/obj/item/device/flashlight/lamp/green{ + pixel_x = -14; + pixel_y = 4 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/groundbase/security/hos) "lH" = ( /turf/simulated/floor/tiled/monotile, /area/shuttle/groundbase/exploration) +"lI" = ( +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor, +/area/groundbase/security/hall3) "lN" = ( /obj/structure/table/bench/marble, /obj/effect/floor_decal/corner/paleblue/full{ @@ -1023,10 +1132,6 @@ }, /turf/simulated/open, /area/groundbase/medical/uhallway) -"nq" = ( -/obj/machinery/door/firedoor, -/turf/simulated/floor/bmarble, -/area/groundbase/security/hall3) "nu" = ( /obj/structure/lattice, /turf/simulated/open, @@ -1125,8 +1230,14 @@ /turf/simulated/floor, /area/groundbase/medical/patient3) "ob" = ( -/obj/structure/fence/corner, -/turf/simulated/floor/outdoors/sidewalk/slab, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/milspec/color/red/corner, +/turf/simulated/floor/tiled/dark, /area/groundbase/security/hall3) "oc" = ( /obj/machinery/light{ @@ -1214,6 +1325,18 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) +"oV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hall3) "oW" = ( /obj/structure/table/rack, /obj/item/device/suit_cooling_unit{ @@ -1320,11 +1443,8 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/medicalshowers) "qj" = ( -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 8 - }, -/turf/simulated/floor/outdoors/sidewalk/slab, -/area/groundbase/security/hall3) +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "ql" = ( /obj/structure/fuel_port{ pixel_y = 32 @@ -1372,11 +1492,8 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/paramedic) "qB" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/effect/floor_decal/milspec/color/red/half{ - dir = 8 + dir = 6 }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall3) @@ -1529,6 +1646,16 @@ "rT" = ( /turf/simulated/floor/carpet/retro, /area/groundbase/dorms/bathroom) +"rX" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/glass/polarized{ + dir = 1; + id_tag = null; + name = "Rooftop"; + req_one_access = list(38,63) + }, +/turf/simulated/floor/bmarble, +/area/groundbase/security/hall3) "sa" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -1598,6 +1725,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/groundbase/medical/cmo) +"sH" = ( +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 10 + }, +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hall3) "sK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1616,11 +1750,11 @@ /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) "sN" = ( -/obj/machinery/power/apc, -/obj/structure/cable/yellow, -/obj/effect/floor_decal/milspec/color/red/half, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hall3) +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/open, +/area/groundbase/level3/nw) "sQ" = ( /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level3/nw) @@ -1639,6 +1773,17 @@ "sY" = ( /turf/simulated/floor/tiled/white, /area/groundbase/dorms/bathroom) +"ta" = ( +/obj/structure/bookcase, +/obj/item/weapon/book/manual/security_space_law, +/obj/item/weapon/book/manual/standard_operating_procedure, +/obj/item/weapon/book/manual/command_guide, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "tb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -1822,6 +1967,20 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient1) +"ur" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced/polarized/full{ + id = "hosoffice" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor, +/area/groundbase/security/hos) "us" = ( /obj/machinery/power/smes/buildable{ charge = 500000 @@ -1915,6 +2074,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/power/apc{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall3) "vj" = ( @@ -1963,10 +2131,15 @@ /obj/structure/bed/chair/wood, /turf/simulated/floor/wood, /area/groundbase/hotspring) +"vX" = ( +/obj/effect/floor_decal/milspec/color/red/half, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hall3) "wa" = ( -/obj/effect/floor_decal/milspec/color/red/corner{ - dir = 1 +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 6 }, +/obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall3) "wb" = ( @@ -1978,12 +2151,12 @@ /area/groundbase/level3/se) "wd" = ( /obj/machinery/light{ - dir = 1 + dir = 4 }, /obj/effect/floor_decal/milspec/color/red/half{ - dir = 1 + dir = 4 }, -/turf/simulated/floor/outdoors/sidewalk/slab, +/turf/simulated/floor/tiled/dark, /area/groundbase/security/hall3) "wg" = ( /obj/structure/handrail, @@ -2020,8 +2193,18 @@ }, /area/groundbase/exploration/shuttlepad) "wB" = ( -/obj/structure/target_stake, -/obj/item/target/alien, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 20 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 28 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 36 + }, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/security/hall3) "wD" = ( @@ -2281,12 +2464,12 @@ }, /area/groundbase/level3/ne) "yA" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ - icon_state = "32-2" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers, -/obj/machinery/atmospherics/pipe/zpipe/down/supply, -/obj/structure/disposalpipe/down, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall3) "yD" = ( @@ -2602,12 +2785,20 @@ /obj/effect/floor_decal/corner/paleblue/full, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) -"Dh" = ( -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 9 - }, +"Dg" = ( +/obj/structure/target_stake, +/obj/item/target/alien, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/security/hall3) +"Dh" = ( +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 24 + }, +/obj/machinery/suit_cycler/prototype, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "Dk" = ( /obj/machinery/door/airlock/command{ id_tag = "cmodoor"; @@ -2685,11 +2876,32 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/medicalshowers) "DL" = ( -/obj/effect/floor_decal/milspec/color/red/half{ +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/table/rack, +/obj/item/clothing/shoes/magboots, +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/oxygen, +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 2; + name = "Protosuit Storage"; + req_access = list(58) + }, +/obj/item/clothing/mask/breath, +/obj/item/clothing/suit/space/void/security/prototype, +/obj/item/clothing/head/helmet/space/void/security/prototype, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/outdoors/sidewalk/slab, -/area/groundbase/security/hall3) +/turf/simulated/floor/tiled/techfloor, +/area/groundbase/security/hos) "DQ" = ( /obj/effect/landmark/start/pilot, /obj/machinery/button/remote/airlock{ @@ -2913,6 +3125,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall3) "Gk" = ( @@ -2938,9 +3156,8 @@ /turf/simulated/floor/tiled/monotile, /area/shuttle/groundbase/exploration) "Gz" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/turf/simulated/floor/outdoors/sidewalk/slab, -/area/groundbase/security/hall3) +/turf/simulated/floor/carpet/sblucarpet, +/area/groundbase/security/hos) "GF" = ( /obj/structure/table/glass, /obj/item/weapon/clipboard, @@ -3111,18 +3328,21 @@ /area/groundbase/medical/patient2) "Io" = ( /turf/simulated/floor/tiled/steel_ridged, -/area/groundbase/medical/uhallway) -"Is" = ( -/turf/simulated/wall/r_wall, -/area/groundbase/exploration/shuttlepad) -"Ix" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, +/area/groundbase/medical/uhallway) +"Is" = ( +/turf/simulated/wall/r_wall, +/area/groundbase/exploration/shuttlepad) +"Ix" = ( +/obj/structure/table/steel_reinforced, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/ears/earmuffs, +/obj/item/clothing/ears/earmuffs, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/security/hall3) +"Iz" = ( +/obj/structure/table/steel_reinforced, +/obj/item/weapon/storage/box/donut, +/turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/security/hall3) "IF" = ( /obj/structure/table/bench/marble, @@ -3144,11 +3364,16 @@ }, /area/groundbase/medical/patio) "IG" = ( -/obj/machinery/vending/hydronutrients/brig, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/turf/simulated/floor/outdoors/sidewalk/slab, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/dark, /area/groundbase/security/hall3) "IJ" = ( /obj/effect/floor_decal/industrial/warning{ @@ -3165,6 +3390,24 @@ }, /turf/simulated/floor/carpet, /area/groundbase/medical/cmo) +"IO" = ( +/obj/structure/bed/chair/comfy/black, +/obj/effect/landmark/start/hos, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "briglockdown"; + name = "Brig Lockdown"; + pixel_x = 24; + pixel_y = -21; + req_access = list(2) + }, +/obj/machinery/button/windowtint/multitint{ + id = "hosoffice"; + pixel_x = -17; + pixel_y = -25 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/groundbase/security/hos) "IP" = ( /obj/machinery/alarm{ dir = 8 @@ -3217,12 +3460,15 @@ }, /area/groundbase/medical/patio) "Ju" = ( -/obj/machinery/seed_storage/brig, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 1 +/obj/machinery/requests_console/preset/hos{ + pixel_y = 32 }, -/turf/simulated/floor/outdoors/sidewalk/slab, -/area/groundbase/security/hall3) +/obj/structure/table/woodentable, +/obj/machinery/computer/skills{ + pixel_y = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "Jz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3342,12 +3588,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, /obj/structure/cable/yellow{ icon_state = "1-4" }, @@ -3439,6 +3679,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/outdoors/sidewalk, /area/groundbase/level3/se) +"Lo" = ( +/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs, +/area/groundbase/security/hall3) "Lv" = ( /obj/machinery/button/remote/airlock{ dir = 4; @@ -3498,6 +3741,12 @@ /obj/structure/railing/grey{ dir = 4 }, +/obj/structure/disposalpipe/down, +/obj/structure/cable/yellow{ + icon_state = "32-2" + }, +/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers, +/obj/machinery/atmospherics/pipe/zpipe/down/supply, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall3) "LU" = ( @@ -3641,7 +3890,7 @@ pixel_x = 30 }, /obj/effect/floor_decal/milspec/color/red/half{ - dir = 1 + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/iaa1) @@ -3710,11 +3959,6 @@ /area/groundbase/civilian/pilot) "Nd" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass/polarized{ - id_tag = null; - name = "Rooftop"; - req_one_access = list(38,63) - }, /turf/simulated/floor/bmarble, /area/groundbase/security/hall3) "Nj" = ( @@ -3731,6 +3975,14 @@ }, /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) +"NL" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet/sblucarpet, +/area/groundbase/security/hos) "NY" = ( /obj/machinery/door/airlock/multi_tile/glass/polarized{ name = "Cargo Office"; @@ -3760,9 +4012,7 @@ /turf/simulated/wall/r_wall, /area/groundbase/level3/se) "OK" = ( -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 1 - }, +/obj/structure/table/bench/steel, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/security/hall3) "OL" = ( @@ -3858,17 +4108,20 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/patient1) "PE" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/hall3) @@ -3918,11 +4171,17 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/security/iaa2) "Qq" = ( -/obj/effect/floor_decal/milspec/color/red/corner{ - dir = 4 +/obj/structure/table/woodentable, +/obj/machinery/photocopier/faxmachine{ + department = "Head of Security"; + pixel_y = 6 }, -/turf/simulated/floor/outdoors/sidewalk/slab, -/area/groundbase/security/hall3) +/obj/item/device/radio/intercom/department/security{ + dir = 1; + pixel_y = 24 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "QH" = ( /obj/machinery/door/airlock{ id_tag = "pilotB"; @@ -3950,6 +4209,12 @@ "QQ" = ( /turf/simulated/wall, /area/groundbase/medical/uhallway) +"QS" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/open, +/area/groundbase/level3/nw) "QT" = ( /turf/simulated/wall, /area/groundbase/medical/patient1) @@ -3957,6 +4222,10 @@ /obj/structure/table/steel, /turf/simulated/floor/tiled, /area/groundbase/civilian/pilot) +"Ri" = ( +/obj/structure/flora/pottedplant/minitree, +/turf/simulated/floor/outdoors/grass/seasonal/notrees_nomobs, +/area/groundbase/security/hall3) "Rk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/paleblue{ @@ -4024,6 +4293,14 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +"RR" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/light, +/obj/structure/closet/secure_closet/hos, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "RX" = ( /obj/structure/table/reinforced, /obj/item/weapon/stamp/internalaffairs, @@ -4040,11 +4317,21 @@ /turf/simulated/floor/carpet/sblucarpet, /area/groundbase/security/iaa2) "RZ" = ( -/obj/structure/fence{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/floor/outdoors/sidewalk/slab, -/area/groundbase/security/hall3) +/obj/structure/table/woodentable, +/obj/item/clothing/accessory/permit/gun, +/obj/item/clothing/accessory/permit/gun, +/obj/item/clothing/accessory/permit/gun, +/obj/item/clothing/accessory/permit/gun{ + desc = "An example of a card indicating that the owner is allowed to carry a firearm. There's a note saying to fax CentCom if you want to order more blank permits."; + name = "sample weapon permit"; + owner = 1 + }, +/obj/item/device/megaphone, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "Sh" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -4105,6 +4392,24 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/uhallway) +"SR" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/weapon/pen/multi, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/carpet/sblucarpet, +/area/groundbase/security/hos) "SS" = ( /obj/effect/floor_decal/industrial/warning{ dir = 5 @@ -4218,11 +4523,8 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/security/iaa1) "TQ" = ( -/obj/effect/floor_decal/milspec/color/red/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/security/hall3) +/turf/simulated/wall/r_wall, +/area/groundbase/security/hos) "TR" = ( /obj/machinery/newscaster{ layer = 3.3; @@ -4355,6 +4657,17 @@ "UV" = ( /turf/simulated/floor/wood, /area/groundbase/hotspring) +"Vb" = ( +/obj/item/weapon/gun/energy/laser/practice{ + pixel_y = 9 + }, +/obj/item/weapon/gun/energy/laser/practice, +/obj/item/weapon/gun/energy/laser/practice{ + pixel_y = -9 + }, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/groundbase/security/hall3) "Vc" = ( /obj/structure/grille, /obj/machinery/door/firedoor, @@ -4389,13 +4702,6 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/medicalshowers) -"VB" = ( -/obj/structure/fence, -/obj/effect/floor_decal/milspec/color/red/half{ - dir = 1 - }, -/turf/simulated/floor/outdoors/sidewalk/slab, -/area/groundbase/security/hall3) "VK" = ( /obj/structure/table/bench/marble, /obj/effect/landmark/start/medical, @@ -4619,7 +4925,7 @@ /turf/simulated/wall/r_wall, /area/groundbase/security/iaa1) "XK" = ( -/obj/structure/fence, +/obj/structure/table/steel_reinforced, /turf/simulated/floor/outdoors/sidewalk/slab, /area/groundbase/security/hall3) "XL" = ( @@ -4678,6 +4984,29 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/patient2) +"Yi" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command{ + id_tag = "HoSdoor"; + name = "Head of Security"; + req_access = list(58) + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/groundbase/security/hos) "Yp" = ( /turf/simulated/floor/carpet/sblucarpet, /area/groundbase/security/iaa2) @@ -4838,6 +5167,12 @@ /obj/structure/handrail, /turf/simulated/floor/tiled, /area/shuttle/groundbase/exploration) +"ZU" = ( +/obj/machinery/newscaster/security_unit{ + pixel_x = -27 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/security/hos) "ZV" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -6608,7 +6943,7 @@ Ue Ue Ue Ue -PZ +Ue PZ PZ PZ @@ -6749,8 +7084,8 @@ Ue Ue Ue Ue -PZ -PZ +Ue +Ue PZ PZ PZ @@ -6891,8 +7226,8 @@ Ue Ue Ue Ue -PZ -PZ +Ue +Ue PZ PZ PZ @@ -7034,7 +7369,7 @@ Ue Ue Ue Ue -PZ +Ue PZ PZ PZ @@ -8024,8 +8359,8 @@ Ue Ue Ue Ue -PZ -PZ +Ue +Ue PZ PZ PZ @@ -8161,7 +8496,9 @@ Ue Ue Ue Ue -Ue +PZ +PZ +PZ Ue Ue Ue @@ -8171,8 +8508,6 @@ PZ PZ PZ PZ -PZ -PZ XJ XY XY @@ -8180,16 +8515,16 @@ XJ XY XY XJ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ +sN +sN +sN +sN +sN +sN +sN +sN +sN +sN PZ PZ PZ @@ -8322,17 +8657,17 @@ HW cL WU XJ -VB -XK -XK XK XK -XK -XK -XK -XK -cN -PZ +Iz +YE +YE +YE +YE +YE +YE +YE +hL PZ PZ rf @@ -8465,16 +8800,16 @@ Fe Zc XJ OK +OK +OK YE YE YE +Lo +Lo +Lo YE -YE -YE -YE -YE -RZ -PZ +hL PZ PZ rf @@ -8606,17 +8941,17 @@ ON xT ZI XJ -OK -Gz YE -Gz YE YE YE YE YE -RZ -PZ +Lo +Ri +Lo +YE +hL PZ PZ rf @@ -8748,17 +9083,17 @@ OP gr QM XJ -fQ -DL -Qq YE YE YE YE YE YE -RZ -PZ +Lo +Lo +Lo +YE +hL PZ PZ rf @@ -8890,17 +9225,17 @@ XJ XJ XJ XJ -SD -SD -wd YE YE YE YE YE YE -RZ -PZ +YE +YE +YE +YE +hL PZ PZ rf @@ -9030,19 +9365,19 @@ ug OZ Bw Bw -Bw -qB -wa +cN +SD +SD Nd +rX +SD +SD +wB YE YE YE YE -YE -YE -wB -RZ -PZ +hL PZ PZ rf @@ -9172,19 +9507,19 @@ vj Mm tN tN -tN +fQ Gh +Bw Xz -nq -YE -YE +Xz +sH +lI YE YE YE YE YE -RZ -PZ +hL PZ yx nd @@ -9316,17 +9651,17 @@ rP LK yA KI -sN -SD -Ju -YE +Xz +Xz +Xz +vX +lI YE YE YE YE YE -RZ -PZ +hL PZ yx dy @@ -9459,16 +9794,16 @@ Ti Xz PE bG -SD +bG IG +vX +lI YE YE YE YE YE -YE -RZ -PZ +hL PZ yx dy @@ -9598,19 +9933,19 @@ vj ZV tN tN -tN +ob vi -Xz -Nd -YE -YE -YE -YE -YE +wd +Xe +oV +wa +lI YE YE -RZ -PZ +Vb +Ix +fh +hL PZ yx dy @@ -9740,19 +10075,19 @@ en Kj Xe Xe -Xe -Ix +qB +TQ +TQ +TQ +Yi +TQ +TQ TQ -nq -YE -YE YE YE YE YE -wB -RZ -PZ +hL PZ yx dy @@ -9883,18 +10218,18 @@ yv vH vH vH -vH -SD -SD +TQ +DL +fi hK +ZU +RR +TQ YE YE YE YE -YE -YE -RZ -PZ +hL PZ yx dy @@ -10025,18 +10360,18 @@ Jz Qm TR JG -vH +TQ Dh qj gh +qj +aZ +TQ YE YE YE YE -YE -YE -RZ -PZ +hL PZ yx dy @@ -10167,18 +10502,18 @@ Xj mh Yp mo -vH -OK -Gz -YE +TQ +Ju Gz +SR +NL +hr +TQ YE +Dg YE YE -YE -YE -RZ -PZ +hL PZ yx nd @@ -10291,15 +10626,15 @@ PZ PZ PZ PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ +yx +yx +yx +yx +yx +yx +yx +yx +yx PZ PZ PZ @@ -10309,18 +10644,18 @@ Mx Rx LV ym -vH -OK -YE -YE -YE -YE +TQ +Qq +IO +lq +dV +js +TQ YE YE YE YE -RZ -PZ +hL PZ PZ rf @@ -10433,15 +10768,15 @@ PZ PZ PZ PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ +yx +yx +yx +yx +yx +yx +yx +yx +yx PZ PZ PZ @@ -10451,18 +10786,18 @@ My RX Wf fP -vH -VB -XK -XK -XK -XK -XK -XK -XK -XK -ob -PZ +TQ +RZ +Gz +kH +Gz +ta +TQ +YE +YE +Dg +YE +hL PZ PZ rf @@ -10575,15 +10910,15 @@ PZ PZ PZ PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ +yx +yx +yx +yx +yx +yx +yx +yx +yx PZ PZ PZ @@ -10593,17 +10928,17 @@ GK vH GK GK -vH -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ +TQ +TQ +ur +ur +ur +TQ +TQ +QS +QS +QS +QS PZ PZ PZ @@ -10717,15 +11052,15 @@ PZ PZ PZ PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ +yx +yx +yx +yx +yx +yx +yx +yx +yx PZ PZ PZ @@ -10859,15 +11194,15 @@ PZ PZ PZ PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ +yx +yx +yx +yx +yx +yx +yx +yx +yx PZ PZ PZ @@ -11001,14 +11336,14 @@ PZ PZ PZ PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ -PZ +yx +yx +yx +yx +yx +yx +yx +yx PZ PZ PZ @@ -13434,7 +13769,7 @@ yx yx yx yx -PZ +yx PZ PZ PZ