From fca769c182d7fb25dadb30fc21630039eb3541a4 Mon Sep 17 00:00:00 2001 From: Suicidalpickles Date: Tue, 12 Nov 2019 21:17:42 -0800 Subject: [PATCH] e --- code/__DEFINES/reactions.dm | 3 ++- code/modules/atmospherics/gasmixtures/reactions.dm | 2 +- code/modules/mob/living/living.dm | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/reactions.dm b/code/__DEFINES/reactions.dm index b7526263..99ff5ec3 100644 --- a/code/__DEFINES/reactions.dm +++ b/code/__DEFINES/reactions.dm @@ -40,4 +40,5 @@ #define PARTICLE_CHANCE_CONSTANT (-20000000) #define FUSION_RAD_MAX 2000 #define FUSION_RAD_COEFFICIENT (-1000) -#define FUSION_INSTABILITY_ENDOTHERMALITY 2 \ No newline at end of file +#define FUSION_INSTABILITY_ENDOTHERMALITY 2 +#define FUSION_MAXIMUM_TEMPERATURE 1e8 \ No newline at end of file diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index bc44bfbd..b8905a36 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -291,7 +291,7 @@ radiation_pulse(location,rad_power) var/new_heat_capacity = air.heat_capacity() - if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) + if(new_heat_capacity > MINIMUM_HEAT_CAPACITY && (air.temperature <= FUSION_MAXIMUM_TEMPERATURE || reaction_energy <= 0)) //If above FUSION_MAXIMUM_TEMPERATURE, will only adjust temperature for endothermic reactions. air.temperature = CLAMP(((air.temperature*old_heat_capacity + reaction_energy)/new_heat_capacity),TCMB,INFINITY) return REACTING diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index d7d1e27b..5be545a0 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -919,7 +919,7 @@ var/blocked = getarmor(null, "rad") if(amount > RAD_BURN_THRESHOLD) - apply_damage((amount-RAD_BURN_THRESHOLD)/RAD_BURN_THRESHOLD, BURN, null, blocked) + apply_damage(log(amount)*2, BURN, null, blocked) apply_effect((amount*RAD_MOB_COEFFICIENT)/max(1, (radiation**2)*RAD_OVERDOSE_REDUCTION), EFFECT_IRRADIATE, blocked)