cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes linter and conflict shit

Browse Source
This commit is contained in:
Artur
2020-07-13 16:35:12 +03:00
parent 5f9364c5f8
commit 732a1ca438
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
_maps/map_files/CogStation/CogStation.dmm
View File

@@ -62072,7 +62072,6 @@
departmentType = 2;
name = "Chemistry RC";
pixel_x = 30;
pixel_y = 0;
receive_ore_updates = 1
},
/turf/open/floor/plasteel/white,

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

@@ -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)