Merge branch 'master' of https://github.com/Monkestation/Monkestation2.0

 into more-tgui

_maps/map_files/BoxStation/BoxStation.dmm

@@ -14478,6 +14478,10 @@
 	},
 /turf/open/floor/wood,
 /area/station/service/lawoffice)
+"ePU" = (
+/obj/effect/spawner/random/structure/grille,
+/turf/open/space/basic,
+/area/space/nearstation)
 "ePX" = (
 /obj/structure/cable,
 /obj/machinery/duct,
@@ -34183,7 +34187,6 @@
 /obj/item/seeds/ambrosia,
 /obj/item/seeds/grass,
 /obj/item/seeds/carrot,
-/obj/item/seeds/tomato,
 /obj/item/seeds/potato,
 /obj/item/seeds/garlic,
 /obj/item/seeds/onion,
@@ -56030,10 +56033,10 @@
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable,
 /obj/machinery/light/small/directional/south,
+/obj/effect/turf_decal/bot,
 /obj/machinery/vending/hydroseeds{
 	slogan_delay = 700
 	},
-/obj/effect/turf_decal/bot,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "sLG" = (
@@ -72567,6 +72570,11 @@
 	},
 /turf/open/floor/carpet/purple,
 /area/station/command/heads_quarters/rd)
+"ylq" = (
+/obj/effect/spawner/random/structure/grille,
+/obj/structure/lattice,
+/turf/open/space/basic,
+/area/space/nearstation)
 "ylx" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
@@ -94281,10 +94289,10 @@ uoo
 uoo
 ksa
 uoo
-ksa
-uoo
-uoo
-ksa
+fEP
+fEP
+fEP
+ePU
 fEP
 uoo
 aeM
@@ -94538,12 +94546,12 @@ ksa
 uoo
 uoo
 uoo
-uoo
-fEP
-fEP
-fEP
 fEP
 ksa
+ksa
+uoo
+ksa
+ksa
 aeM
 joc
 amL
@@ -94795,8 +94803,8 @@ ksa
 ksa
 uoo
 ksa
+ylq
 ksa
-fEP
 kFk
 kFk
 kFk
@@ -95052,8 +95060,8 @@ ksa
 ksa
 ksa
 ksa
-ksa
-fEP
+ylq
+uoo
 kFk
 apg
 bdb
@@ -95309,8 +95317,8 @@ ksa
 ksa
 ksa
 ksa
+ylq
 ksa
-fEP
 kFk
 apg
 wGs
@@ -95566,8 +95574,8 @@ ksa
 uoo
 uoo
 ksa
+ylq
 ksa
-fEP
 kFk
 apg
 vIP
@@ -95823,8 +95831,8 @@ uoo
 uoo
 ksa
 ksa
+ylq
 ksa
-fEP
 kFk
 kzh
 emc
@@ -96081,7 +96089,7 @@ ksa
 ksa
 ksa
 fEP
-fEP
+ksa
 kFk
 gSB
 lIO
@@ -96338,7 +96346,7 @@ ksa
 ksa
 fEP
 fEP
-ksa
+uoo
 kFk
 xZo
 nKe

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -20234,10 +20234,10 @@
 /turf/open/floor/iron,
 /area/station/maintenance/department/chapel)
 "eOW" = (
+/obj/effect/turf_decal/bot,
 /obj/machinery/vending/hydroseeds{
 	slogan_delay = 700
 	},
-/obj/effect/turf_decal/bot,
 /turf/open/floor/iron/dark,
 /area/station/security/prison/garden)
 "ePa" = (
@@ -86884,7 +86884,6 @@
 /obj/item/seeds/ambrosia,
 /obj/item/seeds/grass,
 /obj/item/seeds/carrot,
-/obj/item/seeds/tomato,
 /obj/item/seeds/potato,
 /obj/item/seeds/garlic,
 /obj/item/seeds/onion,