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

Tesla containment area safety #1119

Merged
merged 2 commits into from
Mar 24, 2024
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
69 changes: 56 additions & 13 deletions _maps/map_files220/cyberiad/cyberiad.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -28769,6 +28769,15 @@
/mob/living/simple_animal/pet/cat/Floppa,
/turf/simulated/floor/wood/oak,
/area/station/command/office/blueshield)
"clS" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"clU" = (
/obj/machinery/door/airlock/medical/glass,
/obj/effect/mapping_helpers/airlock/autoname,
Expand Down Expand Up @@ -54952,6 +54961,12 @@
/obj/item/radio/intercom,
/turf/simulated/wall,
/area/station/engineering/atmos)
"hcy" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/turf/simulated/floor/plating/airless,
/area/station/engineering/control)
"hcz" = (
/obj/machinery/atmospherics/pipe/manifold/visible/cyan,
/obj/machinery/atmospherics/meter,
Expand Down Expand Up @@ -60427,6 +60442,16 @@
},
/turf/simulated/floor/plating,
/area/station/security/processing)
"jft" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"jfx" = (
/obj/structure/cable{
d1 = 1;
Expand Down Expand Up @@ -66719,6 +66744,12 @@
/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/engine,
/area/station/science/explab/chamber)
"lBS" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plating/airless,
/area/station/engineering/control)
"lCk" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/lootdrop/maintenance,
Expand Down Expand Up @@ -77526,6 +77557,18 @@
/obj/effect/spawner/random_spawners/blood_maybe,
/turf/simulated/floor/plasteel,
/area/station/maintenance/asmaint)
"pqE" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/power/grounding_rod{
anchored = 1
},
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"pqG" = (
/obj/structure/table,
/obj/machinery/door/window/classic/normal{
Expand Down Expand Up @@ -121183,17 +121226,17 @@ qsQ
qsQ
qsQ
cSU
cKr
cKr
cKr
jft
jft
jft
cSU
cKr
cKr
cKr
clS
pqE
clS
cSU
cKr
cKr
cKr
jft
jft
jft
cSU
cKr
cKr
Expand Down Expand Up @@ -121694,7 +121737,7 @@ aab
cSU
iIG
dpO
cPn
lBS
aaa
cTn
cVB
Expand All @@ -121710,7 +121753,7 @@ cVB
cVB
rDS
aaa
qJO
hcy
afT
cSU
cSU
Expand Down Expand Up @@ -123236,7 +123279,7 @@ aab
cSU
cSU
cRz
cRA
cLC
aab
dei
cWf
Expand All @@ -123252,7 +123295,7 @@ aaa
cRk
mha
aab
cRA
cLC
dfA
cSU
cSU
Expand Down
63 changes: 50 additions & 13 deletions _maps/map_files220/delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -49194,6 +49194,12 @@
"eoX" = (
/turf/simulated/wall/r_wall,
/area/station/security/permabrig)
"epo" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/turf/simulated/floor/plating/airless,
/area/station/engineering/control)
"epE" = (
/obj/machinery/door/airlock/maintenance,
/obj/effect/mapping_helpers/airlock/autoname,
Expand Down Expand Up @@ -57204,6 +57210,16 @@
},
/turf/simulated/floor/plasteel/dark,
/area/station/command/bridge)
"gSE" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/grille,
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"gSH" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair/sofa/pew/right{
Expand Down Expand Up @@ -94522,6 +94538,15 @@
icon_state = "neutralfull"
},
/area/station/hallway/primary/aft)
"sAx" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"sAG" = (
/obj/structure/cable{
d1 = 2;
Expand Down Expand Up @@ -101088,6 +101113,18 @@
},
/turf/simulated/floor/plating,
/area/station/service/hydroponics)
"uIz" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/power/grounding_rod{
anchored = 1
},
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"uIK" = (
/obj/structure/cable{
d1 = 1;
Expand Down Expand Up @@ -129579,17 +129616,17 @@ cba
cba
cba
bXU
cie
cie
cie
gSE
gSE
gSE
bXU
cie
cie
cie
sAx
uIz
sAx
bXU
cie
cie
cie
gSE
gSE
gSE
bXU
cie
cie
Expand Down Expand Up @@ -130090,7 +130127,7 @@ aaa
bXU
bZj
cbb
cdc
epo
aaa
ctY
cJe
Expand All @@ -130106,7 +130143,7 @@ cJe
cJe
cOm
aaa
cda
cbb
cbb
cDx
bXU
Expand Down Expand Up @@ -131632,7 +131669,7 @@ jof
bXU
bXU
bZl
cbb
cda
abj
cBU
cjJ
Expand All @@ -131648,7 +131685,7 @@ aaa
dUE
cPK
abj
cbb
cda
cDv
bXU
cEA
Expand Down
Loading