cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

balancing/sanity checks

Browse Source
This commit is contained in:
Putnam
2020-01-10 04:23:43 -08:00
parent e468fa3e71
commit c0be46e07f
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm
View File

@@ -68,7 +68,7 @@
var/data = list() var/data = list()
data["open_pressure"] = round(open_pressure) data["open_pressure"] = round(open_pressure)
data["close_pressure"] = round(close_pressure) data["close_pressure"] = round(close_pressure)
data["max_pressure"] = round(MAX_OUTPUT_PRESSURE) data["max_pressure"] = round(50*ONE_ATMOSPHERE)
return data return data
/obj/machinery/atmospherics/components/binary/relief_valve/ui_act(action, params) /obj/machinery/atmospherics/components/binary/relief_valve/ui_act(action, params)
@@ -78,31 +78,31 @@
if("open_pressure") if("open_pressure")
var/pressure = params["open_pressure"] var/pressure = params["open_pressure"]
if(pressure == "max") if(pressure == "max")
pressure = MAX_OUTPUT_PRESSURE pressure = 50*ONE_ATMOSPHERE
. = TRUE . = TRUE
else if(pressure == "input") else if(pressure == "input")
pressure = input("New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, open_pressure) as num|null pressure = input("New output pressure ([close_pressure]-[50*ONE_ATMOSPHERE] kPa):", name, open_pressure) as num|null
if(!isnull(pressure) && !..()) if(!isnull(pressure) && !..())
. = TRUE . = TRUE
else if(text2num(pressure) != null) else if(text2num(pressure) != null)
pressure = text2num(pressure) pressure = text2num(pressure)
. = TRUE . = TRUE
if(.) if(.)
open_pressure = CLAMP(pressure, 0, MAX_OUTPUT_PRESSURE) open_pressure = CLAMP(pressure, close_pressure, 50*ONE_ATMOSPHERE)
investigate_log("open pressure was set to [open_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS) investigate_log("open pressure was set to [open_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
if("close_pressure") if("close_pressure")
var/pressure = params["close_pressure"] var/pressure = params["close_pressure"]
if(pressure == "max") if(pressure == "max")
pressure = MAX_OUTPUT_PRESSURE pressure = open_pressure
. = TRUE . = TRUE
else if(pressure == "input") else if(pressure == "input")
pressure = input("New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, close_pressure) as num|null pressure = input("New output pressure (0-[open_pressure] kPa):", name, close_pressure) as num|null
if(!isnull(pressure) && !..()) if(!isnull(pressure) && !..())
. = TRUE . = TRUE
else if(text2num(pressure) != null) else if(text2num(pressure) != null)
pressure = text2num(pressure) pressure = text2num(pressure)
. = TRUE . = TRUE
if(.) if(.)
close_pressure = CLAMP(pressure, 0, MAX_OUTPUT_PRESSURE) close_pressure = CLAMP(pressure, 0, open_pressure)
investigate_log("close pressure was set to [close_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS) investigate_log("close pressure was set to [close_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
update_icon() update_icon()

14
code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm
View File

@@ -71,7 +71,7 @@
var/data = list() var/data = list()
data["open_pressure"] = round(open_pressure) data["open_pressure"] = round(open_pressure)
data["close_pressure"] = round(close_pressure) data["close_pressure"] = round(close_pressure)
data["max_pressure"] = round(MAX_OUTPUT_PRESSURE) data["max_pressure"] = round(50*ONE_ATMOSPHERE)
return data return data
/obj/machinery/atmospherics/components/unary/relief_valve/ui_act(action, params) /obj/machinery/atmospherics/components/unary/relief_valve/ui_act(action, params)
@@ -81,31 +81,31 @@
if("open_pressure") if("open_pressure")
var/pressure = params["open_pressure"] var/pressure = params["open_pressure"]
if(pressure == "max") if(pressure == "max")
pressure = MAX_OUTPUT_PRESSURE pressure = 50*ONE_ATMOSPHERE
. = TRUE . = TRUE
else if(pressure == "input") else if(pressure == "input")
pressure = input("New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, open_pressure) as num|null pressure = input("New output pressure ([close_pressure]-[50*ONE_ATMOSPHERE] kPa):", name, open_pressure) as num|null
if(!isnull(pressure) && !..()) if(!isnull(pressure) && !..())
. = TRUE . = TRUE
else if(text2num(pressure) != null) else if(text2num(pressure) != null)
pressure = text2num(pressure) pressure = text2num(pressure)
. = TRUE . = TRUE
if(.) if(.)
open_pressure = CLAMP(pressure, 0, MAX_OUTPUT_PRESSURE) open_pressure = CLAMP(pressure, close_pressure, 50*ONE_ATMOSPHERE)
investigate_log("open pressure was set to [open_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS) investigate_log("open pressure was set to [open_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
if("close_pressure") if("close_pressure")
var/pressure = params["close_pressure"] var/pressure = params["close_pressure"]
if(pressure == "max") if(pressure == "max")
pressure = MAX_OUTPUT_PRESSURE pressure = open_pressure
. = TRUE . = TRUE
else if(pressure == "input") else if(pressure == "input")
pressure = input("New output pressure (0-[MAX_OUTPUT_PRESSURE] kPa):", name, close_pressure) as num|null pressure = input("New output pressure (0-[open_pressure] kPa):", name, close_pressure) as num|null
if(!isnull(pressure) && !..()) if(!isnull(pressure) && !..())
. = TRUE . = TRUE
else if(text2num(pressure) != null) else if(text2num(pressure) != null)
pressure = text2num(pressure) pressure = text2num(pressure)
. = TRUE . = TRUE
if(.) if(.)
close_pressure = CLAMP(pressure, 0, MAX_OUTPUT_PRESSURE) close_pressure = CLAMP(pressure, 0, open_pressure)
investigate_log("close pressure was set to [close_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS) investigate_log("close pressure was set to [close_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
update_icon() update_icon()

14
tgui/assets/tgui.js
View File

File diff suppressed because one or more lines are too long

2
tgui/src/interfaces/atmos_relief.ract
View File

@@ -6,7 +6,7 @@
</ui-section> </ui-section>
<ui-section label='Close Pressure'> <ui-section label='Close Pressure'>
<ui-button icon='pencil' action='close_pressure' params='{"close_pressure": "input"}'>Set</ui-button> <ui-button icon='pencil' action='close_pressure' params='{"close_pressure": "input"}'>Set</ui-button>
<ui-button icon='plus' state='{{data.close_pressure == data.max_pressure ? "disabled" : null}}' action='close_pressure' params='{"close_pressure": "max"}'>Max</ui-button> <ui-button icon='plus' state='{{data.close_pressure == data.open_pressure ? "disabled" : null}}' action='close_pressure' params='{"close_pressure": "max"}'>Max</ui-button>
<span>{{Math.round(adata.close_pressure)}} kPa</span> <span>{{Math.round(adata.close_pressure)}} kPa</span>
</ui-section> </ui-section>
</ui-display> </ui-display>