Skip to content

Commit

Permalink
Aough
Browse files Browse the repository at this point in the history
  • Loading branch information
Doctor-Derp committed May 27, 2022
1 parent ce90424 commit 74a3113
Showing 1 changed file with 41 additions and 33 deletions.
74 changes: 41 additions & 33 deletions maps/intrepid/intrepid1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@
/obj/machinery/igniter{
id_tag = "portsparker"
},
/turf/simulated/floor/reinforced/oxygen,
/turf/simulated/floor/reinforced/phoron/fuel,
/area/intrepid/department/engineering/portthruster)
"axh" = (
/obj/structure/handrail{
Expand Down Expand Up @@ -1180,11 +1180,11 @@
/turf/simulated/floor/tiled/white,
/area/shuttle/research/xenobiolab)
"bhz" = (
/obj/effect/paint/expeditionary,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
/obj/effect/paint/sun,
/turf/simulated/wall/r_titanium,
/area/shuttle/pandora/lifesupport)
"biN" = (
Expand Down Expand Up @@ -1695,11 +1695,11 @@
/turf/simulated/floor/tiled/dark,
/area/space)
"bGo" = (
/obj/effect/paint/expeditionary,
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9;
icon_state = "intact"
},
/obj/effect/paint/sun,
/turf/simulated/wall/r_titanium,
/area/shuttle/pandora/electrical)
"bGT" = (
Expand Down Expand Up @@ -2202,7 +2202,7 @@
"ceF" = (
/obj/machinery/computer/ship/helm{
icon_state = "computer";
req_access = list("access_expedition_shuttle_helm")
req_access = list("ACCESS_EXPLO_HELM")
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/pandora/cockpit)
Expand Down Expand Up @@ -3126,6 +3126,12 @@
},
/turf/simulated/floor/tiled/white,
/area/space)
"cXn" = (
/obj/machinery/hologram/holopad{
caller_id = "Intrepid Meeting Room"
},
/turf/simulated/floor/tiled/dark,
/area/intrepid/department/command/meetingroom)
"cXU" = (
/obj/machinery/conveyor{
dir = 1
Expand Down Expand Up @@ -3230,7 +3236,6 @@
frequency = 1331;
id_tag = "pandora_shuttle";
pixel_y = -25;
req_access = list("access_expedition_shuttle");
tag_airpump = "pandora_shuttle_pump";
tag_chamber_sensor = "pandora_shuttle_sensor";
tag_exterior_door = "pandora_shuttle_outer";
Expand Down Expand Up @@ -4837,6 +4842,9 @@
dir = 1
},
/obj/random_multi/single_item/boombox,
/obj/item/device/radio,
/obj/item/device/radio,
/obj/item/device/radio,
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/pandora/lifesupport)
"epR" = (
Expand Down Expand Up @@ -4878,7 +4886,7 @@
id_tag = "stardust_shuttle_dock_airlock";
pixel_x = -24;
pixel_y = 0;
req_access = list("access_stardust");
req_access = list("ACCESS_INTREPID_STARDUST");
tag_exterior_door = "stardust_outer_shuttle_airlock";
tag_exterior_sensor = null;
tag_interior_door = "stardust_shuttle_airlock"
Expand Down Expand Up @@ -6589,10 +6597,10 @@
/turf/simulated/floor,
/area/intrepid/misc/maint/aft)
"fWJ" = (
/obj/effect/paint/expeditionary,
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 8
},
/obj/effect/paint/sun,
/turf/simulated/wall/r_titanium,
/area/shuttle/pandora/lifesupport)
"fXh" = (
Expand Down Expand Up @@ -7026,7 +7034,7 @@
frequency = 1331;
id_tag = "stardust_outer_shuttle_airlock";
name = "Stardust Dock Access";
req_access = list("access_stardust")
req_access = list("ACCESS_INTREPID_STARDUST")
},
/turf/simulated/floor/tiled/white/monotile,
/area/intrepid/department/medical/treatment)
Expand Down Expand Up @@ -7116,6 +7124,9 @@
/turf/simulated/floor/tiled/white,
/area/intrepid/department/civillian/galley)
"gFn" = (
/obj/machinery/hologram/holopad{
caller_id = "Intrepid Medical Reception"
},
/turf/simulated/floor/tiled/white,
/area/intrepid/misc/hallway/portside)
"gFC" = (
Expand Down Expand Up @@ -7157,7 +7168,7 @@
/turf/simulated/wall/r_titanium,
/area/shuttle/research/maint)
"gHe" = (
/obj/effect/paint/expeditionary,
/obj/effect/paint/sun,
/turf/simulated/wall/r_titanium,
/area/shuttle/pandora/cockpit)
"gHo" = (
Expand Down Expand Up @@ -7578,7 +7589,7 @@
frequency = 1331;
id_tag = "stardust_outer_shuttle_airlock";
name = "Stardust Dock Access";
req_access = list("access_stardust")
req_access = list("ACCESS_INTREPID_STARDUST")
},
/turf/simulated/floor/tiled/white/monotile,
/area/intrepid/misc/hallway/portside)
Expand Down Expand Up @@ -7917,8 +7928,8 @@
/turf/simulated/floor/wood/walnut,
/area/intrepid/department/medical/therapy)
"huo" = (
/obj/effect/paint/expeditionary,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/paint/sun,
/turf/simulated/wall/r_titanium,
/area/shuttle/pandora/electrical)
"huA" = (
Expand Down Expand Up @@ -10602,7 +10613,7 @@
frequency = 1331;
id_tag = "stardust_outer_shuttle_airlock";
name = "Stardust Dock Access";
req_access = list("access_stardust")
req_access = list("ACCESS_INTREPID_STARDUST")
},
/turf/simulated/floor/tiled/white/monotile,
/area/intrepid/misc/hallway/portside)
Expand Down Expand Up @@ -11176,7 +11187,7 @@
frequency = 1331;
id_tag = "stardust_shuttle_airlock";
name = "Stardust External Access";
req_access = list("access_stardust")
req_access = list("ACCESS_INTREPID_STARDUST")
},
/turf/simulated/floor/tiled/white/monotile,
/area/shuttle/research/hallway)
Expand Down Expand Up @@ -11282,7 +11293,7 @@
dir = 6;
icon_state = "intact"
},
/turf/simulated/floor/reinforced/oxygen,
/turf/simulated/floor/reinforced/phoron/fuel,
/area/intrepid/department/engineering/portthruster)
"kLs" = (
/obj/machinery/door/airlock/highsecurity/bolted,
Expand Down Expand Up @@ -11592,8 +11603,7 @@
frequency = 1331;
icon_state = "closed";
id_tag = "pandora_shuttle_inner";
name = "Pandora External Access";
req_access = list("access_expedition_shuttle_helm")
name = "Pandora External Access"
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/pandora/cargo)
Expand Down Expand Up @@ -12806,7 +12816,7 @@
/obj/machinery/igniter{
id_tag = "starboardsparker"
},
/turf/simulated/floor/reinforced/oxygen,
/turf/simulated/floor/reinforced/phoron/fuel,
/area/intrepid/department/engineering/starboardthruster)
"mio" = (
/obj/machinery/optable,
Expand Down Expand Up @@ -13042,10 +13052,10 @@
/turf/simulated/wall/r_wall/hull,
/area/intrepid/misc/maint/starboard)
"msO" = (
/obj/effect/paint/expeditionary,
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
},
/obj/effect/paint/sun,
/turf/simulated/wall/r_titanium,
/area/shuttle/pandora/electrical)
"msQ" = (
Expand Down Expand Up @@ -14578,7 +14588,8 @@
/area/space)
"nHp" = (
/obj/structure/closet/secure_closet/guncabinet{
name = "ammunition cabinet"
name = "ammunition cabinet";
req_access = list("ACCESS_INTREPID_SQUAD_LEADER")
},
/obj/item/ammo_magazine/t12,
/obj/item/ammo_magazine/t12,
Expand Down Expand Up @@ -14744,7 +14755,7 @@
frequency = 1331;
id_tag = "stardust_shuttle_airlock";
name = "Stardust External Access";
req_access = list("access_stardust")
req_access = list("ACCESS_INTREPID_STARDUST")
},
/turf/simulated/floor/tiled/white/monotile,
/area/shuttle/research/hallway)
Expand Down Expand Up @@ -15231,8 +15242,8 @@
/turf/simulated/floor,
/area/intrepid/misc/maint/aft)
"ong" = (
/obj/effect/paint/expeditionary,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/paint/sun,
/turf/simulated/wall/r_titanium,
/area/shuttle/pandora/lifesupport)
"onp" = (
Expand Down Expand Up @@ -15349,8 +15360,7 @@
master_tag = "pandora_shuttle";
name = "interior access button";
pixel_x = -24;
pixel_y = -24;
req_access = list("access_expedition_shuttle")
pixel_y = -24
},
/obj/machinery/airlock_sensor{
frequency = 1331;
Expand Down Expand Up @@ -16248,15 +16258,13 @@
frequency = 1331;
icon_state = "closed";
id_tag = "pandora_shuttle_outer";
name = "Pandora External Access";
req_access = list("access_expedition_shuttle_helm")
name = "Pandora External Access"
},
/obj/machinery/access_button/airlock_exterior{
frequency = 1331;
master_tag = "pandora_shuttle";
pixel_x = 24;
pixel_y = -9;
req_access = list("access_expedition_shuttle")
pixel_y = -9
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/shuttle/pandora/cargo)
Expand Down Expand Up @@ -16666,10 +16674,10 @@
/turf/simulated/floor,
/area/intrepid/misc/maint/starboard)
"pCb" = (
/obj/effect/paint/expeditionary,
/obj/machinery/atmospherics/pipe/simple/hidden/universal{
dir = 4
},
/obj/effect/paint/sun,
/turf/simulated/wall/r_titanium,
/area/shuttle/pandora/lifesupport)
"pCf" = (
Expand Down Expand Up @@ -19230,7 +19238,7 @@
/obj/machinery/igniter{
id_tag = "starboardsparker"
},
/turf/simulated/floor/reinforced/oxygen,
/turf/simulated/floor/reinforced/phoron/fuel,
/area/intrepid/department/engineering/starboardthruster)
"rOx" = (
/obj/machinery/computer/rdconsole/core{
Expand Down Expand Up @@ -19631,7 +19639,7 @@
frequency = 1331;
id_tag = "stardust_shuttle_airlock";
name = "Stardust External Access";
req_access = list("access_stardust")
req_access = list("ACCESS_INTREPID_STARDUST")
},
/turf/simulated/floor/tiled/white/monotile,
/area/shuttle/research/hallway)
Expand Down Expand Up @@ -21398,10 +21406,10 @@
/turf/simulated/floor/tiled/white,
/area/intrepid/department/civillian/galley)
"tHW" = (
/obj/effect/paint/expeditionary,
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 8
},
/obj/effect/paint/sun,
/turf/simulated/wall/r_titanium,
/area/shuttle/pandora/electrical)
"tIB" = (
Expand Down Expand Up @@ -23988,7 +23996,7 @@
frequency = 1331;
id_tag = "stardust_outer_shuttle_airlock";
name = "Stardust Dock Access";
req_access = list("access_stardust")
req_access = list("ACCESS_INTREPID_STARDUST")
},
/turf/simulated/floor/tiled/white/monotile,
/area/intrepid/department/medical/treatment)
Expand Down Expand Up @@ -49418,7 +49426,7 @@ vfa
mQH
xaI
rTV
rTV
cXn
rTV
ihe
eyU
Expand Down

0 comments on commit 74a3113

Please sign in to comment.