diff --git a/_maps/map_files/MetaStation/z3.dmm b/_maps/map_files/MetaStation/z3.dmm index c2a11075ee8..c1e20ddacaa 100644 --- a/_maps/map_files/MetaStation/z3.dmm +++ b/_maps/map_files/MetaStation/z3.dmm @@ -1060,6 +1060,16 @@ /obj/structure/girder, /turf/simulated/floor/plating/airless, /area/AIsattele) +"gw" = ( +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 + }, +/turf/simulated/floor/plating/airless, +/area/AIsattele) +"AV" = ( +/obj/machinery/atmospherics/unary/tank/oxygen_agent_b, +/turf/simulated/floor/plating/airless, +/area/AIsattele) (1,1,1) = {" aa @@ -55476,8 +55486,8 @@ aa ay em em -er -eB +AV +gw eG em em diff --git a/_maps/map_files/cyberiad/z3.dmm b/_maps/map_files/cyberiad/z3.dmm index b517ac3154b..31314bf545a 100644 --- a/_maps/map_files/cyberiad/z3.dmm +++ b/_maps/map_files/cyberiad/z3.dmm @@ -4065,6 +4065,16 @@ /obj/structure/girder, /turf/simulated/floor/plating/airless, /area/AIsattele) +"we" = ( +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 + }, +/turf/simulated/floor/plating/airless, +/area/AIsattele) +"LU" = ( +/obj/machinery/atmospherics/unary/tank/oxygen_agent_b, +/turf/simulated/floor/plating/airless, +/area/AIsattele) (1,1,1) = {" aa @@ -58481,8 +58491,8 @@ aa aT iF iF -iK -iT +LU +we iW iF iF diff --git a/code/ATMOSPHERICS/components/unary_devices/tank.dm b/code/ATMOSPHERICS/components/unary_devices/tank.dm index bf0c3c8e06d..deb194af6e7 100644 --- a/code/ATMOSPHERICS/components/unary_devices/tank.dm +++ b/code/ATMOSPHERICS/components/unary_devices/tank.dm @@ -16,7 +16,7 @@ if(!istype(T)) return add_underlay(T, node, dir) - + /obj/machinery/atmospherics/unary/tank/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/analyzer)) atmosanalyzer_scan(air_contents, user) @@ -94,4 +94,18 @@ trace_gas.moles = (25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature) air_contents.trace_gases += trace_gas - \ No newline at end of file + +/obj/machinery/atmospherics/unary/tank/oxygen_agent_b + name = "Unidentified Gas Tank" + desc = "A large vessel containing an unknown pressurized gas." + icon_state = "agent_b_map" + +/obj/machinery/atmospherics/unary/tank/oxygen_agent_b/New() + ..() + icon_state = "agent_b" + air_contents.volume = volume + air_contents.temperature = T20C + + var/datum/gas/oxygen_agent_b/trace_gas = new + trace_gas.moles = (50 * ONE_ATMOSPHERE) * (air_contents.volume) / (R_IDEAL_GAS_EQUATION * air_contents.temperature) + air_contents.trace_gases += trace_gas \ No newline at end of file diff --git a/code/datums/gas_mixture.dm b/code/datums/gas_mixture.dm index a10c3a8358f..7a7571999cf 100644 --- a/code/datums/gas_mixture.dm +++ b/code/datums/gas_mixture.dm @@ -117,7 +117,7 @@ What are the archived variables for? trace_gas.moles -= reaction_rate*0.05 - temperature -= (reaction_rate*20000)/heat_capacity() + temperature += (reaction_rate*20000)/heat_capacity() reacting = 1 diff --git a/icons/atmos/tank.dmi b/icons/atmos/tank.dmi index bf98899fb8e..3a6e2031cbc 100644 Binary files a/icons/atmos/tank.dmi and b/icons/atmos/tank.dmi differ