cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Ready] Atmos cleanup + subtypes (#36690)

Browse Source 
* dv cleanup/pump fixes
dv cleanup pubby

* atmos machinery subtypes

* incinerator cleanup after on = FALSE; removes luminosity overrides

* fixes freezer target temp

fixes heater/freezer target temp

* flipped filters, flipped/inverse air mixers

* atmos filters and air mixers

* freezers and heaters

* semicolon

* solves conflicts with #36659, #36673

* fixes pubbystation.dmm merge conflict

* adds icon_state and comments to pumps/mixer/thermomachine

* min/max_temperature comment

* replaces 4500kPa with MAX_OUTPUT_PRESSURE

* handles freezer/on temp in Initialize()
This commit is contained in:
81Denton
2018-03-31 22:33:21 +02:00
committed by yogstation13-bot
parent 91ab914928
commit 75669ef937
22 changed files with 491 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
View File

@@ -164,28 +164,41 @@
icon_state_on = "freezer_1"
icon_state_open = "freezer-o"
max_temperature = T20C
min_temperature = 170
min_temperature = 170 //actual minimum temperature is defined by RefreshParts()
circuit = /obj/item/circuitboard/machine/thermomachine/freezer
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on
on = TRUE
icon_state = "freezer_1"
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/Initialize()
. = ..()
if(target_temperature == initial(target_temperature))
target_temperature = min_temperature
/obj/machinery/atmospherics/components/unary/thermomachine/freezer/RefreshParts()
..()
var/L
for(var/obj/item/stock_parts/micro_laser/M in component_parts)
L += M.rating
min_temperature = max(T0C - (initial(min_temperature) + L * 15), TCMB)
min_temperature = max(T0C - (initial(min_temperature) + L * 15), TCMB) //73.15K with T1 stock parts
/obj/machinery/atmospherics/components/unary/thermomachine/heater
name = "heater"
icon_state = "heater"
icon_state_on = "heater_1"
icon_state_open = "heater-o"
max_temperature = 140
max_temperature = 140 //actual maximum temperature is defined by RefreshParts()
min_temperature = T20C
circuit = /obj/item/circuitboard/machine/thermomachine/heater
/obj/machinery/atmospherics/components/unary/thermomachine/heater/on
on = TRUE
icon_state = "heater_1"
/obj/machinery/atmospherics/components/unary/thermomachine/heater/RefreshParts()
..()
var/L
for(var/obj/item/stock_parts/micro_laser/M in component_parts)
L += M.rating
max_temperature = T20C + (initial(max_temperature) * L)
max_temperature = T20C + (initial(max_temperature) * L) //573.15K with T1 stock parts