Skip to content

Commit

Permalink
[MIRROR] Merge ordinance burn chamber with main lab for MetaStation (#…
Browse files Browse the repository at this point in the history
…1777)

* Merge ordinance burn chamber with main lab for MetaStation (#82322)

## About The Pull Request
Fixes the issue specified in #82294 for Metastation ordinance burn
chamber.

Now both the burn chamber and the lab are combined together as one
area(no physical objects were displaced just their area properties were
modified) so they share the same apc allowing the igniter to function
there

## Changelog
:cl:
fix: igniter in meta station ordinance burn chamber works again
/:cl:

* Merge ordinance burn chamber with main lab for MetaStation

---------

Co-authored-by: SyncIt21 <[email protected]>
  • Loading branch information
2 people authored and StealsThePRs committed Apr 3, 2024
1 parent 6875b7d commit b923243
Showing 1 changed file with 17 additions and 28 deletions.
45 changes: 17 additions & 28 deletions _maps/map_files/MetaStation/MetaStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4630,7 +4630,7 @@
/obj/effect/mapping_helpers/airlock/locked,
/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
/area/station/science/ordnance)
"bEA" = (
/obj/structure/cable,
/obj/machinery/camera/directional/south{
Expand Down Expand Up @@ -6010,7 +6010,7 @@
"cgP" = (
/obj/machinery/air_sensor/ordnance_burn_chamber,
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
/area/station/science/ordnance)
"cha" = (
/obj/machinery/door/airlock/research/glass{
name = "Ordnance Lab"
Expand Down Expand Up @@ -7664,7 +7664,7 @@
dir = 1
},
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
/area/station/science/ordnance)
"cOX" = (
/obj/structure/sign/warning/radiation/rad_area/directional/north,
/obj/effect/turf_decal/stripes/line{
Expand Down Expand Up @@ -8570,10 +8570,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/station/service/theater)
"deY" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
/turf/closed/wall/r_wall,
/area/station/science/ordnance/burnchamber)
"dfh" = (
/obj/effect/spawner/random/structure/closet_maintenance,
/turf/open/floor/plating,
Expand Down Expand Up @@ -9751,7 +9747,7 @@
dir = 4
},
/turf/open/floor/engine,
/area/station/science/ordnance/burnchamber)
/area/station/science/ordnance)
"dEH" = (
/obj/effect/landmark/generic_maintenance_landmark,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
Expand Down Expand Up @@ -10846,7 +10842,7 @@
/area/station/security/execution/education)
"dXU" = (
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
/area/station/science/ordnance)
"dYa" = (
/obj/effect/turf_decal/tile/blue/fourcorners,
/turf/open/floor/iron,
Expand Down Expand Up @@ -13318,7 +13314,7 @@
"eRn" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/turf/closed/wall/r_wall,
/area/station/science/ordnance/burnchamber)
/area/station/science/ordnance)
"eRR" = (
/obj/structure/table,
/obj/item/screwdriver{
Expand Down Expand Up @@ -16796,7 +16792,7 @@
dir = 4
},
/turf/open/floor/engine,
/area/station/science/ordnance/burnchamber)
/area/station/science/ordnance)
"gip" = (
/obj/structure/table/wood,
/obj/machinery/fax{
Expand Down Expand Up @@ -19977,9 +19973,6 @@
/obj/effect/mapping_helpers/burnt_floor,
/turf/open/floor/plating,
/area/station/medical/abandoned)
"hqj" = (
/turf/closed/wall/r_wall,
/area/station/science/ordnance/burnchamber)
"hqr" = (
/obj/machinery/atmospherics/pipe/smart/simple/supply/visible{
dir = 10
Expand Down Expand Up @@ -28500,7 +28493,7 @@
"kgC" = (
/obj/machinery/door/poddoor/incinerator_ordmix,
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
/area/station/science/ordnance)
"kgV" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
Expand Down Expand Up @@ -39129,7 +39122,7 @@
dir = 8
},
/turf/open/floor/engine,
/area/station/science/ordnance/burnchamber)
/area/station/science/ordnance)
"nZQ" = (
/obj/machinery/airalarm/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -39473,7 +39466,7 @@
dir = 1
},
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
/area/station/science/ordnance)
"oew" = (
/turf/open/floor/iron,
/area/station/commons/fitness/recreation)
Expand Down Expand Up @@ -43356,10 +43349,6 @@
/obj/structure/extinguisher_cabinet/directional/west,
/turf/open/floor/iron/white,
/area/station/medical/office)
"pCa" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
/turf/closed/wall/r_wall,
/area/station/science/ordnance/burnchamber)
"pCh" = (
/obj/machinery/camera/directional/east{
c_tag = "Prison Laundry";
Expand Down Expand Up @@ -48597,7 +48586,7 @@
"rtj" = (
/obj/machinery/igniter/incinerator_ordmix,
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/burnchamber)
/area/station/science/ordnance)
"rtD" = (
/obj/effect/turf_decal/tile/purple,
/obj/machinery/light/directional/east,
Expand Down Expand Up @@ -99748,10 +99737,10 @@ uEo
fiS
gyQ
eRn
hqj
hqj
hqj
hqj
gyQ
gyQ
gyQ
gyQ
lMJ
uGg
nFa
Expand Down Expand Up @@ -100005,7 +99994,7 @@ xEU
iqx
xYZ
gil
deY
xYZ
oet
dXU
kgC
Expand Down Expand Up @@ -100519,7 +100508,7 @@ aHH
iYE
dTN
dEF
pCa
dTN
cOT
dXU
kgC
Expand Down

0 comments on commit b923243

Please sign in to comment.