Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 0136678

Browse files
authored
Makes defib wall mount standard on all stations (#22528)
* adding defib mounts * remove from cmo locker
1 parent e69fae0 commit 0136678

File tree

6 files changed

+114
-90
lines changed

6 files changed

+114
-90
lines changed

_maps/map_files/AsteroidStation/AsteroidStation.dmm

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46295,6 +46295,19 @@
4629546295
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
4629646296
/turf/open/floor/plasteel,
4629746297
/area/hallway/primary/central)
46298+
"nzB" = (
46299+
/obj/structure/window/reinforced{
46300+
dir = 8
46301+
},
46302+
/obj/machinery/stasis{
46303+
dir = 4
46304+
},
46305+
/obj/machinery/defibrillator_mount/loaded{
46306+
pixel_x = 0;
46307+
pixel_y = -31
46308+
},
46309+
/turf/open/floor/plasteel/dark,
46310+
/area/medical/sleeper)
4629846311
"nzK" = (
4629946312
/obj/machinery/ai/networking{
4630046313
label = "Subcontroller";
@@ -64932,15 +64945,6 @@
6493264945
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
6493364946
/turf/open/floor/plasteel,
6493464947
/area/security/prison)
64935-
"tcY" = (
64936-
/obj/structure/window/reinforced{
64937-
dir = 8
64938-
},
64939-
/obj/machinery/stasis{
64940-
dir = 4
64941-
},
64942-
/turf/open/floor/plasteel/dark,
64943-
/area/medical/sleeper)
6494464948
"tdc" = (
6494564949
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
6494664950
dir = 5
@@ -108337,7 +108341,7 @@ rWu
108337108341
brj
108338108342
ppp
108339108343
uYv
108340-
tcY
108344+
nzB
108341108345
wOY
108342108346
dmS
108343108347
ugr

_maps/map_files/DonutStation/DonutStation.dmm

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3426,9 +3426,9 @@
34263426
/area/space/nearstation)
34273427
"bnJ" = (
34283428
/obj/machinery/conveyor{
3429+
dir = 5;
34293430
id = "garbage";
3430-
name = " recycler conveyor belt";
3431-
dir = 5
3431+
name = " recycler conveyor belt"
34323432
},
34333433
/turf/open/floor/plasteel,
34343434
/area/maintenance/disposal)
@@ -7889,9 +7889,9 @@
78897889
},
78907890
/obj/effect/turf_decal/trimline/secred/filled/line/lower,
78917891
/obj/machinery/door/window/brigdoor/security/cell{
7892+
dir = 8;
78927893
id = "Cell 2";
7893-
name = "Cell 2";
7894-
dir = 8
7894+
name = "Cell 2"
78957895
},
78967896
/turf/open/floor/plasteel,
78977897
/area/security/brig)
@@ -9457,9 +9457,9 @@
94579457
},
94589458
/obj/effect/turf_decal/trimline/secred/filled/line/lower,
94599459
/obj/machinery/door/window/brigdoor/security/cell{
9460+
dir = 8;
94609461
id = "Cell 3";
9461-
name = "Cell 3";
9462-
dir = 8
9462+
name = "Cell 3"
94639463
},
94649464
/turf/open/floor/plasteel,
94659465
/area/security/brig)
@@ -12305,7 +12305,9 @@
1230512305
/obj/structure/cable{
1230612306
icon_state = "0-2"
1230712307
},
12308-
/obj/machinery/power/apc/auto_name/north,
12308+
/obj/machinery/power/apc/auto_name/north{
12309+
pixel_y = 23
12310+
},
1230912311
/turf/open/floor/plasteel,
1231012312
/area/engine/engine_smes)
1231112313
"eVV" = (
@@ -24130,9 +24132,9 @@
2413024132
/area/maintenance/fore)
2413124133
"jYA" = (
2413224134
/obj/machinery/conveyor{
24135+
dir = 4;
2413324136
id = "garbage";
24134-
name = " recycler conveyor belt";
24135-
dir = 4
24137+
name = " recycler conveyor belt"
2413624138
},
2413724139
/obj/machinery/door/firedoor/border_only{
2413824140
dir = 8
@@ -28282,8 +28284,8 @@
2828228284
/obj/structure/table/wood,
2828328285
/obj/item/taperecorder,
2828428286
/obj/item/storage/secure/safe{
28285-
pixel_y = -28;
28286-
pixel_x = 6
28287+
pixel_x = 6;
28288+
pixel_y = -28
2828728289
},
2828828290
/turf/open/floor/plasteel/grimy,
2828928291
/area/security/detectives_office)
@@ -34085,9 +34087,9 @@
3408534087
"oeo" = (
3408634088
/obj/machinery/recycler,
3408734089
/obj/machinery/conveyor{
34090+
dir = 4;
3408834091
id = "garbage";
34089-
name = " recycler conveyor belt";
34090-
dir = 4
34092+
name = " recycler conveyor belt"
3409134093
},
3409234094
/turf/open/floor/plasteel/burnt,
3409334095
/area/maintenance/disposal)
@@ -36442,8 +36444,8 @@
3644236444
layer = 2.9
3644336445
},
3644436446
/obj/machinery/door/window/eastleft{
36445-
name = "Mail";
36446-
dir = 2
36447+
dir = 2;
36448+
name = "Mail"
3644736449
},
3644836450
/turf/open/floor/plasteel,
3644936451
/area/quartermaster/sorting)
@@ -39928,9 +39930,9 @@
3992839930
/area/maintenance/port)
3992939931
"qBV" = (
3993039932
/obj/machinery/conveyor{
39933+
dir = 6;
3993139934
id = "garbage";
39932-
name = " recycler conveyor belt";
39933-
dir = 6
39935+
name = " recycler conveyor belt"
3993439936
},
3993539937
/turf/open/floor/plating,
3993639938
/area/maintenance/disposal)
@@ -46187,6 +46189,18 @@
4618746189
},
4618846190
/turf/open/floor/plasteel,
4618946191
/area/security/main)
46192+
"tmr" = (
46193+
/obj/machinery/stasis{
46194+
dir = 4
46195+
},
46196+
/obj/structure/window{
46197+
dir = 8
46198+
},
46199+
/obj/machinery/defibrillator_mount/loaded{
46200+
pixel_y = 25
46201+
},
46202+
/turf/open/floor/plasteel/dark,
46203+
/area/medical/sleeper)
4619046204
"tmx" = (
4619146205
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
4619246206
dir = 10
@@ -50139,15 +50153,6 @@
5013950153
"uRy" = (
5014050154
/turf/open/floor/carpet/black,
5014150155
/area/crew_quarters/bar)
50142-
"uRH" = (
50143-
/obj/machinery/stasis{
50144-
dir = 4
50145-
},
50146-
/obj/structure/window{
50147-
dir = 8
50148-
},
50149-
/turf/open/floor/plasteel/dark,
50150-
/area/medical/sleeper)
5015150156
"uSS" = (
5015250157
/obj/effect/landmark/stationroom/maint/tenxten,
5015350158
/turf/template_noop,
@@ -50427,7 +50432,9 @@
5042750432
/obj/structure/cable{
5042850433
icon_state = "0-4"
5042950434
},
50430-
/obj/machinery/power/apc/auto_name/north,
50435+
/obj/machinery/power/apc/auto_name/north{
50436+
pixel_y = 23
50437+
},
5043150438
/turf/open/floor/plasteel,
5043250439
/area/maintenance/disposal/incinerator)
5043350440
"uXD" = (
@@ -50577,9 +50584,9 @@
5057750584
},
5057850585
/obj/effect/turf_decal/trimline/secred/filled/line/lower,
5057950586
/obj/machinery/door/window/brigdoor/security/cell{
50587+
dir = 8;
5058050588
id = "Cell 1";
50581-
name = "Cell 1";
50582-
dir = 8
50589+
name = "Cell 1"
5058350590
},
5058450591
/turf/open/floor/plasteel,
5058550592
/area/security/brig)
@@ -83288,7 +83295,7 @@ pev
8328883295
gQw
8328983296
gAQ
8329083297
dAp
83291-
uRH
83298+
tmr
8329283299
uhX
8329383300
pMJ
8329483301
fJI

