Skip to content

Commit

Permalink
[MIRROR] Adds several fire alarms to Birdshot (#611)
Browse files Browse the repository at this point in the history
* Adds several fire alarms to Birdshot (#81063)

## About The Pull Request
Several rooms were closed in by firelocks but were missing fire alarms,
leading to an entrapment hazard should a fire break out with no crowbars
nearby.
- circuit lab
- hallway outside of circuit lab
- mech bay
- chapel garden
- chapel office
- security hallway outside the office
- warden's office
- evidence storage
- both dormitory private quarters
- atmospherics gas storage
- north and south telecomms antechambers
- library study
- head of personnel quarters
- recreation hallway outside of cytology
- also removed a short line of air supply pipes in cargo delivery office
that went nowhere

In memory of a particular crewmember who perished in a horrible fire, no
crowbar or fire alarm in sight.

I'm not much of a mapper, if any of these seem unnecessary or misplaced
let me know and I can change it.
## Why It's Good For The Game
Additional escape options should a fire break out without a crowbar
handy.
## Changelog
:cl:
fix: Missing fire alarms added to several rooms on Birdshot
/:cl:

* Adds several fire alarms to Birdshot

---------

Co-authored-by: Isratosh <[email protected]>
  • Loading branch information
2 people authored and FFMirrorBot committed Jan 25, 2024
1 parent c18c4c3 commit affa319
Showing 1 changed file with 17 additions and 5 deletions.
22 changes: 17 additions & 5 deletions _maps/map_files/Birdshot/birdshot.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,7 @@
},
/obj/structure/cable,
/obj/effect/turf_decal/siding/wideplating/dark,
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
/area/station/security)
"apB" = (
Expand Down Expand Up @@ -4087,6 +4088,7 @@
/obj/effect/turf_decal/siding/green{
dir = 8
},
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron/cafeteria,
/area/station/science/circuits)
"bDN" = (
Expand Down Expand Up @@ -7076,6 +7078,7 @@
dir = 1
},
/obj/effect/turf_decal/tile/neutral/half/contrasted,
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/station/security/courtroom)
"cLH" = (
Expand Down Expand Up @@ -10445,6 +10448,7 @@
/obj/effect/turf_decal/siding/red{
dir = 6
},
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/white/small,
/area/station/security/warden)
"dXE" = (
Expand Down Expand Up @@ -21821,6 +21825,7 @@
/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{
dir = 10
},
/obj/machinery/firealarm/directional/north,
/turf/open/floor/circuit,
/area/station/tcommsat/server)
"hQs" = (
Expand Down Expand Up @@ -25768,7 +25773,6 @@
/turf/open/floor/wood/tile,
/area/station/command/corporate_showroom)
"jns" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/chair/stool/directional/south,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/holopad,
Expand All @@ -25779,6 +25783,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
},
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/smooth,
/area/station/security/evidence)
"jnS" = (
Expand Down Expand Up @@ -26094,6 +26099,7 @@
/obj/structure/bed,
/obj/item/bedsheet/hop,
/obj/effect/landmark/start/head_of_personnel,
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron/grimy,
/area/station/command/heads_quarters/hop)
"jvB" = (
Expand Down Expand Up @@ -29749,6 +29755,7 @@
/obj/structure/table,
/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small/directional/west,
/obj/machinery/firealarm/directional/west,
/turf/open/floor/iron,
/area/station/commons/dorms)
"kIe" = (
Expand Down Expand Up @@ -31495,7 +31502,6 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/turf_decal/tile/brown/half/contrasted{
dir = 1
},
Expand Down Expand Up @@ -32336,6 +32342,7 @@
/obj/item/stack/sheet/titaniumglass,
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/machinery/light/directional/north,
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron,
/area/station/engineering/atmos/storage/gas)
"lAO" = (
Expand Down Expand Up @@ -33266,6 +33273,7 @@
/obj/structure/table,
/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small/directional/east,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron,
/area/station/commons/dorms)
"lQh" = (
Expand Down Expand Up @@ -39041,6 +39049,7 @@
/obj/effect/decal/cleanable/cobweb,
/obj/effect/mapping_helpers/broken_floor,
/obj/structure/sign/poster/official/random/directional/north,
/obj/machinery/firealarm/directional/west,
/turf/open/floor/wood/parquet,
/area/station/service/library)
"nTi" = (
Expand Down Expand Up @@ -41202,6 +41211,7 @@
/obj/machinery/camera/autoname/directional/east,
/obj/item/wrench,
/obj/item/paper/fluff/jobs/engineering/frequencies,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/circuit,
/area/station/tcommsat/server)
"oJz" = (
Expand Down Expand Up @@ -44668,6 +44678,7 @@
},
/obj/machinery/mechpad,
/obj/machinery/light/small/directional/north,
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron/smooth_large,
/area/station/science/robotics/mechbay)
"pQE" = (
Expand Down Expand Up @@ -47240,7 +47251,6 @@
/turf/open/misc/sandy_dirt,
/area/station/security/tram)
"qDP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/chair/stool/directional/north,
/obj/effect/landmark/event_spawn,
/turf/open/floor/iron,
Expand Down Expand Up @@ -49803,6 +49813,7 @@
pixel_y = -2
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/directional/south,
/turf/open/floor/iron,
/area/station/science/lower)
"ruC" = (
Expand Down Expand Up @@ -52336,6 +52347,7 @@
/obj/item/clothing/mask/bandana/skull,
/obj/effect/mapping_helpers/broken_floor,
/obj/item/toy/basketball,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/iron,
/area/station/hallway/secondary/recreation)
"sih" = (
Expand Down Expand Up @@ -54512,7 +54524,6 @@
/turf/open/floor/iron,
/area/station/cargo/sorting)
"sSA" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/table,
/obj/item/folder/yellow,
/turf/open/floor/iron,
Expand Down Expand Up @@ -57576,6 +57587,7 @@
dir = 4
},
/obj/structure/flora/bush/flowers_pp/style_random,
/obj/machinery/firealarm/directional/east,
/turf/open/floor/grass,
/area/station/service/hydroponics/garden/monastery)
"tTR" = (
Expand Down Expand Up @@ -64507,7 +64519,6 @@
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
"wcP" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/modular_computer/preset/cargochat/cargo,
/turf/open/floor/iron,
/area/station/cargo/sorting)
Expand Down Expand Up @@ -68057,6 +68068,7 @@
/area/station/service/library)
"xeP" = (
/obj/structure/table/wood,
/obj/machinery/firealarm/directional/west,
/turf/open/floor/wood,
/area/station/service/chapel/office)
"xeT" = (
Expand Down

0 comments on commit affa319

Please sign in to comment.