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

cleanup

Browse Source
This commit is contained in:
SinTwo
2016-08-14 20:46:04 -04:00
parent 7248d4a81d
commit 9e4d4752ac
7 changed files with 100 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,19 +4,17 @@
icon = 'icons/obj/atmos.dmi' icon = 'icons/obj/atmos.dmi'
icon_state = "sheater0" icon_state = "sheater0"
name = "space heater" name = "space heater"
desc = "Made by Space Amish using traditional space techniques, this heater/cooler is guaranteed not to set the station on fire." desc = "Made by Space Amish using traditional space techniques, this heater is guaranteed not to set the station on fire."
var/obj/item/weapon/cell/cell var/obj/item/weapon/cell/cell
var/cell_type = /obj/item/weapon/cell/high var/cell_type = /obj/item/weapon/cell/high
var/on = 0 var/on = 0
var/set_temperature = T20C var/set_temperature = T0C + 20 //K
var/heating_power = 40000 var/heating_power = 40000
var/settableTemperatureMedian = 30 + T0C
var/settableTemperatureRange = 30
/obj/machinery/space_heater/New() /obj/machinery/space_heater/New()
..() ..()
if (cell_type) if (cell_type)
src.cell = new cell_type(src) cell = new cell_type(src)
update_icon() update_icon()
/obj/machinery/space_heater/update_icon() /obj/machinery/space_heater/update_icon()
@@ -80,105 +78,107 @@
return return
/obj/machinery/space_heater/attack_hand(mob/user as mob) /obj/machinery/space_heater/attack_hand(mob/user as mob)
src.add_fingerprint(user) add_fingerprint(user)
tg_ui_interact(user) interact(user)
/obj/machinery/space_heater/tg_ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/ui_state/state = tg_physical_state) /obj/machinery/space_heater/interact(mob/user as mob)
ui = tgui_process.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
ui = new(user, src, ui_key, "space_heater", name, 400, 305, master_ui, state)
ui.open()
/obj/machinery/space_heater/ui_data(mob/user) if(panel_open)
var/list/data = list()
data["open"] = panel_open var/dat
data["hasPowercell"] = cell dat = "Power cell: "
data["on"] = on if(cell)
data["powerLevel"] = cell ? round(cell.percent(), 1) : 0 dat += "<A href='byond://?src=\ref[src];op=cellremove'>Installed</A><BR>"
data["targetTemp"] = round(set_temperature - T0C, 1) else
data["minTemp"] = max(settableTemperatureMedian - settableTemperatureRange - T0C, TCMB) dat += "<A href='byond://?src=\ref[src];op=cellinstall'>Removed</A><BR>"
data["maxTemp"] = settableTemperatureMedian + settableTemperatureRange - T0C
var/turf/L = get_turf(loc) dat += "Power Level: [cell ? round(cell.percent(),1) : 0]%<BR><BR>"
var/curTemp
if(istype(L)) dat += "Set Temperature: "
var/datum/gas_mixture/env = L.return_air()
curTemp = env.temperature dat += "<A href='?src=\ref[src];op=temp;val=-5'>-</A>"
else if(isturf(L))
curTemp = L.temperature dat += " [set_temperature]K ([set_temperature-T0C]&deg;C)"
if(isnull(curTemp)) dat += "<A href='?src=\ref[src];op=temp;val=5'>+</A><BR>"
data["currentTemp"] = "N/A"
user.set_machine(src)
user << browse("<HEAD><TITLE>Space Heater Control Panel</TITLE></HEAD><TT>[dat]</TT>", "window=spaceheater")
onclose(user, "spaceheater")
else else
data["currentTemp"] = round(curTemp - T0C, 1) on = !on
user.visible_message("<span class='notice'>[user] switches [on ? "on" : "off"] the [src].</span>","<span class='notice'>You switch [on ? "on" : "off"] the [src].</span>")
update_icon()
return
return data /obj/machinery/space_heater/Topic(href, href_list)
if (usr.stat)
return
if ((in_range(src, usr) && istype(src.loc, /turf)) || (istype(usr, /mob/living/silicon)))
usr.set_machine(src)
/obj/machinery/space_heater/ui_act(action, params) switch(href_list["op"])
if(..())
return TRUE
if(usr.stat)
return TRUE
if((in_range(src, usr) && istype(src.loc, /turf)) || (istype(usr, /mob/living/silicon)))
switch(action)
if("power")
on = !on
usr.visible_message("[usr] switches [on ? "on" : "off"] \the [src].", "<span class='notice'>You switch [on ? "on" : "off"] \the [src].</span>")
if("target") if("temp")
if(!panel_open) var/value = text2num(href_list["val"])
return
var/target = params["target"]
var/adjust = text2num(params["adjust"])
if(target == "input")
target = input("New target temperature:", name, round(set_temperature - T0C, 1)) as num|null
if(!isnull(target) && !..())
target += T0C
else if(adjust)
target = set_temperature + adjust
else if(text2num(target) != null)
target = text2num(target) + T0C
if(.)
set_temperature = Clamp(round(target),
max(settableTemperatureMedian - settableTemperatureRange, TCMB),
settableTemperatureMedian + settableTemperatureRange)
if("eject") // limit to 0-90 degC
if(panel_open && cell) set_temperature = dd_range(T0C, T0C + 90, set_temperature + value)
cell.loc = get_turf(src)
if("cellremove")
if(panel_open && cell && !usr.get_active_hand())
usr.visible_message("<span class='notice'>\The usr] removes \the [cell] from \the [src].</span>", "<span class='notice'>You remove \the [cell] from \the [src].</span>")
cell.update_icon()
usr.put_in_hands(cell)
cell.add_fingerprint(usr)
cell = null cell = null
power_change()
src.update_icon() if("cellinstall")
return TRUE if(panel_open && !cell)
var/obj/item/weapon/cell/C = usr.get_active_hand()
if(istype(C))
usr.drop_item()
cell = C
C.loc = src
C.add_fingerprint(usr)
power_change()
usr.visible_message("<span class='notice'>[usr] inserts \the [C] into \the [src].</span>", "<span class='notice'>You insert \the [C] into \the [src].</span>")
updateDialog()
else
usr << browse(null, "window=spaceheater")
usr.unset_machine()
return
/obj/machinery/space_heater/process() /obj/machinery/space_heater/process()
if(!on) if(on)
return if(cell && cell.charge)
if(cell && cell.charge > 0) var/datum/gas_mixture/env = loc.return_air()
var/datum/gas_mixture/env = loc.return_air() if(env && abs(env.temperature - set_temperature) > 0.1)
if(env && abs(env.temperature - set_temperature) > 0.1) var/transfer_moles = 0.25 * env.total_moles
var/transfer_moles = 0.25 * env.total_moles var/datum/gas_mixture/removed = env.remove(transfer_moles)
var/datum/gas_mixture/removed = env.remove(transfer_moles)
if(removed) if(removed)
var/heat_transfer = removed.get_thermal_energy_change(set_temperature) var/heat_transfer = removed.get_thermal_energy_change(set_temperature)
if(heat_transfer > 0) //heating air if(heat_transfer > 0) //heating air
heat_transfer = min( heat_transfer , heating_power ) //limit by the power rating of the heater heat_transfer = min( heat_transfer , heating_power ) //limit by the power rating of the heater
removed.add_thermal_energy(heat_transfer) removed.add_thermal_energy(heat_transfer)
cell.use(heat_transfer*CELLRATE) cell.use(heat_transfer*CELLRATE)
else //cooling air else //cooling air
heat_transfer = abs(heat_transfer) heat_transfer = abs(heat_transfer)
//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
var/cop = removed.temperature/T20C //coefficient of performance from thermodynamics -> power used = heat_transfer/cop var/cop = removed.temperature/T20C //coefficient of performance from thermodynamics -> power used = heat_transfer/cop
heat_transfer = min(heat_transfer, cop * heating_power) //limit heat transfer by available power heat_transfer = min(heat_transfer, cop * heating_power) //limit heat transfer by available power
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
var/power_used = abs(heat_transfer)/cop var/power_used = abs(heat_transfer)/cop
cell.use(power_used*CELLRATE) cell.use(power_used*CELLRATE)
env.merge(removed) env.merge(removed)
else else
on = 0 on = 0
power_change() power_change()
update_icon() update_icon()

