Skip to content

Commit

Permalink
Merge pull request NebulaSS13#4552 from NebulaSS13/staging
Browse files Browse the repository at this point in the history
Updating dev from staging.
  • Loading branch information
MistakeNot4892 authored Nov 9, 2024
2 parents e925d5f + 9411d74 commit f7eedf1
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion code/modules/ZAS/Turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,10 @@ var/global/list/STANDARD_AIRMIX = list(
/turf/return_air()
RETURN_TYPE(/datum/gas_mixture)

// TODO: immutable gas mixtures for stuff like this, to avoid creating new datums every time.
if(!simulated)
return make_air()

// ZAS participation
if(zone && !zone.invalid)
SSair.mark_zone_update(zone)
Expand Down Expand Up @@ -261,7 +265,7 @@ var/global/list/STANDARD_AIRMIX = list(
return FALSE

/turf/proc/make_air()
air = new/datum/gas_mixture
air = new /datum/gas_mixture
air.temperature = temperature
if(initial_gas)
if(initial_gas == GAS_STANDARD_AIRMIX)
Expand Down

0 comments on commit f7eedf1

Please sign in to comment.