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.

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

Fix electrochromic windows #1745

Merged
merged 4 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion _maps/map_files220/stations/boxstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9643,7 +9643,8 @@
/obj/machinery/button/windowtint{
id = "Courtroom";
pixel_y = -12;
req_one_access = list(74,3)
req_one_access = list(74,3);
range = 6
},
/turf/simulated/floor/carpet/black,
/area/station/legal/courtroom)
Expand Down
13 changes: 7 additions & 6 deletions _maps/map_files220/stations/deltastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4791,7 +4791,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/station/security/processing)
/area/station/security/interrogation/observation)
"axt" = (
/obj/structure/cable{
icon_state = "4-8"
Expand Down Expand Up @@ -51492,7 +51492,7 @@
},
/obj/structure/cable,
/turf/simulated/floor/plating,
/area/station/security/processing)
/area/station/security/interrogation/observation)
"ffH" = (
/obj/effect/landmark/start/chemist,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -73448,7 +73448,8 @@
/area/station/medical/medbay)
"mbz" = (
/obj/machinery/button/windowtint/east{
id = "Cloning Room"
id = "Cloning Room";
range = 6
},
/obj/machinery/camera{
c_tag = "Medbay Cloning";
Expand Down Expand Up @@ -96021,7 +96022,7 @@
},
/obj/effect/mapping_helpers/airlock/access/any/security/general,
/turf/simulated/floor/plasteel/dark,
/area/station/security/processing)
/area/station/security/interrogation/observation)
"sYf" = (
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
Expand Down Expand Up @@ -108114,7 +108115,7 @@
icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/station/security/processing)
/area/station/security/interrogation/observation)
"wVi" = (
/obj/machinery/economy/vending/cart,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -108313,7 +108314,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/plating,
/area/station/security/processing)
/area/station/security/interrogation/observation)
"wWZ" = (
/obj/structure/cable{
icon_state = "1-2"
Expand Down
42 changes: 26 additions & 16 deletions _maps/map_files220/stations/metastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4024,6 +4024,9 @@
/obj/effect/mapping_helpers/airlock/autoname,
/obj/effect/mapping_helpers/airlock/access/any/supply/qm,
/obj/effect/mapping_helpers/airlock/access/any/command/blueshield,
/obj/effect/mapping_helpers/airlock/polarized{
id = "qm"
},
/turf/simulated/floor/plasteel,
/area/station/supply/qm)
"ayI" = (
Expand Down Expand Up @@ -32977,7 +32980,8 @@
},
/obj/machinery/button/windowtint/south{
pixel_x = -24;
id = "clon"
id = "clon";
range = 5
},
/turf/simulated/floor/plasteel{
dir = 10;
Expand Down Expand Up @@ -42727,7 +42731,7 @@
"eak" = (
/obj/structure/cable/yellow,
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "Processing"
id = "qm"
},
/obj/structure/cable/yellow{
icon_state = "1-4"
Expand Down Expand Up @@ -43937,7 +43941,7 @@
/area/station/security/storage)
"eEy" = (
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "Processing"
id = "qm"
},
/obj/structure/cable/yellow{
icon_state = "0-8"
Expand Down Expand Up @@ -53613,7 +53617,7 @@
icon_state = "2-4"
},
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "Processing"
id = "qm"
},
/turf/simulated/floor/plating,
/area/station/supply/qm)
Expand Down Expand Up @@ -55725,7 +55729,7 @@
/area/station/engineering/control)
"kBn" = (
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "Processing"
id = "qm"
},
/obj/structure/cable/yellow{
icon_state = "0-8"
Expand Down Expand Up @@ -64528,6 +64532,12 @@
icon_state = "white"
},
/area/station/medical/medbay)
"oQm" = (
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "CHAP"
},
/turf/simulated/floor/plating,
/area/station/service/chapel)
"oQz" = (
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
Expand Down Expand Up @@ -74735,7 +74745,7 @@
icon_state = "1-2"
},
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "Processing"
id = "qm"
},
/turf/simulated/floor/plating,
/area/station/supply/qm)
Expand Down Expand Up @@ -75761,7 +75771,7 @@
},
/obj/structure/cable/yellow,
/turf/simulated/floor/plating,
/area/station/security/range)
/area/station/command/office/hos)
"uKm" = (
/obj/effect/spawner/airlock/e_to_w,
/turf/simulated/wall,
Expand Down Expand Up @@ -80240,7 +80250,7 @@
/area/station/hallway/primary/aft)
"xdC" = (
/obj/effect/spawner/window/reinforced/polarized/grilled{
id = "Processing"
id = "CHAP2"
},
/turf/simulated/floor/plating,
/area/station/service/chapel)
Expand Down Expand Up @@ -105707,7 +105717,7 @@ gDK
cFD
bdq
oiv
xdC
oQm
aaa
aaa
aaa
Expand Down Expand Up @@ -105964,7 +105974,7 @@ cDc
cFD
cUX
oiv
xdC
oQm
aaa
aaa
aaa
Expand Down Expand Up @@ -106221,7 +106231,7 @@ cJM
cyN
cUK
cqj
xdC
oQm
aaa
aaa
aaa
Expand Down Expand Up @@ -106478,7 +106488,7 @@ csw
cFD
cUX
oiv
xdC
oQm
aaa
aaa
aaa
Expand Down Expand Up @@ -106735,7 +106745,7 @@ xJB
cFD
bdq
oiv
xdC
oQm
aaa
aaa
aaa
Expand Down Expand Up @@ -113043,7 +113053,7 @@ hFF
ugM
tio
cKm
esA
avc
czl
sdX
pWM
Expand Down Expand Up @@ -113300,7 +113310,7 @@ usg
dHE
aXp
tvd
esA
avc
aUG
sYR
liS
Expand Down Expand Up @@ -113557,7 +113567,7 @@ adX
vKy
oyY
tSX
esA
avc
uos
wRh
stW
Expand Down
Loading