From c1468923d8ecd7235a510e91e139804484efe31b Mon Sep 17 00:00:00 2001 From: raspyosu Date: Thu, 20 Aug 2020 21:32:52 -0400 Subject: [PATCH 1/3] nerf the teg it had to be done, my child. --- code/modules/power/generator.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 78a20e5b62..da93b53504 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -66,7 +66,7 @@ var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity) var/heat = energy_transfer*(1-efficiency) - lastgen += energy_transfer*efficiency + lastgen += energy_transfer*(efficiency-0.41) hot_air.set_temperature(hot_air.return_temperature() - energy_transfer/hot_air_heat_capacity) cold_air.set_temperature(cold_air.return_temperature() + heat/cold_air_heat_capacity) From 2bd63023d164df23eb453a668245c68c898f51ab Mon Sep 17 00:00:00 2001 From: raspyosu Date: Fri, 21 Aug 2020 00:19:46 -0400 Subject: [PATCH 2/3] fix it again FIXITFIXITFIXITFIXITFIXITFIXITFIXIT makes teg logistic (thanks to putnam for the function) --- code/modules/power/generator.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index da93b53504..8baf751ac7 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -42,6 +42,7 @@ #define GENRATE 800 // generator output coefficient from Q +#define LOGISTIC_FUNCTION(L,k,x,x_0) (L/(1+(NUM_E**(-k*(x-x_0))))) /obj/machinery/power/generator/process_atmos() @@ -66,7 +67,7 @@ var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity) var/heat = energy_transfer*(1-efficiency) - lastgen += energy_transfer*(efficiency-0.41) + lastgen += LOGISTIC_FUNCTION(1000000,0.0034,delta_temperature,2000) hot_air.set_temperature(hot_air.return_temperature() - energy_transfer/hot_air_heat_capacity) cold_air.set_temperature(cold_air.return_temperature() + heat/cold_air_heat_capacity) From 95cb1faa375ff53861252bdeefa5795143ad1794 Mon Sep 17 00:00:00 2001 From: raspyosu Date: Fri, 21 Aug 2020 00:30:12 -0400 Subject: [PATCH 3/3] remove redefinition of logistic function oops! all redefines --- code/modules/power/generator.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 8baf751ac7..54b1362518 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -42,7 +42,6 @@ #define GENRATE 800 // generator output coefficient from Q -#define LOGISTIC_FUNCTION(L,k,x,x_0) (L/(1+(NUM_E**(-k*(x-x_0))))) /obj/machinery/power/generator/process_atmos()