From 07bda29fc58ef70f538f4cd026090e0171cdcfea Mon Sep 17 00:00:00 2001 From: Whoneedspacee Date: Wed, 17 Feb 2021 08:52:23 -0500 Subject: [PATCH 1/2] Icebox Botany is no longer space (#57002) Conflicts: _maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm --- .../IcemoonUnderground_Above.dmm | 933 ++++++++++++++++++ 1 file changed, 933 insertions(+) diff --git a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm index 3473aa29ed..af865c4600 100644 --- a/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm +++ b/_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm @@ -334,6 +334,7 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "ba" = ( +<<<<<<< HEAD /obj/structure/closet/crate/freezer, /obj/machinery/power/apc{ areastring = "/area/quartermaster/warehouse"; @@ -360,6 +361,12 @@ }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) +======= +/obj/machinery/light, +/obj/machinery/chem_master/condimaster, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "bd" = ( /obj/machinery/mineral/processing_unit_console, /turf/closed/wall, @@ -1327,6 +1334,18 @@ }, /turf/open/floor/plasteel, /area/mine/production) +<<<<<<< HEAD +======= +"dL" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "dM" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, @@ -2038,6 +2057,12 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) +<<<<<<< HEAD +======= +"fw" = ( +/turf/open/floor/plating, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "fy" = ( /obj/structure/table, /obj/item/clothing/glasses/meson, @@ -2240,6 +2265,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/science/xenobiology) +<<<<<<< HEAD +======= +"fT" = ( +/obj/structure/flora/ausbushes/sunnybush, +/turf/open/floor/grass, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "ga" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -2291,6 +2323,13 @@ }, /turf/open/floor/plasteel/white, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"gq" = ( +/obj/structure/closet/crate, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "gs" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -2341,6 +2380,16 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/freezer, /area/science/xenobiology) +<<<<<<< HEAD +======= +"hu" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "hv" = ( /obj/machinery/conveyor_switch/oneway{ id = "gulag"; @@ -2393,6 +2442,22 @@ "hM" = ( /turf/closed/wall, /area/maintenance/aft) +<<<<<<< HEAD +======= +"hS" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Hydroponics Exit"; + req_access_txt = "35" + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +"hT" = ( +/obj/structure/extinguisher_cabinet{ + pixel_y = -30 + }, +/turf/open/floor/grass, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "hY" = ( /obj/machinery/door/airlock/public/glass{ id_tag = "gulag3"; @@ -2403,11 +2468,29 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"hZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "ia" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, /turf/open/floor/plating, /area/mine/production) +<<<<<<< HEAD +======= +"ic" = ( +/obj/machinery/door/airlock/maintenance, +/turf/open/floor/plating, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "ie" = ( /obj/machinery/vending/sustenance, /obj/effect/decal/cleanable/dirt, @@ -2424,12 +2507,27 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +<<<<<<< HEAD +======= +"ij" = ( +/obj/machinery/vending/hydronutrients, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "ip" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 }, /turf/open/floor/plasteel, /area/mine/living_quarters) +<<<<<<< HEAD +======= +"iw" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/plating, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "ix" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ @@ -2439,6 +2537,18 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"iA" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/service/hydroponics) +"iC" = ( +/obj/structure/closet/crate/internals, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "iG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 @@ -2482,6 +2592,7 @@ dir = 4; network = list("labor") }, +<<<<<<< HEAD /turf/closed/mineral/random/snow, /area/mine/laborcamp) "jc" = ( @@ -2494,6 +2605,10 @@ /obj/effect/turf_decal/stripes/white/box, /turf/open/floor/plating, /area/storage/mining) +======= +/turf/open/floor/iron/dark, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "je" = ( /obj/structure/bed, /obj/effect/decal/cleanable/dirt, @@ -2609,6 +2724,13 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +<<<<<<< HEAD +======= +"jT" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "jU" = ( /obj/structure/ore_box, /obj/effect/decal/cleanable/dirt, @@ -2646,6 +2768,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"kg" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "kh" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -2666,6 +2799,16 @@ }, /turf/open/floor/plasteel, /area/science/xenobiology) +<<<<<<< HEAD +======= +"kr" = ( +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "ks" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -2737,6 +2880,14 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) +<<<<<<< HEAD +======= +"kQ" = ( +/obj/effect/landmark/start/botanist, +/obj/machinery/holopad, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "kS" = ( /obj/structure/sign/warning/vacuum, /turf/closed/wall, @@ -2760,10 +2911,29 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/engine, /area/science/xenobiology) +<<<<<<< HEAD "lL" = ( /obj/structure/sign/warning/xeno_mining, /turf/closed/wall, /area/hydroponics) +======= +"lA" = ( +/obj/structure/closet/decay, +/turf/open/floor/plating, +/area/maintenance/aft) +"lI" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/mine/storage) +"lL" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "lO" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -2782,12 +2952,29 @@ }, /turf/open/floor/plating, /area/science/xenobiology) +<<<<<<< HEAD +======= +"mf" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/machinery/power/apc{ + name = "Lower Hydroponics APC"; + pixel_y = -23 + }, +/obj/structure/cable, +/obj/structure/table, +/obj/machinery/reagentgrinder, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "mi" = ( /obj/effect/turf_decal/bot, /obj/structure/ore_box, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD "mj" = ( /obj/structure/sign/poster/contraband/random, /turf/closed/wall, @@ -2796,11 +2983,37 @@ /obj/structure/cable, /turf/open/floor/plating, /area/storage/mining) +======= +"mk" = ( +/obj/machinery/door/morgue{ + name = "Wilderness Supplies"; + req_access_txt = "35" + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +"mm" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "mu" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/aft) +<<<<<<< HEAD +======= +"mx" = ( +/obj/structure/closet/cardboard, +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -28 + }, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "mG" = ( /obj/machinery/atmospherics/pipe/simple{ dir = 4 @@ -2826,10 +3039,21 @@ }, /turf/open/floor/plasteel/freezer, /area/mine/laborcamp) +<<<<<<< HEAD "mZ" = ( /obj/structure/flora/ausbushes/sunnybush, /turf/open/floor/grass, /area/hydroponics) +======= +"mV" = ( +/obj/machinery/biogenerator, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +"mW" = ( +/obj/effect/decal/cleanable/oil, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "na" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -2845,10 +3069,18 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD "nk" = ( /obj/machinery/light/small, /turf/open/floor/plating/asteroid/snow/icemoon, /area/hydroponics) +======= +"nh" = ( +/obj/structure/closet/crate, +/obj/structure/cable, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "nl" = ( /obj/machinery/button/door{ id = "xenobio2"; @@ -2879,6 +3111,12 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"ny" = ( +/turf/closed/wall, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "nE" = ( /obj/structure/sign/poster/official/do_not_question{ pixel_y = 32 @@ -2901,6 +3139,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/mine/living_quarters) +<<<<<<< HEAD +======= +"nJ" = ( +/turf/closed/wall, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "nM" = ( /turf/closed/wall, /area/mine/mechbay) @@ -2936,6 +3180,18 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +<<<<<<< HEAD +======= +"oe" = ( +/obj/machinery/power/apc/auto_name/east, +/obj/structure/cable, +/obj/structure/closet/crate/secure/freezer/pizza, +/turf/open/floor/iron, +/area/cargo/warehouse) +"oh" = ( +/turf/open/openspace/icemoon, +/area/icemoon/underground/explored) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "oi" = ( /obj/structure/closet, /turf/open/floor/plating, @@ -3081,6 +3337,14 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"pk" = ( +/obj/structure/reagent_dispensers/watertank/high, +/obj/item/reagent_containers/glass/bucket, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "pu" = ( /obj/structure/sign/poster/official/obey{ pixel_y = 32 @@ -3194,12 +3458,18 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "qw" = ( +<<<<<<< HEAD /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 1 }, /obj/effect/turf_decal/trimline/green/filled/corner, /turf/open/floor/plasteel/dark, /area/hydroponics) +======= +/obj/effect/turf_decal/trimline/green/filled/line, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "qC" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -3212,6 +3482,13 @@ }, /turf/open/floor/plasteel, /area/science/xenobiology) +<<<<<<< HEAD +======= +"qG" = ( +/obj/structure/sign/poster/contraband/random, +/turf/closed/wall, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "qN" = ( /obj/structure/chair/stool, /obj/machinery/flasher{ @@ -3242,6 +3519,7 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 }, +<<<<<<< HEAD /turf/open/floor/plasteel/dark, /area/hydroponics) "rb" = ( @@ -3253,6 +3531,11 @@ }, /turf/open/floor/plasteel/dark, /area/hydroponics) +======= +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "rj" = ( /obj/structure/cable, /turf/open/floor/plasteel, @@ -3276,6 +3559,7 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD "rD" = ( /obj/machinery/seed_extractor, /turf/open/floor/plasteel/dark, @@ -3283,6 +3567,12 @@ "rG" = ( /turf/open/floor/plasteel/dark, /area/hydroponics) +======= +"rQ" = ( +/obj/machinery/hydroponics/constructable, +/turf/open/floor/grass, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "rS" = ( /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas{ @@ -3477,12 +3767,21 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD "tB" = ( /obj/machinery/light{ dir = 4 }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/storage/mining) +======= +"to" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/structure/cable, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "tD" = ( /obj/machinery/firealarm{ dir = 8; @@ -3538,6 +3837,26 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/xenobiology) +<<<<<<< HEAD +======= +"tV" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Public Mining Storage" + }, +/turf/open/floor/iron/dark, +/area/mine/storage) +"tZ" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "ub" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ @@ -3556,6 +3875,39 @@ }, /turf/open/floor/plasteel/freezer, /area/science/xenobiology) +<<<<<<< HEAD +======= +"ug" = ( +/obj/structure/table, +/obj/machinery/cell_charger{ + pixel_y = 3 + }, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high{ + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/camera{ + c_tag = "Mining Mech Bay"; + dir = 1; + network = list("mine") + }, +/turf/open/floor/iron, +/area/mine/mechbay) +"uh" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/grass, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "uk" = ( /obj/machinery/atmospherics/pipe/manifold{ dir = 8 @@ -3573,6 +3925,16 @@ }, /turf/open/floor/plasteel/freezer, /area/science/xenobiology) +<<<<<<< HEAD +======= +"uu" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "uz" = ( /obj/machinery/door/window/northleft{ dir = 4; @@ -3602,6 +3964,19 @@ /obj/structure/cable, /turf/open/floor/plating, /area/mine/living_quarters) +<<<<<<< HEAD +======= +"uP" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/mine/storage) +"uZ" = ( +/obj/structure/railing, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "vb" = ( /obj/machinery/door/window/southleft, /obj/machinery/shower{ @@ -3613,12 +3988,20 @@ /obj/effect/loot_site_spawner, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/underground/explored) +<<<<<<< HEAD "vl" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, /turf/open/floor/grass, /area/hydroponics) +======= +"vo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/ore/glass, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "vq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel, @@ -3741,11 +4124,35 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"wP" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "wR" = ( /obj/structure/table/optable, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/engine, /area/science/xenobiology) +<<<<<<< HEAD +======= +"wS" = ( +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/unexplored) +"wU" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "wX" = ( /obj/machinery/door/airlock{ name = "Labor Camp Library" @@ -3807,6 +4214,7 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +<<<<<<< HEAD "xH" = ( /obj/effect/turf_decal/trimline/green/filled/corner{ dir = 8 @@ -3816,6 +4224,17 @@ }, /turf/open/floor/plasteel/dark, /area/hydroponics) +======= +"xz" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/open/floor/grass, +/area/service/hydroponics) +"xB" = ( +/obj/structure/closet/crate, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "xU" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/green{ @@ -3829,6 +4248,25 @@ /obj/item/seeds/onion, /turf/open/floor/plasteel/dark, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"xV" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +"yj" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/filled/end{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "yk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -3863,8 +4301,28 @@ /obj/machinery/light/small{ dir = 1 }, +<<<<<<< HEAD /turf/open/genturf, /area/icemoon/underground/unexplored/rivers) +======= +/obj/structure/disposalpipe/trunk/multiz{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/white/box, +/turf/open/floor/plating, +/area/mine/storage) +"yK" = ( +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/cargo/warehouse) +"yL" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/filled/end{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "zb" = ( /obj/structure/sign/warning/coldtemp, /obj/effect/spawner/structure/window/reinforced, @@ -3927,6 +4385,29 @@ /obj/effect/turf_decal/stripes/box, /turf/open/floor/plating, /area/maintenance/aft) +<<<<<<< HEAD +======= +"zH" = ( +/obj/structure/table, +/obj/item/clothing/glasses/meson, +/obj/item/storage/bag/ore, +/obj/item/pickaxe, +/obj/item/mining_scanner, +/obj/item/flashlight, +/obj/item/clothing/suit/hooded/wintercoat/hydro, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/iron, +/area/service/hydroponics) +"zM" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green, +/turf/open/floor/iron, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "zQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, @@ -3978,6 +4459,18 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +<<<<<<< HEAD +======= +"Ap" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Aw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -3994,10 +4487,30 @@ }, /turf/open/floor/plasteel, /area/mine/production) +<<<<<<< HEAD "AC" = ( /obj/structure/stairs/south, /turf/open/floor/plasteel, /area/hydroponics) +======= +"AF" = ( +/turf/closed/wall, +/area/mine/storage) +"AL" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron, +/area/cargo/warehouse) +"AN" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "AQ" = ( /obj/machinery/light{ dir = 8 @@ -4074,6 +4587,7 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD "BB" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -4089,6 +4603,11 @@ /obj/structure/cable, /turf/open/floor/plasteel/dark, /area/hydroponics) +======= +"BJ" = ( +/turf/open/floor/iron/dark, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "BL" = ( /obj/machinery/light/small, /obj/machinery/camera{ @@ -4103,8 +4622,13 @@ /obj/effect/turf_decal/trimline/green/filled/end{ dir = 4 }, +<<<<<<< HEAD /turf/open/floor/plasteel/dark, /area/hydroponics) +======= +/turf/open/floor/grass, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Cc" = ( /obj/machinery/atmospherics/components/binary/pump, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, @@ -4190,10 +4714,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD "CS" = ( /obj/structure/sign/warning, /turf/closed/wall, /area/storage/mining) +======= +"CT" = ( +/obj/structure/stairs/south, +/turf/open/floor/iron, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "CV" = ( /obj/machinery/door/window/northleft{ dir = 4; @@ -4213,6 +4744,17 @@ }, /turf/open/floor/plasteel/white, /area/science/xenobiology) +<<<<<<< HEAD +======= +"Dg" = ( +/obj/machinery/requests_console{ + department = "Hydroponics"; + departmentType = 2; + pixel_y = 30 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Dh" = ( /obj/machinery/light{ dir = 4 @@ -4220,6 +4762,13 @@ /obj/effect/turf_decal/tile/brown, /turf/open/floor/plasteel, /area/mine/living_quarters) +<<<<<<< HEAD +======= +"Dm" = ( +/obj/machinery/seed_extractor, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Dn" = ( /obj/structure/rack, /obj/item/storage/bag/ore, @@ -4363,6 +4912,14 @@ "Et" = ( /turf/closed/mineral/random/snow, /area/icemoon/underground/explored) +<<<<<<< HEAD +======= +"Eu" = ( +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Ez" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -4441,6 +4998,18 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp/security) +<<<<<<< HEAD +======= +"Fg" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +"Fi" = ( +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Fk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /turf/open/floor/plasteel/white, @@ -4497,6 +5066,13 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"FE" = ( +/obj/structure/table, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "FF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -4511,6 +5087,22 @@ }, /turf/open/floor/plating, /area/science/xenobiology) +<<<<<<< HEAD +======= +"FH" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace/icemoon/keep_below, +/area/icemoon/underground/explored) +"FI" = ( +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/green/filled/corner, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "FK" = ( /obj/machinery/button/door{ id = "misclab"; @@ -4538,6 +5130,15 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"FS" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "FU" = ( /obj/machinery/seed_extractor, /obj/effect/turf_decal/tile/green{ @@ -4695,9 +5296,40 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +<<<<<<< HEAD +"Hd" = ( +/turf/closed/wall/r_wall, +/area/mine/laborcamp/security) +======= +"Hc" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/filled/end{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) "Hd" = ( /turf/closed/wall/r_wall, /area/mine/laborcamp/security) +"Hk" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = 11 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +"Hn" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Ho" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -4716,10 +5348,17 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp/security) +<<<<<<< HEAD "HC" = ( /obj/machinery/biogenerator, /turf/open/floor/plasteel/dark, /area/hydroponics) +======= +"Hy" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "HF" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, @@ -4790,6 +5429,21 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/xenobiology) +<<<<<<< HEAD +======= +"Im" = ( +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/effect/turf_decal/trimline/green/filled/corner{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +"Io" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Iq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -4805,6 +5459,15 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"Iw" = ( +/turf/open/floor/grass, +/area/service/hydroponics) +"Iy" = ( +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/icemoon/underground/unexplored) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "IB" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -4846,10 +5509,26 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +<<<<<<< HEAD +======= +"Ja" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Jd" = ( /obj/structure/table, /turf/open/floor/engine, /area/science/xenobiology) +<<<<<<< HEAD +======= +"Jk" = ( +/obj/structure/stairs/north, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Jo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -4943,6 +5622,36 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/mine/living_quarters) +<<<<<<< HEAD +======= +"Kj" = ( +/obj/machinery/camera{ + c_tag = "Labor Camp External South"; + dir = 4; + network = list("labor") + }, +/turf/open/openspace/icemoon/keep_below, +/area/mine/laborcamp) +"Kl" = ( +/obj/machinery/camera{ + c_tag = "Labor Camp External West"; + dir = 4; + network = list("labor") + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/mine/laborcamp) +"Km" = ( +/obj/effect/turf_decal/tile/green{ + dir = 4 + }, +/obj/effect/turf_decal/tile/green, +/obj/machinery/door/airlock/highsecurity{ + name = "Hydroponics Exit"; + req_access_txt = "35" + }, +/turf/open/floor/iron, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Kn" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -4972,10 +5681,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD "KJ" = ( /obj/structure/closet/crate, /turf/open/genturf, /area/icemoon/underground/unexplored/rivers) +======= +"KF" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "KN" = ( /obj/machinery/door/poddoor/preopen{ id = "misclab"; @@ -5018,8 +5734,13 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 6 }, +<<<<<<< HEAD /turf/open/floor/plasteel/dark, /area/storage/mining) +======= +/turf/open/floor/iron/dark, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Ls" = ( /obj/structure/sign/warning/biohazard{ pixel_x = -32 @@ -5037,6 +5758,16 @@ }, /turf/open/floor/plasteel, /area/mine/production) +<<<<<<< HEAD +======= +"LA" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/trimline/green/filled/end{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "LC" = ( /obj/structure/closet/crate, /turf/open/floor/plating, @@ -5098,11 +5829,16 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 }, +<<<<<<< HEAD /turf/open/floor/plasteel/dark, /area/storage/mining) "Ma" = ( /turf/open/openspace/icemoon, /area/icemoon/underground/explored) +======= +/turf/open/floor/iron/dark, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Mk" = ( /obj/machinery/camera{ c_tag = "Xenobiology Kill Chamber"; @@ -5198,6 +5934,16 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel/white, /area/science/xenobiology) +<<<<<<< HEAD +======= +"MX" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/hydroponics/constructable, +/turf/open/floor/grass, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "MZ" = ( /obj/machinery/door/window/southleft{ dir = 4; @@ -5212,6 +5958,14 @@ }, /turf/open/floor/plasteel, /area/science/xenobiology) +<<<<<<< HEAD +======= +"Ne" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/floor, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Ni" = ( /obj/effect/landmark/blobstart, /turf/open/floor/engine, @@ -5287,6 +6041,12 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +<<<<<<< HEAD +======= +"NH" = ( +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "NI" = ( /obj/structure/table, /obj/item/reagent_containers/food/condiment/saltshaker{ @@ -5386,6 +6146,12 @@ /obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/dark, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"Ox" = ( +/turf/open/floor/iron/elevatorshaft, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Oy" = ( /obj/structure/cable, /obj/machinery/door/poddoor/preopen{ @@ -5604,6 +6370,13 @@ }, /turf/open/floor/plating/asteroid/snow/icemoon, /area/icemoon/underground/explored) +<<<<<<< HEAD +======= +"Ql" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Qv" = ( /turf/closed/wall/r_wall, /area/science/xenobiology) @@ -5691,8 +6464,13 @@ /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 9 }, +<<<<<<< HEAD /turf/open/floor/plasteel/dark, /area/storage/mining) +======= +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Rx" = ( /obj/structure/cable, /turf/open/floor/plasteel, @@ -5713,6 +6491,21 @@ }, /turf/open/floor/plasteel, /area/mine/production) +<<<<<<< HEAD +======= +"RK" = ( +/obj/structure/cable/multilayer/multiz, +/obj/structure/sign/warning/electricshock{ + pixel_x = -32 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/box, +/turf/open/floor/plating, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "RN" = ( /obj/machinery/power/shieldwallgen/xenobiologyaccess, /obj/structure/cable, @@ -5765,6 +6558,7 @@ /obj/effect/turf_decal/tile/green{ dir = 4 }, +<<<<<<< HEAD /obj/effect/turf_decal/tile/green, /turf/open/floor/plasteel, /area/hydroponics) @@ -5787,6 +6581,14 @@ }, /turf/open/floor/grass, /area/hydroponics) +======= +/turf/open/floor/iron/dark, +/area/mine/storage) +"Sy" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "SE" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -5821,6 +6623,15 @@ }, /turf/open/floor/plasteel, /area/mine/mechbay) +<<<<<<< HEAD +======= +"SU" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "SV" = ( /obj/machinery/computer/security/labor, /obj/structure/cable, @@ -5849,6 +6660,13 @@ /obj/item/seeds/soya, /turf/open/floor/plasteel/dark, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"Tm" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Tn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -5859,6 +6677,35 @@ }, /turf/open/floor/plasteel/freezer, /area/mine/living_quarters) +<<<<<<< HEAD +======= +"Tq" = ( +/turf/open/floor/iron/dark, +/area/service/hydroponics) +"Tt" = ( +/obj/machinery/light_switch{ + pixel_x = 27 + }, +/obj/structure/table, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/item/clothing/head/beanie/orange, +/obj/machinery/camera{ + c_tag = "Mining Eva"; + dir = 8 + }, +/obj/machinery/light, +/turf/open/floor/iron, +/area/mine/eva) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Tv" = ( /obj/machinery/camera{ c_tag = "Crew Area Hallway West"; @@ -5897,6 +6744,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/mine/living_quarters) +<<<<<<< HEAD +======= +"TE" = ( +/obj/structure/ore_box, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "TK" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -5910,6 +6764,16 @@ /obj/structure/sign/warning/electricshock, /turf/open/floor/plating, /area/science/xenobiology) +<<<<<<< HEAD +======= +"TN" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "TP" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -5987,6 +6851,13 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp/security) +<<<<<<< HEAD +======= +"UL" = ( +/obj/structure/beebox, +/turf/open/floor/grass, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "UM" = ( /obj/structure/table, /obj/item/paper, @@ -6158,6 +7029,7 @@ "Wb" = ( /turf/open/floor/engine, /area/science/xenobiology) +<<<<<<< HEAD "Wd" = ( /obj/structure/ore_box, /turf/open/floor/plating/asteroid/snow/icemoon, @@ -6170,6 +7042,13 @@ "Wq" = ( /turf/closed/wall, /area/hydroponics) +======= +"Wi" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table, +/turf/open/floor/iron, +/area/cargo/warehouse) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Wt" = ( /obj/structure/window/reinforced, /turf/open/floor/engine, @@ -6214,6 +7093,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/xenobiology) +<<<<<<< HEAD +======= +"WJ" = ( +/obj/structure/sign/warning/xeno_mining, +/turf/closed/wall, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "WM" = ( /obj/machinery/shower{ pixel_y = 22 @@ -6324,6 +7210,13 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"XV" = ( +/obj/structure/sign/warning, +/turf/closed/wall, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "XW" = ( /obj/machinery/door/window/northleft{ base_state = "right"; @@ -6454,6 +7347,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/mine/laborcamp) +<<<<<<< HEAD +======= +"Ze" = ( +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "Zf" = ( /obj/machinery/door/airlock{ id_tag = "miningbathroom"; @@ -6521,6 +7421,32 @@ /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/open/floor/plasteel, /area/science/xenobiology) +<<<<<<< HEAD +======= +"ZA" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window{ + dir = 4; + name = "Greenhouse Access"; + req_access_txt = "35" + }, +/turf/open/floor/grass, +/area/service/hydroponics) +"ZB" = ( +/obj/structure/cable, +/obj/machinery/power/apc/highcap/five_k{ + areastring = /area/storage/mining; + dir = 1; + name = "Public Mining APC"; + pixel_y = 23 + }, +/obj/item/reagent_containers/food/drinks/bottle/hooch, +/turf/open/floor/plating, +/area/mine/storage) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) "ZK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6551,6 +7477,13 @@ "ZY" = ( /turf/open/floor/plasteel/white, /area/science/xenobiology) +<<<<<<< HEAD +======= +"ZZ" = ( +/obj/machinery/light/small, +/turf/open/floor/plating/asteroid/snow/icemoon, +/area/service/hydroponics) +>>>>>>> b813588... Icebox Botany is no longer space (#57002) (1,1,1) = {" ak From 9958578f46093df53dd169681fec23b557655b8e Mon Sep 17 00:00:00 2001 From: drexample Date: Wed, 17 Feb 2021 13:54:05 +0000 Subject: [PATCH 2/2] Icebox Botany is no longer space