diff --git a/html/changelogs/fix_atm_pos.yml b/html/changelogs/fix_atm_pos.yml new file mode 100644 index 00000000000..143661c54be --- /dev/null +++ b/html/changelogs/fix_atm_pos.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - bugfix: "Fixes ATM position in the bar." \ No newline at end of file diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index c822d39f05e..414c5d94d08 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -3665,11 +3665,11 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/wing/starboard) "cam" = ( -/obj/machinery/atm{ - pixel_x = 32 +/obj/machinery/orderterminal{ + pixel_y = -32 }, -/turf/simulated/wall, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/dark, +/area/crew_quarters/cafeteria) "can" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/effect/floor_decal/industrial/warning{ @@ -10843,6 +10843,9 @@ c_tag = "Dinner - Bar 1"; dir = 8 }, +/obj/machinery/atm{ + pixel_x = 32 + }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/cafeteria) "gBa" = ( @@ -15669,12 +15672,6 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_room) -"jzc" = ( -/obj/machinery/orderterminal{ - pixel_y = 32 - }, -/turf/simulated/wall, -/area/crew_quarters/kitchen) "jzq" = ( /obj/structure/table/standard, /obj/machinery/light{ @@ -60164,7 +60161,7 @@ due bsQ swH exU -cam +sKJ gul oUu pFr @@ -60981,7 +60978,7 @@ izV juS vfm bGg -juS +cam txq txq txq @@ -61176,7 +61173,7 @@ cMF eSd txq txq -jzc +pED xaF xtu nuZ