Skip to content

Commit 8cba589

Browse files
west3436west3436
authored
Minor ZAS Optimizations (#37277)
* ZAS Optimizations * more * even more * smoke
1 parent 108257e commit 8cba589

File tree

108 files changed

+302
-285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+302
-285
lines changed

‎code/ATMOSPHERICS/atmospherics.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ Pipelines + Other Objects -> Pipe network
318318
var/datum/gas_mixture/int_air = return_air()
319319
var/datum/gas_mixture/env_air = loc.return_air()
320320
add_fingerprint(user)
321-
if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
321+
if ((int_air.pressure-env_air.pressure) > 2*ONE_ATMOSPHERE)
322322
if(istype(W, /obj/item/tool/wrench/socket) && istype(src, /obj/machinery/atmospherics/pipe))
323323
to_chat(user, "<span class='warning'>You begin to open the pressure release valve on the pipe...</span>")
324324
if(!do_after(user, src, 50) || !loc)

‎code/ATMOSPHERICS/components/binary_devices/MSGS.dm‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@
4141
return
4242

4343
//Output handling, stolen from pump code.
44-
var/output_starting_pressure = air2.return_pressure()
44+
var/output_starting_pressure = air2.pressure
4545

4646
if((target_pressure - output_starting_pressure) > 0.01)
4747
//No need to output gas if target is already reached!
4848

4949
//Calculate necessary moles to transfer using PV=nRT
50-
if((air.total_moles() > 0) && (air.temperature > 0))
50+
if((air.total_moles > 0) && (air.temperature > 0))
5151
var/pressure_delta = target_pressure - output_starting_pressure
5252
var/transfer_moles = pressure_delta * air2.volume / (air.temperature * R_IDEAL_GAS_EQUATION)
5353

@@ -60,13 +60,13 @@
6060

6161
//Input handling. Literally pump code again with the target pressure being the max pressure of the MSGS
6262
if(on)
63-
var/input_starting_pressure = air1.return_pressure()
63+
var/input_starting_pressure = air1.pressure
6464

6565
if((max_pressure - input_starting_pressure) > 0.01)
6666
//No need to output gas if target is already reached!
6767

6868
//Calculate necessary moles to transfer using PV=nRT
69-
if((air1.total_moles() > 0) && (air1.temperature > 0))
69+
if((air1.total_moles > 0) && (air1.temperature > 0))
7070
var/pressure_delta = max_pressure - input_starting_pressure
7171
var/transfer_moles = pressure_delta * air.volume / (air1.temperature * R_IDEAL_GAS_EQUATION)
7272

@@ -82,8 +82,8 @@
8282
/obj/machinery/atmospherics/binary/msgs/ui_data()
8383
var/list/data = list()
8484

85-
data["pressure"] = round(air.return_pressure(), 0.01)
86-
data["temperature"] = air.return_temperature()
85+
data["pressure"] = round(air.pressure, 0.01)
86+
data["temperature"] = air.temperature
8787
data["power"] = on
8888
data["targetPressure"] = target_pressure
8989
data["gases"] = list()
@@ -152,7 +152,7 @@
152152
if((update_flags & MSGS_ON) != !(stat & (NOPOWER | BROKEN | FORCEDISABLE)))
153153
update = 1
154154

155-
var/pressure = air.return_pressure() // null ref error here.
155+
var/pressure = air.pressure // null ref error here.
156156
var/i = clamp(round(pressure / (max_pressure / 5)), 0, 5)
157157
if(i != last_pressure)
158158
update = 1

‎code/ATMOSPHERICS/components/binary_devices/circulator.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
return
4949

5050
var/datum/gas_mixture/removed
51-
var/input_starting_pressure = air1.return_pressure()
52-
var/output_starting_pressure = air2.return_pressure()
51+
var/input_starting_pressure = air1.pressure
52+
var/output_starting_pressure = air2.pressure
5353
last_pressure_delta = max(input_starting_pressure - output_starting_pressure - 5, 0)
5454

5555
//Only circulate air if there is a pressure difference (plus 5kPa kinetic, 10kPa static friction).

‎code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
//4: Do not pass output_pressure_max
2323

2424
frequency = 0
25-
25+
2626
var/datum/radio_frequency/radio_connection
2727

2828
machine_flags = MULTITOOL_MENU
@@ -73,7 +73,7 @@
7373
if(!on)
7474
return
7575

76-
var/datum/gas_mixture/environment = loc.return_air()
76+
var/datum/gas_mixture/environment = loc.return_readonly_air()
7777

7878
var/pressure_delta = get_pressure_delta(environment)
7979
if(pressure_delta > 0.5)
@@ -105,18 +105,18 @@
105105

106106
/obj/machinery/atmospherics/binary/dp_vent_pump/proc/get_pressure_delta(datum/gas_mixture/environment)
107107
var/pressure_delta = 10000 //why is this 10000? whatever
108-
var/environment_pressure = environment.return_pressure()
108+
var/environment_pressure = environment.pressure
109109

110110
if(pump_direction) //internal -> external
111111
if(pressure_checks & 1)
112112
pressure_delta = min(pressure_delta, external_pressure_bound - environment_pressure) //increasing the pressure here
113113
if(pressure_checks & 2)
114-
pressure_delta = min(pressure_delta, air1.return_pressure() - input_pressure_min) //decreasing the pressure here
114+
pressure_delta = min(pressure_delta, air1.pressure - input_pressure_min) //decreasing the pressure here
115115
else //external -> internal
116116
if(pressure_checks & 1)
117117
pressure_delta = min(pressure_delta, environment_pressure - external_pressure_bound) //decreasing the pressure here
118118
if(pressure_checks & 2)
119-
pressure_delta = min(pressure_delta, output_pressure_max - air2.return_pressure()) //increasing the pressure here
119+
pressure_delta = min(pressure_delta, output_pressure_max - air2.pressure) //increasing the pressure here
120120

121121
return pressure_delta
122122

‎code/ATMOSPHERICS/components/binary_devices/passive_gate.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
if(!open)
4242
return
4343

44-
var/output_starting_pressure = air2.return_pressure()
45-
var/input_starting_pressure = air1.return_pressure()
44+
var/output_starting_pressure = air2.pressure
45+
var/input_starting_pressure = air1.pressure
4646
//var/pressure_delta = min(10000, abs(environment_pressure - air_contents.return_pressure()))
4747
var/pressure_delta = min(10000, input_starting_pressure - output_starting_pressure)
4848

‎code/ATMOSPHERICS/components/binary_devices/pump.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ air2.volume
5353
if((stat & (NOPOWER|BROKEN|FORCEDISABLE)) || !on)
5454
return
5555

56-
var/output_starting_pressure = air2.return_pressure()
56+
var/output_starting_pressure = air2.pressure
5757
var/pressure_delta = target_pressure - output_starting_pressure
5858

5959
if(pressure_delta > 0.01 && (air1.temperature > 0 || air2.temperature > 0))

‎code/ATMOSPHERICS/components/binary_devices/volume_pump.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ Thus, the two variables affect pump operation are set in New():
5252

5353
// Pump mechanism just won't do anything if the pressure is too high/too low
5454

55-
var/input_starting_pressure = air1.return_pressure()
56-
var/output_starting_pressure = air2.return_pressure()
55+
var/input_starting_pressure = air1.pressure
56+
var/output_starting_pressure = air2.pressure
5757

5858
if((input_starting_pressure < 0.01) || (output_starting_pressure > (9000+input_starting_pressure)))
5959
pump_stalled = 1

‎code/ATMOSPHERICS/components/trinary_devices/filter.dm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
if(!on)
5454
return
5555

56-
var/output_starting_pressure = air3.return_pressure()
56+
var/output_starting_pressure = air3.pressure
5757
var/pressure_delta = target_pressure - output_starting_pressure
58-
var/filtered_pressure_delta = target_pressure - air2.return_pressure()
58+
var/filtered_pressure_delta = target_pressure - air2.pressure
5959

6060
if(pressure_delta > 0.01 && filtered_pressure_delta > 0.01 && (air1.temperature > 0 || air3.temperature > 0))
6161
//Figure out how much gas to transfer to meet the target pressure.

‎code/ATMOSPHERICS/components/trinary_devices/mixer.dm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
if(!on)
4444
return
4545

46-
var/output_starting_pressure = air3.return_pressure()
46+
var/output_starting_pressure = air3.pressure
4747
var/pressure_delta = target_pressure - output_starting_pressure
4848

4949
if(pressure_delta > 0.01 && ((air1.temperature > 0 && air2.temperature > 0) || air3.temperature > 0))
@@ -56,8 +56,8 @@
5656
var/transfer_moles2 = ((node2_concentration * pressure_delta) * output_volume) / (air_temperature2 * R_IDEAL_GAS_EQUATION)
5757

5858
//fix the mix if one of the inputs has insufficient gas
59-
var/air1_moles = air1.total_moles()
60-
var/air2_moles = air2.total_moles()
59+
var/air1_moles = air1.total_moles
60+
var/air2_moles = air2.total_moles
6161
if((air1_moles < transfer_moles1) || (air2_moles < transfer_moles2))
6262
if(!transfer_moles1 || !transfer_moles2)
6363
return

‎code/ATMOSPHERICS/components/unary/oxygen_generator.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
if(!on)
3434
return
3535

36-
var/total_moles = air_contents.total_moles()
36+
var/total_moles = air_contents.total_moles
3737

3838
if(total_moles < oxygen_content)
3939
var/current_heat_capacity = air_contents.heat_capacity()

0 commit comments

Comments
 (0)