_maps/map_files/GaxStation/GaxStation.dmm

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3009,6 +3009,15 @@
30093009
/obj/effect/landmark/blobstart,
30103010
/turf/open/floor/plasteel,
30113011
/area/engine/atmos/distro)
3012+
"bxF" = (
3013+
/obj/machinery/stasis{
3014+
dir = 8
3015+
},
3016+
/obj/machinery/defibrillator_mount/loaded{
3017+
pixel_y = 25
3018+
},
3019+
/turf/open/floor/plasteel/dark,
3020+
/area/medical/sleeper)
30123021
"bxI" = (
30133022
/obj/machinery/requests_console{
30143023
announcementConsole = 1;
@@ -16024,8 +16033,8 @@
1602416033
/obj/structure/closet/secure_closet/brig,
1602516034
/obj/effect/turf_decal/trimline/secred/filled/line/lower,
1602616035
/obj/machinery/airalarm{
16027-
pixel_y = -24;
16028-
dir = 1
16036+
dir = 1;
16037+
pixel_y = -24
1602916038
},
1603016039
/turf/open/floor/plasteel,
1603116040
/area/security/prison)
@@ -34526,8 +34535,8 @@
3452634535
id = "chapelgun";
3452734536
name = "Mass Driver Controller";
3452834537
pixel_x = -24;
34529-
req_access = list("chapel_office");
34530-
pixel_y = -4
34538+
pixel_y = -4;
34539+
req_access = list("chapel_office")
3453134540
},
3453234541
/turf/open/floor/plating,
3453334542
/area/chapel/office)
@@ -41089,12 +41098,6 @@
4108941098
/obj/structure/grille,
4109041099
/turf/open/space/basic,
4109141100
/area/space/nearstation)
41092-
"tTF" = (
41093-
/obj/machinery/stasis{
41094-
dir = 8
41095-
},
41096-
/turf/open/floor/plasteel/dark,
41097-
/area/medical/sleeper)
4109841101
"tTT" = (
4109941102
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
4110041103
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -80528,7 +80531,7 @@ dog
8052880531
cqi
8052980532
gLV
8053080533
nXR
80531-
tTF
80534+
bxF
8053280535
klA
8053380536
gcJ
8053480537
rjs

0 commit comments

Comments
 (0)