From 59dc33dfa6ce73991aadbf55d4e19aa8394c8de5 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sun, 26 Nov 2017 21:14:29 -0500 Subject: [PATCH] unkevinz the station maps (#33091) * unkevinzes the station maps * Added wardrobe --- _maps/map_files/BoxStation/BoxStation.dmm | 309 +++++----- _maps/map_files/MetaStation/MetaStation.dmm | 96 ++-- _maps/map_files/OmegaStation/OmegaStation.dmm | 52 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 536 +++++++++--------- 4 files changed, 520 insertions(+), 473 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index cab085b3dec..3eea930ed31 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -2193,7 +2193,6 @@ /area/security/main) "aff" = ( /obj/effect/landmark/start/security_officer, -/obj/machinery/rnd/protolathe/department/security, /turf/open/floor/plasteel/red/side{ dir = 9 }, @@ -17951,7 +17950,7 @@ /area/crew_quarters/kitchen) "aSP" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "aSQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -47254,6 +47253,7 @@ /area/engine/engineering) "clS" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/rnd/protolathe/department/security, /turf/open/floor/plasteel/red/side, /area/security/main) "clT" = ( @@ -48391,6 +48391,9 @@ name = "HIGH VOLTAGE"; pixel_x = -32 }, +/obj/machinery/computer/rdconsole/production{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/engineering) "cps" = ( @@ -48603,12 +48606,12 @@ /turf/open/floor/plasteel, /area/engine/engine_smes) "cpV" = ( -/obj/structure/table, /obj/machinery/camera{ c_tag = "Engineering Storage"; dir = 4; network = list("SS13") }, +/obj/machinery/rnd/protolathe/department/engineering, /turf/open/floor/plasteel, /area/engine/engineering) "cpW" = ( @@ -48822,13 +48825,10 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "cqw" = ( -/obj/structure/table, -/obj/item/stack/sheet/plasteel{ - amount = 10 - }, /obj/machinery/light{ dir = 8 }, +/obj/machinery/rnd/circuit_imprinter, /turf/open/floor/plasteel, /area/engine/engineering) "cqx" = ( @@ -48954,6 +48954,9 @@ /obj/structure/table, /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/plasteel{ + amount = 10 + }, /turf/open/floor/plasteel, /area/engine/engineering) "cqO" = ( @@ -53734,7 +53737,6 @@ dir = 4 }, /obj/effect/landmark/start/station_engineer, -/obj/machinery/rnd/circuit_imprinter, /turf/open/floor/plasteel, /area/engine/engineering) "cDC" = ( @@ -57655,7 +57657,7 @@ /area/crew_quarters/kitchen) "QoM" = ( /obj/machinery/rnd/protolathe/department/service, -/turf/closed/wall, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "QoN" = ( /obj/machinery/rnd/protolathe/department/cargo, @@ -57700,6 +57702,13 @@ /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) +"QoU" = ( +/obj/structure/closet/crate/freezer/surplus_limbs, +/obj/item/reagent_containers/glass/beaker/synthflesh, +/turf/open/floor/plasteel/white/side{ + dir = 8 + }, +/area/medical/sleeper) (1,1,1) = {" aaa @@ -70169,7 +70178,7 @@ ayl beM aAC aaf -aHr +aoV aaa aaa aaa @@ -73737,7 +73746,7 @@ arH alU aaH bNb -apQ +aaf atO asK azF @@ -75340,8 +75349,8 @@ aag aaa aoV bVz -apQ -apQ +aaf +aaf aoV aaa aaS @@ -75595,10 +75604,10 @@ aaa aaa aag aaa -bVw +aag bVz -bVw -bVw +aag +aag aoV aaa aaS @@ -75786,7 +75795,7 @@ amC amC amC ali -apQ +aaf ali amC alU @@ -75852,10 +75861,10 @@ aaa aaa aag aaa -apQ +aaf bVz aoV -bVw +aag aoV aaa aaS @@ -76109,10 +76118,10 @@ aaa aaa aag aaa -apQ +aaf bVz -apQ -bVw +aaf +aag aoV aaa aaa @@ -76369,8 +76378,8 @@ aaa bVx caf aoV -bVw -apQ +aag +aaf aaa aaa aaf @@ -76557,7 +76566,7 @@ amF alU amC alU -apQ +aaf alU alU alU @@ -76626,8 +76635,8 @@ bCq aoV cbj aoV -bVw -apQ +aag +aaf aaf bCq bCq @@ -76814,7 +76823,7 @@ alU alU amC alU -apQ +aaf aaH alU arO @@ -77329,8 +77338,8 @@ alU amC alU aaH -apQ -apQ +aaf +aaf aaH alU ali @@ -77586,12 +77595,12 @@ ali aKY ali asC -apQ +aaf aaH -apQ +aaf aoV aoV -apQ +aaf avY axo ayB @@ -77844,7 +77853,7 @@ amC ali asC aaH -apQ +aaf aoV aoV aoV @@ -78102,10 +78111,10 @@ alU alU alU aaH -apQ +aaf aoV -apQ -apQ +aaf +aaf avY axo ayA @@ -79186,8 +79195,8 @@ bxy bJd bKm bxy -apQ -apQ +aaf +aaf bCq bPY cOw @@ -79456,7 +79465,7 @@ bHE bHE bHE bLv -apQ +aaf aoV aoV aoV @@ -79700,8 +79709,8 @@ byE byE byE bGi -apQ -apQ +aaf +aaf bLv bQa bHE @@ -79718,7 +79727,7 @@ aoV aoV aoV aoV -apQ +aaf bLv bUs bLv @@ -80214,8 +80223,8 @@ byE byE bKp bGi -apQ -apQ +aaf +aaf bLv bHE bHE @@ -80227,7 +80236,7 @@ aoV aoV aoV bcU -apQ +aaf aaH cCa aoV @@ -80480,16 +80489,16 @@ bLu bCq bHE bLv -apQ -apQ +aaf +aaf aoV aoV aaH bdV aaH -apQ -apQ -apQ +aaf +aaf +aaf bLv bUs bLv @@ -80728,8 +80737,8 @@ bGn bGn bKq bxy -apQ -apQ +aaf +aaf bCq bOK bCq @@ -81000,7 +81009,7 @@ aoV aoV aoV aaH -apQ +aaf aoV aoV aoV @@ -81251,16 +81260,16 @@ aaf bLv bUt bLv -apQ -apQ +aaf +aaf aoV aoV aoV aaH aoV aoV -apQ -apQ +aaf +aaf bLv bUs bLv @@ -81513,7 +81522,7 @@ aoV aoV aoV aoV -apQ +aaf aoV aoV aoV @@ -82814,7 +82823,7 @@ cfe cfD cgv chE -QoR +ciN ciN cji cDZ @@ -83328,7 +83337,7 @@ ckB ccw cnY coH -QoS +cgR cgR cqx cqR @@ -89745,7 +89754,7 @@ bOd cfN cfN bLK -apQ +aaf bOh bOh bOh @@ -90259,7 +90268,7 @@ cfi bRH cgV bMQ -apQ +aaf bQA ckU clT @@ -91287,7 +91296,7 @@ bOd cfP cgZ bMQ -apQ +aaf bQA ckX clV @@ -91801,7 +91810,7 @@ bUL cfP bOd bMQ -apQ +aaf bOh bOh bOh @@ -92068,7 +92077,7 @@ aaa cpd cpM cpd -cDS +cCQ aaf aaa aaa @@ -92315,7 +92324,7 @@ bUR cfT chc bMQ -apQ +aaf bQA cla cBP @@ -92325,7 +92334,7 @@ aaa aaa czN aaa -cDS +cCQ aaf aaa aaa @@ -92545,7 +92554,7 @@ bvh bzS bBc bCJ -buk +QoU cCp bvd bKH @@ -92582,7 +92591,7 @@ aaa aaa aaa aaa -cDS +cCQ aaf aaa aaa @@ -92829,7 +92838,7 @@ bLK bLK che bLK -apQ +aaf bOh bOh bOh @@ -92839,7 +92848,7 @@ aaa aaa aaa aaa -cDS +cCQ aaf aaa aaa @@ -93065,13 +93074,13 @@ bvd bKH bzs bRK -apQ +aaf bRK -apQ +aaf bVv -apQ +aaf bRK -apQ +aaf bVv cCG cCH @@ -93086,12 +93095,12 @@ cCP bLK chg bLK -apQ +aaf aoV aoV -apQ -apQ -apQ +aaf +aaf +aaf aoV aoV aoV @@ -93346,8 +93355,8 @@ bLK aoV aoV aoV -apQ -apQ +aaf +aaf aoV aoV aoV @@ -93611,7 +93620,7 @@ cCI cCI cCI cDY -apQ +aaf aaf aaf aaf @@ -93853,21 +93862,21 @@ cbH ccB cbH bOh -apQ +aaf aoV aoV -apQ +aaf aoV aoV aoV -apQ +aaf aoV aoV aoV aoV aoV aoV -apQ +aaf aoV aaa aaa @@ -94110,21 +94119,21 @@ cbH ccD cbH bOh -apQ -apQ -apQ -apQ -apQ +aaf +aaf +aaf +aaf +aaf aoV aoV -apQ +aaf aoV aoV aoV aoV aoV -csz -apQ +aae +aaf aoV aaa aaa @@ -94367,8 +94376,8 @@ bOh bOh bOh bOh -apQ -apQ +aaf +aaf ciC bVu bVu @@ -94381,7 +94390,7 @@ aoV aoV aoV aoV -apQ +aaf aoV aaa aaa @@ -94620,11 +94629,11 @@ bVu bVu bVu caJ -apQ -apQ -apQ -apQ -apQ +aaf +aaf +aaf +aaf +aaf cfj cfU cfj @@ -94640,19 +94649,19 @@ bVu bVu bVu bVu -csw -csw -csw -csw +bVu +bVu +bVu +bVu csM -csw -csw +bVu +bVu ctd -csw -csw -csw -csw -ctO +bVu +bVu +bVu +bVu +caJ ctZ ctZ cuo @@ -95115,7 +95124,7 @@ bvj bCO bDR bDR -QoQ +bDR bIn bJC bKL @@ -95372,7 +95381,7 @@ bvj bCN bEa bFA -bGS +QoQ bIm bJD bKK @@ -95409,7 +95418,7 @@ cpQ cpQ cpQ czJ -apQ +aaf aoV aaa aaa @@ -95664,10 +95673,10 @@ cmd cmd cmd cmd -bVw -bVw -bVw -bVw +aag +aag +aag +aag aaa aaa aaf @@ -95924,7 +95933,7 @@ cmd cmd cqs aaa -bVw +aag aaa aaa aaf @@ -96181,7 +96190,7 @@ ciM cpN cqt aaa -bVw +aag aaa aaa aaf @@ -96438,7 +96447,7 @@ cmd cmd cqs aaa -bVw +aag aaa aaa aaf @@ -96693,9 +96702,9 @@ cmd cos cmd czI -bVw -bVw -bVw +aag +aag +aag aaa aaa aaf @@ -96947,11 +96956,11 @@ clk clk bAw bzs -apQ +aaf aaa -apQ -apQ -apQ +aaf +aaf +aaf aaa aaa aaa @@ -97205,8 +97214,8 @@ cmg cnc cnD bzs -apQ -apQ +aaf +aaf aaa aaa aaa @@ -105859,13 +105868,13 @@ aaf aaa aaa atS -apQ +aaf aoV aoV atS -apQ -apQ -apQ +aaf +aaf +aaf atS aCR aEn @@ -106122,7 +106131,7 @@ aoV atS aoV aoV -apQ +aaf atS aaf aaa @@ -106379,7 +106388,7 @@ aoV aaH aoV aoV -apQ +aaf atS aaf aaa @@ -107151,7 +107160,7 @@ atS aoV aoV aoV -apQ +aaf aaf aaa aaf @@ -107657,7 +107666,7 @@ aaa aaa aaa aaa -apQ +aaf aoV aoV aoV @@ -107914,11 +107923,11 @@ aaa aaa aaa aaa -apQ +aaf aoV aoV aoV -apQ +aaf aoV aoV aoV @@ -108175,7 +108184,7 @@ aoV aoV aoV aoV -apQ +aaf aoV aoV aoV @@ -119241,7 +119250,7 @@ aaa aaa aaa aaa -aHr +aoV aaa aaa aaa @@ -119513,7 +119522,7 @@ aaa aaa aaa aaa -aHr +aoV aaa aaa aaa @@ -119803,7 +119812,7 @@ aaa aaa aaa aaa -aHr +aoV aaa aaa aaa @@ -121033,7 +121042,7 @@ aaa aaa aaa aaa -aHr +aoV aaa aaa aaa @@ -121066,7 +121075,7 @@ aaa aaa aaa aaa -aHr +aoV aaa aaa aaa @@ -121358,7 +121367,7 @@ aaa aaa aaa aaa -aHr +aoV aaa aaa aaa diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 8d7bcdc89ba..7df92b45531 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -5046,7 +5046,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/rnd/protolathe/department/security, /turf/open/floor/plasteel/red/side{ dir = 1 }, @@ -7526,6 +7525,9 @@ /obj/structure/reagent_dispensers/peppertank{ pixel_x = -32 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, /turf/open/floor/plasteel/red/side{ dir = 8 }, @@ -7575,6 +7577,7 @@ dir = 8; network = list("SS13") }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/red/side{ dir = 4 }, @@ -8169,7 +8172,7 @@ /area/security/main) "art" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 + dir = 9 }, /turf/open/floor/plasteel/red/side{ dir = 4 @@ -8767,9 +8770,6 @@ /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "asy" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, /obj/vehicle/secway, /obj/item/key/security, /turf/open/floor/plasteel/red/side{ @@ -8822,10 +8822,12 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "asC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, /turf/open/floor/plasteel/red/side, /area/security/main) "asD" = ( @@ -8914,9 +8916,7 @@ /turf/open/floor/plasteel/red/side, /area/security/main) "asL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, +/obj/machinery/rnd/protolathe/department/security, /turf/open/floor/plasteel/red/side{ dir = 6 }, @@ -13359,7 +13359,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/obj/effect/turf_decal/stripes/line, +/obj/machinery/rnd/circuit_imprinter, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, /turf/open/floor/plasteel, /area/engine/engineering) "aBM" = ( @@ -13367,13 +13371,21 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/effect/turf_decal/stripes/line, +/obj/machinery/rnd/protolathe/department/engineering, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/engineering) "aBN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/computer/rdconsole/production{ + dir = 1 + }, +/obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ - dir = 6 + dir = 1 }, /turf/open/floor/plasteel, /area/engine/engineering) @@ -16009,7 +16021,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/computer/rdconsole/production, /turf/open/floor/plasteel, /area/engine/engineering) "aGW" = ( @@ -16467,7 +16478,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/rnd/circuit_imprinter, /turf/open/floor/plasteel, /area/engine/engineering) "aHY" = ( @@ -22462,8 +22472,8 @@ /turf/open/floor/plasteel/vault, /area/crew_quarters/dorms) "aUY" = ( -/obj/structure/closet/firecloset, /obj/effect/turf_decal/delivery, +/obj/structure/closet/wardrobe/engineering_yellow, /turf/open/floor/plasteel, /area/engine/engineering) "aUZ" = ( @@ -46689,7 +46699,7 @@ /area/hydroponics) "bSW" = ( /obj/machinery/smartfridge, -/turf/closed/wall, +/turf/open/floor/plating, /area/hydroponics) "bSX" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -49584,6 +49594,17 @@ }, /obj/structure/closet/wardrobe/white/medical, /obj/item/clothing/suit/hooded/wintercoat/medical, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/item/storage/belt/medical{ + pixel_y = 2 + }, +/obj/item/clothing/neck/stethoscope, +/obj/item/clothing/neck/stethoscope, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, @@ -51819,6 +51840,7 @@ /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, +/obj/item/gun/syringe, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, @@ -51836,25 +51858,12 @@ /area/medical/storage) "cdu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/rnd/protolathe/department/medical, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, /area/medical/storage) "cdv" = ( -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/item/storage/belt/medical{ - pixel_y = 2 - }, -/obj/item/clothing/neck/stethoscope, -/obj/item/clothing/neck/stethoscope, -/obj/item/gun/syringe, -/obj/structure/table/glass, +/obj/machinery/rnd/protolathe/department/medical, /turf/open/floor/plasteel/whiteblue/side{ dir = 5 }, @@ -80780,7 +80789,7 @@ /area/engine/engineering) "EDw" = ( /obj/machinery/rnd/protolathe/department/service, -/turf/closed/wall, +/turf/open/floor/plating, /area/hydroponics) "EDx" = ( /turf/closed/wall/mineral/plastitanium, @@ -80803,6 +80812,25 @@ "EDC" = ( /turf/closed/wall/mineral/plastitanium, /area/engine/break_room) +"EDD" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/landmark/start/security_officer, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel/red/side{ + dir = 8 + }, +/area/security/main) +"EDE" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/engine/engineering) (1,1,1) = {" aaa @@ -110187,7 +110215,7 @@ akM alY cZR cZR -cZR +EDD arm asC atT @@ -120485,7 +120513,7 @@ axY aJm aKy aMb -aJu +EDE axY aPX aRm @@ -121253,7 +121281,7 @@ aEn aFv aGV aHX -EDv +aEi aKA aMc aEi diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 1625a7b7b81..9bbb42b2b5e 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -4733,9 +4733,7 @@ }, /area/quartermaster/storage) "aiK" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-22" - }, +/obj/structure/closet/crate/bin, /turf/open/floor/plasteel/brown{ dir = 1 }, @@ -4835,9 +4833,7 @@ /turf/open/floor/plating, /area/security/brig) "aiV" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, +/obj/machinery/rnd/protolathe/department/security, /turf/open/floor/plasteel/red/side{ dir = 8 }, @@ -5269,7 +5265,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/rnd/protolathe/department/cargo, /turf/open/floor/plasteel/brown{ dir = 4 }, @@ -6382,7 +6377,6 @@ /turf/open/floor/plasteel/neutral, /area/quartermaster/storage) "alF" = ( -/obj/structure/closet/crate/bin, /obj/machinery/power/apc{ dir = 4; name = "Cargo Bay APC"; @@ -6392,6 +6386,7 @@ /obj/structure/cable/white{ icon_state = "0-8" }, +/obj/machinery/rnd/protolathe/department/cargo, /turf/open/floor/plasteel/brown{ dir = 4 }, @@ -6955,7 +6950,6 @@ dir = 4; network = list("MINE") }, -/obj/machinery/rnd/protolathe/department/security, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, @@ -8773,6 +8767,7 @@ "apX" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/effect/turf_decal/delivery, +/obj/machinery/rnd/protolathe/department/service, /turf/open/floor/plasteel, /area/crew_quarters/bar/atrium) "apY" = ( @@ -18966,12 +18961,18 @@ /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/glass/fifty, -/obj/item/crowbar, -/obj/item/grenade/chem_grenade/smart_metal_foam, -/obj/item/grenade/chem_grenade/smart_metal_foam, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/item/stack/sheet/rglass{ + amount = 50; + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/stack/sheet/plasteel/fifty, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/item/crowbar, /turf/open/floor/plasteel/yellow/side{ dir = 8 }, @@ -19560,7 +19561,6 @@ /obj/structure/cable/white{ icon_state = "4-8" }, -/obj/machinery/rnd/protolathe/department/engineering, /turf/open/floor/plasteel/neutral, /area/engine/engineering) "aKK" = ( @@ -20714,13 +20714,6 @@ /turf/open/floor/plasteel, /area/engine/engineering) "aNd" = ( -/obj/structure/table/reinforced, -/obj/item/stack/sheet/plasteel/fifty, -/obj/item/stack/sheet/rglass{ - amount = 50; - pixel_x = 2; - pixel_y = -2 - }, /obj/effect/turf_decal/delivery, /obj/machinery/computer/security/telescreen{ desc = "Used for watching the Engine."; @@ -20729,6 +20722,7 @@ network = list("Engine"); pixel_y = -32 }, +/obj/machinery/rnd/protolathe/department/engineering, /turf/open/floor/plasteel, /area/engine/engineering) "aNe" = ( @@ -25904,6 +25898,12 @@ pixel_y = 24 }, /obj/effect/turf_decal/bot, +/obj/item/storage/box/beakers{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe, /turf/open/floor/plasteel, /area/medical/medbay/zone3) "aXR" = ( @@ -27184,13 +27184,6 @@ /turf/open/floor/plasteel, /area/medical/medbay/zone3) "bau" = ( -/obj/structure/table/glass, -/obj/item/storage/box/beakers{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/syringes, -/obj/item/gun/syringe, /obj/machinery/light, /obj/structure/noticeboard{ dir = 1; @@ -27200,6 +27193,7 @@ dir = 5 }, /obj/effect/turf_decal/bot, +/obj/machinery/rnd/protolathe/department/medical, /turf/open/floor/plasteel, /area/medical/medbay/zone3) "bav" = ( @@ -71716,7 +71710,7 @@ aUm aVe aWa aWJ -swu +aSh aXQ aYI aZE @@ -75807,7 +75801,7 @@ avi azK aAP aBZ -swt +avi aDP aEX aFO diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index e67a09b23cd..43fc70f0165 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -4988,12 +4988,12 @@ }, /area/security/main) "anP" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-22" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-22" + }, /turf/open/floor/plasteel/dark, /area/security/main) "anQ" = ( @@ -21258,9 +21258,7 @@ /area/hydroponics) "aZZ" = ( /obj/machinery/smartfridge, -/turf/open/floor/plasteel/vault{ - dir = 8 - }, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "baa" = ( /obj/structure/disposalpipe/segment, @@ -34414,15 +34412,10 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bEv" = ( -/obj/structure/table, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/storage/box/syringes, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, +/obj/machinery/rnd/protolathe/department/medical, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, @@ -36113,6 +36106,11 @@ /area/medical/medbay/central) "bIg" = ( /obj/structure/table, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/box/syringes, /obj/item/storage/belt/medical{ pixel_y = 2 }, @@ -42960,7 +42958,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/computer/rdconsole/production, /turf/open/floor/plasteel, /area/engine/engineering) "bYL" = ( @@ -42990,7 +42987,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/rnd/circuit_imprinter, /turf/open/floor/plasteel, /area/engine/engineering) "bYN" = ( @@ -43012,7 +43008,6 @@ icon_state = "map-pubby"; pixel_y = 32 }, -/obj/machinery/rnd/protolathe/department/engineering, /turf/open/floor/plasteel, /area/engine/engineering) "bYO" = ( @@ -43241,6 +43236,7 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/structure/closet/wardrobe/engineering_yellow, /turf/open/floor/plasteel, /area/engine/engineering) "bZd" = ( @@ -44923,6 +44919,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel/yellow/side, /area/engine/engineering) "cdS" = ( @@ -44975,6 +44972,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/structure/reagent_dispensers/watertank, /turf/open/floor/plasteel/yellow/side, /area/engine/engineering) "cdY" = ( @@ -45002,7 +45000,9 @@ /turf/open/floor/plasteel, /area/engine/engineering) "ceb" = ( -/obj/structure/reagent_dispensers/watertank, +/obj/machinery/computer/rdconsole/production{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engine/engineering) "cec" = ( @@ -51262,7 +51262,7 @@ /area/quartermaster/storage) "cCD" = ( /obj/machinery/rnd/protolathe/department/service, -/turf/closed/wall, +/turf/open/floor/plating, /area/crew_quarters/kitchen) "cCE" = ( /obj/machinery/rnd/protolathe/department/medical, @@ -51341,6 +51341,22 @@ }, /turf/open/floor/plating/airless, /area/maintenance/department/chapel/monastery) +"cCS" = ( +/obj/machinery/rnd/protolathe/department/security, +/turf/open/floor/plasteel/dark, +/area/security/main) +"cCT" = ( +/obj/machinery/rnd/protolathe/department/cargo, +/turf/open/floor/plasteel, +/area/quartermaster/storage) +"cCU" = ( +/obj/machinery/rnd/circuit_imprinter, +/turf/open/floor/plasteel, +/area/engine/engineering) +"cCV" = ( +/obj/machinery/rnd/protolathe/department/engineering, +/turf/open/floor/plasteel, +/area/engine/engineering) (1,1,1) = {" aaa @@ -65680,19 +65696,19 @@ aaa aaa aaa aaa -cgX -cgX -cgX -cgX -cgX aaa aaa aaa aaa -cgX -cgX -cgX -cgX +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -65934,24 +65950,24 @@ aaa aaa aaa aaa -cgX -cgX -cgX -cgX -cfN -cfN -cfN -cgX aaa -cgX -cgX -cgX -cgX +aaa +aaa +aaa cfN cfN -cgX -cgX -cgX +cfN +aaa +aaa +aaa +aaa +aaa +aaa +cfN +cfN +aaa +aaa +aaa aaa aaa aaa @@ -66189,18 +66205,18 @@ aaa aaa aaa aaa -cgX -cgX -cgX +aaa +aaa +aaa cfN cfN cfN cfN cfN cyM -cgX aaa -cgX +aaa +aaa cfN cfN cfN @@ -66208,9 +66224,9 @@ cfN cfN cfN cfN -cgX -cgX -cgX +aaa +aaa +aaa aaa aaa aaa @@ -66446,18 +66462,18 @@ aaa aaa aaa aaa -cgX -cfN -cfN -cfN -cfN -cfN -cfN -cfN -cyK -cgX aaa -cgX +cfN +cfN +cfN +cfN +cfN +cfN +cfN +aht +aaa +aaa +aaa cfN cyM cfN @@ -66467,7 +66483,7 @@ cfN cfN cfN cfN -cgX +aaa aaa aaa aaa @@ -66703,28 +66719,28 @@ aaa aaa aaa aaa -cgX +aaa cfN cfN cfN cyM cfN cyM -cgX -cyK +aaa +aht aaa aaa -cgX -cgX -cyK -cgX +aaa +aaa +aht +aaa cfN cfN cfN cfN cfN cfN -cgX +aaa aaa aaa aaa @@ -66960,28 +66976,28 @@ aaa aaa aaa aaa -cgX +aaa cfN cfN cfN -cyK -cgX -cyK -cgX +aht +aaa +aht +aaa aht aht aht aht aht aht -cgX +aaa cfN cfN cyM cfN cfN cfN -cgX +aaa aaa aaa aaa @@ -67217,11 +67233,11 @@ cfN cfN aaa aaa -cgX -cgX -cgX -cgX -cyK +aaa +aaa +aaa +aaa +aht aaa aht aaa @@ -67231,14 +67247,14 @@ aaa aaa aaa aht -cgX -cgX -cgX -cyK +aaa +aaa +aaa +aht cfN cfN -cgX -cgX +aaa +aaa aaa aaa aaa @@ -67491,10 +67507,10 @@ cjp cyU aht aht -cyK -cgX -cgX -cgX +aht +aaa +aaa +aaa aaa aaa aaa @@ -68267,9 +68283,9 @@ aaa aaa aaa aaa -cgX -cgX -cgX +aaa +aaa +aaa aaa aaa aaa @@ -68523,11 +68539,11 @@ cjp cyU aaa aaa -cgX -cgX +aaa +aaa cfN -cgX -cgX +aaa +aaa aaa aaa aaa @@ -68780,11 +68796,11 @@ cAS cyU aht aht -cyK +aht cyM cfN cfN -cgX +aaa aaa aaa aaa @@ -69037,12 +69053,12 @@ cAT cyU aaa aaa -cgX +aaa cfN cfN cfN -cgX -cgX +aaa +aaa aaa aaa aaa @@ -69293,13 +69309,13 @@ cAK cAU cyU aaa -cgX -cgX +aaa +aaa cfN cfN cfN cfN -cgX +aaa aaa aaa aaa @@ -69550,13 +69566,13 @@ cAa cAV cyU aaa -cgX +aaa cfN cfN cfN cfN cfN -cgX +aaa aaa aaa aaa @@ -69807,13 +69823,13 @@ cAM cjp cyU aaa -cgX +aaa cfN cfN cfN cfN cfN -cgX +aaa aaa aaa aaa @@ -70064,13 +70080,13 @@ cyU cjp aht aht -cyK +aht cyM cfN cfN cfN cfN -cgX +aaa aaa aaa aaa @@ -70320,14 +70336,14 @@ cjp cyU aht aaa -cgX -cgX +aaa +aaa cfN cfN cfN cfN -cgX -cgX +aaa +aaa aaa aaa aaa @@ -70576,8 +70592,8 @@ cyU aaa aaa aht -cgX -cgX +aaa +aaa cfN cfN cfN @@ -70833,13 +70849,13 @@ cyU aht aht aht -cyK +aht cyM cfN cfN cfN cfN -cgX +aaa aaa aaa aaa @@ -71086,17 +71102,17 @@ aaa aht aaa aht -cgX -cgX -cgX -cgX -cgX +aaa +aaa +aaa +aaa +aaa cfN cfN -cgX +aaa cfN cfN -cgX +aaa aaa aaa aaa @@ -71335,25 +71351,25 @@ aaa aht aht aht -cyK -cgX -cgX -cyK -cyK -cyK +aht +aaa aaa aht -cgX +aht +aht +aaa +aht +aaa cfN cfN -cgX -cgX -cgX -cgX -cgX -cgX -cgX -cgX +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -71590,21 +71606,21 @@ aaa aaa aaa aht -cgX -cgX -cyK +aaa +aaa +aht cfN cfN cyM cfN -cyK -cgX -cyK +aht +aaa +aht cfN cfN cfN -cgX -cgX +aaa +aaa aaa aaa aaa @@ -71845,9 +71861,9 @@ cfN aaa aaa aaa -cgX -cyK -cgX +aaa +aht +aaa cfN cyM cfN @@ -71861,7 +71877,7 @@ cfN cfN cfN cfN -cgX +aaa aaa aaa aaa @@ -72101,8 +72117,8 @@ cfN aaa aaa aaa -cgX -cgX +aaa +aaa cyL cfN cfN @@ -72118,7 +72134,7 @@ cfN cfN cfN cfN -cgX +aaa aaa aaa aaa @@ -72358,7 +72374,7 @@ aaa aaa aaa aaa -cgX +aaa cfN cfN cfN @@ -72375,7 +72391,7 @@ cfN cfN cfN cfN -cgX +aaa aaa aaa aaa @@ -72615,7 +72631,7 @@ aaa aaa aaa aaa -cgX +aaa cfN cfN cfN @@ -72623,8 +72639,8 @@ cfN cfN cfN cfN -cgX -cgX +aaa +aaa cfN cfN cfN @@ -72632,7 +72648,7 @@ cfN cfN cfN cfN -cgX +aaa aaa aaa aaa @@ -72872,24 +72888,24 @@ aaa aaa aaa aaa -cgX -cgX -cgX +aaa +aaa +aaa cfN cfN cfN -cgX -cgX -cgX -cgX -cgX -cgX +aaa +aaa +aaa +aaa +aaa +aaa cfN cfN cfN cfN -cgX -cgX +aaa +aaa aaa aaa aaa @@ -73131,21 +73147,21 @@ aaa aaa aaa aaa -cgX -cgX -cgX -cgX -cgX aaa aaa aaa aaa -cgX -cgX -cgX -cgX -cgX -cgX +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -77115,10 +77131,10 @@ air agP agP agP -akS +cCS alH ams -alH +akS anP agP apg @@ -78213,7 +78229,7 @@ bBa bCj bsA bEw -cCE +bkh bkh bId bFO @@ -79511,7 +79527,7 @@ bPB bQp cCH cCF -cCQ +cCP bTp bPB bUI @@ -79790,7 +79806,7 @@ bZA cgs cgQ chv -bPm +ahi abI abI abI @@ -81588,13 +81604,13 @@ cfV cfU cgv cgV -cgW -cgW -cgX +bBW +bBW +aaa cgV -cgX -cgW -cgW +aaa +bBW +bBW cgV cfV bTE @@ -81844,15 +81860,15 @@ cfa cfa cfa cgv -cgW -cgW -cgW -cgX -chy -cgX -cgW -cgW -cgW +bBW +bBW +bBW +aaa +abI +aaa +bBW +bBW +bBW cfV bTE abI @@ -82101,15 +82117,15 @@ cfb cfu cfa cgv -cgW -cgW -cgX -cgX -chy -cgX -cgX -cgW -cgW +bBW +bBW +aaa +aaa +abI +aaa +aaa +bBW +bBW cfV bTE abI @@ -82358,15 +82374,15 @@ cfc cfv cfa cgv -cgX -cgX -cgX +aaa +aaa +aaa cii cis ciG -cgX -cgX -cgX +aaa +aaa +aaa cfV bTE abI @@ -82616,13 +82632,13 @@ cfw cfW cgw cgV -chy -chy +abI +abI cij cit ciH -chy -chy +abI +abI cgV cfV bTE @@ -82872,15 +82888,15 @@ cfe cfx cfa cgv -cgX -cgX -cgX +aaa +aaa +aaa cik ciu ciI -cgX -cgX -cgX +aaa +aaa +aaa cfV bTE aaa @@ -83129,15 +83145,15 @@ cey cfy cfa cgv -cgW -cgW -cgX -cgX -chy -cgX -cgX -cgW -cgW +bBW +bBW +aaa +aaa +abI +aaa +aaa +bBW +bBW cfV bTE aaa @@ -83386,15 +83402,15 @@ cfa cfa cfa cgv -cgW -cgW -cgX -cgX -chy -cgX -cgX -cgW -cgW +bBW +bBW +aaa +aaa +abI +aaa +aaa +bBW +bBW cfV bTE aaa @@ -83644,13 +83660,13 @@ cfV cfU cgv cgV -cgW -cgX -cgX +bBW +aaa +aaa cgV -cgX -cgW -cgW +aaa +bBW +bBW cgV cfV bTE @@ -85179,7 +85195,7 @@ cah cbq cam cam -cea +cav bXk bXk bXk @@ -85432,10 +85448,10 @@ bXk bTE bZc bZJ -cay -cbr ccl -cam +cbr +cCU +cCV ceb bXk aaa @@ -91548,7 +91564,7 @@ aVz aWz aVz aYz -cCC +aZo baC bbI bbI @@ -92576,7 +92592,7 @@ aVB aWA aXy aYB -aTm +cCT baF bbI bcG