Merge remote-tracking branch 'upstream/master' into snaxi2

_maps/map_files/BoxStation/BoxStation.dmm

@@ -18338,7 +18338,7 @@
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "aQV" = (
-/obj/machinery/vending/autodrobe/all_access,
+/obj/machinery/vending/autodrobe,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -24736,9 +24736,6 @@
 /obj/machinery/camera{
 	c_tag = "Chemistry"
 	},
-/obj/machinery/firealarm{
-	pixel_y = 24
-	},
 /obj/machinery/chem_heater,
 /turf/open/floor/plasteel/white,
 /area/medical/chemistry)
@@ -27778,6 +27775,10 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -24
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/chemistry)
 "boc" = (
@@ -39446,14 +39447,6 @@
 /obj/machinery/atmospherics/pipe/simple/cyan/visible,
 /turf/open/floor/plasteel,
 /area/engine/atmos)
-"bPh" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/layer_manifold{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/engine/atmos)
 "bPi" = (
 /obj/machinery/light{
 	dir = 4
@@ -41478,13 +41471,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/atmos)
-"bUO" = (
-/obj/machinery/portable_atmospherics/canister,
-/obj/machinery/atmospherics/components/unary/portables_connector/visible{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/engine/atmos)
 "bUR" = (
 /obj/machinery/atmospherics/pipe/simple/green/visible,
 /turf/open/floor/plasteel,
@@ -55361,14 +55347,6 @@
 /obj/effect/turf_decal/tile/green,
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
-"ivJ" = (
-/obj/machinery/atmospherics/pipe/simple/cyan/visible,
-/obj/effect/spawner/structure/window/reinforced,
-/obj/machinery/atmospherics/pipe/layer_manifold{
-	dir = 4
-	},
-/turf/open/floor/plating,
-/area/engine/atmos)
 "iwB" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
 	dir = 4
@@ -56424,7 +56402,7 @@
 	},
 /area/maintenance/bar)
 "lsk" = (
-/obj/machinery/vending/autodrobe/all_access,
+/obj/machinery/vending/autodrobe,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness)
 "ltK" = (
@@ -58873,7 +58851,7 @@
 /turf/open/floor/plating,
 /area/maintenance/fore/secondary)
 "sXA" = (
-/obj/machinery/vending/boozeomat/all_access,
+/obj/machinery/vending/boozeomat,
 /turf/closed/wall,
 /area/maintenance/bar)
 "sXV" = (
@@ -93957,7 +93935,7 @@ bMQ
 bRC
 rdl
 daq
-bUO
+bUN
 bOd
 bOd
 bOd
@@ -94214,7 +94192,7 @@ cBF
 bRD
 rdl
 daq
-bUO
+bUN
 bOd
 bOd
 bOd
@@ -94471,7 +94449,7 @@ bQs
 cez
 ceA
 daq
-bUO
+bUN
 bOd
 bOd
 bOd
@@ -96008,19 +95986,19 @@ bKH
 bLK
 bLK
 bOf
-ivJ
+bPh
 bQy
 bRI
 bSP
-ivJ
+bPh
 jzM
 bRI
 cCF
-ivJ
+bPh
 bQy
 bRI
 bQy
-ivJ
+bPh
 bQy
 bRI
 bSP

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -11361,7 +11361,7 @@
 "ayW" = (
 /obj/machinery/light/small,
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/vending/autodrobe/all_access,
+/obj/machinery/vending/autodrobe,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -81511,7 +81511,7 @@
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/locker)
 "cGO" = (
-/obj/machinery/vending/autodrobe/all_access,
+/obj/machinery/vending/autodrobe,
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
@@ -108635,7 +108635,7 @@
 /obj/structure/sign/poster/contraband/random{
 	pixel_y = -32
 	},
-/obj/machinery/vending/boozeomat/all_access,
+/obj/machinery/vending/boozeomat,
 /turf/open/floor/plating,
 /area/crew_quarters/abandoned_gambling_den)
 "dBS" = (

_maps/map_files/IceBoxStation/IceBoxStation.dmm

@@ -18490,7 +18490,7 @@
 /turf/open/floor/plasteel,
 /area/crew_quarters/locker)
 "aQV" = (
-/obj/machinery/vending/autodrobe/all_access,
+/obj/machinery/vending/autodrobe,
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
@@ -24888,9 +24888,6 @@
 /obj/machinery/camera{
 	c_tag = "Chemistry"
 	},
-/obj/machinery/firealarm{
-	pixel_y = 24
-	},
 /obj/machinery/chem_heater,
 /turf/open/floor/plasteel/white,
 /area/medical/chemistry)
@@ -27915,6 +27912,10 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/machinery/firealarm{
+	dir = 4;
+	pixel_x = -24
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/chemistry)
 "boc" = (
@@ -56834,7 +56835,7 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "lsk" = (
-/obj/machinery/vending/autodrobe/all_access,
+/obj/machinery/vending/autodrobe,
 /turf/open/floor/plasteel,
 /area/crew_quarters/fitness)
 "ltK" = (
@@ -59723,7 +59724,7 @@
 /turf/open/floor/plating,
 /area/maintenance/fore/secondary)
 "sXA" = (
-/obj/machinery/vending/boozeomat/all_access,
+/obj/machinery/vending/boozeomat,
 /turf/closed/wall,
 /area/maintenance/bar)
 "sXV" = (

_maps/map_files/KiloStation/KiloStation.dmm

@@ -54029,7 +54029,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 8
 	},
-/obj/machinery/vending/autodrobe/all_access,
+/obj/machinery/vending/autodrobe,
 /obj/effect/turf_decal/delivery,
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/locker)
@@ -78316,7 +78316,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 4
 	},
-/obj/machinery/vending/autodrobe/all_access,
+/obj/machinery/vending/autodrobe,
 /obj/structure/noticeboard{
 	dir = 4;
 	pixel_x = -27
@@ -84861,7 +84861,7 @@
 /turf/open/floor/engine,
 /area/engine/engineering)
 "iLn" = (
-/obj/machinery/vending/boozeomat/all_access,
+/obj/machinery/vending/boozeomat,
 /turf/open/floor/wood,
 /area/maintenance/port/fore)
 "iMb" = (

_maps/map_files/LambdaStation/lambda.dmm

@@ -45021,7 +45021,7 @@
 /turf/open/floor/wood,
 /area/maintenance/bar)
 "bGM" = (
-/obj/machinery/vending/boozeomat/all_access,
+/obj/machinery/vending/boozeomat,
 /turf/open/floor/wood,
 /area/maintenance/bar)
 "bGN" = (
@@ -47241,7 +47241,6 @@
 /area/hydroponics/garden/abandoned)
 "bKT" = (
 /obj/item/poster/random_contraband,
-/turf/open/floor/plating,
 /turf/open/floor/plating{
 	icon_state = "platingdmg2"
 	},
@@ -58598,7 +58597,7 @@
 /turf/open/space,
 /area/space/nearstation)
 "cgJ" = (
-/obj/machinery/vending/autodrobe/all_access,
+/obj/machinery/vending/autodrobe,
 /turf/open/floor/plating,
 /area/maintenance/aft)
 "cgK" = (
@@ -62158,7 +62157,6 @@
 /obj/structure/cable{
 	icon_state = "0-4"
 	},
-/turf/open/floor/plating,
 /turf/open/floor/plating{
 	icon_state = "platingdmg2"
 	},
@@ -63619,7 +63617,6 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/open/floor/plating,
 /turf/open/floor/plating{
 	icon_state = "platingdmg2"
 	},
@@ -72658,7 +72655,7 @@
 /turf/open/floor/plasteel/grimy,
 /area/bridge)
 "cIV" = (
-/obj/machinery/vending/boozeomat/all_access,
+/obj/machinery/vending/boozeomat,
 /obj/machinery/status_display/evac{
 	pixel_y = 32
 	},
@@ -75970,7 +75967,6 @@
 	},
 /area/maintenance/department/medical)
 "cPo" = (
-/turf/open/floor/plating,
 /turf/open/floor/plating{
 	icon_state = "platingdmg2"
 	},
@@ -76073,7 +76069,6 @@
 	},
 /area/maintenance/fore/secondary)
 "cPB" = (
-/turf/open/floor/plating,
 /turf/open/floor/plating{
 	icon_state = "platingdmg2"
 	},
@@ -76098,17 +76093,10 @@
 	},
 /area/maintenance/department/crew_quarters/dorms)
 "cPE" = (
-/turf/open/floor/plating,
 /turf/open/floor/plating{
 	icon_state = "platingdmg2"
 	},
 /area/maintenance/department/crew_quarters/dorms)
