cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds celsius to the freezer/heater

Browse Source
This commit is contained in:
Markolie
2015-02-21 22:14:02 +01:00
parent d2dcb7a041
commit cb732b2b2d
3 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/Freezer.dm
+30 -1
View File
@@ -22,6 +22,18 @@
component_parts += new /obj/item/stack/cable_coil(src, 1)
RefreshParts()
/obj/machinery/atmospherics/unary/cold_sink/freezer/upgraded/New()
..()
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/thermomachine(src)
component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src)
component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src)
component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(src)
component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(src)
component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
component_parts += new /obj/item/stack/cable_coil(src, 1)
RefreshParts()
/obj/machinery/atmospherics/unary/cold_sink/freezer/RefreshParts()
var/H
var/T
@@ -85,9 +97,11 @@
data["on"] = on ? 1 : 0
data["gasPressure"] = round(air_contents.return_pressure())
data["gasTemperature"] = round(air_contents.temperature)
data["gasTemperatureCelsius"] = round(air_contents.temperature - T0C)
data["minGasTemperature"] = round(min_temperature)
data["maxGasTemperature"] = round(T20C)
data["targetGasTemperature"] = round(current_temperature)
data["targetGasTemperatureCelsius"] = round(current_temperature - T0C)
var/temp_class = "good"
if (air_contents.temperature > (T0C - 20))
@@ -101,7 +115,7 @@
if (!ui)
// the ui does not exist, so we'll create a new() one
// for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
ui = new(user, src, ui_key, "freezer.tmpl", "Gas Cooling System", 440, 300)
ui = new(user, src, ui_key, "freezer.tmpl", "Gas Cooling System", 520, 300)
// when the ui is first opened this is the data it will use
ui.set_initial_data(data)
// open the new ui window
@@ -159,6 +173,21 @@
component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
component_parts += new /obj/item/stack/cable_coil(src, 1)
RefreshParts()
/obj/machinery/atmospherics/unary/heat_reservoir/heater/upgraded/New()
..()
var/obj/item/weapon/circuitboard/thermomachine/H = new /obj/item/weapon/circuitboard/thermomachine(null)
H.build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater
H.name = "circuit board (Heater)"
component_parts = list()
component_parts += H
component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src)
component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(src)
component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(src)
component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(src)
component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
component_parts += new /obj/item/stack/cable_coil(src, 1)
RefreshParts()
/obj/machinery/atmospherics/unary/heat_reservoir/heater/RefreshParts()
var/H
code/game/objects/structures/tables_racks.dm
+2 -1
View File
@@ -41,7 +41,8 @@
update_icon()
update_adjacent()
craft_holder = new /datum/crafting_holder(src, "table")
spawn(5)
craft_holder = new /datum/crafting_holder(src, "table")
/obj/structure/table/Destroy()
update_adjacent()