cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes some compile errors

Browse Source
This commit is contained in:
mwerezak
2014-07-11 17:04:14 -04:00
parent 7c0541da5e
commit fa1f587939
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/spaceheater.dm
View File

@@ -185,7 +185,7 @@
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

4
code/game/machinery/telecomms/broadcaster.dm
View File

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

14
code/game/machinery/telecomms/presets.dm
View File

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

2
code/game/machinery/telecomms/telecomunications.dm
View File

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