From 7a9e1113921531f2c46886137d0daffab1e2636f Mon Sep 17 00:00:00 2001 From: Byemoh Date: Wed, 5 Jan 2022 16:20:45 -0600 Subject: [PATCH 1/2] move the wardrobe --- _maps/map_files/YogStation/YogStation.dmm | 42 +++++++++++------------ 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 1331f890b805..dccd4ed08a8b 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -22205,13 +22205,6 @@ /obj/item/stack/packageWrap, /turf/open/floor/plasteel/white/side, /area/science/explab) -"brA" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_y = 6 - }, -/turf/open/floor/plasteel/white/corner, -/area/science/explab) "brB" = ( /obj/structure/closet/l3closet/scientist, /turf/open/floor/plasteel/white/side, @@ -25809,14 +25802,6 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer, /turf/open/floor/plasteel, /area/science/mixing) -"bEy" = ( -/obj/machinery/portable_atmospherics/pump, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plasteel, -/area/science/mixing) "bEC" = ( /turf/closed/wall/r_wall, /area/science/mixing) @@ -26735,10 +26720,6 @@ /obj/machinery/vending/cigarette, /turf/open/floor/plasteel/white, /area/science/research) -"bJU" = ( -/obj/machinery/vending/wardrobe/science_wardrobe, -/turf/open/floor/plasteel/white, -/area/science/mixing) "bJW" = ( /obj/item/transfer_valve{ pixel_x = -5 @@ -52712,6 +52693,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/construction/mining/aux_base) +"pQf" = ( +/obj/machinery/vending/wardrobe/science_wardrobe, +/turf/open/floor/plasteel/white/corner, +/area/science/explab) "pQy" = ( /obj/machinery/door/airlock/public/glass{ name = "Escape Podbay" @@ -56947,6 +56932,14 @@ }, /turf/open/floor/plasteel, /area/science/misc_lab) +"ssa" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/plasteel, +/area/science/mixing) "sti" = ( /obj/structure/chair/office/light{ dir = 4 @@ -59478,6 +59471,11 @@ }, /turf/open/floor/plasteel/white, /area/medical/paramedic) +"tYF" = ( +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/science/mixing) "tYQ" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -116241,7 +116239,7 @@ byt byt byt byt -bEy +tYF bFU bsA bsU @@ -116498,7 +116496,7 @@ bzO bzO bzO bqe -bJU +ssa bFU bFU wOx @@ -117002,7 +117000,7 @@ hoc ncq bjS bqe -brA +pQf blD buw bvO From e64f690542f3f49940f935815193c91e4c8d96b9 Mon Sep 17 00:00:00 2001 From: Byemoh Date: Thu, 13 Jan 2022 06:06:26 -0600 Subject: [PATCH 2/2] re-adds paper bin --- _maps/map_files/YogStation/YogStation.dmm | 28 +++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index dccd4ed08a8b..6292c4716b5d 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -22194,17 +22194,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/science/lab) -"brz" = ( -/obj/structure/table, -/obj/item/pen, -/obj/machinery/camera{ - c_tag = "Experimentor Lab"; - network = list("ss13","rd") - }, -/obj/item/hand_labeler, -/obj/item/stack/packageWrap, -/turf/open/floor/plasteel/white/side, -/area/science/explab) "brB" = ( /obj/structure/closet/l3closet/scientist, /turf/open/floor/plasteel/white/side, @@ -56436,6 +56425,21 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"sbK" = ( +/obj/structure/table, +/obj/machinery/camera{ + c_tag = "Experimentor Lab"; + network = list("ss13","rd") + }, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/pen, +/obj/item/hand_labeler, +/obj/item/stack/packageWrap, +/turf/open/floor/plasteel/white/side, +/area/science/explab) "scv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -117257,7 +117261,7 @@ hoc hoc bjT bqe -brz +sbK blN cBt bvN