Skip to content

Commit

Permalink
Ranger Minor Fixes (#3794)
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
My stupid ass messed up the access requirements on the armory, so I've
fixed that in this PR and added the vigilitas gas masks that were
brought to my attention.
<!-- 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

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: fixes access on the ranger armory 
/: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
fighterslam authored Nov 20, 2024
1 parent 5395c23 commit 4b31d92
Showing 1 changed file with 63 additions and 34 deletions.
97 changes: 63 additions & 34 deletions _maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,11 @@
/obj/effect/turf_decal/techfloor{
dir = 1
},
/obj/item/radio/weather_monitor{
pixel_x = 25;
anchored = 1;
name = "barometric monitor"
},
/turf/open/floor/circuit/telecomms,
/area/ship/science/ai_chamber)
"cN" = (
Expand Down Expand Up @@ -463,9 +468,7 @@
},
/obj/effect/turf_decal/trimline/opaque/vired/arrow_ccw,
/obj/machinery/light/dim/directional/north,
/turf/open/floor/plasteel/tech/techmaint{
color = "#a8b2b6"
},
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"dC" = (
/obj/effect/turf_decal/ntspaceworks_small/right,
Expand Down Expand Up @@ -590,9 +593,7 @@
/obj/machinery/advanced_airlock_controller{
pixel_y = 24
},
/turf/open/floor/plasteel/tech/techmaint{
color = "#a8b2b6"
},
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"eD" = (
/obj/machinery/power/apc/auto_name/directional/west,
Expand Down Expand Up @@ -694,10 +695,10 @@
dir = 1
},
/obj/structure/platform/industrial{
dir = 8
dir = 4
},
/obj/structure/platform/industrial/corner{
dir = 9
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
Expand Down Expand Up @@ -987,6 +988,7 @@
/obj/machinery/airalarm/directional/south,
/obj/item/clothing/head/nanotrasen/beret/security/command,
/obj/item/clothing/suit/armor/nanotrasen/sec_director,
/obj/item/clothing/under/nanotrasen/security/director,
/turf/open/floor/wood,
/area/ship/crew/dorm/captain)
"hz" = (
Expand All @@ -1000,7 +1002,9 @@
/area/ship/crew/specialized/engineering)
"hF" = (
/obj/machinery/light/dim/directional/north,
/obj/structure/closet/secure_closet/armorycage,
/obj/structure/closet/secure_closet/armorycage{
req_access = list(1)
},
/obj/effect/turf_decal/industrial/fire,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 5
Expand Down Expand Up @@ -1402,7 +1406,7 @@
},
/obj/item/paper{
name = "NT Spaceworks Notice";
default_raw_text = "Dear engineer, please bring your attention to the advanced control mechanisms present on and around this console. There is an external lighting switch to toggle the vessel's exterior lighting, highlighted in yellow, an aiar alarm connected to this console which controls external atmospherics fittings, and the console itself, which can read external atmosphere from a main sensor affixed to the port-side hull. -NT Spaceworks"
default_raw_text = "Dear engineer, please bring your attention to the advanced control mechanisms present on and around this console. There is an external lighting switch to toggle the vessel's exterior lighting, highlighted in yellow, an air alarm connected to this console which controls external atmospherics fittings, and the console itself, which can read external atmosphere from a main sensor affixed to the fore of the vessel. -NT Spaceworks"
},
/turf/open/floor/plasteel/mono/dark,
/area/ship/external/dark)
Expand Down Expand Up @@ -2035,9 +2039,7 @@
/obj/effect/turf_decal/techfloor{
dir = 8
},
/turf/open/floor/plasteel/tech/techmaint{
color = "#a8b2b6"
},
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"oq" = (
/obj/structure/cable/cyan{
Expand Down Expand Up @@ -2274,7 +2276,6 @@
/obj/machinery/camera/autoname{
dir = 1
},
/obj/machinery/air_sensor/external,
/obj/item/radio/intercom/directional/south,
/obj/machinery/light/floor,
/turf/open/floor/engine/hull,
Expand Down Expand Up @@ -2636,9 +2637,7 @@
/obj/machinery/camera/autoname{
dir = 10
},
/turf/open/floor/plasteel/tech/techmaint{
color = "#a8b2b6"
},
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"sJ" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
Expand Down Expand Up @@ -3432,6 +3431,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/effect/decal/cleanable/plasma,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engines/port)
"yf" = (
Expand Down Expand Up @@ -3661,7 +3661,8 @@
},
/obj/structure/filingcabinet/chestdrawer{
dir = 4;
pixel_x = -6
pixel_x = -6;
density = 0
},
/obj/structure/cable{
icon_state = "4-8"
Expand Down Expand Up @@ -3774,6 +3775,9 @@
},
/obj/structure/closet/cabinet,
/obj/machinery/light/small/directional/south,
/obj/item/clothing/head/nanotrasen/cap/security,
/obj/item/clothing/under/nanotrasen/science,
/obj/item/clothing/under/nanotrasen/medical/paramedic,
/turf/open/floor/plasteel/tech,
/area/ship/crew/specialized/medical)
"AF" = (
Expand Down Expand Up @@ -4172,9 +4176,7 @@
/obj/effect/turf_decal/techfloor{
dir = 8
},
/turf/open/floor/plasteel/tech/techmaint{
color = "#a8b2b6"
},
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"CW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
Expand Down Expand Up @@ -4431,6 +4433,10 @@
},
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/reagent_containers/food/drinks/waterbottle/large,
/obj/item/storage/ration/cheese_pizza_slice,
/obj/item/storage/ration/pepperoni_pizza_slice,
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"EE" = (
Expand Down Expand Up @@ -5525,6 +5531,8 @@
pixel_y = -10
},
/obj/item/clothing/suit/hooded/wintercoat,
/obj/item/storage/backpack/duffelbag,
/obj/item/storage/backpack/duffelbag,
/turf/open/floor/plasteel/tech,
/area/ship/engineering/engines/starboard)
"MR" = (
Expand Down Expand Up @@ -5902,6 +5910,13 @@
},
/turf/open/floor/plasteel/dark,
/area/ship/hallway/central)
"Pa" = (
/obj/structure/catwalk/over/plated_catwalk/dark{
name = "sensor protection plate"
},
/obj/machinery/air_sensor/external,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/external/dark)
"Pd" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
Expand Down Expand Up @@ -5972,6 +5987,11 @@
/obj/item/clothing/suit/hooded/wintercoat/engineering/atmos,
/obj/machinery/airalarm/directional/north,
/obj/machinery/light/small/directional/west,
/obj/item/clothing/head/nanotrasen/cap/security,
/obj/item/clothing/under/nanotrasen/science/robotics,
/obj/item/clothing/under/nanotrasen/engineering,
/obj/item/clothing/under/nanotrasen/engineering/atmos,
/obj/item/clothing/under/nanotrasen/engineering/director,
/turf/open/floor/wood,
/area/ship/crew/specialized/engineering)
"PG" = (
Expand Down Expand Up @@ -6040,6 +6060,8 @@
/obj/machinery/camera/autoname{
dir = 6
},
/obj/item/clothing/under/nanotrasen/supply,
/obj/item/clothing/under/nanotrasen/supply/miner,
/turf/open/floor/plasteel/tech,
/area/ship/crew/specialized/cargo)
"PR" = (
Expand Down Expand Up @@ -6126,7 +6148,9 @@
/turf/open/floor/engine/hull,
/area/ship/external/dark)
"Rn" = (
/obj/structure/closet/secure_closet/armorycage,
/obj/structure/closet/secure_closet/armorycage{
req_access = list(1)
},
/obj/effect/turf_decal/industrial/fire,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 9
Expand All @@ -6147,14 +6171,6 @@
pixel_x = -1;
pixel_y = 9
},
/obj/item/clothing/mask/gas/sechailer{
pixel_x = -10;
pixel_y = -14
},
/obj/item/clothing/mask/gas/sechailer{
pixel_x = -1;
pixel_y = -14
},
/obj/item/flashlight/seclite{
pixel_x = 5;
pixel_y = 4
Expand All @@ -6169,6 +6185,18 @@
pixel_x = 5;
pixel_y = -11
},
/obj/item/clothing/mask/gas/vigilitas,
/obj/item/clothing/mask/gas/vigilitas,
/obj/item/clothing/mask/gas/sechailer{
pixel_x = -1;
pixel_y = -14;
name = "half-mask respirator"
},
/obj/item/clothing/mask/gas/sechailer{
pixel_x = -1;
pixel_y = -14;
name = "half-mask respirator"
},
/turf/open/floor/plasteel/tech,
/area/ship/storage/equip)
"Ro" = (
Expand Down Expand Up @@ -6200,9 +6228,7 @@
/obj/effect/turf_decal/techfloor{
dir = 4
},
/turf/open/floor/plasteel/tech/techmaint{
color = "#a8b2b6"
},
/turf/open/floor/plasteel/tech,
/area/ship/hallway/central)
"RM" = (
/obj/structure/chair/sofa/brown/left/directional/west,
Expand Down Expand Up @@ -6893,6 +6919,7 @@
/obj/item/clothing/shoes/sneakers/black{
pixel_y = -10
},
/obj/item/clothing/suit/hooded/wintercoat,
/turf/open/floor/plasteel/dark,
/area/ship/crew/cryo)
"XL" = (
Expand Down Expand Up @@ -7203,6 +7230,8 @@
/obj/machinery/firealarm/directional/west,
/obj/item/clothing/head/nanotrasen/beret/security,
/obj/item/clothing/head/nanotrasen/cap/security,
/obj/item/clothing/under/nanotrasen/security,
/obj/item/clothing/under/nanotrasen/security/director,
/turf/open/floor/plasteel/tech,
/area/ship/crew/specialized/security)
"Zw" = (
Expand Down Expand Up @@ -8627,7 +8656,7 @@ zW
zW
zW
zW
wq
Pa
zW
Lk
LU
Expand Down

0 comments on commit 4b31d92

Please sign in to comment.