mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Fixes some compile errors
This commit is contained in:
@@ -181,21 +181,21 @@
|
|||||||
if(removed.temperature < set_temperature + T0C) //heating air
|
if(removed.temperature < set_temperature + T0C) //heating air
|
||||||
// Added min(set_temperature + T0C, 1000) check to try and avoid wacky superheating issues in low gas scenarios
|
// Added min(set_temperature + T0C, 1000) check to try and avoid wacky superheating issues in low gas scenarios
|
||||||
var/energy_used = min( removed.get_thermal_energy_change(min(set_temperature + T0C, 1000)) , heating_power )
|
var/energy_used = min( removed.get_thermal_energy_change(min(set_temperature + T0C, 1000)) , heating_power )
|
||||||
|
|
||||||
removed.add_thermal_energy(energy_used)
|
removed.add_thermal_energy(energy_used)
|
||||||
cell.use(energy_used*CELLRATE)
|
cell.use(energy_used*CELLRATE)
|
||||||
else //cooling air
|
else //cooling air
|
||||||
var/heat_transfer = min(abs(removed.get_thermal_energy_change(target_temperature)), heating_power)
|
var/heat_transfer = min(abs(removed.get_thermal_energy_change(set_temperature + T0C)), heating_power)
|
||||||
|
|
||||||
//Assume the heat is being pumped into the hull which is fixed at 20 C
|
//Assume the heat is being pumped into the hull which is fixed at 20 C
|
||||||
//none of this is really proper thermodynamics but whatever
|
//none of this is really proper thermodynamics but whatever
|
||||||
|
|
||||||
var/cop = removed.temperature/T20C //coefficient of performance -> power used = heat_transfer/cop
|
var/cop = removed.temperature/T20C //coefficient of performance -> power used = heat_transfer/cop
|
||||||
|
|
||||||
heat_transfer = min(heat_transfer, cop * heating_power) //this ensures that we don't use more than MAX_ENERGY_CHANGE amount of power - the machine can only do so much cooling
|
heat_transfer = min(heat_transfer, cop * heating_power) //this ensures that we don't use more than MAX_ENERGY_CHANGE amount of power - the machine can only do so much cooling
|
||||||
|
|
||||||
heat_transfer = -removed.add_thermal_energy(-heat_transfer) //get the actual heat transfer
|
heat_transfer = -removed.add_thermal_energy(-heat_transfer) //get the actual heat transfer
|
||||||
|
|
||||||
cell.use(heat_transfer/cop*CELLRATE)
|
cell.use(heat_transfer/cop*CELLRATE)
|
||||||
|
|
||||||
env.merge(removed)
|
env.merge(removed)
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
|
|||||||
use_power = 1
|
use_power = 1
|
||||||
idle_power_usage = 25
|
idle_power_usage = 25
|
||||||
machinetype = 5
|
machinetype = 5
|
||||||
heatgen = 0
|
operating_temperature = null
|
||||||
delay = 7
|
delay = 7
|
||||||
circuitboard = "/obj/item/weapon/circuitboard/telecomms/broadcaster"
|
circuitboard = "/obj/item/weapon/circuitboard/telecomms/broadcaster"
|
||||||
|
|
||||||
@@ -120,7 +120,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
|
|||||||
use_power = 0
|
use_power = 0
|
||||||
idle_power_usage = 0
|
idle_power_usage = 0
|
||||||
machinetype = 6
|
machinetype = 6
|
||||||
heatgen = 0
|
operating_temperature = null
|
||||||
var/intercept = 0 // if nonzero, broadcasts all messages to syndicate channel
|
var/intercept = 0 // if nonzero, broadcasts all messages to syndicate channel
|
||||||
|
|
||||||
/obj/machinery/telecomms/allinone/receive_signal(datum/signal/signal)
|
/obj/machinery/telecomms/allinone/receive_signal(datum/signal/signal)
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
//anchored = 1
|
//anchored = 1
|
||||||
//use_power = 0
|
//use_power = 0
|
||||||
//idle_power_usage = 0
|
//idle_power_usage = 0
|
||||||
heatgen = 0
|
operating_temperature = null
|
||||||
autolinkers = list("c_relay")
|
autolinkers = list("c_relay")
|
||||||
|
|
||||||
//HUB
|
//HUB
|
||||||
@@ -46,7 +46,7 @@
|
|||||||
/obj/machinery/telecomms/hub/preset_cent
|
/obj/machinery/telecomms/hub/preset_cent
|
||||||
id = "CentComm Hub"
|
id = "CentComm Hub"
|
||||||
network = "tcommsat"
|
network = "tcommsat"
|
||||||
heatgen = 0
|
operating_temperature = null
|
||||||
autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay",
|
autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay",
|
||||||
"centcomm", "receiverCent", "broadcasterCent")
|
"centcomm", "receiverCent", "broadcasterCent")
|
||||||
|
|
||||||
@@ -78,7 +78,7 @@
|
|||||||
/obj/machinery/telecomms/receiver/preset_cent
|
/obj/machinery/telecomms/receiver/preset_cent
|
||||||
id = "CentComm Receiver"
|
id = "CentComm Receiver"
|
||||||
network = "tcommsat"
|
network = "tcommsat"
|
||||||
heatgen = 0
|
operating_temperature = null
|
||||||
autolinkers = list("receiverCent")
|
autolinkers = list("receiverCent")
|
||||||
freq_listening = list(1345, 1341)
|
freq_listening = list(1345, 1341)
|
||||||
|
|
||||||
@@ -118,7 +118,7 @@
|
|||||||
id = "CentComm Bus"
|
id = "CentComm Bus"
|
||||||
network = "tcommsat"
|
network = "tcommsat"
|
||||||
freq_listening = list(1345, 1341)
|
freq_listening = list(1345, 1341)
|
||||||
heatgen = 0
|
operating_temperature = null
|
||||||
autolinkers = list("processorCent", "centcomm")
|
autolinkers = list("processorCent", "centcomm")
|
||||||
|
|
||||||
//Processors
|
//Processors
|
||||||
@@ -146,7 +146,7 @@
|
|||||||
/obj/machinery/telecomms/processor/preset_cent
|
/obj/machinery/telecomms/processor/preset_cent
|
||||||
id = "CentComm Processor"
|
id = "CentComm Processor"
|
||||||
network = "tcommsat"
|
network = "tcommsat"
|
||||||
heatgen = 0
|
operating_temperature = null
|
||||||
autolinkers = list("processorCent")
|
autolinkers = list("processorCent")
|
||||||
|
|
||||||
//Servers
|
//Servers
|
||||||
@@ -200,7 +200,7 @@
|
|||||||
/obj/machinery/telecomms/server/presets/centcomm
|
/obj/machinery/telecomms/server/presets/centcomm
|
||||||
id = "CentComm Server"
|
id = "CentComm Server"
|
||||||
freq_listening = list(1345, 1341)
|
freq_listening = list(1345, 1341)
|
||||||
heatgen = 0
|
operating_temperature = null
|
||||||
autolinkers = list("centcomm")
|
autolinkers = list("centcomm")
|
||||||
|
|
||||||
|
|
||||||
@@ -223,5 +223,5 @@
|
|||||||
/obj/machinery/telecomms/broadcaster/preset_cent
|
/obj/machinery/telecomms/broadcaster/preset_cent
|
||||||
id = "CentComm Broadcaster"
|
id = "CentComm Broadcaster"
|
||||||
network = "tcommsat"
|
network = "tcommsat"
|
||||||
heatgen = 0
|
operating_temperature = null
|
||||||
autolinkers = list("broadcasterCent")
|
autolinkers = list("broadcasterCent")
|
||||||
@@ -29,7 +29,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
|
|||||||
var/toggled = 1 // Is it toggled on
|
var/toggled = 1 // Is it toggled on
|
||||||
var/on = 1
|
var/on = 1
|
||||||
var/integrity = 100 // basically HP, loses integrity by heat
|
var/integrity = 100 // basically HP, loses integrity by heat
|
||||||
var/operating_temperature = 20 + T0C // the temperature that the machine will raise the environment to, null for no heat production
|
var/operating_temperature = 20 + T0C // the temperature that the machine will raise the environment to, or null for no heat production
|
||||||
var/delay = 10 // how many process() ticks to delay per heat
|
var/delay = 10 // how many process() ticks to delay per heat
|
||||||
var/long_range_link = 0 // Can you link it across Z levels or on the otherside of the map? (Relay & Hub)
|
var/long_range_link = 0 // Can you link it across Z levels or on the otherside of the map? (Relay & Hub)
|
||||||
var/circuitboard = null // string pointing to a circuitboard type
|
var/circuitboard = null // string pointing to a circuitboard type
|
||||||
|
|||||||
Reference in New Issue
Block a user