From 48ea020ed6b455c7ec71640d87965b013252d921 Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Sat, 8 Mar 2025 21:03:25 +0000 Subject: [PATCH] Adds more ATMs to all stations. All ATMs now have a floor marking to catch your eye and remind you they exist. (#28269) * MONEY! * Update cerestation.dmm * update based on code review * Update atm.dm --- _maps/map_files/stations/boxstation.dmm | 63 ++++- _maps/map_files/stations/cerestation.dmm | 249 +++++++++++------- _maps/map_files/stations/deltastation.dmm | 68 ++++- _maps/map_files/stations/emeraldstation.dmm | 110 ++++---- _maps/map_files/stations/metastation.dmm | 207 +++++++++------ code/modules/economy/economy_machinery/atm.dm | 2 + 6 files changed, 445 insertions(+), 254 deletions(-) diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index b90e2447b3f..29d5b80ad0b 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -11832,8 +11832,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/economy/atm/directional/north, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) @@ -22623,7 +22624,6 @@ /area/station/service/chapel) "bxE" = ( /obj/machinery/economy/atm/directional/east, -/obj/item/kirbyplants/large, /turf/simulated/floor/wood, /area/station/service/bar) "bxF" = ( @@ -42557,6 +42557,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/economy/atm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -60009,6 +60010,14 @@ }, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) +"jPg" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/economy/atm/directional/west, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "redcorner" + }, +/area/station/security/lobby) "jPk" = ( /obj/structure/cable{ icon_state = "0-2" @@ -60255,7 +60264,6 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/economy/atm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -61387,6 +61395,13 @@ /obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, /area/station/engineering/gravitygenerator) +"kyJ" = ( +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellowcorner" + }, +/area/station/hallway/primary/aft/south) "kzB" = ( /obj/effect/spawner/random/food_or_drink/three_course_meal, /obj/structure/closet/crate/freezer, @@ -73432,6 +73447,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/station/maintenance/aft) +"qEe" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry/north) "qEt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 5 @@ -73653,8 +73674,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) @@ -74948,6 +74969,10 @@ icon_state = "dark" }, /area/station/telecomms/chamber) +"rsw" = ( +/obj/item/kirbyplants/large, +/turf/simulated/floor/wood, +/area/station/service/bar) "rsz" = ( /obj/structure/cable{ icon_state = "1-2" @@ -82776,6 +82801,15 @@ icon_state = "bluecorner" }, /area/station/hallway/secondary/exit) +"vKU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/secondary/entry/north) "vLb" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -85601,6 +85635,11 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/assembly_line) +"xnt" = ( +/obj/effect/spawner/random/blood/often, +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/wood, +/area/station/maintenance/apmaint2) "xnF" = ( /obj/structure/cable{ icon_state = "1-2" @@ -97640,7 +97679,7 @@ aJP aRm aOR aQa -keI +qEe aMD fay fay @@ -98668,7 +98707,7 @@ aJR aRV aOR aQa -aPQ +vKU aRd nff aUm @@ -110036,7 +110075,7 @@ gwb uWp tGO cgQ -jQI +xnt xRm lnh kym @@ -115947,7 +115986,7 @@ cBp cAL cDY cvx -dpR +kyJ mqV ePP ePP @@ -116386,7 +116425,7 @@ avd axD axA ayj -ayj +jPg azP aBY aCv @@ -124132,7 +124171,7 @@ bqk bqk bqk bAV -bmq +rsw aUS bAo bHy diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 82a8cda2831..c13145a9eaf 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -4886,21 +4886,6 @@ icon_state = "redcorner" }, /area/station/security/lobby) -"aQe" = ( -/obj/structure/disposalpipe/segment{ - color = "#954535" - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/economy/atm/directional/west, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/station/hallway/primary/fore/east) "aQh" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -6580,6 +6565,7 @@ c_tag = "Supply Lobby"; dir = 8 }, +/obj/machinery/economy/atm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "browncorner"; dir = 4 @@ -7216,6 +7202,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/economy/atm/directional/north, /turf/simulated/floor/plasteel, /area/station/public/locker) "bhy" = ( @@ -19453,6 +19440,22 @@ icon_state = "dark" }, /area/station/security/brig) +"cHK" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Walkway" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id_tag = "medlockdown"; + layer = 2.6; + name = "Medical Lockdown" + }, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/station/hallway/spacebridge/dockmed) "cHL" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -29031,10 +29034,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/extinguisher_cabinet{ - name = "north bump"; - pixel_y = 30 - }, +/obj/machinery/economy/atm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "purple" @@ -31406,6 +31406,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/economy/atm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -35329,6 +35330,11 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plating, /area/station/hallway/primary/fore/north) +"fXv" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard) "fXz" = ( /obj/effect/spawner/random/dirt/often, /obj/structure/extinguisher_cabinet{ @@ -36655,6 +36661,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/extinguisher_cabinet{ + name = "north bump"; + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "purplecorner" @@ -41225,6 +41235,14 @@ icon_state = "whitepurple" }, /area/station/science/toxins/mixing) +"hAz" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/engine{ + slowdown = -0.3 + }, +/area/station/hallway/spacebridge/dockmed) "hAA" = ( /obj/structure/table/wood, /obj/item/ashtray/bronze, @@ -47407,6 +47425,18 @@ icon_state = "darkredfull" }, /area/station/medical/morgue) +"iVq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/economy/atm/directional/east, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "redcorner" + }, +/area/station/security/lobby) "iVv" = ( /obj/structure/chair/stool{ dir = 1 @@ -48166,6 +48196,24 @@ icon_state = "dark" }, /area/station/hallway/primary/starboard/south) +"jer" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Walkway" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id_tag = "medlockdown"; + layer = 2.6; + name = "Medical Lockdown" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/station/hallway/spacebridge/dockmed) "jeu" = ( /obj/machinery/hologram/holopad, /obj/structure/cable/orange{ @@ -49582,22 +49630,6 @@ }, /turf/simulated/floor/plating/asteroid/ancient, /area/station/maintenance/maintcentral) -"juZ" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Walkway" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "medlockdown"; - layer = 2.6; - name = "Medical Lockdown" - }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/station/hallway/spacebridge/dockmed) "jvd" = ( /obj/effect/spawner/random/dirt/frequent, /turf/simulated/floor/plasteel{ @@ -50455,6 +50487,10 @@ /area/station/hallway/secondary/exit) "jDq" = ( /obj/item/flag/nt, +/obj/item/radio/intercom{ + name = "west bump"; + pixel_x = -28 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "blue" @@ -51136,11 +51172,6 @@ icon_state = "redcorner" }, /area/station/hallway/primary/fore/west) -"jKO" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/station/maintenance/starboard) "jKQ" = ( /obj/machinery/light/small{ dir = 4 @@ -55293,6 +55324,10 @@ icon_state = "bcircuit" }, /area/station/command/vault) +"kJa" = ( +/obj/machinery/economy/atm/directional/west, +/turf/simulated/floor/wood, +/area/station/maintenance/gambling_den) "kJb" = ( /obj/structure/disposalpipe/segment{ color = "#954535" @@ -61316,6 +61351,19 @@ }, /turf/simulated/floor/plating, /area/station/hallway/primary/central/west) +"mcc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/port/south) "mck" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -65070,10 +65118,7 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior) "nbh" = ( -/obj/item/radio/intercom{ - name = "west bump"; - pixel_x = -28 - }, +/obj/machinery/economy/atm/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "blue" @@ -81167,6 +81212,21 @@ icon_state = "darkpurple" }, /area/station/science/robotics) +"qWT" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Walkway" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/preopen{ + id_tag = "medlockdown"; + layer = 2.6; + name = "Medical Lockdown" + }, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/hallway/spacebridge/dockmed) "qWZ" = ( /obj/machinery/bodyscanner{ dir = 4 @@ -81763,14 +81823,6 @@ icon_state = "asteroidplating" }, /area/station/maintenance/apmaint) -"rez" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/engine{ - slowdown = -0.3 - }, -/area/station/hallway/spacebridge/dockmed) "reB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating{ @@ -84251,6 +84303,25 @@ icon_state = "red" }, /area/station/security/range) +"rNj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/fore/west) "rNm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -88734,6 +88805,7 @@ /obj/effect/turf_decal/woodsiding{ dir = 5 }, +/obj/machinery/economy/atm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -91308,7 +91380,6 @@ dir = 4; color = "#954535" }, -/obj/machinery/economy/atm/directional/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -91835,6 +91906,22 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/starboard/south) +"tBx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "escape" + }, +/area/station/hallway/secondary/entry/east) "tBG" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, @@ -97241,21 +97328,6 @@ icon_state = "asteroidplating" }, /area/station/maintenance/apmaint) -"uPR" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Walkway" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "medlockdown"; - layer = 2.6; - name = "Medical Lockdown" - }, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/hallway/spacebridge/dockmed) "uPU" = ( /obj/effect/spawner/random/dirt/often, /turf/simulated/floor/plasteel{ @@ -105499,7 +105571,6 @@ dir = 4; color = "#954535" }, -/obj/machinery/economy/atm/directional/south, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" @@ -110225,24 +110296,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/port) -"xUV" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Walkway" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "medlockdown"; - layer = 2.6; - name = "Medical Lockdown" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/turf_decal/delivery, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/station/hallway/spacebridge/dockmed) "xUW" = ( /obj/machinery/computer/shuttle/labor{ dir = 4 @@ -128780,7 +128833,7 @@ avf aGB qyA qyA -qyA +iVq qyA crz jKZ @@ -128843,7 +128896,7 @@ nCV aZZ aZZ aZZ -mlY +mcc abh gTt cxo @@ -134001,7 +134054,7 @@ sbn sbn oTL qDR -dgP +kJa gLG bRd doZ @@ -136492,7 +136545,7 @@ wvr kop bvz wvr -dtd +rNj chV iEe dzk @@ -156349,7 +156402,7 @@ ooM bmR wDU oXl -xUV +jer lVF nos ksp @@ -156606,11 +156659,11 @@ bvt bvt bvt qkV -uPR +qWT oEj bio bio -rez +hAz bio oiB bio @@ -156863,7 +156916,7 @@ fXz hCz npl jLn -juZ +cHK lAC xwI xwI @@ -157932,7 +157985,7 @@ nlJ tJP kQz nFW -daX +tBx djw fEC xMQ @@ -159385,7 +159438,7 @@ ujB ujB ujB cqp -aQe +cqp cqp gjc fXO @@ -170970,7 +171023,7 @@ lCC hnV tqi tqi -jKO +fXv eKJ wyL iJv diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index ec7b81aecd1..165603ab65d 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -1046,19 +1046,16 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/economy/atm/directional/north, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" }, /area/station/hallway/secondary/entry/south) "aip" = ( -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, -/obj/effect/turf_decal/delivery/hollow, -/obj/structure/closet/emcloset, /obj/structure/sign/vacuum/external{ pixel_x = -32 }, +/obj/machinery/economy/atm/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "arrival" @@ -2079,6 +2076,13 @@ icon_state = "red" }, /area/station/maintenance/fore2) +"aoz" = ( +/obj/machinery/economy/atm/directional/east, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "yellowcorner" + }, +/area/station/hallway/primary/port/north) "aoA" = ( /obj/item/kirbyplants/large, /turf/simulated/floor/plasteel{ @@ -62797,9 +62801,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/status_display{ - pixel_x = -32 - }, /turf/simulated/floor/plasteel/white/side{ dir = 4 }, @@ -63907,6 +63908,13 @@ /obj/machinery/newscaster/directional/north, /turf/simulated/floor/plasteel/grimy, /area/station/public/vacant_office) +"ims" = ( +/obj/machinery/economy/atm/directional/west, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, +/area/station/science/lobby) "imG" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop{ @@ -64641,6 +64649,10 @@ dir = 8 }, /obj/effect/landmark/start/paramedic, +/obj/machinery/status_display{ + layer = 4; + pixel_x = 32 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" @@ -67044,6 +67056,16 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/fore/south) +"kdT" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/central) "kej" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/hatch{ @@ -67217,6 +67239,13 @@ /obj/item/mounted/frame/apc_frame, /turf/simulated/floor/wood, /area/station/maintenance/library) +"khT" = ( +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "redcorner" + }, +/area/station/hallway/primary/starboard/east) "khY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -72914,6 +72943,10 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) +"nrA" = ( +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/plasteel/dark, +/area/station/maintenance/abandonedbar) "nsl" = ( /obj/machinery/clonepod, /turf/simulated/floor/plasteel{ @@ -82680,6 +82713,13 @@ }, /turf/simulated/floor/plating, /area/station/medical/coldroom) +"sDM" = ( +/obj/machinery/economy/atm/directional/east, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitebluecorner" + }, +/area/station/medical/reception) "sDN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -117384,7 +117424,7 @@ sEA cXS drn irt -yeh +nrA dfU dcT deD @@ -122739,7 +122779,7 @@ bGR brV brV brV -brV +aoz bQw brV bUC @@ -129198,7 +129238,7 @@ cIW cKw cMd msD -mxh +ims tQM cSm cZt @@ -132518,7 +132558,7 @@ drp bYv mTf bYv -clS +kdT tmq tmq cqo @@ -136906,7 +136946,7 @@ ckv cHN ppu cKX -nCu +sDM cNW vXU qqT @@ -144072,7 +144112,7 @@ vOc hhU vOc vOc -bAN +khT bVq sUE pYm diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 53e41aa5b64..695084723fb 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -6675,7 +6675,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/economy/atm/directional/east, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -8715,12 +8714,6 @@ icon_state = "darkbluecorners" }, /area/station/medical/surgery/observation) -"bKv" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel, -/area/station/supply/lobby) "bKz" = ( /turf/simulated/floor/plasteel{ icon_state = "bluecorner" @@ -11352,7 +11345,6 @@ /obj/structure/chair/sofa/right{ dir = 4 }, -/obj/machinery/economy/atm/directional/south, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "blue" @@ -13010,6 +13002,13 @@ /obj/effect/turf_decal/box, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) +"cCX" = ( +/obj/machinery/economy/atm/directional/east, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "purplecorner" + }, +/area/station/hallway/primary/starboard/south) "cDa" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/drip, @@ -18132,11 +18131,7 @@ }, /area/station/medical/morgue) "dEs" = ( -/obj/effect/turf_decal/delivery/hollow, -/obj/machinery/power/apc/directional/north, -/obj/structure/cable{ - icon_state = "0-2" - }, +/obj/machinery/economy/atm/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "browncorner" @@ -46886,13 +46881,6 @@ "jnP" = ( /turf/space, /area/space) -"jnV" = ( -/obj/machinery/economy/atm/directional/west, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "purplecorner" - }, -/area/station/hallway/primary/starboard/south) "jnX" = ( /obj/effect/decal/cleanable/generic, /obj/effect/decal/cleanable/dirt, @@ -49851,7 +49839,10 @@ /obj/machinery/computer/supplycomp/public{ dir = 4 }, -/obj/machinery/economy/atm/directional/west, +/obj/machinery/power/apc/directional/west, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "browncorner" @@ -51584,6 +51575,9 @@ /area/station/hallway/primary/central/sw) "kjM" = ( /obj/structure/table, +/obj/machinery/status_display{ + pixel_x = -32 + }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -58242,6 +58236,12 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/asteroid_filtering) +"lCc" = ( +/obj/machinery/economy/atm/directional/east, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/central/ne) "lCl" = ( /obj/structure/cable{ icon_state = "2-4" @@ -61803,12 +61803,6 @@ }, /turf/simulated/floor/engine, /area/station/engineering/engine) -"mqU" = ( -/obj/effect/turf_decal/siding{ - dir = 5 - }, -/turf/simulated/floor/engine, -/area/station/hallway/spacebridge/security/west) "mqW" = ( /obj/structure/table, /obj/machinery/firealarm/directional/south, @@ -63891,9 +63885,7 @@ }, /area/station/engineering/atmos/transit) "mOO" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, +/obj/machinery/economy/atm/directional/north, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkredcorners" @@ -68122,6 +68114,13 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) +"nEV" = ( +/obj/effect/turf_decal/siding{ + dir = 5 + }, +/obj/machinery/economy/atm/directional/west, +/turf/simulated/floor/engine, +/area/station/hallway/spacebridge/security/west) "nFi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 5 @@ -82551,6 +82550,10 @@ icon_state = "freezerfloor" }, /area/station/medical/cloning) +"qvu" = ( +/obj/machinery/economy/atm/directional/west, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/central/se) "qvB" = ( /obj/structure/cable{ icon_state = "2-8" @@ -89464,7 +89467,7 @@ /obj/item/trash/spentcasing/shotgun, /obj/effect/decal/cleanable/dirt, /obj/machinery/economy/atm/directional/west, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/station/maintenance/dorms/starboard) "rMy" = ( /obj/machinery/door/airlock/maintenance, @@ -93431,6 +93434,15 @@ icon_state = "neutralfull" }, /area/station/engineering/atmos/asteroid_filtering) +"szY" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/economy/atm/directional/east, +/turf/simulated/floor/plasteel{ + icon_state = "bluecorner" + }, +/area/station/hallway/primary/fore) "szZ" = ( /obj/effect/decal/cleanable/glass, /obj/item/shard, @@ -98272,7 +98284,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/economy/atm/directional/west, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "twC" = ( @@ -104034,6 +104045,10 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/storage) +"uFt" = ( +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/wood, +/area/station/service/bar) "uFx" = ( /obj/effect/landmark/start/shaft_miner, /turf/simulated/floor/plasteel, @@ -119967,14 +119982,11 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "xQw" = ( -/obj/structure/sign/securearea{ - pixel_x = 32 - }, /obj/machinery/camera{ c_tag = "Research Lobby"; - network = list("Research","SS13"); - dir = 9 + network = list("Research","SS13") }, +/obj/machinery/economy/atm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -144042,7 +144054,7 @@ lNK gWF qMn vdk -rGN +qTV nTr ipp ipp @@ -144299,7 +144311,7 @@ vTd bCW nua iqc -rGN +qTV mMw xVa afT @@ -144556,7 +144568,7 @@ hTl hTl hTl dEs -bKv +qTV rGN atV jwC @@ -154244,7 +154256,7 @@ mJS rpF jPn tap -rmE +szY rmE oQM qxy @@ -155064,7 +155076,7 @@ iuw iUr ijH icD -nXh +tjs gcl iUr nXh @@ -155075,7 +155087,7 @@ nXh nXh iUr gYS -tjs +nXh nXh gch rxd @@ -156893,7 +156905,7 @@ iTl uqq aFa vKF -gBS +uFt gBS gBS wEZ @@ -160208,8 +160220,8 @@ twu jOu icb dbu +qvu adx -jOu dZF xfI jOu @@ -160682,7 +160694,7 @@ kAe mZE nXu brq -uBv +lCc bwi uBv nOk @@ -163483,7 +163495,7 @@ pvz pGB ebB jwm -mqU +nEV ouc iNH ouc @@ -163577,7 +163589,7 @@ eJB iWE wWr lAs -jnV +lAs ern aqy hiT @@ -164080,7 +164092,7 @@ xyC eDy iWE muy -muy +cCX pJV giM pcZ diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 7e13d21a0c0..91e42a9ae77 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -6251,6 +6251,21 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/north) +"aJf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/fore/north) "aJh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -8933,13 +8948,6 @@ /obj/item/kirbyplants/large/alien/alien6, /turf/simulated/floor/plating, /area/station/maintenance/fore) -"aTi" = ( -/obj/machinery/economy/atm/directional/south, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redcorner" - }, -/area/station/hallway/primary/fore/north) "aTm" = ( /obj/machinery/firealarm/directional/west, /obj/structure/table, @@ -9748,6 +9756,13 @@ icon_state = "neutralcorner" }, /area/station/public/locker) +"aVM" = ( +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, +/area/station/science/lobby) "aVT" = ( /obj/structure/table, /obj/item/clothing/head/soft{ @@ -11168,6 +11183,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/machinery/economy/atm/directional/north, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/north) "baZ" = ( @@ -13862,7 +13878,7 @@ /obj/machinery/flasher{ id = "hopflash"; pixel_x = 26; - pixel_y = -26 + pixel_y = 19 }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/bridge) @@ -13875,19 +13891,6 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) -"biS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/bar, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/station/hallway/primary/fore/east) "biU" = ( /obj/machinery/ai_slipper, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17327,6 +17330,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/economy/atm/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -20314,7 +20318,7 @@ id = "hopqueue"; name = "Queue Shutters Control"; pixel_x = -6; - pixel_y = -35; + pixel_y = -33; req_access = list(28) }, /obj/machinery/door_control{ @@ -20345,7 +20349,7 @@ dir = 1; name = "custom placement"; pixel_x = 6; - pixel_y = -34 + pixel_y = -33 }, /turf/simulated/floor/wood, /area/station/command/office/hop) @@ -21084,7 +21088,6 @@ c_tag = "Arrivals - Middle Arm"; dir = 1 }, -/obj/machinery/economy/atm/directional/south, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) @@ -27561,10 +27564,8 @@ }, /area/station/service/chapel/office) "ceV" = ( -/obj/structure/sign/poster/contraband/random{ - pixel_y = 32 - }, /obj/effect/decal/cleanable/insectguts, +/obj/machinery/economy/atm/directional/north, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) "ceW" = ( @@ -27959,7 +27960,6 @@ }, /area/station/service/library) "cgu" = ( -/obj/structure/chair, /obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 5; @@ -36658,13 +36658,6 @@ icon_state = "darkblue" }, /area/station/medical/surgery/secondary) -"cRq" = ( -/obj/machinery/economy/atm/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/secondary/exit) "cRt" = ( /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) @@ -37767,6 +37760,10 @@ icon_state = "dark" }, /area/station/service/chapel) +"cWA" = ( +/obj/machinery/economy/atm/directional/south, +/turf/simulated/floor/wood, +/area/station/service/bar) "cWB" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -41359,6 +41356,13 @@ /obj/effect/spawner/random/blood/often, /turf/simulated/floor/plating, /area/station/maintenance/aft2) +"dYe" = ( +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/port/east) "dYi" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/visible/yellow, @@ -41578,6 +41582,12 @@ /obj/effect/spawner/random/cobweb/left/rare, /turf/simulated/floor/plating, /area/station/maintenance/aft2) +"ecw" = ( +/obj/machinery/economy/atm/directional/east, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/aft/south) "edg" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, @@ -43456,7 +43466,7 @@ /area/station/medical/surgery/observation) "eVn" = ( /obj/machinery/alarm/directional/west, -/obj/structure/reagent_dispensers/water_cooler, +/obj/machinery/economy/atm/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -50665,6 +50675,12 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/south) +"ibV" = ( +/obj/machinery/economy/atm/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/station/public/locker) "icm" = ( /turf/simulated/floor/plasteel{ dir = 10; @@ -51842,6 +51858,13 @@ "iBR" = ( /turf/simulated/wall/r_wall, /area/station/security/storage) +"iCa" = ( +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "cautioncorner" + }, +/area/station/hallway/primary/starboard/east) "iCJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -52346,21 +52369,6 @@ /obj/item/clothing/glasses/science, /turf/simulated/floor/plasteel, /area/station/science/xenobiology) -"iPQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/fore/north) "iPT" = ( /obj/machinery/light/small{ dir = 8 @@ -58723,12 +58731,6 @@ /obj/item/clothing/gloves/color/white, /turf/simulated/floor/plating, /area/station/maintenance/fore) -"lHY" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/station/science/lobby) "lHZ" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -69164,6 +69166,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "browncorner" @@ -71321,7 +71324,6 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "rmg" = ( -/obj/machinery/economy/atm/directional/south, /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -72514,6 +72516,13 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/station/maintenance/aft2) +"rKT" = ( +/obj/machinery/economy/atm/directional/west, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/central/se) "rKV" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -74137,6 +74146,13 @@ icon_state = "whiteblue" }, /area/station/medical/storage) +"syT" = ( +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "red" + }, +/area/station/hallway/primary/fore/north) "szn" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -76640,6 +76656,22 @@ }, /turf/space, /area/space/nearstation) +"tFD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/economy/atm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/station/hallway/secondary/bridge) "tGP" = ( /obj/structure/cable{ icon_state = "4-8" @@ -78491,6 +78523,19 @@ icon_state = "dark" }, /area/station/security/armory/secure) +"uCa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/turf_decal/tile/bar, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/fore/east) "uCe" = ( /turf/simulated/wall/r_wall, /area/station/science/testrange) @@ -83697,10 +83742,6 @@ }, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) -"xaA" = ( -/obj/machinery/firealarm/directional/west, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/fore/east) "xaD" = ( /obj/structure/sign/vacuum/external{ pixel_y = -32 @@ -85979,6 +86020,10 @@ }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) +"xYE" = ( +/obj/machinery/economy/atm/directional/west, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/fore/east) "xYR" = ( /obj/structure/sign/poster/official/random{ pixel_x = 32 @@ -106152,7 +106197,7 @@ boh boh fjl bfw -btv +dYe sLH lMU bzM @@ -108192,9 +108237,9 @@ oWO kPB bgk qpH -xaA -aYj aUw +aYj +xYE nGC nGC dEG @@ -108449,9 +108494,9 @@ hjr oOt jfb oHu -aKj +uCa xNu -biS +aKj aWu lid lOd @@ -111315,7 +111360,7 @@ can jdP kmz cfi -chE +coo eVn xxa fqX @@ -111557,7 +111602,7 @@ bCb bqc bLR bFI -bJs +tFD bKT bMW bPp @@ -112296,7 +112341,7 @@ ioy tmZ huV aHM -iPQ +aJf aNJ lIM qqG @@ -112552,9 +112597,9 @@ nvB pNO dig lXV -aHM +syT aJh -aTi +pRQ lIM nVo iCR @@ -113410,7 +113455,7 @@ bZU cqh bZU cVk -cRq +cQM cRx cRt cRt @@ -114173,7 +114218,7 @@ cKx khl bAt mGK -lHZ +ecw lHZ eaG cxl @@ -115942,7 +115987,7 @@ jdP bcX cee cHM -lHY +cgE wey cjM cUE @@ -116455,8 +116500,8 @@ caN jdP bdb cei -cHM -cgE +rNC +aVM ily cLY oFw @@ -118500,7 +118545,7 @@ bcN byg cfr bQF -xki +rKT bSW bTW bVn @@ -120274,7 +120319,7 @@ aTo spj aTo aTo -aYK +ibV aLl niC eTo @@ -121837,7 +121882,7 @@ sqp sqp sqp ueC -bEv +cWA bQI soT tRb @@ -126451,7 +126496,7 @@ cfd bhU bjH bam -dSN +iCa bsY mGk bHN diff --git a/code/modules/economy/economy_machinery/atm.dm b/code/modules/economy/economy_machinery/atm.dm index c21ed777258..511c1b79191 100644 --- a/code/modules/economy/economy_machinery/atm.dm +++ b/code/modules/economy/economy_machinery/atm.dm @@ -33,6 +33,8 @@ /obj/machinery/economy/atm/Initialize(mapload) . = ..() update_icon() + if(mapload) + new /obj/effect/turf_decal/delivery/green/hollow(loc) /obj/machinery/economy/atm/update_icon_state() . = ..()