-"cPF" = (
-/turf/open/floor/plating,
-/turf/open/floor/plating{
-	icon_state = "platingdmg2"
-	},
-/area/maintenance/aft)
 "cPG" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -115439,7 +115427,7 @@ cgm
 thv
 uRw
 boU
-cPF
+cfm
 chI
 cqg
 cWW
@@ -118541,7 +118529,7 @@ aaA
 ceG
 cqt
 bYa
-cPF
+cfm
 ceG
 aaA
 aaA
@@ -119299,7 +119287,7 @@ cQK
 bYa
 bYa
 cRQ
-cPF
+cfm
 chI
 cRv
 bYa

_maps/map_files/MetaStation/MetaStation.dmm

@@ -45054,7 +45054,7 @@
 /turf/open/floor/plating,
 /area/maintenance/port)
 "bLe" = (
-/obj/machinery/vending/autodrobe/all_access,
+/obj/machinery/vending/autodrobe,
 /turf/open/floor/plating,
 /area/maintenance/port)
 "bLf" = (
@@ -57077,7 +57077,7 @@
 /turf/open/floor/plating/airless,
 /area/engine/atmos)
 "cjp" = (
-/obj/machinery/vending/boozeomat/all_access,
+/obj/machinery/vending/boozeomat,
 /turf/open/floor/wood,
 /area/maintenance/port/aft)
 "cjq" = (

_maps/map_files/debug/runtimestation.dmm

@@ -2526,7 +2526,6 @@
 /obj/machinery/atmospherics/components/unary/vent_pump/on{
 	dir = 1
 	},
-/turf/open/space/basic,
 /turf/open/floor/carpet/blackred,
 /area/crew_quarters/bar)
 "gR" = (
@@ -2806,7 +2805,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/space/basic,
 /turf/open/floor/carpet/blackred,
 /area/crew_quarters/bar)
 "vP" = (
@@ -2832,7 +2830,6 @@
 /turf/open/floor/plasteel,
 /area/hallway/primary/central)
 "wf" = (
-/turf/open/space/basic,
 /turf/open/floor/carpet/blackred,
 /area/crew_quarters/bar)
 "wS" = (
@@ -2854,7 +2851,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
 	},
