Skip to content

Commit

Permalink
Main map fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
LordNest committed Nov 5, 2023
1 parent 602bd60 commit 470abb2
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 52 deletions.
4 changes: 2 additions & 2 deletions maps/sierra/sierra_shuttles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ SIERRA_ESCAPE_POD(11)

/datum/shuttle/autodock/ferry/petrov
name = "Petrov"
dock_target = "petrov_shuttle"
dock_target = "petrov_shuttle_airlock"
waypoint_station = "nav_petrov_start"
waypoint_offsite = "nav_petrov_out"
logging_home_tag = "nav_petrov_start"
Expand All @@ -68,7 +68,7 @@ SIERRA_ESCAPE_POD(11)
..()

/obj/shuttle_landmark/petrov/start
name = "First Deck"
name = "Fourth Deck"
landmark_tag = "nav_petrov_start"
docking_controller = "petrov_shuttle_dock"

Expand Down
102 changes: 52 additions & 50 deletions maps/sierra/z1-z5_sierra.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1229,7 +1229,8 @@
/obj/machinery/door/airlock/security{
name = "Security Checkpoint";
req_access = newlist();
secured_wires = 1
secured_wires = 1;
autoset_access = 0
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/techfloor/grid,
Expand Down Expand Up @@ -10709,8 +10710,9 @@
/obj/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/airlock/security{
name = "Security Checkpoint";
req_access = newlist();
secured_wires = 1
req_access = list(list("ACCESS_SECURITY","ACCESS_FORENSICS"));
secured_wires = 1;
autoset_access = 0
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/security/sierra/dockcheck)
Expand Down Expand Up @@ -63362,7 +63364,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
dir = 4;
id_tag = "bridge_windows"
id_tag = "lounge_windows"
},
/turf/simulated/floor/plating,
/area/crew_quarters/garden_room)
Expand Down Expand Up @@ -64040,7 +64042,8 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/multi_tile/maintenance{
dir = 8
dir = 8;
autoset_access = 0
},
/obj/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/techfloor/grid,
Expand Down Expand Up @@ -71321,7 +71324,7 @@
/obj/wallframe_spawn/reinforced/hull,
/obj/machinery/door/blast/regular{
dir = 2;
id_tag = "bridge_windows"
id_tag = "lounge_windows"
},
/obj/structure/cable/green{
d1 = 1;
Expand Down Expand Up @@ -93631,7 +93634,10 @@
id_tag = "petrov_shuttle_dock";
pixel_x = 20;
pixel_y = 32;
req_access = list("ACCESS_PETROV")
req_access = list("ACCESS_PETROV");
tag_exterior_door = "petrov_shuttle_dock_outer";
tag_interior_door = "petrov_shuttle_dock_inner";
tag_exterior_sensor = "petrov_shuttle_dock_sensor"
},
/obj/floor_decal/borderfloorwhite,
/obj/floor_decal/borderfloorwhite{
Expand Down Expand Up @@ -102509,6 +102515,12 @@
/obj/floor_decal/spline/fancy/black{
dir = 1
},
/obj/machinery/button/blast_door{
dir = 8;
id_tag = "lounge_windows";
name = "Lounge Window Blast Doors";
pixel_x = 25
},
/turf/simulated/floor/grass,
/area/crew_quarters/garden_room)
"pAw" = (
Expand Down Expand Up @@ -104616,18 +104628,6 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/hallway/primary/thirddeck/fore)
"pRS" = (
/obj/floor_decal/solarpanel,
/obj/structure/cable/yellow{
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/solar{
id = "auxsolarstarboard";
name = "Aft Starboard Solar Array"
},
/turf/simulated/open,
/area/solar/starboard)
"pRZ" = (
/obj/machinery/vending/coffee{
dir = 8
Expand Down Expand Up @@ -137253,8 +137253,9 @@
"uNI" = (
/obj/machinery/door/airlock/security{
name = "Security Checkpoint";
req_access = newlist();
secured_wires = 1
req_access = list(list("ACCESS_SECURITY","ACCESS_FORENSICS"));
secured_wires = 1;
autoset_access = 0
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
Expand Down Expand Up @@ -146303,7 +146304,7 @@
/obj/wallframe_spawn/reinforced/hull,
/obj/machinery/door/blast/regular{
dir = 2;
id_tag = "bridge_windows"
id_tag = "lounge_windows"
},
/turf/simulated/floor/plating,
/area/crew_quarters/garden_room)
Expand Down Expand Up @@ -151250,7 +151251,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/regular{
dir = 2;
id_tag = "bridge_windows"
id_tag = "lounge_windows"
},
/turf/simulated/floor/plating,
/area/crew_quarters/garden_room)
Expand Down Expand Up @@ -153943,8 +153944,9 @@
"xsF" = (
/obj/machinery/door/airlock/security{
name = "Security Checkpoint";
req_access = newlist();
secured_wires = 1
req_access = list(list("ACCESS_SECURITY","ACCESS_FORENSICS"));
secured_wires = 1;
autoset_access = 0
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
Expand Down Expand Up @@ -212777,14 +212779,14 @@ tQA
tQA
eAS
pfc
pfc
pfc
pfc
pfc
pfc
pfc
pfc
pfc
vvw
vvw
vvw
vvw
vvw
vvw
vvw
vvw
kkr
mXk
rtT
Expand Down Expand Up @@ -213181,14 +213183,14 @@ qDa
dMW
aVL
rdY
rdY
rdY
rdY
rdY
rdY
rdY
rdY
rdY
rjF
rjF
rjF
rjF
rjF
rjF
rjF
rjF
kkr
mXk
rtT
Expand Down Expand Up @@ -217968,15 +217970,15 @@ rtT
rtT
lUl
rtT
pRS
pRS
pRS
pRS
pRS
pRS
pRS
pRS
pRS
qfi
qfi
qfi
qfi
qfi
qfi
qfi
qfi
qfi
yba
lPg
lPg
Expand Down

0 comments on commit 470abb2

Please sign in to comment.