From fa2cbe7fdcbb8fb62731e9a6f858dab1669122a1 Mon Sep 17 00:00:00 2001 From: Cw3040 Date: Thu, 7 Jun 2018 20:43:22 -0400 Subject: [PATCH 1/4] BoxStation Changes -Maintbar -Added Cryosleepers -Added KinkMate in Locker Room --- _maps/map_files/BoxStation/BoxStation.dmm | 831 +++++++++++++--------- 1 file changed, 482 insertions(+), 349 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index bd68296861..d0992de6c7 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -33,13 +33,6 @@ }, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) -"aad" = ( -/obj/structure/table, -/obj/machinery/chem_dispenser/drinks/beer{ - dir = 1 - }, -/turf/open/floor/wood, -/area/maintenance/port/aft) "aae" = ( /obj/effect/landmark/carpspawn, /turf/open/space, @@ -11096,21 +11089,7 @@ /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "aCd" = ( -/obj/structure/bed, -/obj/item/bedsheet, -/obj/machinery/airalarm{ - pixel_y = 23 - }, -/obj/machinery/button/door{ - id = "Dorm1"; - name = "Dorm Bolt Control"; - normaldoorcontrol = 1; - pixel_x = 25; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, +/obj/machinery/cryopod, /turf/open/floor/carpet, /area/crew_quarters/dorms) "aCe" = ( @@ -11730,7 +11709,7 @@ "aDK" = ( /obj/machinery/door/airlock{ id_tag = "Dorm1"; - name = "Dorm 1" + name = "Cryogenics" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -16696,10 +16675,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/locker) "aQX" = ( -/obj/machinery/firealarm{ - dir = 2; - pixel_y = 24 - }, +/obj/machinery/vending/kink, /turf/open/floor/plasteel, /area/crew_quarters/locker) "aQY" = ( @@ -21100,10 +21076,6 @@ }, /turf/closed/wall, /area/quartermaster/warehouse) -"bcU" = ( -/obj/item/stack/tile/plasteel, -/turf/open/space, -/area/space/nearstation) "bcV" = ( /obj/machinery/airalarm{ dir = 8; @@ -21494,10 +21466,6 @@ /obj/structure/closet/crate/medical, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) -"bdV" = ( -/obj/item/stack/sheet/metal, -/turf/open/floor/plating/airless, -/area/space/nearstation) "bdW" = ( /obj/item/clothing/gloves/color/rainbow, /obj/item/clothing/head/soft/rainbow, @@ -34912,10 +34880,6 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab) -"bJP" = ( -/obj/machinery/vending/boozeomat, -/turf/open/floor/plasteel/bar, -/area/maintenance/port/aft) "bJQ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -37457,34 +37421,8 @@ }, /turf/open/floor/plasteel, /area/tcommsat/computer) -"bPR" = ( -/obj/effect/decal/cleanable/robot_debris/old, -/turf/open/floor/wood, -/area/maintenance/port/aft) -"bPS" = ( -/turf/open/floor/wood, -/area/maintenance/port/aft) -"bPT" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/maintenance/port/aft) "bPU" = ( -/obj/item/shard, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"bPV" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Maint Bar Access"; - req_access_txt = "12" - }, -/obj/structure/barricade/wooden{ - name = "wooden barricade (CLOSED)" - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"bPW" = ( -/obj/effect/decal/cleanable/oil, +/obj/effect/spawner/lootdrop/keg, /turf/open/floor/plating, /area/maintenance/port/aft) "bPX" = ( @@ -37898,27 +37836,6 @@ /obj/machinery/computer/libraryconsole/bookmanagement, /turf/open/floor/plasteel/white, /area/science/circuit) -"bRc" = ( -/obj/structure/table/wood, -/obj/item/soap/nanotrasen, -/turf/open/floor/wood{ - icon_state = "wood-broken7" - }, -/area/maintenance/port/aft) -"bRe" = ( -/obj/structure/table/wood, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 4; - name = "4maintenance loot spawner" - }, -/turf/open/floor/wood, -/area/maintenance/port/aft) -"bRf" = ( -/obj/structure/table/wood, -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/maintenance/port/aft) "bRg" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -38386,18 +38303,6 @@ icon_state = "platingdmg3" }, /area/maintenance/starboard/aft) -"bSn" = ( -/obj/machinery/space_heater, -/turf/open/floor/wood, -/area/maintenance/port/aft) -"bSo" = ( -/obj/structure/chair/stool, -/turf/open/floor/wood, -/area/maintenance/port/aft) -"bSp" = ( -/obj/structure/grille/broken, -/turf/open/floor/plating, -/area/maintenance/port/aft) "bSq" = ( /obj/structure/rack, /obj/item/tank/internals/emergency_oxygen, @@ -38421,11 +38326,12 @@ /turf/open/floor/plasteel, /area/tcommsat/computer) "bSu" = ( -/obj/item/stack/cable_coil{ - amount = 5 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 }, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/maintenance/bar) "bSv" = ( /obj/machinery/camera{ c_tag = "Construction Area"; @@ -38876,54 +38782,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"bTs" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken5" - }, -/area/maintenance/port/aft) -"bTt" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 - }, -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/maintenance/port/aft) -"bTu" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/port/aft) -"bTv" = ( -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"bTw" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ - req_access_txt = "12" - }, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"bTx" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plating, -/area/maintenance/port/aft) -"bTy" = ( -/obj/effect/spawner/structure/window, -/obj/machinery/atmospherics/pipe/simple/general/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port/aft) "bTz" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -40474,6 +40332,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/science/circuit) +"bXu" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/lootdrop/gambling, +/turf/open/floor/wood, +/area/maintenance/bar) "bXv" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -41569,11 +41432,9 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "car" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/closed/wall, -/area/maintenance/port/aft) +/area/maintenance/bar) "cas" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -42097,16 +41958,13 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cbw" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/cable{ icon_state = "2-8" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 +/obj/structure/cable{ + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plating, /area/maintenance/port/aft) "cbx" = ( @@ -45097,10 +44955,6 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) -"cjn" = ( -/obj/item/weldingtool, -/turf/open/floor/plating/airless, -/area/space/nearstation) "cjo" = ( /obj/structure/closet/toolcloset, /turf/open/floor/plasteel, @@ -51054,10 +50908,6 @@ /obj/item/clothing/under/burial, /turf/open/floor/plasteel/grimy, /area/chapel/office) -"cCa" = ( -/obj/item/clothing/head/hardhat, -/turf/open/floor/plating/airless, -/area/space/nearstation) "cCb" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -52888,6 +52738,13 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"cQh" = ( +/obj/machinery/cryopod{ + dir = 4; + tag = "0" + }, +/turf/open/floor/carpet, +/area/maintenance/fore/secondary) "cQw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -53304,6 +53161,13 @@ }, /turf/open/floor/plasteel, /area/science/circuit) +"dir" = ( +/obj/machinery/cryopod{ + dir = 4; + tag = "0" + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "dqu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, @@ -53314,12 +53178,33 @@ }, /turf/closed/wall, /area/science/circuit) +"dxy" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/lootdrop/gambling, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/maintenance/bar) +"dMc" = ( +/obj/item/restraints/legcuffs, +/obj/item/restraints/handcuffs/fake, +/obj/structure/bed/dogbed, +/turf/open/floor/plating, +/area/maintenance/bar) "dMZ" = ( /obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plasteel/white, /area/science/circuit) +"dOb" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/maintenance/bar) "eaI" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ @@ -53327,6 +53212,21 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) +"ekq" = ( +/obj/structure/reagent_dispensers/keg/aphro/strong, +/obj/item/reagent_containers/glass/beaker, +/turf/open/floor/plating, +/area/maintenance/bar) +"elP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/chair/stool/bar, +/turf/open/floor/wood, +/area/maintenance/bar) +"exQ" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck/syndicate, +/turf/open/floor/wood, +/area/maintenance/bar) "eyM" = ( /obj/machinery/mineral/ore_redemption{ input_dir = 2; @@ -53341,6 +53241,12 @@ }, /turf/open/floor/plasteel/floorgrime, /area/maintenance/disposal/incinerator) +"eMI" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/open/floor/wood, +/area/maintenance/bar) "eRz" = ( /obj/structure/lattice, /obj/structure/grille, @@ -53392,6 +53298,11 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/science/circuit) +"fVx" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/maintenance/bar) "gbq" = ( /obj/structure/cable{ icon_state = "4-8" @@ -53407,6 +53318,10 @@ "gjl" = ( /turf/closed/wall, /area/quartermaster/warehouse) +"gpI" = ( +/obj/machinery/vending/boozeomat, +/turf/open/floor/wood, +/area/maintenance/bar) "gsz" = ( /obj/machinery/camera{ c_tag = "Fitness Room South"; @@ -53467,6 +53382,20 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"hhg" = ( +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"hrK" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/closed/wall, +/area/maintenance/bar) +"hPN" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/shaker, +/turf/open/floor/wood, +/area/maintenance/bar) "hRa" = ( /obj/structure/table/reinforced, /obj/machinery/light{ @@ -53479,6 +53408,15 @@ /obj/item/stock_parts/cell/super, /turf/open/floor/plasteel/white, /area/science/circuit) +"iek" = ( +/obj/structure/chair/stool/bar, +/turf/open/floor/wood, +/area/maintenance/bar) +"igN" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/beer, +/turf/open/floor/wood, +/area/maintenance/bar) "ijc" = ( /obj/structure/table, /obj/item/stack/sheet/metal/fifty, @@ -53510,6 +53448,20 @@ /obj/structure/reagent_dispensers/cooking_oil, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) +"iPG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/turf/open/floor/wood, +/area/maintenance/bar) +"iRq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, +/area/maintenance/bar) +"iZC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, +/area/maintenance/bar) "jbf" = ( /obj/structure/cable{ icon_state = "0-2" @@ -53522,6 +53474,15 @@ }, /turf/open/floor/plasteel/hydrofloor, /area/hallway/secondary/service) +"jbX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/maintenance/bar) "jgm" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -53551,6 +53512,12 @@ /obj/structure/grille, /turf/open/floor/plating/airless, /area/space/nearstation) +"jCg" = ( +/obj/machinery/computer/cryopod{ + step_y = 31 + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "jCq" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -53609,6 +53576,12 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"kfy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/maintenance/bar) "khb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -53652,10 +53625,19 @@ }, /turf/closed/wall/r_wall, /area/science/mixing) +"kLN" = ( +/turf/open/floor/wood, +/area/maintenance/bar) "kOw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/science/mixing) +"kOA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/wood, +/area/maintenance/bar) "kPd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable{ @@ -53682,6 +53664,11 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/miningdock) +"lnu" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/spray/cleaner, +/turf/open/floor/wood, +/area/maintenance/bar) "lAB" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall, @@ -53692,14 +53679,28 @@ }, /turf/open/floor/plasteel, /area/science/circuit) +"lMz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood{ + icon_state = "wood-broken4" + }, +/area/maintenance/bar) "lQG" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/science/circuit) +"lUN" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/wood, +/area/maintenance/bar) "mjr" = ( /obj/machinery/vending/wardrobe/bar_wardrobe, /turf/open/floor/wood, /area/crew_quarters/bar) +"mrv" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/maintenance/bar) "mBv" = ( /obj/structure/cable{ icon_state = "1-2" @@ -53723,6 +53724,16 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) +"mUU" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/maintenance/bar) +"nga" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/maintenance/bar) "noK" = ( /obj/structure/girder, /turf/open/floor/plasteel/dark, @@ -53742,6 +53753,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"nzS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/vending/games, +/turf/open/floor/wood, +/area/maintenance/bar) "nGt" = ( /obj/structure/cable{ icon_state = "1-2" @@ -53765,6 +53781,24 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) +"ojF" = ( +/turf/closed/wall, +/area/maintenance/bar) +"osd" = ( +/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears, +/obj/item/assembly/signaler, +/turf/open/floor/plating, +/area/maintenance/bar) +"oui" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/maintenance/bar) +"oxF" = ( +/obj/effect/spawner/lootdrop/costume, +/obj/item/electropack/shockcollar, +/turf/open/floor/plating, +/area/maintenance/bar) "oDF" = ( /obj/machinery/light, /turf/open/floor/plating, @@ -53782,6 +53816,10 @@ /obj/machinery/disposal/bin, /turf/open/floor/plasteel/white, /area/science/circuit) +"pmB" = ( +/obj/machinery/vending/kink, +/turf/open/floor/plating, +/area/maintenance/bar) "pHl" = ( /obj/structure/table, /obj/item/storage/box/beakers{ @@ -53821,6 +53859,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/floorgrime, /area/science/misc_lab) +"pSl" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks, +/turf/open/floor/wood, +/area/maintenance/bar) +"qcu" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood, +/area/maintenance/bar) "qeQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -53860,6 +53908,16 @@ }, /turf/open/floor/plating, /area/construction) +"rWn" = ( +/obj/structure/table/wood, +/obj/item/weaponcrafting/receiver, +/turf/open/floor/wood, +/area/maintenance/bar) +"rYr" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/maintenance/bar) "saK" = ( /obj/structure/closet/crate, /obj/item/target/alien, @@ -53872,6 +53930,10 @@ /obj/item/gun/energy/laser/practice, /turf/open/floor/plasteel/white, /area/science/circuit) +"saV" = ( +/obj/machinery/vending/clothing, +/turf/open/floor/wood, +/area/maintenance/bar) "slk" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -53890,6 +53952,14 @@ /obj/item/shovel/spade, /turf/open/floor/plasteel/hydrofloor, /area/hallway/secondary/service) +"sDt" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/maintenance/bar) +"sKd" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/maintenance/bar) "sLv" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -53905,6 +53975,9 @@ /obj/machinery/door/airlock/maintenance/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"sPt" = ( +/turf/open/floor/carpet, +/area/maintenance/fore/secondary) "sSW" = ( /obj/structure/chair/office/light, /turf/open/floor/plasteel/white, @@ -53938,6 +54011,12 @@ }, /turf/open/floor/plasteel, /area/security/courtroom) +"tsS" = ( +/obj/machinery/door/airlock/wood{ + name = "Maintenance Bar" + }, +/turf/open/floor/wood, +/area/maintenance/bar) "tMl" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel/showroomfloor, @@ -54023,6 +54102,10 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) +"vfL" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/maintenance/port/aft) "vxh" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance{ @@ -54047,6 +54130,10 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/white, /area/science/circuit) +"vPp" = ( +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) "vPE" = ( /obj/machinery/light{ dir = 4 @@ -54054,6 +54141,15 @@ /obj/machinery/libraryscanner, /turf/open/floor/plasteel/white, /area/science/circuit) +"vWe" = ( +/obj/item/clothing/mask/breath/medical, +/obj/item/tank/internals/anesthetic, +/turf/open/floor/plating, +/area/maintenance/bar) +"wiz" = ( +/obj/item/weaponcrafting/stock, +/turf/open/floor/wood, +/area/maintenance/bar) "wkN" = ( /turf/closed/wall, /area/science/circuit) @@ -54100,11 +54196,28 @@ }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"wME" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/maintenance/bar) +"wOC" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plating, +/area/maintenance/port/aft) "wUY" = ( /obj/structure/table, /obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/hydrofloor, /area/hallway/secondary/service) +"wZJ" = ( +/obj/machinery/vending/autodrobe, +/turf/open/floor/wood, +/area/maintenance/bar) "xhV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -54125,6 +54238,16 @@ }, /turf/open/floor/plating, /area/hallway/secondary/service) +"xjx" = ( +/obj/machinery/cryopod, +/turf/open/floor/carpet, +/area/maintenance/fore/secondary) +"xuS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/maintenance/bar) "xEu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -54136,12 +54259,22 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"xZw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/chair/stool/bar, +/turf/open/floor/wood, +/area/maintenance/bar) "ycu" = ( /obj/structure/cable{ icon_state = "2-4" }, /turf/open/floor/plasteel, /area/science/circuit) +"yeD" = ( +/obj/structure/table/wood/poker, +/obj/item/storage/pill_bottle/dice, +/turf/open/floor/wood, +/area/maintenance/bar) (1,1,1) = {" aaa @@ -72804,8 +72937,8 @@ aaa aaf aaf aaf -aaa -aaa +gXs +gXs aag aaa bVx @@ -73060,11 +73193,11 @@ aaa aaa aaa aaa -bCq -bCq -bCq -bLv -bCq +aaa +aaa +aaa +vPp +aaa aoV cbj aoV @@ -73317,11 +73450,11 @@ aaa aaa aaa aaa -bCq -bJP -bCq -bSn -bCq +aaa +aaa +aaa +vPp +aaa bCq cbj bLv @@ -73574,11 +73707,11 @@ aaa aaa aaa aaa -bCq -bPS -aad -bPS -bPS +aaa +aaa +aaa +vPp +aaa bCq cbk bLv @@ -73793,7 +73926,7 @@ aLJ aLE aOl aPA -aQW +aQN aQW aTD aQW @@ -73831,11 +73964,11 @@ aaa aaa aaa aaa -bLv -bPR -bRc -bSo -bTs +aaa +aaa +aaa +vPp +aaa bCq bVy bLv @@ -74088,11 +74221,11 @@ aaa aaa aaa aaa -bCq -bPS -bRf -bSo -bTu +aaa +aaa +aaa +vPp +aaa bCq bVB bHE @@ -74345,11 +74478,11 @@ aaa aaa aaa aaa -bLv -bPT -bRe -bSo -bTt +aaa +aaa +aaa +vPp +aaa bCq bVA bWw @@ -74603,10 +74736,10 @@ aaa aaa aaa bCq -bPV bCq bCq -bTw +bCq +bCq bCq bVD bWy @@ -74862,8 +74995,8 @@ aoV bCq bPU bHE -bSp -bTv +bPU +bPU bCq bVC bWx @@ -75117,10 +75250,10 @@ bGi aoV aoV bCq -bPW +bCq +vfL bCq bCq -bTy bCq bVF bWA @@ -75376,8 +75509,8 @@ aoV bCq bHE bHE -bSq -bTx +bHE +bHE bCq bVE bWz @@ -75640,14 +75773,14 @@ bCq bCq bCq bYy -bCq -bCq -bLv -bCq -bCq -bCq -bCq -bLv +ojF +ojF +mrv +ojF +ojF +ojF +ojF +ojF bUs bLv aaa @@ -75897,14 +76030,14 @@ bVG bHE bHE bHE -bLv -aaf -aoV -aoV -aoV -aoV -aoV -bLv +tsS +rYr +kLN +kLN +fVx +iek +iek +ojF bUs bLv aaa @@ -76150,18 +76283,18 @@ bHE bHE bCq bHE -bLv -bLv -bLv -bLv -bLv -aoV -aoV -aoV -aoV -aoV -aaf -bLv +ojF +ojF +ojF +ojF +ojF +kLN +oui +kLN +iek +exQ +bXu +ojF bUs bLv aaf @@ -76407,18 +76540,18 @@ bHE bHE cTF bHE -bLv -aoV -aoV -aoV -aoV -aoV -aoV -aoV -aoV -aoV -aoV -bLv +ojF +pmB +oxF +dMc +ojF +kLN +kLN +kLN +iek +yeD +dxy +ojF bUs bLv aaa @@ -76664,18 +76797,18 @@ bHE bSs bCq bHE -bLv -aoV -aoV -aoV -bcU -aaf -aaH -cCa -aoV -aoV -aoV -bLv +ojF +ekq +osd +vWe +ojF +iek +iek +oui +kOA +iek +iek +ojF bUs bLv aaa @@ -76921,18 +77054,18 @@ bRh bLu bCq bHE -bLv -aaf -aaf -aoV -aoV -aaH -bdV -aaH -aaf -aaf -aaf -bLv +ojF +ojF +mUU +ojF +ojF +sKd +sKd +iek +xuS +kLN +kLN +ojF bUs bLv aaf @@ -77178,19 +77311,19 @@ bCq bCq bCq bHE -bLv -aoV -aoV -aoV -aoV -cjn +ojF +hPN +kLN +oui +igN +kLN bSu -aaH -aoV -aoV -aoV -bLv -bUs +elP +jbX +qcu +lMz +iZC +wOC bLv aaa cjJ @@ -77435,19 +77568,19 @@ bLv aaa bLv bHE -bLv -aoV -aoV -aoV -aoV -aoV -aaH -aaf -aoV -aoV -aoV -bLv -bUs +ojF +rWn +iPG +sDt +pSl +kfy +dOb +xZw +nga +sDt +nzS +hrK +bUz bLv aaa cjJ @@ -77692,19 +77825,19 @@ bLv aaf bLv bUt -bLv -aaf -aaf -aoV -aoV -aoV -aaH -aoV -aoV -aaf -aaf -bLv -bUs +ojF +lnu +eMI +rYr +gpI +kLN +sKd +iek +kLN +fVx +saV +wME +bUz bLv aaf cjJ @@ -77949,19 +78082,19 @@ bCq aaa bLv bUs -bLv -aoV -aoV -aoV -aoV -aoV -aaf -aoV -aoV -aoV -aoV -bCq -bUs +ojF +wiz +oui +kLN +lUN +kLN +kLN +kLN +kLN +kLN +wZJ +wME +bUz bCq aaa aaf @@ -78206,19 +78339,19 @@ aaa aaa bTB bUv -bES -bES -bES -bES -bGp -bGp -bGp -bGp -bES -bES -bES +iRq +iRq +iRq +iRq +iRq +iRq +iRq +iRq +iRq +iRq +iRq car -bUs +bUz bCq bCq bCq @@ -84065,7 +84198,7 @@ arf arf arf arf -anF +aoa ahn aJn aJn @@ -84319,10 +84452,10 @@ arf aqa atf arf -aqa -atf -arf -anF +dir +dir +dir +cQh ahn aaa aJn @@ -84576,10 +84709,10 @@ arf apY ath arf -apY -ate -arf -anF +jCg +ath +hhg +sPt ahn aaa aJn @@ -84835,8 +84968,8 @@ ath arf aCd ath -arf -anF +aCd +xjx ahn aJw aJw @@ -85093,7 +85226,7 @@ arf asd aDK arf -aoa +ahn ahn aJv aKG From b833a88204991969f4fadc2c216d51af2716e218 Mon Sep 17 00:00:00 2001 From: Cw3040 Date: Thu, 7 Jun 2018 20:44:02 -0400 Subject: [PATCH 2/4] MetaStation Changes Added Cryosleepers and KinkMates --- _maps/map_files/MetaStation/MetaStation.dmm | 130 +++++++++----------- 1 file changed, 56 insertions(+), 74 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 71f23231b9..a3d43f4113 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -902,6 +902,7 @@ dir = 8; pixel_x = 24 }, +/obj/machinery/cryopod, /turf/open/floor/plasteel/floorgrime, /area/security/prison) "acy" = ( @@ -3638,25 +3639,6 @@ icon_state = "platingdmg1" }, /area/maintenance/fore) -"ahU" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/table, -/obj/item/stock_parts/manipulator, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plating, -/area/maintenance/fore) -"ahV" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/open/floor/plasteel/neutral/corner{ - dir = 1 - }, -/area/crew_quarters/fitness/recreation) "ahW" = ( /obj/structure/window/reinforced{ dir = 1 @@ -4073,22 +4055,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"aiP" = ( -/obj/structure/table, -/obj/item/folder, -/turf/open/floor/plating, -/area/maintenance/fore) -"aiQ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -27 - }, -/turf/open/floor/plasteel/neutral/corner{ - dir = 1 - }, -/area/crew_quarters/fitness/recreation) "aiR" = ( /obj/structure/table, /obj/item/clothing/under/sl_suit{ @@ -4492,7 +4458,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/neutral/corner{ + dir = 8 + }, /area/crew_quarters/fitness/recreation) "ajS" = ( /obj/structure/table, @@ -5137,10 +5105,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"alf" = ( -/obj/structure/closet/firecloset, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "alg" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -5844,10 +5808,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"amv" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness/recreation) "amw" = ( /obj/structure/window/reinforced, /obj/machinery/door/window/eastright{ @@ -7795,9 +7755,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aqR" = ( -/obj/structure/chair{ - dir = 8 - }, +/obj/machinery/vending/kink, /turf/open/floor/plating{ icon_state = "panelscorched" }, @@ -21761,7 +21719,7 @@ /turf/open/floor/plasteel/vault, /area/crew_quarters/locker) "aUR" = ( -/obj/structure/closet/wardrobe/green, +/obj/machinery/vending/kink, /turf/open/floor/plasteel/vault, /area/crew_quarters/locker) "aUS" = ( @@ -25567,7 +25525,7 @@ }, /area/security/checkpoint/engineering) "bcO" = ( -/obj/structure/easel, +/obj/machinery/vending/kink, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -58038,10 +57996,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "cto" = ( -/obj/machinery/vending/assist, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, +/obj/machinery/vending/kink, /turf/open/floor/plating, /area/maintenance/port/aft) "ctq" = ( @@ -73591,19 +73546,12 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "dhp" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 +/turf/open/floor/plasteel/neutral/corner{ + dir = 8 }, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 - }, -/turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "dhq" = ( /obj/structure/table/reinforced, @@ -76193,6 +76141,10 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) +"jiR" = ( +/obj/machinery/computer/cryopod, +/turf/closed/wall, +/area/security/prison) "jwW" = ( /turf/closed/wall/mineral/plastitanium, /area/crew_quarters/fitness/recreation) @@ -76487,6 +76439,13 @@ }, /turf/open/floor/plating, /area/construction/mining/aux_base) +"ocn" = ( +/obj/machinery/cryopod{ + dir = 4; + tag = "0" + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/fitness/recreation) "ocT" = ( /obj/machinery/light{ dir = 1 @@ -76756,6 +76715,13 @@ /obj/machinery/computer/libraryconsole/bookmanagement, /turf/open/floor/plasteel/white, /area/science/circuit) +"tnQ" = ( +/obj/machinery/computer/cryopod{ + step_y = 9; + tag = "0" + }, +/turf/closed/wall, +/area/crew_quarters/fitness/recreation) "tsx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -76771,6 +76737,13 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) +"txv" = ( +/obj/machinery/cryopod{ + dir = 4; + tag = "0" + }, +/turf/open/floor/plasteel/vault, +/area/crew_quarters/fitness/recreation) "tDM" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; @@ -76788,6 +76761,15 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) +"tTL" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/plasteel/neutral/corner{ + dir = 1 + }, +/area/crew_quarters/fitness/recreation) "tVY" = ( /obj/structure/closet/crate, /obj/item/target/alien, @@ -101766,7 +101748,7 @@ aax aax aax aax -abe +jiR abe abe abe @@ -111540,8 +111522,8 @@ acQ afs agr acP -ahU -aiP +acP +acP acP acP acP @@ -111797,12 +111779,12 @@ acP acP ags acP -acP -acP -acP -alf -amv -acP +txv +ocn +ocn +ocn +ocn +tnQ aoS acP arB @@ -112053,9 +112035,9 @@ aaa acQ aft agt +tTL +ahf ahf -ahV -aiQ dhp alg alg @@ -112314,7 +112296,7 @@ ahg ahg ahg ajR -ahg +ahl ahg anG aoU From 45ec368d766ad3aa30d376059d8687c48690ac7d Mon Sep 17 00:00:00 2001 From: Cw3040 Date: Thu, 7 Jun 2018 20:53:15 -0400 Subject: [PATCH 3/4] Pubby Changes -Added Cryogenics -Kinkmates, of course. -Keg in maint bar --- _maps/map_files/PubbyStation/PubbyStation.dmm | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index ea03478492..01ceb61132 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -7813,6 +7813,11 @@ dir = 4; pixel_x = 28 }, +/obj/machinery/computer/cryopod{ + tag = "0"; + step_y = 31 + }, +/obj/machinery/cryopod, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "avm" = ( @@ -10447,7 +10452,7 @@ /turf/open/floor/plasteel/arrival, /area/crew_quarters/fitness/recreation) "aBV" = ( -/obj/structure/closet/wardrobe/green, +/obj/machinery/vending/kink, /turf/open/floor/plasteel/arrival, /area/crew_quarters/fitness/recreation) "aBW" = ( @@ -11037,6 +11042,7 @@ /turf/open/floor/plasteel/white/side, /area/crew_quarters/dorms) "aDk" = ( +/obj/machinery/cryopod, /turf/open/floor/plasteel/white/corner{ icon_state = "whitecorner"; dir = 8 @@ -48334,6 +48340,11 @@ dir = 1 }, /area/hallway/secondary/exit/departure_lounge) +"fVZ" = ( +/obj/structure/lattice, +/obj/structure/reagent_dispensers/keg/aphro/strong, +/turf/open/space, +/area/space/nearstation) "fWv" = ( /obj/structure/bookcase/random/religion, /turf/open/floor/plasteel/dark, @@ -52444,7 +52455,7 @@ /turf/open/floor/plating, /area/engine/engineering) "sbk" = ( -/obj/structure/girder, +/obj/machinery/vending/kink, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "sbY" = ( @@ -53835,6 +53846,10 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) +"wBX" = ( +/obj/effect/spawner/lootdrop/keg, +/turf/open/floor/wood, +/area/maintenance/department/crew_quarters/dorms) "wDm" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -88674,7 +88689,7 @@ aaa aaa aaa aby -abI +fVZ abO abX acg @@ -91537,7 +91552,7 @@ cBo alQ alb cBw -alb +wBX aiS aiS aiS From d5e30012610267c9623609b34061e39bac533ab2 Mon Sep 17 00:00:00 2001 From: Cw3040 Date: Thu, 7 Jun 2018 21:14:21 -0400 Subject: [PATCH 4/4] Changes This should fix Travis's issue. --- _maps/map_files/BoxStation/BoxStation.dmm | 798 +++++++++--------- _maps/map_files/MetaStation/MetaStation.dmm | 81 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 32 +- 3 files changed, 446 insertions(+), 465 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index d0992de6c7..1290ddf469 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -40332,11 +40332,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/science/circuit) -"bXu" = ( -/obj/structure/table/wood/poker, -/obj/effect/spawner/lootdrop/gambling, -/turf/open/floor/wood, -/area/maintenance/bar) "bXv" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -52738,13 +52733,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"cQh" = ( -/obj/machinery/cryopod{ - dir = 4; - tag = "0" - }, -/turf/open/floor/carpet, -/area/maintenance/fore/secondary) "cQw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -53161,50 +53149,35 @@ }, /turf/open/floor/plasteel, /area/science/circuit) -"dir" = ( -/obj/machinery/cryopod{ - dir = 4; - tag = "0" +"dkC" = ( +/obj/machinery/door/airlock/wood{ + name = "Maintenance Bar" }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) +/turf/open/floor/wood, +/area/maintenance/bar) "dqu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"dqT" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/turf/open/floor/plating, +/area/maintenance/port/aft) "dvO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall, /area/science/circuit) -"dxy" = ( -/obj/structure/table/wood/poker, -/obj/effect/spawner/lootdrop/gambling, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/maintenance/bar) -"dMc" = ( -/obj/item/restraints/legcuffs, -/obj/item/restraints/handcuffs/fake, -/obj/structure/bed/dogbed, -/turf/open/floor/plating, -/area/maintenance/bar) "dMZ" = ( /obj/structure/sign/poster/official/random{ pixel_y = 32 }, /turf/open/floor/plasteel/white, /area/science/circuit) -"dOb" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/maintenance/bar) "eaI" = ( /obj/structure/table/reinforced, /obj/item/radio/intercom{ @@ -53212,21 +53185,6 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) -"ekq" = ( -/obj/structure/reagent_dispensers/keg/aphro/strong, -/obj/item/reagent_containers/glass/beaker, -/turf/open/floor/plating, -/area/maintenance/bar) -"elP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/chair/stool/bar, -/turf/open/floor/wood, -/area/maintenance/bar) -"exQ" = ( -/obj/structure/table/wood/poker, -/obj/item/toy/cards/deck/syndicate, -/turf/open/floor/wood, -/area/maintenance/bar) "eyM" = ( /obj/machinery/mineral/ore_redemption{ input_dir = 2; @@ -53235,16 +53193,18 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/quartermaster/miningdock) +"ezO" = ( +/obj/structure/mineral_door/wood, +/turf/open/floor/wood, +/area/maintenance/bar) "eHI" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, /turf/open/floor/plasteel/floorgrime, /area/maintenance/disposal/incinerator) -"eMI" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, +"eKN" = ( +/obj/machinery/vending/clothing, /turf/open/floor/wood, /area/maintenance/bar) "eRz" = ( @@ -53262,6 +53222,12 @@ }, /turf/open/floor/plasteel, /area/quartermaster/miningdock) +"eYI" = ( +/obj/item/restraints/legcuffs, +/obj/item/restraints/handcuffs/fake, +/obj/structure/bed/dogbed, +/turf/open/floor/plating, +/area/maintenance/bar) "fcG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -53298,10 +53264,10 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/science/circuit) -"fVx" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, +"fWI" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/shaker, +/turf/open/floor/wood, /area/maintenance/bar) "gbq" = ( /obj/structure/cable{ @@ -53318,10 +53284,6 @@ "gjl" = ( /turf/closed/wall, /area/quartermaster/warehouse) -"gpI" = ( -/obj/machinery/vending/boozeomat, -/turf/open/floor/wood, -/area/maintenance/bar) "gsz" = ( /obj/machinery/camera{ c_tag = "Fitness Room South"; @@ -53338,6 +53300,9 @@ }, /turf/open/floor/plasteel, /area/science/circuit) +"gxS" = ( +/turf/open/floor/wood, +/area/maintenance/bar) "gLH" = ( /obj/machinery/door/airlock/external{ name = "External Access"; @@ -53348,6 +53313,10 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"gRV" = ( +/obj/machinery/vending/autodrobe, +/turf/open/floor/wood, +/area/maintenance/bar) "gWd" = ( /obj/structure/cable{ icon_state = "1-4" @@ -53382,20 +53351,6 @@ }, /turf/open/floor/plating, /area/maintenance/port) -"hhg" = ( -/turf/open/floor/carpet, -/area/crew_quarters/dorms) -"hrK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/turf/closed/wall, -/area/maintenance/bar) -"hPN" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/shaker, -/turf/open/floor/wood, -/area/maintenance/bar) "hRa" = ( /obj/structure/table/reinforced, /obj/machinery/light{ @@ -53408,13 +53363,10 @@ /obj/item/stock_parts/cell/super, /turf/open/floor/plasteel/white, /area/science/circuit) -"iek" = ( -/obj/structure/chair/stool/bar, -/turf/open/floor/wood, -/area/maintenance/bar) -"igN" = ( -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks/beer, +"idZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, /turf/open/floor/wood, /area/maintenance/bar) "ijc" = ( @@ -53431,6 +53383,11 @@ /obj/item/pen, /turf/open/floor/plasteel/white, /area/science/circuit) +"iEy" = ( +/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears, +/obj/item/assembly/signaler, +/turf/open/floor/plating, +/area/maintenance/bar) "iEJ" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod One" @@ -53440,6 +53397,10 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) +"iGw" = ( +/obj/structure/chair/stool/bar, +/turf/open/floor/wood, +/area/maintenance/bar) "iNn" = ( /obj/machinery/camera{ c_tag = "Kitchen Cold Room" @@ -53448,20 +53409,6 @@ /obj/structure/reagent_dispensers/cooking_oil, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) -"iPG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 - }, -/turf/open/floor/wood, -/area/maintenance/bar) -"iRq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/maintenance/bar) -"iZC" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/closed/wall, -/area/maintenance/bar) "jbf" = ( /obj/structure/cable{ icon_state = "0-2" @@ -53474,15 +53421,6 @@ }, /turf/open/floor/plasteel/hydrofloor, /area/hallway/secondary/service) -"jbX" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood{ - icon_state = "wood-broken" - }, -/area/maintenance/bar) "jgm" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -53508,16 +53446,14 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) +"jtl" = ( +/obj/structure/lattice/catwalk, +/turf/open/space/basic, +/area/space/nearstation) "jAD" = ( /obj/structure/grille, /turf/open/floor/plating/airless, /area/space/nearstation) -"jCg" = ( -/obj/machinery/computer/cryopod{ - step_y = 31 - }, -/turf/open/floor/carpet, -/area/crew_quarters/dorms) "jCq" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -53576,11 +53512,11 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"kfy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/wood{ - icon_state = "wood-broken7" +"kds" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, +/turf/open/floor/wood, /area/maintenance/bar) "khb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -53611,6 +53547,11 @@ }, /turf/open/floor/plasteel, /area/engine/gravity_generator) +"knR" = ( +/obj/structure/table/wood, +/obj/item/weaponcrafting/receiver, +/turf/open/floor/wood, +/area/maintenance/bar) "kob" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, @@ -53625,19 +53566,10 @@ }, /turf/closed/wall/r_wall, /area/science/mixing) -"kLN" = ( -/turf/open/floor/wood, -/area/maintenance/bar) "kOw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/science/mixing) -"kOA" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) "kPd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable{ @@ -53664,11 +53596,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/miningdock) -"lnu" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/spray/cleaner, -/turf/open/floor/wood, -/area/maintenance/bar) "lAB" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall, @@ -53679,27 +53606,17 @@ }, /turf/open/floor/plasteel, /area/science/circuit) -"lMz" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood{ - icon_state = "wood-broken4" - }, -/area/maintenance/bar) "lQG" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/science/circuit) -"lUN" = ( -/obj/structure/mineral_door/wood, -/turf/open/floor/wood, -/area/maintenance/bar) "mjr" = ( /obj/machinery/vending/wardrobe/bar_wardrobe, /turf/open/floor/wood, /area/crew_quarters/bar) -"mrv" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +"mtJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, /area/maintenance/bar) "mBv" = ( /obj/structure/cable{ @@ -53724,20 +53641,15 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) -"mUU" = ( -/obj/structure/falsewall, -/turf/open/floor/plating, -/area/maintenance/bar) -"nga" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) "noK" = ( /obj/structure/girder, /turf/open/floor/plasteel/dark, /area/engine/engineering) +"nwX" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/vending/games, +/turf/open/floor/wood, +/area/maintenance/bar) "nxv" = ( /obj/machinery/power/apc{ name = "Construction Area APC"; @@ -53753,10 +53665,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/engine/engineering) -"nzS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/vending/games, -/turf/open/floor/wood, +"nEe" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, +/turf/closed/wall, /area/maintenance/bar) "nGt" = ( /obj/structure/cable{ @@ -53769,6 +53682,15 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"nKB" = ( +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks/beer, +/turf/open/floor/wood, +/area/maintenance/bar) +"nRn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood, +/area/maintenance/bar) "nRG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -53781,23 +53703,24 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing) -"ojF" = ( -/turf/closed/wall, -/area/maintenance/bar) -"osd" = ( -/obj/effect/spawner/lootdrop/minor/kittyears_or_rabbitears, -/obj/item/assembly/signaler, -/turf/open/floor/plating, -/area/maintenance/bar) -"oui" = ( +"ooS" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/lootdrop/gambling, /turf/open/floor/wood{ - icon_state = "wood-broken7" + icon_state = "wood-broken" }, /area/maintenance/bar) -"oxF" = ( -/obj/effect/spawner/lootdrop/costume, -/obj/item/electropack/shockcollar, -/turf/open/floor/plating, +"oqQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/table/wood, +/obj/machinery/chem_dispenser/drinks, +/turf/open/floor/wood, +/area/maintenance/bar) +"ouu" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/open/floor/wood, /area/maintenance/bar) "oDF" = ( /obj/machinery/light, @@ -53809,6 +53732,12 @@ }, /turf/open/floor/plasteel, /area/science/circuit) +"oPA" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/wood, +/area/maintenance/bar) "oUh" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -53816,9 +53745,9 @@ /obj/machinery/disposal/bin, /turf/open/floor/plasteel/white, /area/science/circuit) -"pmB" = ( -/obj/machinery/vending/kink, -/turf/open/floor/plating, +"pDq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/closed/wall, /area/maintenance/bar) "pHl" = ( /obj/structure/table, @@ -53859,15 +53788,16 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/floorgrime, /area/science/misc_lab) -"pSl" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks, +"qbA" = ( +/obj/structure/table/wood/poker, +/obj/item/toy/cards/deck/syndicate, /turf/open/floor/wood, /area/maintenance/bar) -"qcu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, +"qdB" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, /area/maintenance/bar) "qeQ" = ( /obj/effect/turf_decal/stripes/line{ @@ -53875,6 +53805,11 @@ }, /turf/open/floor/plasteel, /area/science/circuit) +"qit" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/maintenance/bar) "qpv" = ( /obj/machinery/light{ dir = 4 @@ -53887,37 +53822,58 @@ /obj/structure/grille/broken, /turf/open/space/basic, /area/space/nearstation) +"qBv" = ( +/obj/item/clothing/mask/breath/medical, +/obj/item/tank/internals/anesthetic, +/turf/open/floor/plating, +/area/maintenance/bar) +"qBQ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/chair/stool/bar, +/turf/open/floor/wood, +/area/maintenance/bar) +"qKd" = ( +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/maintenance/bar) +"qSC" = ( +/obj/machinery/vending/boozeomat, +/turf/open/floor/wood, +/area/maintenance/bar) "rcD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/closed/wall/r_wall, /area/science/circuit) +"ref" = ( +/turf/closed/wall, +/area/maintenance/bar) "rfW" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/floorgrime, /area/maintenance/disposal/incinerator) +"rgN" = ( +/obj/structure/reagent_dispensers/keg/aphro/strong, +/obj/item/reagent_containers/glass/beaker, +/turf/open/floor/plating, +/area/maintenance/bar) "rmX" = ( /obj/structure/table, /obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"rrl" = ( +/obj/effect/spawner/lootdrop/costume, +/obj/item/electropack/shockcollar, +/turf/open/floor/plating, +/area/maintenance/bar) "rKP" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /turf/open/floor/plating, /area/construction) -"rWn" = ( -/obj/structure/table/wood, -/obj/item/weaponcrafting/receiver, -/turf/open/floor/wood, -/area/maintenance/bar) -"rYr" = ( -/turf/open/floor/wood{ - icon_state = "wood-broken6" - }, -/area/maintenance/bar) "saK" = ( /obj/structure/closet/crate, /obj/item/target/alien, @@ -53930,10 +53886,16 @@ /obj/item/gun/energy/laser/practice, /turf/open/floor/plasteel/white, /area/science/circuit) -"saV" = ( -/obj/machinery/vending/clothing, -/turf/open/floor/wood, -/area/maintenance/bar) +"shL" = ( +/turf/open/floor/carpet, +/area/crew_quarters/dorms) +"sjc" = ( +/obj/machinery/cryopod{ + dir = 4; + tag = "0" + }, +/turf/open/floor/carpet, +/area/crew_quarters/dorms) "slk" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -53946,20 +53908,21 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) +"stg" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood{ + icon_state = "wood-broken" + }, +/area/maintenance/bar) "sxs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table, /obj/item/shovel/spade, /turf/open/floor/plasteel/hydrofloor, /area/hallway/secondary/service) -"sDt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/wood, -/area/maintenance/bar) -"sKd" = ( -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/maintenance/bar) "sLv" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, @@ -53975,9 +53938,6 @@ /obj/machinery/door/airlock/maintenance/abandoned, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"sPt" = ( -/turf/open/floor/carpet, -/area/maintenance/fore/secondary) "sSW" = ( /obj/structure/chair/office/light, /turf/open/floor/plasteel/white, @@ -54005,22 +53965,36 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/hallway/secondary/service) +"tmK" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken6" + }, +/area/maintenance/bar) +"tqe" = ( +/obj/structure/table/wood/poker, +/obj/effect/spawner/lootdrop/gambling, +/turf/open/floor/wood, +/area/maintenance/bar) "trb" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/plasteel, /area/security/courtroom) -"tsS" = ( -/obj/machinery/door/airlock/wood{ - name = "Maintenance Bar" +"tEz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood{ + icon_state = "wood-broken4" }, -/turf/open/floor/wood, /area/maintenance/bar) "tMl" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) +"tOc" = ( +/obj/item/weaponcrafting/stock, +/turf/open/floor/wood, +/area/maintenance/bar) "tOq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -54060,6 +54034,15 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) +"uAK" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/maintenance/port/aft) +"uBG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/chair/stool/bar, +/turf/open/floor/wood, +/area/maintenance/bar) "uNu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54102,10 +54085,12 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) -"vfL" = ( -/obj/structure/falsewall, -/turf/open/floor/plating, -/area/maintenance/port/aft) +"vhC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/closed/wall, +/area/maintenance/bar) "vxh" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance{ @@ -54130,10 +54115,22 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/white, /area/science/circuit) -"vPp" = ( -/obj/structure/lattice/catwalk, -/turf/open/space/basic, -/area/space/nearstation) +"vJu" = ( +/obj/structure/table/wood/poker, +/obj/item/storage/pill_bottle/dice, +/turf/open/floor/wood, +/area/maintenance/bar) +"vJW" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 + }, +/turf/open/floor/wood, +/area/maintenance/bar) +"vNv" = ( +/turf/open/floor/wood{ + icon_state = "wood-broken7" + }, +/area/maintenance/bar) "vPE" = ( /obj/machinery/light{ dir = 4 @@ -54141,13 +54138,8 @@ /obj/machinery/libraryscanner, /turf/open/floor/plasteel/white, /area/science/circuit) -"vWe" = ( -/obj/item/clothing/mask/breath/medical, -/obj/item/tank/internals/anesthetic, -/turf/open/floor/plating, -/area/maintenance/bar) -"wiz" = ( -/obj/item/weaponcrafting/stock, +"vSH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/maintenance/bar) "wkN" = ( @@ -54184,6 +54176,10 @@ /obj/item/stack/sheet/metal/fifty, /turf/open/floor/plasteel/white, /area/science/circuit) +"wzn" = ( +/obj/structure/falsewall, +/turf/open/floor/plating, +/area/maintenance/bar) "wBd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -54196,28 +54192,27 @@ }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) -"wME" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/maintenance/bar) -"wOC" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +"wPS" = ( +/obj/machinery/vending/kink, /turf/open/floor/plating, -/area/maintenance/port/aft) +/area/maintenance/bar) +"wSH" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/table/wood, +/turf/open/floor/wood, +/area/maintenance/bar) "wUY" = ( /obj/structure/table, /obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/hydrofloor, /area/hallway/secondary/service) -"wZJ" = ( -/obj/machinery/vending/autodrobe, -/turf/open/floor/wood, -/area/maintenance/bar) +"xfy" = ( +/obj/machinery/computer/cryopod, +/turf/closed/wall, +/area/crew_quarters/dorms) "xhV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -54238,16 +54233,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/service) -"xjx" = ( -/obj/machinery/cryopod, -/turf/open/floor/carpet, -/area/maintenance/fore/secondary) -"xuS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/wood, -/area/maintenance/bar) "xEu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -54259,10 +54244,9 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"xZw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/chair/stool/bar, -/turf/open/floor/wood, +"xPY" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/maintenance/bar) "ycu" = ( /obj/structure/cable{ @@ -54270,9 +54254,9 @@ }, /turf/open/floor/plasteel, /area/science/circuit) -"yeD" = ( -/obj/structure/table/wood/poker, -/obj/item/storage/pill_bottle/dice, +"ygH" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/wood, /area/maintenance/bar) @@ -73196,7 +73180,7 @@ aaa aaa aaa aaa -vPp +jtl aaa aoV cbj @@ -73453,7 +73437,7 @@ aaa aaa aaa aaa -vPp +jtl aaa bCq cbj @@ -73710,7 +73694,7 @@ aaa aaa aaa aaa -vPp +jtl aaa bCq cbk @@ -73967,7 +73951,7 @@ aaa aaa aaa aaa -vPp +jtl aaa bCq bVy @@ -74224,7 +74208,7 @@ aaa aaa aaa aaa -vPp +jtl aaa bCq bVB @@ -74481,7 +74465,7 @@ aaa aaa aaa aaa -vPp +jtl aaa bCq bVA @@ -75251,7 +75235,7 @@ aoV aoV bCq bCq -vfL +uAK bCq bCq bCq @@ -75773,14 +75757,14 @@ bCq bCq bCq bYy -ojF -ojF -mrv -ojF -ojF -ojF -ojF -ojF +ref +ref +xPY +ref +ref +ref +ref +ref bUs bLv aaa @@ -76030,14 +76014,14 @@ bVG bHE bHE bHE -tsS -rYr -kLN -kLN -fVx -iek -iek -ojF +dkC +tmK +gxS +gxS +qit +iGw +iGw +ref bUs bLv aaa @@ -76283,18 +76267,18 @@ bHE bHE bCq bHE -ojF -ojF -ojF -ojF -ojF -kLN -oui -kLN -iek -exQ -bXu -ojF +ref +ref +ref +ref +ref +gxS +vNv +gxS +iGw +qbA +tqe +ref bUs bLv aaf @@ -76540,18 +76524,18 @@ bHE bHE cTF bHE -ojF -pmB -oxF -dMc -ojF -kLN -kLN -kLN -iek -yeD -dxy -ojF +ref +wPS +rrl +eYI +ref +gxS +gxS +gxS +iGw +vJu +ooS +ref bUs bLv aaa @@ -76797,18 +76781,18 @@ bHE bSs bCq bHE -ojF -ekq -osd -vWe -ojF -iek -iek -oui -kOA -iek -iek -ojF +ref +rgN +iEy +qBv +ref +iGw +iGw +vNv +ouu +iGw +iGw +ref bUs bLv aaa @@ -77054,18 +77038,18 @@ bRh bLu bCq bHE -ojF -ojF -mUU -ojF -ojF -sKd -sKd -iek -xuS -kLN -kLN -ojF +ref +ref +wzn +ref +ref +qKd +qKd +iGw +kds +gxS +gxS +ref bUs bLv aaf @@ -77311,19 +77295,19 @@ bCq bCq bCq bHE -ojF -hPN -kLN -oui -igN -kLN +ref +fWI +gxS +vNv +nKB +gxS bSu -elP -jbX -qcu -lMz -iZC -wOC +uBG +stg +vSH +tEz +pDq +dqT bLv aaa cjJ @@ -77568,18 +77552,18 @@ bLv aaa bLv bHE -ojF -rWn -iPG -sDt -pSl -kfy -dOb -xZw -nga -sDt -nzS -hrK +ref +knR +vJW +nRn +oqQ +qdB +wSH +qBQ +oPA +nRn +nwX +nEe bUz bLv aaa @@ -77825,18 +77809,18 @@ bLv aaf bLv bUt -ojF -lnu -eMI -rYr -gpI -kLN -sKd -iek -kLN -fVx -saV -wME +ref +ygH +idZ +tmK +qSC +gxS +qKd +iGw +gxS +qit +eKN +vhC bUz bLv aaf @@ -78082,18 +78066,18 @@ bCq aaa bLv bUs -ojF -wiz -oui -kLN -lUN -kLN -kLN -kLN -kLN -kLN -wZJ -wME +ref +tOc +vNv +gxS +ezO +gxS +gxS +gxS +gxS +gxS +gRV +vhC bUz bCq aaa @@ -78339,17 +78323,17 @@ aaa aaa bTB bUv -iRq -iRq -iRq -iRq -iRq -iRq -iRq -iRq -iRq -iRq -iRq +mtJ +mtJ +mtJ +mtJ +mtJ +mtJ +mtJ +mtJ +mtJ +mtJ +mtJ car bUz bCq @@ -84199,7 +84183,7 @@ arf arf arf aoa -ahn +arf aJn aJn aJq @@ -84452,11 +84436,11 @@ arf aqa atf arf -dir -dir -dir -cQh -ahn +sjc +sjc +sjc +sjc +arf aaa aJn aJq @@ -84708,12 +84692,12 @@ ath arf apY ath -arf -jCg +xfy +shL ath -hhg -sPt -ahn +shL +shL +arf aaa aJn aLY @@ -84969,8 +84953,8 @@ arf aCd ath aCd -xjx -ahn +aCd +arf aJw aJw aMh @@ -85226,8 +85210,8 @@ arf asd aDK arf -ahn -ahn +arf +arf aJv aKG aMg diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index a3d43f4113..912cc6743b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -70675,6 +70675,13 @@ /obj/structure/disposalpipe/segment, /turf/closed/wall/r_wall, /area/science/xenobiology) +"cUd" = ( +/obj/machinery/cryopod{ + dir = 4; + tag = "0" + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/fitness/recreation) "cUH" = ( /obj/structure/table/optable, /turf/open/floor/plasteel/white, @@ -75923,6 +75930,10 @@ }, /turf/open/floor/plating, /area/maintenance/starboard) +"dWa" = ( +/obj/machinery/computer/cryopod, +/turf/closed/wall, +/area/security/prison) "dYu" = ( /obj/machinery/door/airlock/external{ name = "Auxiliary Airlock" @@ -76091,6 +76102,13 @@ }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"hdw" = ( +/obj/machinery/cryopod{ + dir = 4; + tag = "0" + }, +/turf/open/floor/plasteel/vault, +/area/crew_quarters/fitness/recreation) "hfJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -76141,10 +76159,6 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) -"jiR" = ( -/obj/machinery/computer/cryopod, -/turf/closed/wall, -/area/security/prison) "jwW" = ( /turf/closed/wall/mineral/plastitanium, /area/crew_quarters/fitness/recreation) @@ -76359,6 +76373,15 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) +"mSt" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/plasteel/neutral/corner{ + dir = 1 + }, +/area/crew_quarters/fitness/recreation) "nnK" = ( /obj/item/stack/sheet/glass/fifty, /obj/item/paper_bin, @@ -76439,13 +76462,6 @@ }, /turf/open/floor/plating, /area/construction/mining/aux_base) -"ocn" = ( -/obj/machinery/cryopod{ - dir = 4; - tag = "0" - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/fitness/recreation) "ocT" = ( /obj/machinery/light{ dir = 1 @@ -76626,6 +76642,10 @@ }, /turf/open/floor/wood, /area/library) +"rzf" = ( +/obj/machinery/computer/cryopod, +/turf/closed/wall, +/area/crew_quarters/fitness/recreation) "rzX" = ( /obj/structure/chair/office/light{ dir = 1; @@ -76715,13 +76735,6 @@ /obj/machinery/computer/libraryconsole/bookmanagement, /turf/open/floor/plasteel/white, /area/science/circuit) -"tnQ" = ( -/obj/machinery/computer/cryopod{ - step_y = 9; - tag = "0" - }, -/turf/closed/wall, -/area/crew_quarters/fitness/recreation) "tsx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -76737,13 +76750,6 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) -"txv" = ( -/obj/machinery/cryopod{ - dir = 4; - tag = "0" - }, -/turf/open/floor/plasteel/vault, -/area/crew_quarters/fitness/recreation) "tDM" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; @@ -76761,15 +76767,6 @@ }, /turf/open/floor/plasteel/dark, /area/medical/morgue) -"tTL" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/open/floor/plasteel/neutral/corner{ - dir = 1 - }, -/area/crew_quarters/fitness/recreation) "tVY" = ( /obj/structure/closet/crate, /obj/item/target/alien, @@ -101748,7 +101745,7 @@ aax aax aax aax -jiR +dWa abe abe abe @@ -111779,12 +111776,12 @@ acP acP ags acP -txv -ocn -ocn -ocn -ocn -tnQ +hdw +cUd +cUd +cUd +cUd +rzf aoS acP arB @@ -112035,7 +112032,7 @@ aaa acQ aft agt -tTL +mSt ahf ahf dhp diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 01ceb61132..e0de739f99 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -7813,10 +7813,6 @@ dir = 4; pixel_x = 28 }, -/obj/machinery/computer/cryopod{ - tag = "0"; - step_y = 31 - }, /obj/machinery/cryopod, /turf/open/floor/plasteel, /area/crew_quarters/dorms) @@ -48340,11 +48336,6 @@ dir = 1 }, /area/hallway/secondary/exit/departure_lounge) -"fVZ" = ( -/obj/structure/lattice, -/obj/structure/reagent_dispensers/keg/aphro/strong, -/turf/open/space, -/area/space/nearstation) "fWv" = ( /obj/structure/bookcase/random/religion, /turf/open/floor/plasteel/dark, @@ -49444,6 +49435,10 @@ }, /turf/closed/wall/r_wall, /area/engine/engineering) +"jqN" = ( +/obj/effect/spawner/lootdrop/keg, +/turf/open/floor/wood, +/area/maintenance/department/crew_quarters/dorms) "jrG" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -52331,6 +52326,11 @@ "rHA" = ( /turf/open/floor/plasteel, /area/construction/mining/aux_base) +"rHP" = ( +/obj/structure/lattice, +/obj/structure/reagent_dispensers/keg/aphro/strong, +/turf/open/space, +/area/space/nearstation) "rJg" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/machinery/light/small{ @@ -53846,10 +53846,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"wBX" = ( -/obj/effect/spawner/lootdrop/keg, -/turf/open/floor/wood, -/area/maintenance/department/crew_quarters/dorms) "wDm" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -54424,6 +54420,10 @@ }, /turf/open/floor/plasteel, /area/science/xenobiology) +"yap" = ( +/obj/machinery/computer/cryopod, +/turf/closed/wall, +/area/crew_quarters/dorms) "ybX" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, @@ -88689,7 +88689,7 @@ aaa aaa aaa aby -fVZ +rHP abO abX acg @@ -91552,7 +91552,7 @@ cBo alQ alb cBw -wBX +jqN aiS aiS aiS @@ -94649,7 +94649,7 @@ aaa aaa apX apX -apX +yap avl fIu dbi