shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10396 from Hatterhat/revert-8056-tegnerf

Browse Source 
reverts that one TEG nerf that forced it to require an arbitrary burnmix
This commit is contained in:
Ghom
2020-01-05 15:36:02 +01:00
committed by GitHub
parent 77c09427ef 5b99524e82
commit 4655815c12
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
View File

@@ -61,8 +61,6 @@
//Actually transfer the gas
var/datum/gas_mixture/removed = air2.remove(transfer_moles)
removed.react(src)
update_parents()
return removed

2
code/modules/power/generator.dm
View File

@@ -65,7 +65,7 @@
if(delta_temperature > 0 && cold_air_heat_capacity > 0 && hot_air_heat_capacity > 0)
var/efficiency = 0.00025 + (hot_air.reaction_results["fire"]*0.01)
var/efficiency = 0.45
var/energy_transfer = delta_temperature*hot_air_heat_capacity*cold_air_heat_capacity/(hot_air_heat_capacity+cold_air_heat_capacity)