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

Various tiny map fixes and Camera improvements #1380

Merged
merged 1 commit into from
Jan 10, 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
15 changes: 14 additions & 1 deletion maps/yw/cryogaia-02-mining.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -13409,6 +13409,14 @@
/obj/effect/decal/cleanable/generic,
/turf/simulated/floor/tiled/white,
/area/rnd/lockers)
"Gn" = (
/obj/machinery/camera/network/research{
c_tag = "Xenobiology Lobby";
dir = 4;
network = list("Research","Toxins Test Area")
},
/turf/simulated/floor/tiled,
/area/maintenance/shelter)
"Gp" = (
/obj/structure/table/standard{
name = "plastic table frame"
Expand Down Expand Up @@ -19075,6 +19083,11 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/machinery/camera/network/research{
c_tag = "Xenobiology Lobby";
dir = 4;
network = list("Research","Toxins Test Area")
},
/turf/simulated/floor/tiled,
/area/rnd/hallway)
"Tz" = (
Expand Down Expand Up @@ -38746,7 +38759,7 @@ VB
yF
Yk
Yk
cq
Gn
zd
zd
zd
Expand Down
62 changes: 37 additions & 25 deletions maps/yw/cryogaia-05-main.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2010,7 +2010,12 @@
external_pressure_bound = 101.3;
external_pressure_bound_default = 101.3;
pressure_checks = 1;
pressure_checks_default = 1
pressure_checks_default = 1;
name = "overpressurization vent"
},
/obj/machinery/camera/network/medbay{
c_tag = "Medbay Auto Resleeving";
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/medical/autoresleeving)
Expand Down Expand Up @@ -16477,11 +16482,13 @@
/turf/simulated/floor/tiled/red,
/area/security/armoury)
"gqF" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera/network/engineering{
c_tag = "Engineering Lobby South";
dir = 1
},
/turf/simulated/floor/tiled,
/area/crew_quarters/locker)
/turf/simulated/floor,
/area/storage/tech)
"gqK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
Expand Down Expand Up @@ -40023,6 +40030,7 @@
dir = 1;
pixel_y = -25
},
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/storage/tech)
"pwp" = (
Expand Down Expand Up @@ -42670,21 +42678,22 @@
external_pressure_bound = 101.3;
external_pressure_bound_default = 101.3;
pressure_checks = 1;
pressure_checks_default = 1
pressure_checks_default = 1;
name = "overpressurization vent"
},
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/disposals)
"qDD" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/engineering{
name = "Security Substation";
req_one_access = list(1,11,24)
},
/obj/machinery/door/firedoor/border_only,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor,
/area/maintenance/substation/security)
"qDN" = (
Expand Down Expand Up @@ -44220,9 +44229,6 @@
pixel_x = 5;
pixel_y = -5
},
/obj/machinery/light/small{
dir = 8
},
/obj/machinery/power/apc{
dir = 8;
name = "west bump";
Expand Down Expand Up @@ -57094,6 +57100,9 @@
pixel_y = -3
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating,
/area/storage/tech)
"wyL" = (
Expand Down Expand Up @@ -59530,6 +59539,9 @@
pixel_y = -3
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/plating,
/area/storage/tech)
"xuz" = (
Expand Down Expand Up @@ -74851,7 +74863,7 @@ kyp
fzZ
jYh
rxl
flG
gqF
kru
evI
iNn
Expand Down Expand Up @@ -79988,15 +80000,15 @@ uDf
uDf
uDf
uDf
qNF
qNF
qNF
qNF
qNF
qNF
qNF
qNF
qNF
xbv
xbv
xbv
xbv
xbv
xbv
xbv
xbv
xbv
aOG
mFx
wZI
Expand Down Expand Up @@ -80041,7 +80053,7 @@ wEa
awo
meK
woj
gqF
awo
wEa
cUe
nLs
Expand Down
2 changes: 1 addition & 1 deletion maps/yw/cryogaia-06-upper.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -25876,7 +25876,7 @@ Nj
Nj
VK
Tw
sa
ZB
sa
sa
sa
Expand Down