Skip to content

Commit

Permalink
Exploration Mapping Tweaks (#6797)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Slight amounts of map housekeeping regarding the exploration department.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Things being wrong is bad.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
del: Deleted mapped-in binoculars spawns for exploration, as they are
now included in explo-related job lockers via code per #6796
del: Removed a toxin treatment pouch from Atlas Explo Shuttle.
add: Gave SAR & Explorers some Hand Labelers on both Atlas and Triumph.
tweak: Touched up some of the erroneous or incomplete floor markings in
Atlas exploration.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
AlphaM01 authored Oct 15, 2024
1 parent 97c4cef commit 51065a5
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 56 deletions.
90 changes: 36 additions & 54 deletions maps/rift/levels/rift-06-surface3.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2224,6 +2224,7 @@
/obj/structure/cable/green{
icon_state = "0-8"
},
/obj/effect/floor_decal/borderfloorblack/corner2,
/turf/simulated/floor/tiled/dark,
/area/exploration/showers)
"ahx" = (
Expand Down Expand Up @@ -2735,6 +2736,8 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/floor_decal/borderfloor/corner2,
/obj/effect/floor_decal/corner/beige/bordercorner2,
/turf/simulated/floor/tiled/steel,
/area/exploration)
"aiZ" = (
Expand Down Expand Up @@ -5608,8 +5611,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/beige/border,
/obj/structure/cable{
icon_state = "1-2"
},
Expand Down Expand Up @@ -6637,14 +6638,6 @@
pixel_x = 4;
pixel_y = -6
},
/obj/item/binoculars{
pixel_x = -2;
pixel_y = -2
},
/obj/item/binoculars{
pixel_x = 2;
pixel_y = 2
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 4
},
Expand All @@ -6657,6 +6650,7 @@
},
/obj/effect/floor_decal/industrial/outline,
/obj/machinery/fire_alarm/north_mount,
/obj/item/hand_labeler,
/turf/simulated/floor/tiled/steel,
/area/exploration/explorer_prep)
"auU" = (
Expand Down Expand Up @@ -14191,7 +14185,6 @@
/obj/item/clothing/accessory/permit/gun/planetside,
/obj/item/roller,
/obj/item/storage/backpack/parachute,
/obj/item/binoculars,
/obj/machinery/camera/network/exploration{
dir = 4
},
Expand Down Expand Up @@ -15684,7 +15677,6 @@
/obj/item/clothing/accessory/permit/gun/planetside,
/obj/item/roller,
/obj/item/storage/backpack/parachute,
/obj/item/binoculars,
/turf/simulated/floor/tiled,
/area/exploration/medic_prep)
"aWW" = (
Expand Down Expand Up @@ -15900,11 +15892,13 @@
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals10,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/camera/network/exploration{
dir = 8
},
/obj/effect/floor_decal/borderfloorblack/corner2{
dir = 6
},
/turf/simulated/floor/tiled/dark,
/area/exploration/showers)
"aXE" = (
Expand Down Expand Up @@ -15957,16 +15951,6 @@
},
/turf/simulated/shuttle/wall/voidcraft/blue,
/area/shuttle/courser/cockpit)
"aXQ" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
dir = 8
},
/obj/effect/floor_decal/corner/beige/border{
dir = 8
},
/turf/simulated/floor/tiled/monotile,
/area/exploration)
"aXR" = (
/obj/structure/closet/secure_closet/hop,
/obj/item/megaphone,
Expand Down Expand Up @@ -16373,7 +16357,7 @@
},
/obj/item/robotanalyzer,
/obj/item/storage/single_use/med_pouch/oxyloss,
/obj/item/storage/single_use/med_pouch/toxin,
/obj/item/hand_labeler,
/turf/simulated/floor/tiled/white,
/area/shuttle/excursion/general)
"aYY" = (
Expand Down Expand Up @@ -17307,6 +17291,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 8
},
/obj/effect/floor_decal/borderfloor/corner,
/obj/effect/floor_decal/corner/beige/bordercorner,
/turf/simulated/floor/tiled/steel,
/area/exploration/courser_dock)
"ciC" = (
Expand Down Expand Up @@ -19044,6 +19030,18 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 9
},
/obj/effect/floor_decal/borderfloor{
dir = 6
},
/obj/effect/floor_decal/corner/beige/border{
dir = 6
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 6
},
/obj/effect/floor_decal/corner/beige/bordercorner2{
dir = 6
},
/turf/simulated/floor/tiled/steel,
/area/exploration/courser_dock)
"fmA" = (
Expand Down Expand Up @@ -21540,16 +21538,6 @@
},
/turf/simulated/floor/carpet/purcarpet,
/area/exploration/meeting)
"jFJ" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
dir = 8
},
/obj/effect/floor_decal/corner/beige/border{
dir = 8
},
/turf/simulated/floor/tiled/steel,
/area/exploration)
"jFP" = (
/obj/structure/cable/cyan{
icon_state = "4-8"
Expand Down Expand Up @@ -21723,6 +21711,12 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 9
},
/obj/effect/floor_decal/corner/beige/bordercorner2{
dir = 9
},
/turf/simulated/floor/tiled/steel,
/area/exploration)
"jPv" = (
Expand Down Expand Up @@ -22263,12 +22257,6 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/borderfloor{
dir = 8
},
/obj/effect/floor_decal/corner/beige/border{
dir = 8
},
/turf/simulated/floor/tiled/monotile,
/area/exploration)
"kQm" = (
Expand Down Expand Up @@ -23450,12 +23438,6 @@
/obj/effect/floor_decal/corner/beige/border{
dir = 6
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 6
},
/obj/effect/floor_decal/corner/beige/bordercorner2{
dir = 6
},
/turf/simulated/floor/tiled/steel,
/area/exploration/courser_dock)
"mZG" = (
Expand Down Expand Up @@ -23923,6 +23905,12 @@
dir = 8
},
/obj/structure/table/bench/steel,
/obj/effect/floor_decal/borderfloor/corner2{
dir = 1
},
/obj/effect/floor_decal/corner/beige/bordercorner2{
dir = 1
},
/turf/simulated/floor/tiled/steel,
/area/exploration)
"nPl" = (
Expand Down Expand Up @@ -24652,12 +24640,6 @@
name = "Exploration";
sortType = "Exploration"
},
/obj/effect/floor_decal/borderfloor/corner{
dir = 1
},
/obj/effect/floor_decal/corner/beige/bordercorner{
dir = 1
},
/turf/simulated/floor/tiled/monotile,
/area/exploration)
"pjG" = (
Expand Down Expand Up @@ -46654,9 +46636,9 @@ okY
okY
okY
tSS
jFJ
okY
kOx
aXQ
egu
pis
egu
aKd
Expand Down
4 changes: 2 additions & 2 deletions maps/triumph/levels/deck4.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -6431,6 +6431,7 @@
},
/obj/structure/table/standard,
/obj/item/duct_tape_roll,
/obj/item/hand_labeler,
/turf/simulated/floor/tiled/white,
/area/exploration/medical)
"ert" = (
Expand Down Expand Up @@ -31630,9 +31631,8 @@
"wfu" = (
/obj/machinery/camera/network/exploration,
/obj/structure/table/standard,
/obj/item/binoculars,
/obj/item/binoculars,
/obj/machinery/atmospherics/component/unary/vent_pump/on,
/obj/item/hand_labeler,
/turf/simulated/floor/tiled,
/area/exploration/explorer_prep)
"wfz" = (
Expand Down

0 comments on commit 51065a5

Please sign in to comment.