-/turf/open/space/basic,
 /turf/open/floor/carpet/blackred,
 /area/crew_quarters/bar)
 "xh" = (
@@ -2869,7 +2865,6 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/turf/open/space/basic,
 /turf/open/floor/carpet/blackred,
 /area/crew_quarters/bar)
 "yt" = (
@@ -3002,7 +2997,7 @@
 /turf/open/floor/grass,
 /area/hydroponics)
 "Ga" = (
-/obj/machinery/vending/boozeomat/all_access,
+/obj/machinery/vending/boozeomat,
 /obj/machinery/airalarm{
 	dir = 8;
 	pixel_x = 24
@@ -3041,7 +3036,6 @@
 /area/bridge)
 "IB" = (
 /obj/structure/chair/stool/bar,
-/turf/open/space/basic,
 /turf/open/floor/carpet/blackred,
 /area/crew_quarters/bar)
 "JF" = (
@@ -3086,7 +3080,6 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 8
 	},
-/turf/open/space/basic,
 /turf/open/floor/carpet/blackred,
 /area/crew_quarters/bar)
 "Ly" = (
@@ -3115,7 +3108,6 @@
 	icon_state = "1-4"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/turf/open/space/basic,
 /turf/open/floor/carpet/blackred,
 /area/crew_quarters/bar)
 "MS" = (
@@ -3334,7 +3326,6 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 4
 	},
-/turf/open/space/basic,
 /turf/open/floor/carpet/blackred,
 /area/crew_quarters/bar)
 

_maps/map_files/generic/CentCom.dmm

@@ -13278,7 +13278,7 @@
 /turf/open/floor/engine/cult,
 /area/wizard_station)
 "ED" = (
-/obj/machinery/vending/boozeomat/all_access,
+/obj/machinery/vending/boozeomat,
 /turf/closed/indestructible{
 	icon = 'icons/turf/walls/wood_wall.dmi';
 	icon_state = "wood";
@@ -17650,7 +17650,7 @@
 /turf/open/floor/wood,
 /area/syndicate_mothership)
 "Sj" = (
-/obj/machinery/vending/autodrobe/all_access{
+/obj/machinery/vending/autodrobe{
 	extended_inventory = 1
 	},
 /obj/machinery/light,