Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490

2020-01-05 22:53:00 +01:00
parent f5b251db66 bd896b4629
commit 592422ee70
80 changed files with 8334 additions and 11698 deletions
@@ -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)