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

[MIRROR] Blueshift's toxins wont crater Atmos anymore + Virology gets their cuffs back #2217

Merged
merged 1 commit into from
Mar 2, 2024
Merged
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
146 changes: 98 additions & 48 deletions _maps/map_files/NSVBlueshift/Blueshift.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -18347,6 +18347,10 @@
/obj/item/clothing/suit/jacket/croptop,
/turf/open/floor/iron/dark,
/area/station/common/tailoring)
"dwJ" = (
/obj/effect/turf_decal/arrows/red,
/turf/open/floor/engine/hull,
/area/space/nearstation)
"dwK" = (
/obj/structure/chair/sofa/bench/right,
/obj/structure/cable,
Expand Down Expand Up @@ -40664,6 +40668,12 @@
},
/turf/open/floor/plating,
/area/station/maintenance/department/engineering/engine_aft_port)
"hNU" = (
/obj/effect/turf_decal/caution/stand_clear/red{
dir = 4
},
/turf/open/floor/iron/shuttle/evac/airless,
/area/space/nearstation)
"hNX" = (
/obj/effect/turf_decal/bot,
/obj/structure/reagent_dispensers/watertank,
Expand Down Expand Up @@ -43051,6 +43061,12 @@
},
/turf/open/floor/catwalk_floor/iron_dark,
/area/station/hallway/primary/central/fore)
"ilE" = (
/obj/effect/turf_decal/caution/stand_clear/red{
dir = 8
},
/turf/open/floor/iron/shuttle/evac/airless,
/area/space/nearstation)
"ilJ" = (
/obj/effect/turf_decal/tile/blue{
dir = 1
Expand Down Expand Up @@ -48234,6 +48250,16 @@
},
/turf/open/floor/iron/dark,
/area/station/ai_monitored/command/storage/eva)
"jmM" = (
/obj/effect/turf_decal/arrows/red,
/obj/effect/turf_decal/stripes/red/line{
dir = 8
},
/obj/effect/turf_decal/stripes/red/line{
dir = 4
},
/turf/open/floor/engine/hull,
/area/space/nearstation)
"jmN" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 4
Expand Down Expand Up @@ -84541,6 +84567,15 @@
/obj/machinery/duct,
/turf/open/floor/iron,
/area/station/science/research)
"qiR" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 4
},
/obj/effect/turf_decal/stripes/red/line{
dir = 8
},
/turf/open/floor/engine/hull,
/area/space/nearstation)
"qiS" = (
/obj/effect/turf_decal/stripes{
dir = 4
Expand Down Expand Up @@ -94311,6 +94346,7 @@
},
/obj/item/storage/box/syringes,
/obj/machinery/light/small/directional/west,
/obj/item/restraints/handcuffs,
/turf/open/floor/iron,
/area/station/medical/virology/isolation)
"sak" = (
Expand Down Expand Up @@ -116264,6 +116300,16 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/iron,
/area/station/commons/dorms)
"weU" = (
/obj/effect/turf_decal/arrows/red,
/obj/effect/turf_decal/stripes/red/line{
dir = 4
},
/obj/effect/turf_decal/stripes/red/line{
dir = 8
},
/turf/open/floor/engine/hull,
/area/space/nearstation)
"weV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/open/floor/carpet,
Expand Down Expand Up @@ -116396,6 +116442,10 @@
dir = 4
},
/area/station/service/chapel)
"wfG" = (
/obj/structure/marker_beacon/burgundy,
/turf/open/floor/engine/hull,
/area/space/nearstation)
"wfJ" = (
/obj/effect/decal/cleanable/dirt{
icon_state = "dirt-flat-1"
Expand Down Expand Up @@ -232571,17 +232621,17 @@ dtl
dtl
dEi
czg
soz
nvJ
mWQ
soz
gLc
gLc
gLc
gLc
gLc
soz
soz
soz
nvJ
nvJ
nvJ
nvJ
nvJ
nvJ
nvJ
nvJ
nvJ
soz
soz
soz
Expand Down Expand Up @@ -232824,24 +232874,24 @@ iZl
jgT
bTG
iZl
iZl
wfG
iZl
gHy
ulx
cpE
ilE
cpE
soz
mWQ
soz
gLc
gLc
gLc
gLc
gLc
soz
soz
cpE
soz
cpE
soz
cpE
soz
nvJ
pRh
nvJ
pRh
nvJ
nvJ
ulx
Expand Down Expand Up @@ -233081,23 +233131,23 @@ iZl
iZl
bTG
iZl
iZl
dwJ
iZl
gHy
ulx
soz
mWQ
soz
gLc
soz
soz
soz
soz
soz
soz
soz
soz
soz
jmM
qiR
weU
qiR
weU
qiR
weU
qiR
weU
qiR
weU
qiR
weU
nvJ
ulx
ulx
Expand Down Expand Up @@ -233338,24 +233388,24 @@ iZl
jgT
bTG
iZl
iZl
wfG
iZl
gHy
ulx
cpE
hNU
cpE
soz
mWQ
soz
gLc
soz
soz
soz
cpE
soz
cpE
soz
cpE
soz
nvJ
pRh
nvJ
nvJ
nvJ
pRh
ulx
ulx
ulx
Expand Down Expand Up @@ -233599,12 +233649,12 @@ lBe
lBe
jKz
czg
soz
nvJ
mWQ
soz
soz
soz
soz
nvJ
nvJ
nvJ
nvJ
nvJ
nvJ
nvJ
Expand Down
Loading