From 732a1ca4381a59255cc99cf3a5e0c7ca2d5a0e14 Mon Sep 17 00:00:00 2001 From: Artur Date: Mon, 13 Jul 2020 16:35:12 +0300 Subject: [PATCH] Fixes linter and conflict shit --- _maps/map_files/CogStation/CogStation.dmm | 1 - code/modules/power/turbine.dm | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index 47182ff151..182f1a4f27 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -62072,7 +62072,6 @@ departmentType = 2; name = "Chemistry RC"; pixel_x = 30; - pixel_y = 0; receive_ore_updates = 1 }, /turf/open/floor/plasteel/white, diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 3e2c7a1772..e7a97c554f 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -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)