Merge remote-tracking branch 'upstream/master'

_maps/RandomZLevels/museum.dmm

@@ -3147,6 +3147,7 @@
 /obj/structure/transport/linear/tram/slow,
 /obj/structure/thermoplastic,
 /obj/effect/spawner/random/structure/closet_empty/crate/with_loot,
+/obj/effect/spawner/random/maintenance/no_decals/five,
 /turf/open/chasm/true/no_smooth,
 /area/awaymission/museum)
 "Cc" = (
@@ -4988,7 +4989,7 @@
 /obj/machinery/door/window/elevator/right/directional/south{
 	transport_linked_id = "museum_cargo"
 	},
-/obj/effect/spawner/random/maintenance/seven,
+/obj/effect/spawner/random/maintenance/no_decals/seven,
 /turf/open/chasm/true/no_smooth,
 /area/awaymission/museum)
 "Um" = (
@@ -5343,7 +5344,7 @@
 "WJ" = (
 /obj/structure/transport/linear/tram/slow,
 /obj/structure/thermoplastic,
-/obj/effect/spawner/random/maintenance/seven,
+/obj/effect/spawner/random/maintenance/no_decals/seven,
 /obj/item/storage/pill_bottle/maintenance_pill/full,
 /obj/effect/spawner/random/structure/closet_empty/crate/with_loot,
 /turf/open/chasm/true/no_smooth,

_maps/map_files/Birdshot/birdshot.dmm

@@ -5456,10 +5456,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/station/security/tram)
-"cgb" = (
-/obj/machinery/duct,
-/turf/open/floor/iron/kitchen/small,
-/area/station/security/prison/mess)
 "cgy" = (
 /obj/effect/turf_decal/stripes/red/line{
 	dir = 4
@@ -11344,7 +11340,9 @@
 /area/station/maintenance/starboard/aft)
 "ena" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/plumbed,
+/obj/structure/reagent_dispensers/plumbed{
+	dir = 1
+	},
 /turf/open/floor/iron,
 /area/station/maintenance/department/medical/central)
 "enb" = (
@@ -14096,7 +14094,6 @@
 "fls" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/duct,
 /obj/effect/mapping_helpers/broken_floor,
 /obj/effect/decal/cleanable/glass/plastitanium,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -16053,6 +16050,12 @@
 /obj/machinery/airalarm/directional/west,
 /turf/open/floor/iron/white,
 /area/station/medical/medbay/central)
+"fRZ" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/plating,
+/area/station/maintenance/fore/greater)
 "fSe" = (
 /turf/closed/wall/rust,
 /area/station/cargo/miningfoundry)
@@ -17810,7 +17813,6 @@
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/broken_floor,
-/obj/machinery/duct,
 /obj/machinery/power/apc/auto_name/directional/west,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -24624,6 +24626,9 @@
 "iSW" = (
 /obj/structure/rack,
 /obj/item/clothing/gloves/boxing/yellow,
+/obj/item/clothing/gloves/boxing/green{
+	pixel_y = 4
+	},
 /turf/open/floor/plating,
 /area/station/maintenance/fore/greater)
 "iTn" = (
@@ -24697,8 +24702,7 @@
 /turf/open/floor/plating,
 /area/station/engineering/atmos)
 "iUy" = (
-/obj/structure/rack,
-/obj/item/clothing/gloves/boxing/green,
+/obj/structure/reagent_dispensers/plumbed,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/greater)
 "iUz" = (
@@ -27370,7 +27374,6 @@
 "jPr" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/duct,
 /obj/effect/mapping_helpers/broken_floor,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -28482,6 +28485,12 @@
 /obj/item/storage/backpack/duffelbag,
 /turf/open/floor/plating,
 /area/station/maintenance/fore/greater)
+"kld" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/duct,
+/turf/open/floor/iron/kitchen/small,
+/area/station/security/prison/mess)
 "klf" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/chair{
@@ -30608,7 +30617,6 @@
 "kZo" = (
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/duct,
 /obj/effect/spawner/random/trash,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/mapping_helpers/broken_floor,
@@ -32653,6 +32661,12 @@
 /obj/structure/chair/stool/directional/south,
 /turf/open/floor/carpet/donk,
 /area/station/command/heads_quarters/qm)
+"lHi" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/duct,
+/turf/open/floor/iron/kitchen/small,
+/area/station/security/prison/mess)
 "lHk" = (
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
@@ -49391,7 +49405,9 @@
 /area/station/maintenance/port/lesser)
 "row" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/structure/reagent_dispensers/plumbed,
