Fixes linter and conflict shit

2020-07-13 16:35:12 +03:00
parent 5f9364c5f8
commit 732a1ca438
2 changed files with 1 additions and 2 deletions
@@ -265,7 +265,7 @@
 	data["online"] = compressor?.starter
 	data["power"] = DisplayPower(compressor?.turbine?.lastgen)
 	data["rpm"] = compressor?.rpm
-	data["temp"] = compressor?.gas_contained.temperature
+	data["temp"] = compressor?.gas_contained.return_temperature()
 	return data

 /obj/machinery/power/turbine/ui_act(action, params)