Skip to content

blueshift stuffs #5371

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

Merged
merged 5 commits into from
Feb 12, 2025
Merged

blueshift stuffs #5371

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e89ea62
Fixes blueshift sec engi, immunity scanners, and evidence storage room
notghosti Feb 9, 2025
51258c0
Merge remote-tracking branch 'upstream/master' into even-more-various…
notghosti Feb 9, 2025
7fe7fe9
bbbbbbbbbbbbbb
notghosti Feb 9, 2025
2af6656
Revert "bbbbbbbbbbbbbb"
notghosti Feb 9, 2025
916e889
update bridge
notghosti Feb 9, 2025
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
161 changes: 89 additions & 72 deletions _maps/map_files/Blueshift/Blueshift.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/interrogation)
/area/station/security/evidence)
"aeF" = (
/obj/structure/cable,
/turf/open/floor/catwalk_floor/iron/airless,
Expand Down Expand Up @@ -5218,7 +5218,7 @@
dir = 8
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
/area/station/security/evidence)
"bbr" = (
/obj/effect/turf_decal/siding/thinplating/dark,
/turf/open/floor/iron/dark/herringbone,
Expand Down Expand Up @@ -6474,7 +6474,7 @@
/obj/structure/cable,
/obj/machinery/door/firedoor,
/turf/open/floor/iron,
/area/station/security/interrogation)
/area/station/security/evidence)
"bnZ" = (
/obj/machinery/smartfridge/organ,
/turf/open/floor/iron/white,
Expand Down Expand Up @@ -17102,8 +17102,9 @@
/obj/effect/turf_decal/tile/red/half/contrasted{
dir = 8
},
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
/area/station/security/evidence)
"dkX" = (
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=2";
Expand Down Expand Up @@ -17584,7 +17585,7 @@
dir = 8
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
/area/station/security/evidence)
"dqD" = (
/obj/effect/turf_decal/tile/neutral{
dir = 8
Expand Down Expand Up @@ -21423,7 +21424,8 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/turf/open/floor/iron,
/area/station/engineering/storage_shared)
"eeY" = (
Expand Down Expand Up @@ -21650,6 +21652,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/maintenance/aft/upper)
"egX" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/evidence)
"ehf" = (
/obj/effect/turf_decal/trimline/blue/filled/corner,
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -23425,6 +23433,20 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/button/door/directional/south{
id = "bridgedoors";
name = "Bridge Access Blast Doors";
pixel_x = 6;
req_access = list("command");
pixel_y = -35
},
/obj/machinery/button/door/directional/south{
id = "bridgewindows";
name = "Bridge View Blast Doors";
pixel_x = -6;
req_access = list("command");
pixel_y = -35
},
/turf/open/floor/iron,
/area/station/command/bridge)
"eyF" = (
Expand Down Expand Up @@ -23776,7 +23798,7 @@
dir = 8
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
/area/station/security/evidence)
"eBK" = (
/obj/machinery/door/window/left/directional/north,
/obj/structure/liquid_barrier,
Expand Down Expand Up @@ -27011,6 +27033,8 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/item/device/antibody_scanner,
/obj/item/device/antibody_scanner,
/obj/item/book/manual/wiki/infections,
/turf/open/floor/iron,
/area/station/medical/virology)
Expand Down Expand Up @@ -34016,7 +34040,8 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/turf/open/floor/iron,
/area/station/engineering/lobby)
"gBa" = (
Expand Down Expand Up @@ -35890,7 +35915,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/iron,
/area/station/security/interrogation)
/area/station/security/evidence)
"gTL" = (
/obj/structure/cable,
/turf/open/floor/plating/airless,
Expand Down Expand Up @@ -36726,7 +36751,8 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/turf/open/floor/iron,
/area/station/engineering/storage_shared)
"hdL" = (
Expand Down Expand Up @@ -49068,15 +49094,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/iron,
/area/station/engineering/break_room)
"jAf" = (
/obj/item/storage/secure/safe/caps_spare{
base_icon_state = "floorsafe";
icon_state = "floorsafe";
pixel_x = -1;
density = 0
},
/turf/open/floor/iron,
/area/station/command/bridge)
"jAj" = (
/obj/structure/cable/layer1,
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -49755,7 +49772,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/effect/landmark/navigate_destination,
/obj/effect/mapping_helpers/airlock/access/all/engineering/construction,
/obj/effect/mapping_helpers/airlock/access/any/engineering/general,
/obj/effect/mapping_helpers/airlock/access/any/engineering/construction,
/turf/open/floor/iron,
/area/station/engineering/lobby)
"jGA" = (
Expand Down Expand Up @@ -61407,7 +61425,7 @@
dir = 4
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
/area/station/security/evidence)
"lSv" = (
/turf/closed/wall/r_wall,
/area/station/security/prison/upper)
Expand Down Expand Up @@ -62576,21 +62594,17 @@
/turf/open/floor/iron,
/area/station/engineering/main)
"mdM" = (
/obj/machinery/button/door/directional/south{
id = "bridgewindows";
name = "Bridge View Blast Doors";
pixel_x = -6;
req_access = list("command")
},
/obj/machinery/button/door/directional/south{
id = "bridgedoors";
name = "Bridge Access Blast Doors";
pixel_x = 6;
req_access = list("command")
},
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/requests_console/directional/south{
department = "Bridge";
name = "Bridge Requests Console";
pixel_y = -37
},
/obj/effect/mapping_helpers/requests_console/information,
/obj/effect/mapping_helpers/requests_console/assistance,
/obj/effect/mapping_helpers/requests_console/announcement,
/turf/open/floor/iron,
/area/station/command/bridge)
"mdY" = (
Expand Down Expand Up @@ -77794,7 +77808,16 @@
dir = 4
},
/obj/machinery/recharger{
pixel_y = 3
pixel_y = 3;
pixel_x = -7
},
/obj/item/paper_bin{
pixel_y = 3;
pixel_x = 5
},
/obj/item/pen{
pixel_y = 3;
pixel_x = 5
},
/turf/open/floor/iron/dark,
/area/station/command/bridge)
Expand Down Expand Up @@ -85580,17 +85603,6 @@
dir = 1;
pixel_y = 3
},
/obj/machinery/keycard_auth/directional/south{
pixel_y = -23
},
/obj/machinery/requests_console/directional/south{
department = "Bridge";
name = "Bridge Requests Console";
pixel_y = -37
},
/obj/effect/mapping_helpers/requests_console/announcement,
/obj/effect/mapping_helpers/requests_console/information,
/obj/effect/mapping_helpers/requests_console/assistance,
/obj/machinery/camera/directional/south{
c_tag = "Bridge - Command Chair";
name = "command camera"
Expand All @@ -85599,6 +85611,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/item/storage/secure/safe/caps_spare/directional/south,
/turf/open/floor/iron,
/area/station/command/bridge)
"qDq" = (
Expand Down Expand Up @@ -98244,6 +98257,9 @@
dir = 1
},
/area/station/security/prison/workout)
"sZJ" = (
/turf/closed/wall/r_wall,
/area/station/security/evidence)
"sZM" = (
/obj/structure/girder,
/obj/structure/grille/broken,
Expand Down Expand Up @@ -105346,7 +105362,7 @@
dir = 4
},
/turf/open/floor/iron/dark,
/area/station/security/interrogation)
/area/station/security/evidence)
"urq" = (
/obj/effect/turf_decal/stripes,
/obj/effect/turf_decal/stripes{
Expand Down Expand Up @@ -106232,8 +106248,10 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/interrogation)
/area/station/security/evidence)
"uAs" = (
/obj/effect/spawner/random/trash/mess,
/obj/structure/disposalpipe/segment{
Expand Down Expand Up @@ -116960,10 +116978,8 @@
"wzY" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced/spawner/directional/west,
/obj/item/paper_bin{
pixel_y = 3
},
/obj/item/pen{
/obj/machinery/keycard_auth{
pixel_x = 1;
pixel_y = 3
},
/turf/open/floor/iron/dark,
Expand Down Expand Up @@ -120410,7 +120426,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/iron,
/area/station/security/mechbay)
/area/station/security/evidence)
"xkf" = (
/obj/machinery/door/airlock/wood{
name = "Sauna"
Expand Down Expand Up @@ -122537,8 +122553,9 @@
/area/station/command/heads_quarters/nt_rep)
"xFO" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/security/interrogation)
/area/station/security/evidence)
"xFQ" = (
/obj/structure/table/wood,
/obj/item/folder/yellow{
Expand Down Expand Up @@ -151130,12 +151147,12 @@ vpe
tUj
uut
eGr
cZT
fAw
fAw
fAw
fAw
fAw
sZJ
sZJ
sZJ
sZJ
sZJ
sZJ
tEK
rKn
jAp
Expand Down Expand Up @@ -151387,12 +151404,12 @@ tUj
vpe
wcZ
hpF
cZT
sZJ
bbn
dqw
eBG
dkT
fAw
sZJ
laf
rKn
lHI
Expand Down Expand Up @@ -151649,7 +151666,7 @@ aey
gTF
xFO
uAr
fAw
sZJ
laf
kUo
lHI
Expand Down Expand Up @@ -151901,12 +151918,12 @@ uBX
bAo
bAo
azm
cZT
sZJ
lSs
qDO
egX
uro
uro
fAw
sZJ
xKh
rKn
lHI
Expand Down Expand Up @@ -152157,13 +152174,13 @@ cZT
hAz
nDO
hAz
fAw
fAw
fAw
cZT
sZJ
sZJ
bnX
fAw
fAw
fAw
sZJ
sZJ
sZJ
iGF
iGF
msS
Expand Down Expand Up @@ -222828,7 +222845,7 @@ bbG
bwg
gij
bMO
jAf
tVq
kJQ
qDo
jiu
Expand Down
Loading