From abe52f40a6deb554a325c854032a604fee424113 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 13 Sep 2017 16:55:00 -0500 Subject: [PATCH] [MIRROR] Fix transit tube atmos (again) (#2736) * Fix transit tube atmos (again) (#30597) * Fix transit tube atmos * transit tube Initialize() * Fix transit tube atmos (again) --- code/game/objects/structures/transit_tubes/station.dm | 5 ++++- .../objects/structures/transit_tubes/transit_tube_pod.dm | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 9662f0c0e3..ffc62ac127 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -147,8 +147,11 @@ sleep(OPEN_DURATION + 2) pod_moving = 0 if(!QDELETED(pod)) + var/datum/gas_mixture/floor_mixture = loc.return_air() + floor_mixture.archive() pod.air_contents.archive() - pod.air_contents.share(loc.return_air(), 1) //mix the pod's gas mixture with the tile it's on + pod.air_contents.share(floor_mixture, 1) //mix the pod's gas mixture with the tile it's on + air_update_turf() /obj/structure/transit_tube/station/init_tube_dirs() switch(dir) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 43394f01c9..1cf8e330fe 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -9,9 +9,9 @@ var/datum/gas_mixture/air_contents = new() -/obj/structure/transit_tube_pod/New(loc) - ..() - air_contents.assert_gases("o2", "n2") +/obj/structure/transit_tube_pod/Initialize() + . = ..() + air_contents.add_gases("o2", "n2") air_contents.gases["o2"][MOLES] = MOLES_O2STANDARD air_contents.gases["n2"][MOLES] = MOLES_N2STANDARD air_contents.temperature = T20C