use directional helpers for ATMs (#24426)

* use directional helpers for ATMs

* updatepaths script PR number

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
warriorstar-orion
2024-03-16 16:25:30 +00:00
committed by GitHub
co-authored by S34N
parent d01d3e4f02
commit 08f9a8129b
9 changed files with 135 additions and 186 deletions
+49 -63
View File
@@ -1038,9 +1038,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/east)
"ait" = (
/obj/machinery/economy/atm{
pixel_y = -32
},
/obj/machinery/economy/atm/directional/south,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -60021,9 +60019,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/obj/machinery/economy/atm{
pixel_x = 32
},
/obj/machinery/economy/atm/directional/east,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -64411,16 +64407,6 @@
/obj/item/crowbar/red,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/apmaint)
"dSB" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
},
/obj/machinery/atmospherics/portable/canister/air,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"dSD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -67200,9 +67186,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/hardsuitstorage)
"eEG" = (
/obj/machinery/economy/atm{
pixel_x = 32
},
/obj/machinery/economy/atm/directional/east,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
@@ -69068,9 +69052,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"fJp" = (
/obj/machinery/economy/atm{
pixel_y = 32
},
/obj/machinery/economy/atm/directional/north,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -71544,6 +71526,16 @@
},
/turf/simulated/floor/plating,
/area/station/command/office/rd)
"hli" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 8
},
/obj/machinery/atmospherics/portable/canister/air,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"hly" = (
/obj/structure/table/wood,
/turf/simulated/floor/plasteel/dark,
@@ -74289,10 +74281,12 @@
icon_state = "bar"
},
/area/station/service/kitchen)
"iVe" = (
/obj/effect/spawner/airlock,
/turf/simulated/wall,
/area/station/service/chapel/office)
"iVg" = (
/obj/machinery/economy/atm{
pixel_x = -32
},
/obj/machinery/economy/atm/directional/west,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -76136,15 +76130,6 @@
icon_state = "whiteblue"
},
/area/station/medical/storage)
"kdg" = (
/obj/structure/sign/vacuum{
pixel_x = -32
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"kdm" = (
/obj/machinery/power/apc/critical/directional/north,
/obj/machinery/firealarm{
@@ -76245,6 +76230,15 @@
},
/turf/simulated/floor/plasteel/dark,
/area/station/medical/morgue)
"kfC" = (
/obj/structure/sign/vacuum{
pixel_x = -32
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"kfT" = (
/obj/structure/cable{
d2 = 4;
@@ -77036,9 +77030,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/library)
"kGm" = (
/obj/machinery/economy/atm{
pixel_x = -32
},
/obj/machinery/economy/atm/directional/west,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -77686,9 +77678,7 @@
},
/area/station/service/hydroponics)
"lbc" = (
/obj/machinery/economy/atm{
pixel_x = -32
},
/obj/machinery/economy/atm/directional/west,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
@@ -91901,6 +91891,21 @@
},
/turf/simulated/floor/plasteel,
/area/station/science/research)
"tjT" = (
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
},
/obj/machinery/newscaster{
dir = 1;
name = "south bump";
pixel_y = -28
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"tkb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -92940,21 +92945,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/prison/cell_block)
"tSp" = (
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
},
/obj/machinery/newscaster{
dir = 1;
name = "south bump";
pixel_y = -28
},
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"tSt" = (
/obj/structure/table,
/obj/item/reagent_containers/drinks/drinkingglass{
@@ -93598,10 +93588,6 @@
icon_state = "darkred"
},
/area/station/security/processing)
"uil" = (
/obj/effect/spawner/airlock,
/turf/simulated/wall,
/area/station/service/chapel/office)
"uit" = (
/obj/machinery/atmospherics/unary/vent_pump{
dir = 4;
@@ -137312,7 +137298,7 @@ dIx
dIx
dIx
dIx
uil
iVe
abj
aaa
aaa
@@ -137823,7 +137809,7 @@ dPM
dkq
dSs
dSP
dSB
hli
dIH
dIH
dIH
@@ -138081,8 +138067,8 @@ dKo
dXJ
dKo
dUj
kdg
tSp
kfC
tjT
dIH
abj
aaa
+17 -29
View File
@@ -10309,9 +10309,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"aTi" = (
/obj/machinery/economy/atm{
pixel_y = -32
},
/obj/machinery/economy/atm/directional/south,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "redcorner"
@@ -24421,9 +24419,7 @@
c_tag = "Arrivals - Middle Arm";
dir = 1
},
/obj/machinery/economy/atm{
pixel_y = -32
},
/obj/machinery/economy/atm/directional/south,
/obj/effect/turf_decal/stripes/line,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/east)
@@ -42135,9 +42131,7 @@
},
/area/station/medical/surgery/secondary)
"cRq" = (
/obj/machinery/economy/atm{
pixel_y = 32
},
/obj/machinery/economy/atm/directional/north,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -67055,6 +67049,16 @@
icon_state = "whiteblue"
},
/area/station/security/permabrig)
"mgu" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
/area/station/science/toxins/launch)
"mgZ" = (
/obj/machinery/atmospherics/air_sensor{
autolink_id = "air_sensor";
@@ -68569,16 +68573,6 @@
icon_state = "greenblue"
},
/area/station/service/hydroponics)
"mQW" = (
/obj/effect/turf_decal/stripes/white/line{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
/area/station/science/toxins/launch)
"mRj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -73031,9 +73025,7 @@
},
/area/station/maintenance/asmaint)
"oPi" = (
/obj/machinery/economy/atm{
pixel_x = -32
},
/obj/machinery/economy/atm/directional/west,
/turf/simulated/floor/wood,
/area/station/public/mrchangs)
"oPO" = (
@@ -78974,9 +78966,7 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"rmg" = (
/obj/machinery/economy/atm{
pixel_y = -32
},
/obj/machinery/economy/atm/directional/south,
/obj/machinery/light,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -93428,9 +93418,7 @@
/area/station/service/chapel)
"xKg" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/economy/atm{
pixel_x = 32
},
/obj/machinery/economy/atm/directional/east,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -128756,7 +128744,7 @@ wtQ
jQZ
eGn
iXy
mQW
mgu
tQW
czx
naq
+42 -58
View File
@@ -26883,9 +26883,7 @@
"cPP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/economy/atm{
pixel_x = -32
},
/obj/machinery/economy/atm/directional/west,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -33915,9 +33913,7 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/economy/atm{
pixel_y = -32
},
/obj/machinery/economy/atm/directional/south,
/obj/structure/disposalpipe/segment{
dir = 4;
color = "#954535"
@@ -36276,6 +36272,27 @@
icon_state = "darkgreenfull"
},
/area/station/service/hydroponics)
"eua" = (
/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{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/economy/atm/directional/north,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "bluecorner"
},
/area/station/hallway/primary/fore/north)
"eul" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -43313,9 +43330,7 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/economy/atm{
pixel_y = 32
},
/obj/machinery/economy/atm/directional/north,
/obj/effect/spawner/random_spawners/dirt_often,
/turf/simulated/floor/plasteel{
dir = 4;
@@ -43964,14 +43979,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"hiN" = (
/obj/machinery/economy/atm{
pixel_y = -32
},
/turf/simulated/floor/plasteel{
icon_state = "arrival"
},
/area/station/hallway/secondary/entry/west)
"hiU" = (
/obj/structure/reagent_dispensers/water_cooler,
/turf/simulated/floor/plasteel{
@@ -54619,9 +54626,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/economy/atm{
pixel_y = -32
},
/obj/machinery/economy/atm/directional/south,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -54837,6 +54842,12 @@
},
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/fsmaint)
"kEV" = (
/obj/machinery/economy/atm/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "arrival"
},
/area/station/hallway/secondary/entry/west)
"kFj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -58619,15 +58630,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"lME" = (
/obj/machinery/economy/atm{
pixel_y = -32
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "yellowcorner"
},
/area/station/hallway/primary/central/north)
"lMW" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
@@ -63310,29 +63312,6 @@
icon_state = "whiteblue"
},
/area/station/medical/medbay)
"nqK" = (
/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{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/economy/atm{
pixel_y = 32
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "bluecorner"
},
/area/station/hallway/primary/fore/north)
"nqO" = (
/obj/machinery/atmospherics/unary/portables_connector{
dir = 4
@@ -75765,6 +75744,13 @@
icon_state = "whiteblue"
},
/area/station/medical/surgery/primary)
"rqJ" = (
/obj/machinery/economy/atm/directional/south,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "yellowcorner"
},
/area/station/hallway/primary/central/north)
"rrp" = (
/obj/machinery/shower{
pixel_y = 20
@@ -93069,9 +93055,7 @@
dir = 4;
color = "#954535"
},
/obj/machinery/economy/atm{
pixel_y = -32
},
/obj/machinery/economy/atm/directional/south,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purplecorner"
@@ -132406,7 +132390,7 @@ pKj
aYJ
eQQ
bgf
lME
rqJ
aYJ
bhQ
dcG
@@ -134688,7 +134672,7 @@ dGA
eDi
djn
dmA
nqK
eua
vuY
pwc
fXC
@@ -138140,7 +138124,7 @@ dbg
sFj
dbg
eWu
hiN
kEV
qHn
rNK
rNK
+11 -33
View File
@@ -18714,9 +18714,7 @@
dir = 4
},
/obj/machinery/light,
/obj/machinery/economy/atm{
pixel_y = -32
},
/obj/machinery/economy/atm/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -21815,9 +21813,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/ne)
"bnu" = (
/obj/machinery/economy/atm{
pixel_x = 32
},
/obj/machinery/economy/atm/directional/east,
/obj/machinery/camera{
c_tag = "Arrivals Hallway";
dir = 8
@@ -22881,9 +22877,7 @@
/turf/simulated/floor/wood,
/area/station/service/bar)
"bql" = (
/obj/machinery/economy/atm{
pixel_x = 32
},
/obj/machinery/economy/atm/directional/east,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/port/east)
"bqm" = (
@@ -25163,9 +25157,7 @@
/turf/simulated/floor/carpet,
/area/station/service/chapel)
"bxE" = (
/obj/machinery/economy/atm{
pixel_x = 32
},
/obj/machinery/economy/atm/directional/east,
/obj/item/kirbyplants,
/turf/simulated/floor/wood,
/area/station/service/bar)
@@ -25858,9 +25850,7 @@
/turf/simulated/floor/wood,
/area/station/public/vacant_office)
"bAn" = (
/obj/machinery/economy/atm{
pixel_y = 32
},
/obj/machinery/economy/atm/directional/north,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard/west)
"bAo" = (
@@ -26128,9 +26118,7 @@
},
/area/station/supply/sorting)
"bBq" = (
/obj/machinery/economy/atm{
pixel_x = -32
},
/obj/machinery/economy/atm/directional/west,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -27054,9 +27042,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard/east)
"bFo" = (
/obj/machinery/economy/atm{
pixel_y = 32
},
/obj/machinery/economy/atm/directional/north,
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -28436,9 +28422,7 @@
},
/area/station/medical/chemistry)
"bJP" = (
/obj/machinery/economy/atm{
pixel_y = -32
},
/obj/machinery/economy/atm/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "whitehall"
},
@@ -32421,9 +32405,7 @@
c_tag = "Cargo Bay Entrance";
dir = 4
},
/obj/machinery/economy/atm{
pixel_x = -32
},
/obj/machinery/economy/atm/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "browncorner"
@@ -33489,9 +33471,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
"ccn" = (
/obj/machinery/economy/atm{
pixel_y = 32
},
/obj/machinery/economy/atm/directional/north,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
"cco" = (
@@ -51622,9 +51602,7 @@
},
/area/station/turret_protected/ai)
"dnk" = (
/obj/machinery/economy/atm{
pixel_x = 32
},
/obj/machinery/economy/atm/directional/east,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/ne)
"dnl" = (
+1 -3
View File
@@ -5440,9 +5440,7 @@
/turf/simulated/floor/plasteel,
/area/centcom/evac)
"sq" = (
/obj/machinery/economy/atm{
pixel_y = 32
},
/obj/machinery/economy/atm/directional/north,
/obj/structure/chair/comfy/shuttle{
dir = 8
},
@@ -314,6 +314,8 @@
return
. += "<span class='warning'>Yellow ooze is dripping from the card slot!</span>"
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/atm, 30, 30)
#undef ATM_SCREEN_DEFAULT
#undef ATM_SCREEN_SECURITY
#undef ATM_SCREEN_TRANSFER
Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 34 KiB

@@ -0,0 +1,4 @@
/obj/machinery/economy/atm{pixel_x=-32} : /obj/machinery/economy/atm/directional/west
/obj/machinery/economy/atm{pixel_x=32} : /obj/machinery/economy/atm/directional/east
/obj/machinery/economy/atm{pixel_y=-32} : /obj/machinery/economy/atm/directional/south
/obj/machinery/economy/atm{pixel_y=32} : /obj/machinery/economy/atm/directional/north
+9
View File
@@ -0,0 +1,9 @@
help: "Use the directional subtypes for this ATM."
/obj/machinery/economy/atm:
banned_variables:
- pixel_x
- pixel_y
=/obj/machinery/economy/atm:
banned: true
=/obj/machinery/economy/atm/directional:
banned: true