diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_shuttlecrash.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_shuttlecrash.dmm index 1b2c987bc85..8a3108315bb 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_shuttlecrash.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_shuttlecrash.dmm @@ -439,10 +439,7 @@ /turf/simulated/floor/plating, /area/ruin/unpowered/misc_lavaruin) "MC" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /obj/machinery/door/window/reinforced/normal{ name = "Luggage Storage" }, diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index cb35f36cd34..87118494d73 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -2555,10 +2555,7 @@ /obj/structure/chair/sofa/bench/left{ dir = 1 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkyellowcorners" @@ -3489,9 +3486,7 @@ /area/lavaland/surface/outdoors) "jG" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/economy/vending/wallmed{ - pixel_y = 32 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /obj/structure/bed/roller, /turf/simulated/floor/plasteel{ icon_state = "barber" @@ -9041,11 +9036,7 @@ /turf/simulated/wall/mineral/iron, /area/lavaland/surface/outdoors) "Qf" = ( -/obj/machinery/economy/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_y = -32 - }, +/obj/machinery/economy/vending/wallmed/directional/south, /turf/simulated/floor/plasteel{ icon_state = "yellowsiding" }, @@ -10206,9 +10197,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "XF" = ( -/obj/machinery/economy/vending/wallmed{ - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -15438,7 +15427,7 @@ wK SJ bk Qf -Iv +OG jM SR WL diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 6dfd1852d14..12b2421a72f 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -1332,9 +1332,7 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 32; +/obj/machinery/economy/vending/wallmed/directional/north{ power_state = 0 }, /obj/item/clipboard, @@ -5723,10 +5721,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) "tt" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 30 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/wood, /area/trader_station/sol) "tv" = ( @@ -5735,9 +5730,7 @@ /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) "tw" = ( -/obj/machinery/economy/vending/wallmed/syndicate{ - pixel_x = -30 - }, +/obj/machinery/economy/vending/wallmed/syndicate/directional/west, /turf/simulated/floor/mineral/plastitanium/red, /area/shuttle/syndicate) "tx" = ( diff --git a/_maps/map_files/shuttles/emergency_bar.dmm b/_maps/map_files/shuttles/emergency_bar.dmm index 96ee62dfcff..b2feadfc8cd 100644 --- a/_maps/map_files/shuttles/emergency_bar.dmm +++ b/_maps/map_files/shuttles/emergency_bar.dmm @@ -368,11 +368,7 @@ /turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "bs" = ( -/obj/machinery/economy/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /obj/structure/bed/roller, /turf/simulated/floor/mineral/titanium, /area/shuttle/escape) diff --git a/_maps/map_files/shuttles/emergency_clown.dmm b/_maps/map_files/shuttles/emergency_clown.dmm index 1aa2399414c..807f8e4933e 100644 --- a/_maps/map_files/shuttles/emergency_clown.dmm +++ b/_maps/map_files/shuttles/emergency_clown.dmm @@ -293,11 +293,7 @@ /turf/simulated/floor/noslip, /area/shuttle/escape) "be" = ( -/obj/machinery/economy/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /obj/structure/bed/roller, /turf/simulated/floor/noslip, /area/shuttle/escape) diff --git a/_maps/map_files/shuttles/emergency_lance.dmm b/_maps/map_files/shuttles/emergency_lance.dmm index ad94624ae31..b8f4b8cd695 100644 --- a/_maps/map_files/shuttles/emergency_lance.dmm +++ b/_maps/map_files/shuttles/emergency_lance.dmm @@ -154,10 +154,7 @@ /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/shuttle/escape) "gN" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /obj/structure/chair/comfy/shuttle, /turf/simulated/floor/plasteel{ dir = 8; @@ -249,10 +246,7 @@ }, /area/shuttle/escape) "jr" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkblue" @@ -561,10 +555,7 @@ }, /area/shuttle/escape) "xj" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /obj/effect/turf_decal/blue_corner{ dir = 4 }, diff --git a/_maps/map_files/shuttles/emergency_meta.dmm b/_maps/map_files/shuttles/emergency_meta.dmm index 364fac836a6..f2a82576cc9 100644 --- a/_maps/map_files/shuttles/emergency_meta.dmm +++ b/_maps/map_files/shuttles/emergency_meta.dmm @@ -283,13 +283,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/general, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) -"aS" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - power_state = 0 - }, -/turf/simulated/wall/mineral/titanium, -/area/shuttle/escape) "aT" = ( /obj/structure/extinguisher_cabinet, /turf/simulated/wall/mineral/titanium, @@ -378,6 +371,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/economy/vending/wallmed/directional/east, /turf/simulated/floor/mineral/titanium, /area/shuttle/escape) "bh" = ( @@ -797,6 +791,11 @@ }, /turf/simulated/floor/plating, /area/shuttle/escape) +"FM" = ( +/obj/structure/closet/emcloset, +/obj/machinery/economy/vending/wallmed/directional/west, +/turf/simulated/floor/mineral/titanium, +/area/shuttle/escape) "Rk" = ( /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) @@ -937,7 +936,7 @@ au au au aZ -at +FM ab bs bs @@ -982,7 +981,7 @@ ai au au aM -aS +ab aW au aL @@ -1110,7 +1109,7 @@ ci au au aM -aS +ab aW au aL diff --git a/_maps/map_files/shuttles/emergency_mil.dmm b/_maps/map_files/shuttles/emergency_mil.dmm index 83d2c452643..313f300f1aa 100644 --- a/_maps/map_files/shuttles/emergency_mil.dmm +++ b/_maps/map_files/shuttles/emergency_mil.dmm @@ -164,11 +164,7 @@ }, /area/shuttle/escape) "aT" = ( -/obj/machinery/economy/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /obj/machinery/sleeper, /turf/simulated/floor/plasteel{ dir = 4; diff --git a/_maps/map_files/shuttles/emergency_old.dmm b/_maps/map_files/shuttles/emergency_old.dmm index 4cf2e775b02..87b13a61c37 100644 --- a/_maps/map_files/shuttles/emergency_old.dmm +++ b/_maps/map_files/shuttles/emergency_old.dmm @@ -327,11 +327,7 @@ /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "rj" = ( -/obj/machinery/economy/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /obj/structure/bed/roller, /turf/simulated/floor/mineral/titanium, /area/shuttle/escape) diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index a3fbf4e0b68..c4a5b342d9e 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -4347,10 +4347,7 @@ /turf/simulated/floor/carpet/cyan, /area/station/security/prison/cell_block/A) "apA" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /obj/structure/table/reinforced, /obj/item/stack/medical/bruise_pack/advanced, /obj/machinery/firealarm{ @@ -13219,10 +13216,7 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore) "aQE" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -14970,10 +14964,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /obj/machinery/light{ dir = 1 }, @@ -26577,10 +26568,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "bFJ" = ( @@ -28932,10 +28920,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -31115,11 +31100,6 @@ /area/station/science/hallway) "bWs" = ( /obj/machinery/sleeper, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -31393,10 +31373,7 @@ }, /area/station/medical/cloning) "bXL" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /obj/machinery/camera{ c_tag = "Medbay Cloning" }, @@ -32444,11 +32421,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = -28; - pixel_x = 5 - }, +/obj/machinery/economy/vending/wallmed/directional/south, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -40345,10 +40318,7 @@ /area/station/science/misc_lab) "cDE" = ( /obj/machinery/hologram/holopad, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/south, /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "cDF" = ( @@ -47048,10 +47018,7 @@ /area/station/engineering/atmos) "dbM" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 }, @@ -57104,10 +57071,7 @@ "fJX" = ( /obj/structure/bed, /obj/item/bedsheet/medical, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /obj/machinery/light{ dir = 8 }, @@ -63181,10 +63145,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/rack, /obj/item/clothing/under/rank/medical/scrubs, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitehall" @@ -66685,6 +66646,16 @@ /obj/structure/closet/jcloset, /turf/simulated/floor/plasteel, /area/station/service/janitor) +"kAl" = ( +/obj/machinery/light_switch{ + dir = 1; + name = "south bump"; + pixel_y = -24 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/station/medical/sleeper) "kAp" = ( /obj/machinery/firealarm{ dir = 1; @@ -70457,10 +70428,7 @@ pixel_x = 5; pixel_y = -6 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) "mmt" = ( @@ -76076,10 +76044,7 @@ /obj/item/clothing/shoes/orange, /obj/item/clothing/shoes/orange, /obj/effect/decal/cleanable/dirt, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /obj/item/crowbar/large, /obj/item/clothing/under/misc/pj/red, /obj/item/clothing/under/misc/pj/red, @@ -86589,10 +86554,7 @@ pixel_y = 2 }, /obj/item/clothing/gloves/boxing/yellow, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/aft) "ubz" = ( @@ -89370,10 +89332,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -91519,10 +91478,7 @@ /obj/item/clothing/glasses/science{ pixel_y = 3 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whiteyellow" @@ -129172,7 +129128,7 @@ mcM bZk bZk bZk -bZk +kAl bWa gKN tmX diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index a888266e0c1..7bb6314b234 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -8041,10 +8041,7 @@ /area/station/hallway/spacebridge/comeng) "aYw" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -9653,10 +9650,7 @@ dir = 4 }, /obj/item/kirbyplants/plant22, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel, /area/station/public/locker) "bgM" = ( @@ -14480,9 +14474,7 @@ /area/station/hallway/secondary/entry/north) "bDh" = ( /obj/structure/table/wood, -/obj/machinery/economy/vending/wallmed{ - pixel_y = 32 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /obj/structure/railing{ dir = 4 }, @@ -15071,10 +15063,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -23050,10 +23039,7 @@ /turf/simulated/floor/engine, /area/station/science/misc_lab) "cuX" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plasteel, /area/station/public/fitness) "cuZ" = ( @@ -25253,10 +25239,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel, /area/station/public/locker) "cIc" = ( @@ -53706,10 +53689,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkbrown" @@ -67460,10 +67440,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/south) "orW" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -72437,10 +72414,7 @@ /turf/simulated/floor/plasteel, /area/station/science/rnd) "pVi" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /obj/structure/disposalpipe/segment/corner{ dir = 4 }, @@ -77732,10 +77706,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /obj/structure/disposalpipe/junction{ dir = 4 }, @@ -79479,10 +79450,7 @@ }, /area/station/turret_protected/aisat/interior) "skm" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -86715,10 +86683,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "escape" diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index e2e7756bf0f..68ba045d3f4 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -68962,11 +68962,7 @@ pixel_x = -4; pixel_y = 5 }, -/obj/machinery/economy/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /obj/machinery/camera{ c_tag = "Chemistry South"; network = list("Medical","SS13") @@ -74862,10 +74858,7 @@ /turf/simulated/floor/engine/vacuum, /area/station/engineering/atmos) "jHq" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" @@ -83330,11 +83323,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "oGw" = ( -/obj/machinery/economy/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_y = -32 - }, +/obj/machinery/economy/vending/wallmed/directional/south, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ dir = 8; @@ -83984,11 +83973,7 @@ }, /area/station/security/brig) "oXz" = ( -/obj/machinery/economy/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /obj/machinery/camera{ c_tag = "Medbay South Hallway"; dir = 9; @@ -86926,10 +86911,7 @@ /area/station/public/toilet/lockerroom) "qTl" = ( /obj/machinery/disposal, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -88243,11 +88225,7 @@ /obj/structure/chair/sofa/bench{ dir = 8 }, -/obj/machinery/economy/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /obj/machinery/camera{ c_tag = "Medbay Entrance Hall"; dir = 8; @@ -93181,11 +93159,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/machinery/economy/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" @@ -98804,11 +98778,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "xFI" = ( -/obj/machinery/economy/vending/wallmed{ - layer = 3.3; - name = "Emergency NanoMed"; - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /obj/machinery/light{ dir = 4 }, diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 8aa0a6565a8..c50390ea6ca 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -2888,10 +2888,7 @@ }, /area/station/security/permabrig) "atS" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -18701,10 +18698,7 @@ /obj/machinery/photocopier/faxmachine{ department = "Chief Medical Officer's Office" }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /obj/machinery/light_switch{ name = "north bump"; pixel_y = 24 @@ -19714,10 +19708,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel, /area/station/engineering/control) "btT" = ( @@ -22457,10 +22448,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/hardsuitstorage) "bAZ" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plasteel, /area/station/supply/storage) "bBc" = ( @@ -25245,10 +25233,7 @@ /obj/machinery/light_construct{ dir = 1 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -47348,10 +47333,7 @@ }, /area/station/medical/exam_room) "eFH" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/south, /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" @@ -48742,10 +48724,7 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "fkN" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel, /area/station/security/permabrig) "fkW" = ( @@ -55173,10 +55152,7 @@ dir = 4 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/disposal) "hMS" = ( @@ -59353,10 +59329,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -61135,10 +61108,7 @@ id_tag = "Engineering"; name = "Engineering Security Doors" }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -72124,10 +72094,7 @@ icon_state = "map-right-MS"; pixel_y = 32 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" @@ -72144,10 +72111,7 @@ /turf/simulated/floor/plasteel, /area/station/security/brig) "oSr" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -72236,10 +72200,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft2) "oUI" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -84316,10 +84277,7 @@ }, /obj/item/reagent_containers/drinks/bottle/vodka, /obj/item/reagent_containers/drinks/cans/beer, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "tYX" = ( @@ -84454,10 +84412,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "ubN" = ( -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -88489,10 +88444,7 @@ /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/syringe, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_y = 28 - }, +/obj/machinery/economy/vending/wallmed/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "vQo" = ( @@ -90452,10 +90404,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/machinery/economy/vending/wallmed{ - name = "Emergency NanoMed"; - pixel_x = -28 - }, +/obj/machinery/economy/vending/wallmed/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" diff --git a/_maps/map_files/templates/shelter_1.dmm b/_maps/map_files/templates/shelter_1.dmm index ddea6f5b696..945dea67b55 100644 --- a/_maps/map_files/templates/shelter_1.dmm +++ b/_maps/map_files/templates/shelter_1.dmm @@ -28,9 +28,7 @@ /area/survivalpod) "g" = ( /obj/machinery/sleeper/survival_pod, -/obj/machinery/economy/vending/wallmed/survival_pod{ - pixel_x = -24 - }, +/obj/machinery/economy/vending/wallmed/survival_pod/directional/west, /turf/simulated/floor/pod, /area/survivalpod) "h" = ( diff --git a/_maps/map_files/templates/shelter_2.dmm b/_maps/map_files/templates/shelter_2.dmm index 0ea165cfb5e..86c7365cf34 100644 --- a/_maps/map_files/templates/shelter_2.dmm +++ b/_maps/map_files/templates/shelter_2.dmm @@ -37,9 +37,7 @@ /area/survivalpod) "i" = ( /obj/machinery/sleeper/survival_pod, -/obj/machinery/economy/vending/wallmed/survival_pod{ - pixel_x = -24 - }, +/obj/machinery/economy/vending/wallmed/survival_pod/directional/west, /turf/simulated/floor/pod, /area/survivalpod) "j" = ( diff --git a/code/game/machinery/vendors/contraband_vendors.dm b/code/game/machinery/vendors/contraband_vendors.dm index 3fc5db5bb5e..f549e9e010a 100644 --- a/code/game/machinery/vendors/contraband_vendors.dm +++ b/code/game/machinery/vendors/contraband_vendors.dm @@ -46,6 +46,8 @@ icon_lightmask = "cigs" products = list(/obj/item/storage/fancy/cigarettes/syndicate = 10, /obj/item/lighter/random = 5) +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed/syndicate, 32, 32) + /obj/machinery/economy/vending/syndisnack name = "\improper Getmore Chocolate Corp" desc = "A modified snack machine courtesy of the Getmore Chocolate Corporation, based out of Mars" diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index 7bd2df311eb..44c73b84db6 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -1290,6 +1290,8 @@ resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/wallmed +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed, 32, 32) + /obj/machinery/economy/vending/cart name = "\improper PTech" desc = "Cartridges for PDA's." diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index be98330ea47..4c4ad8a8e92 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -190,6 +190,8 @@ products = list(/obj/item/stack/medical/splint = 2) contraband = list() +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed/survival_pod, 32, 32) + //Computer /obj/item/gps/computer name = "pod computer" diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index 8c41c57685a..ab320482578 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/tools/UpdatePaths/Scripts/25809_wallmed_directionals.txt b/tools/UpdatePaths/Scripts/25809_wallmed_directionals.txt new file mode 100644 index 00000000000..de50bdcee9e --- /dev/null +++ b/tools/UpdatePaths/Scripts/25809_wallmed_directionals.txt @@ -0,0 +1,13 @@ +/obj/machinery/economy/vending/wallmed/survival_pod{pixel_x=-24} : /obj/machinery/economy/vending/wallmed/survival_pod/directional/west +/obj/machinery/economy/vending/wallmed/syndicate{pixel_x=-30} : /obj/machinery/economy/vending/wallmed/syndicate/directional/west +/obj/machinery/economy/vending/wallmed{layer=3.3;name="Emergency NanoMed";pixel_x=28} : /obj/machinery/economy/vending/wallmed/directional/east +/obj/machinery/economy/vending/wallmed{layer=3.3;name="Emergency NanoMed";pixel_y=-32} : /obj/machinery/economy/vending/wallmed/directional/south +/obj/machinery/economy/vending/wallmed{name="Emergency NanoMed";pixel_x=-28} : /obj/machinery/economy/vending/wallmed/directional/west +/obj/machinery/economy/vending/wallmed{name="Emergency NanoMed";pixel_x=28} : /obj/machinery/economy/vending/wallmed/directional/east +/obj/machinery/economy/vending/wallmed{name="Emergency NanoMed";pixel_x=5;pixel_y=-28} : /obj/machinery/economy/vending/wallmed/directional/south +/obj/machinery/economy/vending/wallmed{name="Emergency NanoMed";pixel_y=-28} : /obj/machinery/economy/vending/wallmed/directional/south +/obj/machinery/economy/vending/wallmed{name="Emergency NanoMed";pixel_y=28} : /obj/machinery/economy/vending/wallmed/directional/north +/obj/machinery/economy/vending/wallmed{name="Emergency NanoMed";pixel_y=30} : /obj/machinery/economy/vending/wallmed/directional/north +/obj/machinery/economy/vending/wallmed{name="Emergency NanoMed";pixel_y=32;power_state=0} : /obj/machinery/economy/vending/wallmed/directional/north{power_state=0} +/obj/machinery/economy/vending/wallmed{pixel_x=28} : /obj/machinery/economy/vending/wallmed/directional/east +/obj/machinery/economy/vending/wallmed{pixel_y=32} : /obj/machinery/economy/vending/wallmed/directional/north diff --git a/tools/maplint/lints/directional_wallmeds.yml b/tools/maplint/lints/directional_wallmeds.yml new file mode 100644 index 00000000000..03b1f2427f3 --- /dev/null +++ b/tools/maplint/lints/directional_wallmeds.yml @@ -0,0 +1,27 @@ +help: "Use the specific directional subtypes for this wallmed." +/obj/machinery/economy/vending/wallmed: + banned_variables: + - pixel_x + - pixel_y +=/obj/machinery/economy/vending/wallmed: + banned: true +=/obj/machinery/economy/vending/wallmed/directional: + banned: true + +/obj/machinery/economy/vending/wallmed/syndicate: + banned_variables: + - pixel_x + - pixel_y +=/obj/machinery/economy/vending/wallmed/syndicate: + banned: true +=/obj/machinery/economy/vending/wallmed/syndicate/directional: + banned: true + +/obj/machinery/economy/vending/wallmed/survival_pod: + banned_variables: + - pixel_x + - pixel_y +=/obj/machinery/economy/vending/wallmed/survival_pod: + banned: true +=/obj/machinery/economy/vending/wallmed/survival_pod/directional: + banned: true