diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index 86825e8ad44..50e60ea529d 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -1,6 +1,6 @@
 /obj/item/watertank
 	name = "backpack water tank"
-	desc = "A watertank backpack with nozzle to clean dirt and graffiti."
+	desc = "A watertank backpack with nozzle to water plants."
 	icon = 'icons/obj/hydro_equipment.dmi'
 	icon_state = "waterpack"
 	item_state = "waterpack"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
index 63b545a0e1d..24c82c1912e 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
@@ -25,3 +25,32 @@
 		new /obj/item/weapon/wirecutters/clippers(src)
 		new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
 //		new /obj/item/weapon/bee_net(src) //No more bees, March 2014
+
+/obj/structure/closet/secure_closet/xenobotany
+	name = "xenobotanist's locker"
+	req_access = list(access_xenobiology)
+	icon_state = "xenobotsecure1"
+	icon_closed = "xenobotsecure"
+	icon_locked = "xenobotsecure1"
+	icon_opened = "xenobotsecureopen"
+	icon_broken = "xenobotsecurebroken"
+	icon_off = "xenobotsecureoff"
+
+	fill()
+		..()
+		switch(rand(1,2))
+			if(1)
+				new /obj/item/clothing/suit/apron(src)
+			if(2)
+				new /obj/item/clothing/suit/apron/overalls/blue(src)
+		new /obj/item/weapon/storage/bag/plants(src)
+		new /obj/item/clothing/under/rank/scientist(src)
+		new /obj/item/device/analyzer/plant_analyzer(src)
+		new /obj/item/device/radio/headset/headset_sci(src)
+		new /obj/item/clothing/head/greenbandana(src)
+		new /obj/item/weapon/material/minihoe(src)
+		new /obj/item/weapon/material/hatchet(src)
+		new /obj/item/weapon/wirecutters/clippers(src)
+		new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
+		new /obj/item/clothing/mask/gas/alt(src)
+		new /obj/item/watertank(src)
diff --git a/html/changelogs/[Ferner]-[200319-xenobotany_locker].yml b/html/changelogs/[Ferner]-[200319-xenobotany_locker].yml
new file mode 100644
index 00000000000..437685d16fb
--- /dev/null
+++ b/html/changelogs/[Ferner]-[200319-xenobotany_locker].yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Ferner
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - maptweak: "Replaced the hydroponics closets in Xenoflora with newly added xenobotany ones.  The new closets will contain the gas masks and watertanks instead of being mapped in. Added a distro to trays pump in xenobotany."
\ No newline at end of file
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index beedb5ae49c..9998ac091fc 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index e0d8d97ac2a..4688f6d6826 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -14244,34 +14244,12 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "aBD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 6
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/turf/simulated/floor/tiled/dark,
-/area/rnd/xenobiology/xenoflora)
-"aBE" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/green{
-	icon_state = "corner_white";
-	dir = 4
-	},
-/turf/simulated/floor/tiled/dark,
-/area/rnd/xenobiology/xenoflora)
-"aBF" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 4
-	},
-/obj/effect/floor_decal/corner/green{
-	icon_state = "corner_white";
-	dir = 1
-	},
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "aBG" = (
@@ -14777,12 +14755,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "aCJ" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
 /obj/structure/cable/green{
 	d1 = 2;
 	d2 = 4;
@@ -14800,12 +14772,15 @@
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "aCK" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 9
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 8;
@@ -14814,6 +14789,12 @@
 /obj/machinery/atmospherics/pipe/simple/visible{
 	dir = 4
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "aCL" = (
@@ -14822,12 +14803,6 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
-"aCM" = (
-/obj/machinery/atmospherics/pipe/manifold/visible{
-	dir = 1
-	},
-/turf/simulated/floor/tiled/dark,
-/area/rnd/xenobiology/xenoflora)
 "aCN" = (
 /obj/machinery/atmospherics/unary/heater{
 	dir = 8
@@ -15305,14 +15280,15 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/corner/green,
-/obj/machinery/atmospherics/portables_connector{
-	dir = 8
+/obj/machinery/atmospherics/binary/pump{
+	dir = 8;
+	icon_state = "map_on";
+	name = "Distro to Trays";
+	use_power = 1
 	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "aDx" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
@@ -15323,11 +15299,13 @@
 	dir = 10
 	},
 /obj/structure/disposalpipe/junction,
+/obj/machinery/atmospherics/pipe/simple/visible/blue{
+	icon_state = "intact";
+	dir = 10
+	},
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "aDy" = (
-/obj/item/clothing/mask/gas/alt,
-/obj/item/clothing/mask/gas/alt,
 /obj/effect/floor_decal/corner/green{
 	icon_state = "corner_white";
 	dir = 10
@@ -15338,8 +15316,8 @@
 	network = list("Research Outpost")
 	},
 /obj/structure/closet/crate/hydroponics/prespawned,
-/obj/item/watertank,
-/obj/item/watertank,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "aDz" = (
@@ -15355,7 +15333,8 @@
 /area/rnd/xenobiology/xenoflora)
 "aDA" = (
 /obj/machinery/atmospherics/binary/pump{
-	dir = 8
+	dir = 8;
+	name = "Trays to Scrubbers"
 	},
 /obj/effect/floor_decal/corner/green{
 	icon_state = "corner_white";
@@ -15744,13 +15723,12 @@
 /area/rnd/xenobiology/xenoflora)
 "aEu" = (
 /obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
 	icon_state = "1-2"
 	},
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
 /turf/simulated/floor/tiled/ramp/bottom{
 	icon_state = "rampbot";
 	dir = 1
@@ -16312,18 +16290,15 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 5
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
-	dir = 5
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 4;
 	icon_state = "1-4"
 	},
 /obj/machinery/firealarm/south,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 5
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology/xenoflora)
 "aFE" = (
@@ -16331,20 +16306,20 @@
 	dir = 2;
 	icon_state = "pipe-c"
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
-	dir = 10
-	},
 /obj/structure/cable/green{
 	d1 = 2;
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
-	dir = 1
-	},
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 8
+	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology/xenoflora)
 "aFF" = (
@@ -23361,7 +23336,10 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/binary/pump{
-	dir = 8
+	dir = 8;
+	icon_state = "map_on";
+	name = "Hazardous Specimens Inlet";
+	use_power = 1
 	},
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology/xenoflora_hazard)
@@ -27346,6 +27324,12 @@
 	icon_state = "asteroidplating"
 	},
 /area/mine/unexplored)
+"brp" = (
+/obj/machinery/atmospherics/binary/pump{
+	dir = 2
+	},
+/turf/simulated/floor/tiled/dark,
+/area/rnd/xenobiology/xenoflora)
 "brs" = (
 /obj/structure/bookcase/libraryspawn/religion,
 /turf/simulated/floor/carpet,
@@ -28592,6 +28576,11 @@
 	},
 /turf/simulated/floor/plating,
 /area/rnd/xenoarch_atrium)
+"fxJ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/wall/r_wall,
+/area/rnd/xenobiology/xenoflora)
 "fzF" = (
 /obj/structure/table/steel,
 /obj/item/device/flashlight/lamp,
@@ -28665,9 +28654,6 @@
 /turf/simulated/floor/tiled,
 /area/rnd/xenoarch_atrium)
 "gaJ" = (
-/obj/structure/closet/secure_closet/hydroponics{
-	req_access = list(47)
-	},
 /obj/effect/floor_decal/corner/green{
 	icon_state = "corner_white";
 	dir = 10
@@ -28676,6 +28662,7 @@
 	icon_state = "spline_plain";
 	dir = 4
 	},
+/obj/structure/closet/secure_closet/xenobotany,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "ged" = (
@@ -29503,7 +29490,8 @@
 	icon_state = "1-8"
 	},
 /obj/machinery/atmospherics/binary/pump{
-	dir = 4
+	dir = 4;
+	name = "Hazardous Specimens Outlet"
 	},
 /obj/structure/disposalpipe/segment{
 	dir = 8;
@@ -29760,9 +29748,7 @@
 /turf/simulated/floor/tiled,
 /area/outpost/research/anomaly_storage)
 "kju" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 8
-	},
+/obj/machinery/atmospherics/portables_connector,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "ksm" = (
@@ -30647,13 +30633,11 @@
 /turf/simulated/floor/plating,
 /area/rnd/xenobiology/xenoflora_hazard)
 "nkZ" = (
-/obj/structure/closet/secure_closet/hydroponics{
-	req_access = list(47)
-	},
 /obj/effect/floor_decal/corner/green{
 	icon_state = "corner_white";
 	dir = 10
 	},
+/obj/structure/closet/secure_closet/xenobotany,
 /turf/simulated/floor/tiled/dark,
 /area/rnd/xenobiology/xenoflora)
 "noC" = (
@@ -53436,7 +53420,7 @@ aBD
 aBZ
 aCK
 aDy
-kJR
+fxJ
 aFE
 aCO
 eUn
@@ -53689,7 +53673,7 @@ aba
 kJR
 aAq
 nyX
-aBE
+wbE
 aCa
 aCL
 aDz
@@ -53946,7 +53930,7 @@ aba
 hob
 aAp
 kKf
-aBF
+uMH
 aCb
 aCL
 aDA
@@ -54204,8 +54188,8 @@ mZC
 cHa
 kKw
 kju
-kKw
-aCM
+brp
+aEs
 aDB
 aEs
 eBJ
diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm
index cc2ee86d4e4..682cf23c07c 100644
--- a/maps/exodus/exodus-1_station.dmm
+++ b/maps/exodus/exodus-1_station.dmm
@@ -61564,13 +61564,11 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology/xenoflora_storage)
 "cfG" = (
-/obj/structure/closet/secure_closet/hydroponics{
-	req_access = list(47)
-	},
 /obj/effect/floor_decal/corner/lime{
 	icon_state = "corner_white";
 	dir = 5
 	},
+/obj/structure/closet/secure_closet/xenobotany,
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology/xenoflora_storage)
 "cfH" = (