cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 17:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes linda heat capacity errors [MDB IGNORE] (#16445)

Browse Source 
* Fixes linda heat capacity errors (#70071)

We make the assumption that a turf's heat capacity will never be 0. This is safe because we've got an override of /datum/gas_mixture for turfs that overrides 0 heat cap with 7000 (SPACE)
This is done to make cold actually flow through empty tiles, because we are hacks.

I forgot to include type in my gas mixture creation logic, so this was being dropped. FIXXXX

* Fixes linda heat capacity errors

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-09-26 14:13:24 +02:00
committed by GitHub
parent 31d925a31d
commit 4734ca7490
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/controllers/subsystem/air.dm
View File

@@ -671,16 +671,17 @@ GLOBAL_LIST_EMPTY(colored_images)
atmos_gen[initial(atmostype.id)] = new atmostype atmos_gen[initial(atmostype.id)] = new atmostype
/// Takes a gas string, returns the matching mutable gas_mixture /// Takes a gas string, returns the matching mutable gas_mixture
/datum/controller/subsystem/air/proc/parse_gas_string(gas_string) /datum/controller/subsystem/air/proc/parse_gas_string(gas_string, gastype = /datum/gas_mixture)
var/datum/gas_mixture/cached = strings_to_mix[gas_string] var/datum/gas_mixture/cached = strings_to_mix["[gas_string]-[gastype]"]
if(cached) if(cached)
if(istype(cached, /datum/gas_mixture/immutable)) if(istype(cached, /datum/gas_mixture/immutable))
return cached return cached
return cached.copy() return cached.copy()
var/datum/gas_mixture/canonical_mix = new() var/datum/gas_mixture/canonical_mix = new gastype()
// We set here so any future key changes don't fuck us // We set here so any future key changes don't fuck us
strings_to_mix[gas_string] = canonical_mix strings_to_mix["[gas_string]-[gastype]"] = canonical_mix
gas_string = preprocess_gas_string(gas_string) gas_string = preprocess_gas_string(gas_string)
var/list/gases = canonical_mix.gases var/list/gases = canonical_mix.gases

2
code/modules/admin/verbs/fix_air.dm
View File

@@ -15,7 +15,7 @@
if(F.blocks_air) if(F.blocks_air)
//skip walls //skip walls
continue continue
var/datum/gas_mixture/GM = SSair.parse_gas_string(F.initial_gas_mix) var/datum/gas_mixture/GM = SSair.parse_gas_string(F.initial_gas_mix, /datum/gas_mixture/turf)
F.copy_air(GM) F.copy_air(GM)
F.update_visuals() F.update_visuals()

2
code/modules/atmospherics/environmental/LINDA_system.dm
View File

@@ -212,7 +212,7 @@
if(!text || !air) if(!text || !air)
return return
var/datum/gas_mixture/turf_mixture = SSair.parse_gas_string(text) var/datum/gas_mixture/turf_mixture = SSair.parse_gas_string(text, /datum/gas_mixture/turf)
air.merge(turf_mixture) air.merge(turf_mixture)
archive() archive()

2
code/modules/atmospherics/environmental/LINDA_turf_tile.dm
View File

@@ -77,7 +77,7 @@
///Copies all gas info from the turf into a new gas_mixture, along with our temperature ///Copies all gas info from the turf into a new gas_mixture, along with our temperature
///Returns the created gas_mixture ///Returns the created gas_mixture
/turf/proc/create_gas_mixture() /turf/proc/create_gas_mixture()
var/datum/gas_mixture/mix = SSair.parse_gas_string(initial_gas_mix) var/datum/gas_mixture/mix = SSair.parse_gas_string(initial_gas_mix, /datum/gas_mixture/turf)
//acounts for changes in temperature //acounts for changes in temperature
var/turf/parent = parent_type var/turf/parent = parent_type