diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index ef96cac1d5..fb3f26d53c 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -19401,18 +19401,21 @@ /turf/open/floor/wood, /area/commons/vacant_room/office) "aUn" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 +/obj/machinery/light/small{ + dir = 1 }, -/turf/open/floor/plasteel, -/area/commons/locker) +/obj/structure/closet/crate/bin, +/turf/open/floor/plating{ + icon_state = "platingdmg2" + }, +/area/maintenance/port/fore) "aUo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 +/obj/item/clothing/mask/cigarette{ + pixel_x = -6; + pixel_y = 14 }, -/turf/open/floor/plasteel, -/area/commons/locker) +/turf/open/floor/plating, +/area/maintenance/port/fore) "aUp" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -19420,9 +19423,6 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/window{ dir = 8 }, @@ -19433,9 +19433,6 @@ /turf/open/floor/plasteel, /area/commons/locker) "aUs" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 8 }, @@ -19449,31 +19446,25 @@ /turf/open/floor/plasteel, /area/commons/locker) "aUt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/commons/locker) +/obj/item/broken_bottle, +/turf/open/floor/plating, +/area/maintenance/port/fore) "aUu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/landmark/start/assistant, +/obj/structure/chair{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 +/obj/structure/sign/poster/contraband/lusty_xenomorph{ + pixel_x = 32 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/turf/open/floor/plating{ + icon_state = "panelscorched" }, -/turf/open/floor/plasteel, -/area/commons/locker) +/area/maintenance/port/fore) "aUv" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, +/obj/structure/closet/wardrobe/black, +/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/head/beret/black, /turf/open/floor/plasteel, /area/commons/locker) "aUw" = ( @@ -19639,8 +19630,12 @@ /turf/open/floor/wood, /area/commons/vacant_room/office) "aUX" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/machinery/camera{ + c_tag = "Locker Room West"; + dir = 1 }, /turf/open/floor/plasteel, /area/commons/locker) @@ -20241,20 +20236,17 @@ /turf/open/floor/wood, /area/commons/vacant_room/office) "aWn" = ( -/obj/structure/closet/wardrobe/black, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/head/beret/black, +/obj/structure/closet, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, /turf/open/floor/plasteel, /area/commons/locker) "aWo" = ( -/obj/machinery/camera{ - c_tag = "Locker Room West"; - dir = 1 +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/commons/locker) "aWp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -20313,9 +20305,10 @@ /turf/open/floor/plating, /area/maintenance/port) "aWy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/commons/toilet/locker) +/obj/structure/table, +/obj/item/storage/secure/briefcase, +/turf/open/floor/plasteel, +/area/commons/locker) "aWz" = ( /obj/machinery/power/apc{ areastring = "/area/commons/storage/emergency/port"; @@ -20799,12 +20792,11 @@ /turf/open/floor/plasteel, /area/service/hydroponics) "aXp" = ( -/obj/machinery/door/airlock{ - name = "Unisex Restrooms" +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/freezer, -/area/commons/toilet/locker) +/turf/open/floor/plasteel, +/area/commons/locker) "aXq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20825,6 +20817,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/commons/locker) "aXt" = ( @@ -21120,12 +21113,12 @@ /turf/open/floor/wood, /area/commons/vacant_room/office) "aYe" = ( -/obj/machinery/light_switch{ - pixel_y = 28 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/freezer, -/area/commons/toilet/locker) +/turf/open/floor/plasteel, +/area/commons/locker) "aYf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -21586,16 +21579,16 @@ /turf/open/floor/wood, /area/commons/vacant_room/office) "aZo" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 +/obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/obj/structure/mirror{ - pixel_x = 28 +/obj/machinery/door/poddoor/shutters{ + id = "commissaryshutters"; + name = "Vacant Commissary Shutters" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/freezer, -/area/commons/toilet/locker) +/turf/open/floor/plasteel, +/area/commons/locker) "aZp" = ( /obj/structure/rack, /obj/item/electronics/apc, @@ -21630,44 +21623,44 @@ /turf/open/floor/plating, /area/maintenance/port) "aZt" = ( -/obj/structure/toilet/secret/low_loot{ - dir = 4 +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" }, -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/structure/sink{ - pixel_y = 25 - }, -/obj/machinery/button/door{ - id = "LockerShitter1"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 14; - pixel_y = 38; - specialfunctions = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/mineral/titanium/blue, -/area/commons/toilet/locker) +/turf/open/floor/plasteel, +/area/commons/locker) "aZu" = ( /obj/machinery/photocopier, /turf/open/floor/wood, /area/command/meeting_room) "aZv" = ( -/obj/machinery/door/airlock{ - id_tag = "LockerShitter1"; - name = "Unit 1" +/obj/item/storage/secure/safe{ + pixel_y = 32 }, -/turf/open/floor/mineral/titanium/blue, -/area/commons/toilet/locker) +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/commons/locker) "aZw" = ( -/obj/effect/landmark/blobstart, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/freezer, -/area/commons/toilet/locker) +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/obj/structure/table, +/obj/machinery/button/door{ + id = "commissaryshutters"; + name = "Commissary Shutters Control"; + pixel_x = 24; + pixel_y = 6; + req_access_txt = null + }, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/pen, +/turf/open/floor/plasteel, +/area/commons/locker) "aZx" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/red{ @@ -21683,6 +21676,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/commons/locker) "aZy" = ( @@ -22013,13 +22009,12 @@ /turf/open/floor/wood, /area/service/library) "baw" = ( -/obj/machinery/camera{ - c_tag = "Locker Room Toilets"; - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/freezer, -/area/commons/toilet/locker) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/commons/locker) "bax" = ( /obj/structure/chair/comfy/black{ dir = 4 @@ -22151,9 +22146,16 @@ /turf/open/floor/plating, /area/maintenance/port) "baO" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel/freezer, -/area/commons/toilet/locker) +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters{ + id = "commissaryshutters"; + name = "Vacant Commissary Shutters" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/commons/locker) "baP" = ( /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, @@ -22334,12 +22336,15 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai_upload) "bbq" = ( -/obj/machinery/light{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/freezer, -/area/commons/toilet/locker) +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/commons/locker) "bbs" = ( /obj/structure/window/reinforced{ dir = 8 @@ -22487,12 +22492,13 @@ /turf/open/floor/plating, /area/maintenance/port) "bbL" = ( -/obj/machinery/door/airlock{ - id_tag = "LockerShitter2"; - name = "Unit 2" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 }, -/turf/open/floor/mineral/titanium/blue, -/area/commons/toilet/locker) +/obj/structure/rack, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/plasteel, +/area/commons/locker) "bbM" = ( /obj/item/book/manual/wiki/security_space_law, /obj/structure/table/wood, @@ -22704,6 +22710,10 @@ /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bct" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/airalarm{ + pixel_y = 23 + }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/locker) "bcu" = ( @@ -23188,8 +23198,8 @@ /area/command/meeting_room) "bdJ" = ( /obj/machinery/door/airlock{ - id_tag = "LockerShitter3"; - name = "Unit 3" + id_tag = "LockerShitter1"; + name = "Unit 1" }, /turf/open/floor/mineral/titanium/blue, /area/commons/toilet/locker) @@ -23208,8 +23218,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/bedsheetbin/color, -/obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, /turf/open/floor/plasteel/cafeteria, /area/commons/locker) "bdN" = ( @@ -24232,8 +24243,8 @@ /area/maintenance/port) "bgr" = ( /obj/machinery/door/airlock{ - id_tag = "LockerShitter4"; - name = "Unit 4" + id_tag = "LockerShitter2"; + name = "Unit 2" }, /turf/open/floor/mineral/titanium/blue, /area/commons/toilet/locker) @@ -51575,6 +51586,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/cafeteria, /area/commons/locker) "cBi" = ( @@ -51611,6 +51623,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/starboard) "cBn" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/sink{ dir = 4; pixel_x = 11 @@ -52081,18 +52094,11 @@ /turf/open/floor/plasteel, /area/commons/fitness) "cFG" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/structure/mirror{ - pixel_x = 28 - }, -/turf/open/floor/plasteel/freezer, -/area/commons/toilet/locker) +/turf/open/floor/plasteel, +/area/commons/locker) "cGf" = ( /obj/structure/sign/poster/contraband/random{ pixel_y = 32 @@ -53141,6 +53147,12 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/white, /area/science/circuit) +"cVX" = ( +/mob/living/simple_animal/bot/secbot/grievous/toy{ + name = "Rave Bot 9001" + }, +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/maintenance/starboard/aft) "cXU" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/light{ @@ -53208,14 +53220,18 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "ddj" = ( -/obj/machinery/light/small{ +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/window{ dir = 1 }, -/obj/structure/closet/crate/bin, -/turf/open/floor/plating{ - icon_state = "platingdmg2" - }, -/area/maintenance/port/fore) +/obj/machinery/washing_machine, +/turf/open/floor/plasteel/cafeteria, +/area/commons/locker) "ddI" = ( /obj/machinery/door/airlock/public/glass{ name = "Central Access" @@ -53241,6 +53257,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/command/gateway) +"def" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/open/floor/plasteel/freezer, +/area/commons/toilet/locker) "dev" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -53277,12 +53299,6 @@ icon_state = "platingdmg3" }, /area/commons/arcade) -"dfl" = ( -/obj/item/mop{ - name = "Ain't Much" - }, -/turf/open/floor/light/colour_cycle/dancefloor_a, -/area/maintenance/starboard/aft) "dfL" = ( /obj/structure/reagent_dispensers/keg/gargle, /turf/open/floor/wood, @@ -53985,15 +54001,6 @@ /obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/carpet, /area/commons/dorms) -"eTF" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/mob/living/simple_animal/opossum{ - name = "trash" - }, -/turf/open/floor/carpet/royalblue, -/area/maintenance/starboard/aft) "eUy" = ( /obj/machinery/door/airlock{ name = "Starboard Emergency Storage" @@ -54055,12 +54062,14 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "eZu" = ( -/obj/item/clothing/mask/cigarette{ - pixel_x = -6; - pixel_y = 14 +/obj/machinery/door/airlock{ + name = "Unisex Restrooms" }, -/turf/open/floor/plating, -/area/maintenance/port/fore) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/commons/toilet/locker) "fbp" = ( /obj/structure/tank_dispenser, /obj/effect/turf_decal/bot, @@ -54420,6 +54429,11 @@ }, /turf/open/floor/plasteel, /area/commons/fitness) +"fFh" = ( +/obj/effect/decal/cleanable/oil/slippery, +/obj/structure/reagent_dispensers/beerkeg, +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/maintenance/starboard/aft) "fFA" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -54546,6 +54560,15 @@ /obj/item/pen/fountain, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) +"fVA" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/mob/living/simple_animal/opossum{ + name = "trash" + }, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "fZm" = ( /obj/structure/chair/sofa/left, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -54936,26 +54959,26 @@ /turf/open/floor/plating, /area/maintenance/fore) "gQX" = ( +/obj/structure/toilet/secret/low_loot{ + dir = 4 + }, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 25 + }, /obj/machinery/button/door{ - id = "LockerShitter4"; + id = "LockerShitter2"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = 14; pixel_y = 38; specialfunctions = 4 }, -/obj/structure/toilet/secret/low_loot{ - dir = 4 - }, /obj/machinery/light/small{ dir = 8 }, -/obj/structure/sink{ - pixel_y = 25 - }, -/obj/structure/mirror{ - pixel_y = 32 - }, /turf/open/floor/mineral/titanium/blue, /area/commons/toilet/locker) "gRV" = ( @@ -55225,8 +55248,13 @@ /obj/item/pen, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"hMJ" = ( -/obj/effect/landmark/event_spawn, +"hOn" = ( +/obj/structure/chair/stool{ + pixel_y = 8 + }, +/mob/living/simple_animal/opossum{ + name = "garbage" + }, /turf/open/floor/carpet/royalblue, /area/maintenance/starboard/aft) "hOv" = ( @@ -55239,9 +55267,8 @@ /turf/open/floor/wood, /area/service/bar) "hPs" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 23 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 }, /turf/open/floor/plasteel/freezer, /area/commons/toilet/locker) @@ -55335,9 +55362,17 @@ /turf/open/floor/plasteel, /area/security/processing) "idD" = ( -/obj/item/broken_bottle, -/turf/open/floor/plating, -/area/maintenance/port/fore) +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/cafeteria, +/area/commons/locker) "idK" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -55449,6 +55484,16 @@ }, /turf/closed/wall, /area/service/theater) +"ior" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Locker Room Toilets"; + dir = 8 + }, +/turf/open/floor/plasteel/freezer, +/area/commons/toilet/locker) "iou" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/firealarm{ @@ -55784,11 +55829,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/service) -"jbk" = ( -/obj/effect/decal/cleanable/oil/slippery, -/obj/structure/reagent_dispensers/beerkeg, -/turf/open/floor/light/colour_cycle/dancefloor_a, -/area/maintenance/starboard/aft) "jbp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/flashlight, @@ -56906,12 +56946,6 @@ /obj/item/clothing/under/rank/civilian/lawyer/red, /turf/open/floor/plasteel, /area/commons/locker) -"ljt" = ( -/mob/living/simple_animal/bot/cleanbot{ - name = "Honest Work" - }, -/turf/open/floor/carpet/royalblue, -/area/maintenance/starboard/aft) "ljV" = ( /obj/machinery/airalarm{ dir = 8; @@ -58200,26 +58234,26 @@ /turf/open/floor/plasteel, /area/security/prison) "omY" = ( +/obj/structure/toilet/secret/low_loot{ + dir = 4 + }, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/structure/sink{ + pixel_y = 25 + }, /obj/machinery/button/door{ - id = "LockerShitter3"; + id = "LockerShitter1"; name = "Door Bolt Control"; normaldoorcontrol = 1; pixel_x = 14; pixel_y = 38; specialfunctions = 4 }, -/obj/structure/toilet/secret/low_loot{ - dir = 4 - }, /obj/machinery/light/small{ dir = 8 }, -/obj/structure/sink{ - pixel_y = 25 - }, -/obj/structure/mirror{ - pixel_y = 32 - }, /turf/open/floor/mineral/titanium/blue, /area/commons/toilet/locker) "opg" = ( @@ -58511,17 +58545,13 @@ /turf/open/floor/plating, /area/maintenance/aft) "pcK" = ( -/obj/effect/landmark/start/assistant, -/obj/structure/chair{ - dir = 1 +/obj/effect/landmark/blobstart, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/light{ + dir = 8 }, -/obj/structure/sign/poster/contraband/lusty_xenomorph{ - pixel_x = 32 - }, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/maintenance/port/fore) +/turf/open/floor/plasteel/freezer, +/area/commons/toilet/locker) "pcQ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -59163,10 +59193,6 @@ /obj/structure/grille/broken, /turf/open/space/basic, /area/space/nearstation) -"qva" = ( -/obj/machinery/jukebox/disco, -/turf/open/floor/light/colour_cycle/dancefloor_b, -/area/maintenance/starboard/aft) "qvf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -59271,6 +59297,12 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/plasteel/dark, /area/maintenance/starboard/aft) +"qNE" = ( +/mob/living/simple_animal/bot/cleanbot{ + name = "Honest Work" + }, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "qOc" = ( /obj/effect/turf_decal/tile/green{ dir = 8 @@ -59324,12 +59356,6 @@ }, /turf/open/floor/plasteel/dark, /area/service/chapel/office) -"qVb" = ( -/mob/living/simple_animal/bot/secbot/grievous/toy{ - name = "Rave Bot 9001" - }, -/turf/open/floor/light/colour_cycle/dancefloor_a, -/area/maintenance/starboard/aft) "qVP" = ( /obj/effect/spawner/structure/window, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -59571,6 +59597,10 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/commons/dorms) +"ruZ" = ( +/obj/machinery/jukebox/disco, +/turf/open/floor/light/colour_cycle/dancefloor_b, +/area/maintenance/starboard/aft) "rvr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -60142,9 +60172,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/structure/window{ dir = 4 }, @@ -60722,9 +60749,6 @@ /turf/open/floor/wood, /area/maintenance/bar) "ubj" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -60738,6 +60762,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, /turf/open/floor/plasteel, /area/commons/locker) "ucq" = ( @@ -60891,6 +60918,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"urS" = ( +/obj/effect/landmark/event_spawn, +/turf/open/floor/carpet/royalblue, +/area/maintenance/starboard/aft) "usE" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/structure/rack, @@ -61248,11 +61279,23 @@ }, /turf/open/floor/plasteel, /area/security/brig) -"uZS" = ( -/obj/structure/sign/poster/contraband/punch_shit{ - pixel_y = 32 +"uYv" = ( +/obj/structure/table, +/obj/machinery/light/floor, +/obj/machinery/light/floor, +/obj/item/clothing/glasses/sunglasses/reagent, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_x = -5; + pixel_y = 12 }, -/turf/open/floor/wood, +/obj/item/storage/fancy/cigarettes/cigpack_uplift{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/structure/sign/poster/contraband/borg_fancy_2{ + pixel_y = -32 + }, +/turf/open/floor/carpet/royalblue, /area/maintenance/starboard/aft) "vae" = ( /obj/effect/turf_decal/stripes/line{ @@ -61355,6 +61398,7 @@ /obj/structure/window{ dir = 1 }, +/obj/structure/bedsheetbin/color, /turf/open/floor/plasteel/cafeteria, /area/commons/locker) "viF" = ( @@ -61865,15 +61909,6 @@ /obj/item/assembly/signaler, /turf/open/floor/plating, /area/maintenance/bar) -"wgj" = ( -/obj/structure/chair/stool{ - pixel_y = 8 - }, -/mob/living/simple_animal/opossum{ - name = "garbage" - }, -/turf/open/floor/carpet/royalblue, -/area/maintenance/starboard/aft) "wig" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -62043,6 +62078,12 @@ }, /turf/closed/wall, /area/hallway/secondary/service) +"wDY" = ( +/obj/item/mop{ + name = "Ain't Much" + }, +/turf/open/floor/light/colour_cycle/dancefloor_a, +/area/maintenance/starboard/aft) "wHk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -62077,24 +62118,6 @@ }, /turf/open/floor/plating, /area/service/abandoned_gambling_den) -"wON" = ( -/obj/structure/table, -/obj/machinery/light/floor, -/obj/machinery/light/floor, -/obj/item/clothing/glasses/sunglasses/reagent, -/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ - pixel_x = -5; - pixel_y = 12 - }, -/obj/item/storage/fancy/cigarettes/cigpack_uplift{ - pixel_x = 8; - pixel_y = 8 - }, -/obj/structure/sign/poster/contraband/borg_fancy_2{ - pixel_y = -32 - }, -/turf/open/floor/carpet/royalblue, -/area/maintenance/starboard/aft) "wQg" = ( /obj/structure/pool/ladder{ dir = 2; @@ -62112,10 +62135,8 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "wTk" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/open/floor/plasteel/freezer, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, /area/commons/toilet/locker) "wUg" = ( /obj/effect/turf_decal/stripes/line{ @@ -62158,6 +62179,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/engineering/atmos) +"wWG" = ( +/obj/structure/sign/poster/contraband/punch_shit{ + pixel_y = 32 + }, +/turf/open/floor/wood, +/area/maintenance/starboard/aft) "wWT" = ( /obj/effect/landmark/start/roboticist, /turf/open/floor/plasteel/white, @@ -62752,28 +62779,21 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "ycd" = ( -/obj/structure/toilet/secret/low_loot{ - dir = 4 +/obj/structure/table, +/obj/item/circuitboard/machine/paystand{ + pixel_x = 5; + pixel_y = -5 }, -/obj/structure/mirror{ - pixel_y = 32 +/obj/effect/decal/cleanable/dirt{ + desc = "A thin layer of dust coating the floor."; + name = "dust" }, -/obj/structure/sink{ - pixel_y = 25 +/obj/effect/spawner/lootdrop/maintenance{ + lootcount = 3; + name = "3maintenance loot spawner" }, -/obj/machinery/button/door{ - id = "LockerShitter2"; - name = "Door Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 14; - pixel_y = 38; - specialfunctions = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/mineral/titanium/blue, -/area/commons/toilet/locker) +/turf/open/floor/plasteel, +/area/commons/locker) "ycu" = ( /obj/machinery/power/apc{ areastring = "/area/science/circuit"; @@ -79173,10 +79193,10 @@ aQM aTv aUT aPz -aXQ -aXQ -aXQ -aXQ +aPA +aWo +aPA +aPA aXQ aXQ aXQ @@ -79430,9 +79450,9 @@ aPA aPA aPA aPA -aXQ +aWn aZt -aXQ +aWy ycd aXQ omY @@ -79686,10 +79706,10 @@ aQO aSh aTw aUU -aWn -aXQ +aPA +aPA aZv -aXQ +aZt bbL aXQ bdJ @@ -79942,16 +79962,16 @@ aPA aQN aQN aQN -aUn -aTy -aWy +aQN +aUv +aPA aYe bbq aZw wTk bct -bct -bct +pcK +def bhQ bjk bkE @@ -80199,16 +80219,16 @@ aPA aQS aQN aSV -aUo +aYU aUX -aXp +aPA baO aZo -baw -cFG +aPA +aXQ hPs cBn -bct +ior bhQ bjk bkF @@ -80456,14 +80476,14 @@ aPA aQP aQN aTB -aUt -aWo -aXQ -aXQ -aXQ -aXQ -aXQ +aQN +aWq +aQN +aWq +aXp +aQN aXQ +eZu aXQ aXQ bhQ @@ -80713,14 +80733,14 @@ aPA aQR aQN aQN -aUt +aQN aWq aQN -aQN -aQN +aWq +aXp aQN vhb -bbO +idD aPA bgt bhS @@ -80941,7 +80961,7 @@ aaf aaf alU anl -eZu +aUo amC ank amC @@ -80974,8 +80994,8 @@ aUp ubj aXr aZx -aQN -aQN +baw +aYU cBh bdL aPA @@ -81231,9 +81251,9 @@ aUs aUY aXv aYS +aXp aQN -aQN -vhb +ddj bbO aPA aSg @@ -81454,8 +81474,8 @@ aaa aaa aaa alU -ddj -idD +aUn +aUt amC alU alU @@ -81488,7 +81508,7 @@ aUs mTG aXt ijG -aQN +aXp aQN aPA aPA @@ -81712,7 +81732,7 @@ aaa aaa amE anm -pcK +aUu aKY alU xFM @@ -81741,11 +81761,11 @@ aPE aQV aQN aTC -aUu +aXv gxc aXt ijG -aQN +aXp aQN aZB aPA @@ -82002,7 +82022,7 @@ sLa oyl aXw qfk -aQN +aXp aQN aZA aPA @@ -82255,11 +82275,11 @@ aPA aQX aQN aSi -aUv +aTy aWp aTy aTy -aTy +cFG aTy bbs bcw @@ -113920,7 +113940,7 @@ yle ccU xgs srk -jbk +fFh srk oYQ cNW @@ -114177,7 +114197,7 @@ ceT cNW hUJ chH -qva +ruZ srk hUJ cNW @@ -114432,11 +114452,11 @@ cNW cNW cPH cNW -hMJ -dfl +urS +wDY srk -qVb -wgj +cVX +hOn cNW aaa aaf @@ -114690,10 +114710,10 @@ cNW ceU cNW cgy -ljt +qNE hUJ -eTF -wON +fVA +uYv cNW aaa aaf @@ -114927,7 +114947,7 @@ gXs aaf aaa cNW -uZS +wWG tsq pkS olh