Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Medbay door access buttons repair #12840

Merged
merged 7 commits into from
Feb 17, 2024
Merged

Medbay door access buttons repair #12840

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8683789
box med
Deahaka Feb 13, 2024
0e812d5
prometheus revert
Deahaka Feb 13, 2024
e9bb7f5
gamma fikisixik
Deahaka Feb 13, 2024
e1bd1a0
cabel gamma
Deahaka Feb 13, 2024
4d3c1f8
delta sideways
Deahaka Feb 13, 2024
44676a1
delta additions
Deahaka Feb 13, 2024
950bcfa
rework all to helpers
Deahaka Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions maps/boxstation/boxstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72207,21 +72207,12 @@
dir = 4
},
/obj/effect/landmark/start/paramedic,
/obj/machinery/door_control{
desc = "A remote control switch for the medbay foyer.";
id = "MedbayFoyerOut";
name = "Medbay Doors Control";
pixel_x = 26;
pixel_y = -1;
req_access = list(5)
},
/obj/machinery/door_control{
desc = "A remote control switch for the medbay foyer.";
id = "MedbayFoyerIn";
name = "Medbay Doors Control";
pixel_x = 26;
pixel_y = 12;
req_access = list(5)
pixel_y = 12
},
/turf/simulated/floor{
dir = 4;
Expand Down
95 changes: 49 additions & 46 deletions maps/delta/delta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,11 +1167,8 @@
},
/area/station/security/checkpoint/escape)
"abQ" = (
/obj/machinery/door_control{
desc = "A remote control switch for the medbay foyer.";
id = "MedbayFoyerOut";
name = "Medbay Doors Control";
pixel_y = -26
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
/turf/simulated/floor{
dir = 6;
Expand Down Expand Up @@ -1967,6 +1964,16 @@
/obj/item/clothing/mask/bandana/skull,
/turf/simulated/floor,
/area/station/cargo/storage)
"adh" = (
/obj/machinery/alarm{
pixel_x = 29;
pixel_y = -6
},
/turf/simulated/floor{
dir = 4;
icon_state = "whitebluecorner"
},
/area/station/medical/hallway)
"adi" = (
/obj/structure/closet/l3closet/scientist,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -2374,12 +2381,6 @@
/obj/machinery/door/firedoor{
dir = 4
},
/obj/machinery/door/airlock/medical/glass{
dir = 4;
id_tag = "MedbayFoyerOut";
name = "Medbay";
req_one_access = list(2,5)
},
/obj/machinery/door/poddoor{
density = 0;
dir = 4;
Expand All @@ -2388,6 +2389,13 @@
name = "Medbay Biohazard Blast Doors";
opacity = 0
},
/obj/machinery/door/airlock/medical/glass{
dir = 4;
id_tag = "MedbayFoyerOut";
name = "Medbay";
req_one_access = list(2,5);
unres_sides = 8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Я для кого делал мап хелперы? Они же позволяют и не рыться в переменных мап редактора, и видеть прямо на карте.
/obj/effect/unrestricted_side/north

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Если б ты не написал, я бы никогда и не узнал что это существует. Добавлю на палитру

},
/turf/simulated/floor{
icon_state = "bluechoco"
},
Expand Down Expand Up @@ -2951,12 +2959,6 @@
/obj/machinery/door/firedoor{
dir = 4
},
/obj/machinery/door/airlock/medical/glass{
dir = 4;
id_tag = "med_second_ex";
name = "Medbay Side Entrance";
req_access = list(5)
},
/obj/structure/disposalpipe/segment{
dir = 4
},
Expand All @@ -2968,6 +2970,13 @@
name = "Medbay Biohazard Blast Doors";
opacity = 0
},
/obj/machinery/door/airlock/medical/glass{
dir = 4;
id_tag = "med_second_ex";
name = "Medbay Side Entrance";
req_access = list(5);
unres_sides = 8
},
/turf/simulated/floor{
icon_state = "neutralchoco"
},
Expand Down Expand Up @@ -24828,9 +24837,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/light/small{
dir = 1
},
/turf/simulated/floor{
dir = 9;
icon_state = "whiteblue"
Expand Down Expand Up @@ -45011,8 +45017,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/extinguisher_cabinet{
pixel_y = 29
/obj/machinery/computer/guestpass{
dir = 1;
pixel_y = 28
},
/turf/simulated/floor{
dir = 5;
Expand Down Expand Up @@ -47235,17 +47242,18 @@
/area/station/hallway/primary/central)
"jBX" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
name = "Medbay Treatment Center";
req_access = list(5)
},
/obj/machinery/door/poddoor{
density = 0;
icon_state = "pdoor0";
id = "medbay_biohazard";
name = "Medbay Biohazard Blast Doors";
opacity = 0
},
/obj/machinery/door/airlock/medical/glass{
name = "Medbay Treatment Center";
req_access = list(5);
unres_sides = 2
},
/turf/simulated/floor{
icon_state = "bluechoco"
},
Expand Down Expand Up @@ -54174,12 +54182,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/door/airlock/medical/glass{
dir = 4;
id_tag = "MedbayFoyerOut";
name = "Medbay";
req_one_access = list(2,5)
},
/obj/machinery/door/poddoor{
density = 0;
dir = 4;
Expand All @@ -54188,6 +54190,13 @@
name = "Medbay Biohazard Blast Doors";
opacity = 0
},
/obj/machinery/door/airlock/medical/glass{
dir = 4;
id_tag = "MedbayFoyerOut";
name = "Medbay";
req_one_access = list(2,5);
unres_sides = 8
},
/turf/simulated/floor{
icon_state = "bluechoco"
},
Expand Down Expand Up @@ -75613,7 +75622,7 @@
/obj/machinery/door/airlock/medical/glass{
id_tag = "MedbayFoyerIn";
name = "Medbay";
req_access = list(5);
req_one_access = list(2,5);
unres_sides = 2
},
/turf/simulated/floor{
Expand Down Expand Up @@ -89109,10 +89118,6 @@
/area/station/civilian/theatre)
"sEZ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
name = "Medbay Treatment Center";
req_access = list(5)
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/poddoor{
Expand All @@ -89122,6 +89127,11 @@
name = "Medbay Biohazard Blast Doors";
opacity = 0
},
/obj/machinery/door/airlock/medical/glass{
name = "Medbay Treatment Center";
req_access = list(5);
unres_sides = 2
},
/turf/simulated/floor{
icon_state = "bluechoco"
},
Expand Down Expand Up @@ -90156,9 +90166,6 @@
/obj/structure/stool/bed/chair/metal{
dir = 8
},
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/firealarm{
dir = 4;
pixel_x = 22
Expand Down Expand Up @@ -103741,7 +103748,7 @@
/obj/machinery/door/airlock/medical/glass{
id_tag = "MedbayFoyerIn";
name = "Medbay";
req_access = list(5);
req_one_access = list(2,5);
unres_sides = 2
},
/turf/simulated/floor{
Expand Down Expand Up @@ -112899,10 +112906,6 @@
dir = 5;
network = list("SS13","Medical")
},
/obj/machinery/computer/guestpass{
dir = 8;
pixel_x = -28
},
/turf/simulated/floor{
dir = 9;
icon_state = "whiteblue"
Expand Down Expand Up @@ -152634,7 +152637,7 @@ jMv
pxa
cAq
qDS
jMv
adh
pxa
pxa
uVF
Expand Down
12 changes: 1 addition & 11 deletions maps/gamma/gamma.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8900,7 +8900,7 @@
},
/obj/machinery/door_control{
desc = "A remote control switch for the medbay foyer.";
id = "MedbayFoyer";
id = "MedbayFoyerIn";
name = "Medbay Doors Control";
pixel_x = 5;
pixel_y = -10;
Expand Down Expand Up @@ -51178,11 +51178,6 @@
},
/area/station/medical/hallway/outbranch)
"jxI" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/medical/glass{
id_tag = "";
Expand Down Expand Up @@ -121742,11 +121737,6 @@
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor,
/area/station/medical/reception)
"xMW" = (
Expand Down
7 changes: 3 additions & 4 deletions maps/prometheus/prometheus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,11 +799,10 @@
dir = 4
},
/obj/machinery/door/airlock/medical/glass{
id_tag = "MedbayFoyerIn";
dir = 4;
id_tag = "Medbay";
name = "Medbay";
req_access = list(5);
unres_sides = 2;
dir = 4
req_access = list(5)
},
/turf/simulated/floor{
icon_state = "dark"
Expand Down
Loading