20
tgui/assets/tgui.js
View File

File diff suppressed because one or more lines are too long

0
tgui/src/interfaces/cargo.ract → tgui/src/Unimplemented/cargo.ract
View File

0
tgui/src/interfaces/resleever.ract → tgui/src/Unimplemented/resleever.ract
View File

0
tgui/src/interfaces/suit_sensor_jammer.ract → tgui/src/Unimplemented/suit_sensor_jammer.ract
View File

0
tgui/src/Unimplemented/airlock_electronics.ract → tgui/src/interfaces/airlock_electronics.ract
View File

36
tgui/src/interfaces/space_heater.ract
View File

@@ -1,36 +0,0 @@
<ui-display title='Power' button>
{{#partial button}}
{{#if data.open}}
<ui-button icon='eject' state='{{data.hasPowercell ? null : "disabled"}}' action='eject'>Eject</ui-button>
{{/if}}
{{/partial}}
<ui-section label='Power'>
<ui-button icon='{{data.on ? "power-off" : "close"}}'
style='{{data.on ? "selected" : null}}' state='{{data.hasPowercell ? null : "disabled"}}'
action='power'>{{data.on ? "On" : "Off"}}</ui-button>
</ui-section>
<ui-section label='Cell'>
{{#if data.hasPowercell}}
<ui-bar min='0' max='100' value='{{data.powerLevel}}'>{{Math.fixed(adata.powerLevel)}}%</ui-bar>
{{else}}
<span class='bad'>No Cell</span>
{{/if}}
</ui-section>
</ui-display>
<ui-display title='Thermostat'>
<ui-section label='Current Temperature'>
<span>{{Math.round(adata.currentTemp)}}&deg;C</span>
</ui-section>
<ui-section label='Target Temperature'>
<span>{{Math.round(adata.targetTemp)}}&deg;C</span>
</ui-section>
{{#if data.open}}
<ui-section label='Adjust Target'>
<ui-button icon='fast-backward' state='{{data.targetTemp > data.minTemp ? null : "disabled"}}' action='target' params='{"adjust": -20}'/>
<ui-button icon='backward' state='{{data.targetTemp > data.minTemp ? null : "disabled"}}' action='target' params='{"adjust": -5}'/>
<ui-button icon='pencil' action='target' params='{"target": "input"}'>Set</ui-button>
<ui-button icon='forward' state='{{data.targetTemp < data.maxTemp ? null : "disabled"}}' action='target' params='{"adjust": 5}'/>
<ui-button icon='fast-forward' state='{{data.targetTemp < data.maxTemp ? null : "disabled"}}' action='target' params='{"adjust": 20}'/>
</ui-section>
{{/if}}
</ui-display>