Skip to content

Commit

Permalink
[MIRROR] Fixes a handful of plumbing issues on Birdshot station (#1127)
Browse files Browse the repository at this point in the history
* Fixes a handful of plumbing issues on Birdshot station (#81660)

## About The Pull Request
There's three sinks in question for this one. A sink in the bar, a sink
in medical's locker/storage room and one in the perma-brig's kitchen.

Additionally adds a water tank connection to the shower room by dorms,
as the plumbing for it existed, but there was no source. (Removed some
redundant piping, as well as moving a rack to make space.)

All the sinks have a plumbed connection leading to a water tank, but
none of the tanks were actually facing towards the pipes, making none of
them supply water in the first place.

This PR rotates the water tanks, and adds one tank so that they connect
with the pipes and actually supply water.
## Why It's Good For The Game
A plumbing system works much better when connected to the water source.
## Changelog
:cl:
fix: Three stationary water tanks on Birdshot which supplied a sink in
the bar, a sink in the medical storage and a sink in the perma-brig's
kitchen are now properly rotated and connected with the plumbing.
fix: The unisex showers on Birdshot have been given a water tank for its
plumbing.
/:cl:

* Fixes a handful of plumbing issues on Birdshot station

---------

Co-authored-by: Derpguy3 <[email protected]>
  • Loading branch information
2 people authored and StealsThePRs committed Feb 25, 2024
1 parent 56d4faa commit 69a86df
Showing 1 changed file with 33 additions and 16 deletions.
49 changes: 33 additions & 16 deletions _maps/map_files/Birdshot/birdshot.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5456,10 +5456,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/station/security/tram)
"cgb" = (
/obj/machinery/duct,
/turf/open/floor/iron/kitchen/small,
/area/station/security/prison/mess)
"cgy" = (
/obj/effect/turf_decal/stripes/red/line{
dir = 4
Expand Down Expand Up @@ -11344,7 +11340,9 @@
/area/station/maintenance/starboard/aft)
"ena" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/plumbed,
/obj/structure/reagent_dispensers/plumbed{
dir = 1
},
/turf/open/floor/iron,
/area/station/maintenance/department/medical/central)
"enb" = (
Expand Down Expand Up @@ -14096,7 +14094,6 @@
"fls" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/duct,
/obj/effect/mapping_helpers/broken_floor,
/obj/effect/decal/cleanable/glass/plastitanium,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -16053,6 +16050,12 @@
/obj/machinery/airalarm/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"fRZ" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
"fSe" = (
/turf/closed/wall/rust,
/area/station/cargo/miningfoundry)
Expand Down Expand Up @@ -17810,7 +17813,6 @@
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/duct,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -24624,6 +24626,9 @@
"iSW" = (
/obj/structure/rack,
/obj/item/clothing/gloves/boxing/yellow,
/obj/item/clothing/gloves/boxing/green{
pixel_y = 4
},
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
"iTn" = (
Expand Down Expand Up @@ -24697,8 +24702,7 @@
/turf/open/floor/plating,
/area/station/engineering/atmos)
"iUy" = (
/obj/structure/rack,
/obj/item/clothing/gloves/boxing/green,
/obj/structure/reagent_dispensers/plumbed,
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
"iUz" = (
Expand Down Expand Up @@ -27370,7 +27374,6 @@
"jPr" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/duct,
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -28482,6 +28485,12 @@
/obj/item/storage/backpack/duffelbag,
/turf/open/floor/plating,
/area/station/maintenance/fore/greater)
"kld" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/duct,
/turf/open/floor/iron/kitchen/small,
/area/station/security/prison/mess)
"klf" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/chair{
Expand Down Expand Up @@ -30608,7 +30617,6 @@
"kZo" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/duct,
/obj/effect/spawner/random/trash,
/obj/effect/decal/cleanable/dirt,
/obj/effect/mapping_helpers/broken_floor,
Expand Down Expand Up @@ -32653,6 +32661,12 @@
/obj/structure/chair/stool/directional/south,
/turf/open/floor/carpet/donk,
/area/station/command/heads_quarters/qm)
"lHi" = (
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/duct,
/turf/open/floor/iron/kitchen/small,
/area/station/security/prison/mess)
"lHk" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
Expand Down Expand Up @@ -49391,7 +49405,9 @@
/area/station/maintenance/port/lesser)
"row" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/plumbed,
/obj/structure/reagent_dispensers/plumbed{
dir = 4
},
/turf/open/floor/plating,
/area/station/maintenance/central/greater)
"roz" = (
Expand Down Expand Up @@ -62899,6 +62915,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
/obj/machinery/duct,
/turf/open/floor/iron/kitchen/small,
/area/station/security/prison/mess)
"vEe" = (
Expand Down Expand Up @@ -89949,7 +89966,7 @@ qeP
lrE
oPV
pId
ect
kld
qRM
vSx
eGL
Expand Down Expand Up @@ -90205,7 +90222,7 @@ uPr
qeP
lrE
oPV
cgb
eHf
vEb
eHf
qsR
Expand Down Expand Up @@ -90463,7 +90480,7 @@ lub
tBA
oPV
iNz
jDe
lHi
jDe
tSB
eGL
Expand Down Expand Up @@ -110124,7 +110141,7 @@ aJN
tIE
nFW
iSW
rdh
fRZ
liR
jQL
uwH
Expand Down

0 comments on commit 69a86df

Please sign in to comment.