+/obj/structure/reagent_dispensers/plumbed{
+	dir = 4
+	},
 /turf/open/floor/plating,
 /area/station/maintenance/central/greater)
 "roz" = (
@@ -62899,6 +62915,7 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
 	dir = 8
 	},
+/obj/machinery/duct,
 /turf/open/floor/iron/kitchen/small,
 /area/station/security/prison/mess)
 "vEe" = (
@@ -89949,7 +89966,7 @@ qeP
 lrE
 oPV
 pId
-ect
+kld
 qRM
 vSx
 eGL
@@ -90205,7 +90222,7 @@ uPr
 qeP
 lrE
 oPV
-cgb
+eHf
 vEb
 eHf
 qsR
@@ -90463,7 +90480,7 @@ lub
 tBA
 oPV
 iNz
-jDe
+lHi
 jDe
 tSB
 eGL
@@ -110124,7 +110141,7 @@ aJN
 tIE
 nFW
 iSW
-rdh
+fRZ
 liR
 jQL
 uwH

_maps/map_files/Deathmatch/The_Brig.dmm

@@ -532,10 +532,6 @@
 	},
 /turf/open/indestructible,
 /area/deathmatch)
-"jB" = (
-/obj/machinery/light_switch/directional/west,
-/turf/open/indestructible/dark,
-/area/deathmatch)
 "jN" = (
 /obj/structure/table,
 /obj/machinery/light/small/directional/north,
@@ -894,10 +890,6 @@
 	},
 /turf/open/indestructible,
 /area/deathmatch)
-"oy" = (
-/obj/machinery/light_switch/directional/west,
-/turf/open/floor/iron/grimy,
-/area/deathmatch)
 "oA" = (
 /obj/machinery/light/directional/north,
 /turf/open/indestructible,
@@ -1162,13 +1154,6 @@
 /obj/effect/decal/cleanable/oil/slippery,
 /turf/open/indestructible,
 /area/deathmatch)
-"rN" = (
-/obj/effect/turf_decal/trimline/red/filled/line{
-	dir = 4
-	},
-/obj/machinery/light_switch/directional/east,
-/turf/open/indestructible,
-/area/deathmatch)
 "sb" = (
 /obj/structure/closet{
 	name = "Evidence Closet 4"
@@ -1526,9 +1511,6 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/machinery/light_switch/directional/west{
-	pixel_y = -12
-	},
 /obj/structure/extinguisher_cabinet/directional/west,
 /turf/open/indestructible/dark,
 /area/deathmatch)
@@ -1683,7 +1665,6 @@
 "yT" = (
 /obj/effect/turf_decal/tile/red,
 /obj/machinery/light/directional/west,
-/obj/machinery/light_switch/directional/west,
 /obj/effect/turf_decal/tile/red{
 	dir = 8
 	},
@@ -2344,16 +2325,6 @@
 	},
 /turf/open/indestructible/dark,
 /area/deathmatch)
-"Ii" = (
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/obj/machinery/light_switch/directional/east,
-/turf/open/indestructible/dark,
-/area/deathmatch)
 "Ik" = (
 /obj/effect/turf_decal/trimline/red/filled/corner,
 /turf/open/indestructible,
@@ -3022,11 +2993,6 @@
 /obj/item/crowbar,
 /turf/open/indestructible,
 /area/deathmatch)
-"RL" = (
-/obj/machinery/light_switch/directional/south,
-/obj/structure/cable,
-/turf/open/floor/carpet,
-/area/deathmatch)
 "RR" = (
 /obj/structure/cable,
 /obj/machinery/door/poddoor/preopen{
@@ -4117,7 +4083,7 @@ tH
 xi
 Am
 EP
-Ii
+tH
 Kh
 Rv
 UU
@@ -4172,7 +4138,7 @@ yH
 uD
 xk
 Bf
-jB
+Ux
 JU
 YW
 yy
@@ -4462,7 +4428,7 @@ Hz
 Ik
 Zv
 ad
-oy
+Pt
 Pt
 eD
 QG
@@ -4563,7 +4529,7 @@ Cx
 ri
 yO
 cW
-rN
+Os
 Os
 Hp
 UQ
@@ -4671,7 +4637,7 @@ cf
 cf
 YN
 aE
-RL
+cf
 Yh
 Wg
 qP