Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

moves sci wardrobe vending machine from toxins room to experimentor room #13049

Merged
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 20 additions & 22 deletions _maps/map_files/YogStation/YogStation.dmm
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -116241,7 +116239,7 @@ byt
byt
byt
byt
bEy
tYF
bFU
bsA
bsU
Expand Down Expand Up @@ -116498,7 +116496,7 @@ bzO
bzO
bzO
bqe
bJU
ssa
bFU
bFU
wOx
Expand Down Expand Up @@ -117002,7 +117000,7 @@ hoc
ncq
bjS
bqe
brA
pQf
blD
buw
bvO
Expand Down