From 9e9c38c4a505ef90600ad38b32bfadd58e255cf1 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 9 Apr 2022 21:44:04 -0700 Subject: [PATCH 1/2] Makes auxmos do fires on Linux --- code/modules/atmospherics/auxgm/gas_types.dm | 8 ++++++++ code/modules/atmospherics/gasmixtures/reactions.dm | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/modules/atmospherics/auxgm/gas_types.dm b/code/modules/atmospherics/auxgm/gas_types.dm index 6ee234d64d..d2ea9544b4 100644 --- a/code/modules/atmospherics/auxgm/gas_types.dm +++ b/code/modules/atmospherics/auxgm/gas_types.dm @@ -60,6 +60,10 @@ fire_products = "plasma_fire" enthalpy = FIRE_PLASMA_ENERGY_RELEASED // 3000000, 3 megajoules, 3000 kj +/datum/gas/plasma/New() + if(world.system_type == UNIX) + fire_temperature = null + /datum/gas/water_vapor id = GAS_H2O specific_heat = 40 @@ -134,6 +138,10 @@ fire_radiation_released = 50 // arbitrary number, basically 60 moles of trit burning will just barely start to harm you fire_temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST - 50 +/datum/gas/tritium/New() + if(world.system_type == UNIX) + fire_temperature = null + /datum/gas/bz id = GAS_BZ specific_heat = 20 diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index a6429a0754..34dce749f5 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -5,10 +5,9 @@ for(var/r in subtypesof(/datum/gas_reaction)) var/datum/gas_reaction/reaction = r - if(initial(reaction.exclude)) - continue reaction = new r - . += reaction + if(!reaction.exclude) + . += reaction sortTim(., /proc/cmp_gas_reaction) /proc/cmp_gas_reaction(datum/gas_reaction/a, datum/gas_reaction/b) // compares lists of reactions by the maximum priority contained within the list @@ -119,6 +118,7 @@ id = "tritfire" /datum/gas_reaction/tritfire/init_reqs() + exclude = world.system_type == MS_WINDOWS // temporary stopgap until generic fires work on linux min_requirements = list( "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST, GAS_TRITIUM = MINIMUM_MOLE_COUNT, @@ -200,6 +200,7 @@ id = "plasmafire" /datum/gas_reaction/plasmafire/init_reqs() + exclude = world.system_type == MS_WINDOWS // temporary stopgap until generic fires work on linux min_requirements = list( "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST, GAS_PLASMA = MINIMUM_MOLE_COUNT, From 4d98d7cedb8a453ec18a5d989b214955bfc2e981 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 9 Apr 2022 22:25:08 -0700 Subject: [PATCH 2/2] makes bombs not super OP on linux, too --- code/__DEFINES/research.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/research.dm b/code/__DEFINES/research.dm index 55c3ac8772..e27489380c 100644 --- a/code/__DEFINES/research.dm +++ b/code/__DEFINES/research.dm @@ -74,5 +74,6 @@ ) #define BOMB_TARGET_POINTS 50000 //Adjust as needed. Actual hard cap is double this, but will never be reached due to hyperbolic curve. -#define BOMB_TARGET_SIZE 175 // The shockwave radius required for a bomb to get TECHWEB_BOMB_MIDPOINT points. +#define BOMB_TARGET_SIZE (world.system_type == MS_WINDOWS ? 240 : 50000) // The shockwave radius required for a bomb to get TECHWEB_BOMB_MIDPOINT points. +// Linux still has old trit fires, so #define BOMB_SUB_TARGET_EXPONENT 3 // The power of the points curve below the target size. Higher = less points for worse bombs, below target.