Skip to content

Commit

Permalink
Fixes windoors of the robotics lab on nss kerberos and nss farragus a…
Browse files Browse the repository at this point in the history
…re not electrochromic (ParadiseSS13#23688)

* cool shades bro

* funny airlocks

* to see the merge conflict

* Update .vscode/settings.json

* fun

---------

Co-authored-by: S34N <[email protected]>
  • Loading branch information
Fluffyzack21 and S34NW authored Feb 6, 2024
1 parent 4219e9d commit 881755d
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 25 deletions.
45 changes: 23 additions & 22 deletions _maps/map_files/Delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1651,6 +1651,13 @@
icon_state = "red"
},
/area/station/maintenance/fore2)
"ani" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "arrival"
},
/area/station/hallway/secondary/entry)
"ank" = (
/turf/simulated/floor/plasteel/white/corner{
dir = 4
Expand Down Expand Up @@ -73132,9 +73139,10 @@
/area/station/public/fitness)
"hQz" = (
/obj/machinery/door/window/classic/normal{
name = "Robotics Desk";
dir = 8
dir = 8;
name = "Robotics Surgery"
},
/obj/effect/mapping_helpers/airlock/polarized,
/obj/effect/mapping_helpers/airlock/windoor/access/any/science/robotics{
dir = 8
},
Expand Down Expand Up @@ -84011,10 +84019,10 @@
/turf/simulated/wall/r_wall,
/area/station/telecomms/chamber)
"oMA" = (
/obj/machinery/door/airlock/external{
name = "Arrival Airlock"
},
/turf/simulated/floor/plating,
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"oMI" = (
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -86359,6 +86367,12 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/central)
"qke" = (
/obj/machinery/door/airlock/external{
name = "Arrival Airlock"
},
/turf/simulated/floor/plating,
/area/station/hallway/secondary/entry)
"qkH" = (
/obj/structure/chair/sofa/corner{
dir = 8;
Expand Down Expand Up @@ -92194,12 +92208,6 @@
icon_state = "darkred"
},
/area/station/security/warden)
"tOv" = (
/obj/machinery/door/firedoor,
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"tOM" = (
/obj/machinery/power/apc{
name = "south bump";
Expand Down Expand Up @@ -98859,13 +98867,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"xQX" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "arrival"
},
/area/station/hallway/secondary/entry)
"xRk" = (
/obj/machinery/door/airlock/maintenance{
name = "Checkpoint Maintenance"
Expand Down Expand Up @@ -130224,7 +130225,7 @@ abj
abj
abj
grB
oMA
qke
rJk
abj
abj
Expand Down Expand Up @@ -130996,9 +130997,9 @@ agA
agg
adZ
xcL
tOv
oMA
qtk
xQX
ani
wSO
adb
aaa
Expand Down
10 changes: 7 additions & 3 deletions _maps/map_files/cerestation/cerestation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -95995,12 +95995,16 @@
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/captain)
"xNF" = (
/obj/machinery/door/window{
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
/obj/effect/mapping_helpers/airlock/polarized,
/obj/machinery/door/window/classic/normal{
dir = 8;
name = "Robotics Surgery"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
/obj/effect/mapping_helpers/airlock/windoor/access/any/science/robotics{
dir = 8
},
/turf/simulated/floor/plasteel{
icon_state = "dark"
Expand Down

0 comments on commit 881755d

Please sign in to comment.