Merge remote-tracking branch 'upstream/dev' into CultPorting

code/game/objects/structures/crates_lockers/closets.dm

@@ -249,6 +249,10 @@
 	src.add_fingerprint(user)
 	return
 
+/obj/structure/closet/attack_ai(mob/user)
+	if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) // Robots can open/close it, but not the AI.
+		attack_hand(user)
+
 /obj/structure/closet/relaymove(mob/user as mob)
 	if(user.stat || !isturf(src.loc))
 		return

code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm

@@ -24,5 +24,6 @@
 		new /obj/item/weapon/minihoe(src)
 		new /obj/item/weapon/hatchet(src)
 		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
 		return