cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

first pass of cleanup

Browse Source 
makes simple pipes more OOP
adjusts defines; puts them in __DEFINES/atmospherics.dm
adds DEVICE_TYPE_LOOP define, which is used in a bunch of the for loops
This commit is contained in:
duncathan
2015-08-16 23:10:57 -06:00
parent ad5f723890
commit 99234185de
33 changed files with 279 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
+1 -3
View File
@@ -28,10 +28,8 @@ Housekeeping and pipe network stuff
*/
/obj/machinery/atmospherics/components/binary/atmosinit()
var/node2_connect = dir
var/node1_connect = turn(dir, 180)
var/list/node_connects = new/list()
node_connects.Add(node1_connect, node2_connect)
var/list/node_connects = list(node1_connect, node2_connect)
..(node_connects)
code/ATMOSPHERICS/components/binary_devices/circulator.dm
+2 -2
View File
@@ -18,8 +18,8 @@
/obj/machinery/atmospherics/components/binary/circulator/proc/return_transfer_air()
var/datum/gas_mixture/air1 = airs[AIR1]
var/datum/gas_mixture/air2 = airs[AIR2]
var/datum/gas_mixture/air1 = AIR1
var/datum/gas_mixture/air2 = AIR2
var/output_starting_pressure = air1.return_pressure()
var/input_starting_pressure = air2.return_pressure()
code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+6 -6
View File
@@ -42,8 +42,8 @@ Acts like a normal vent, but has an input AND output.
/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/New()
..()
var/datum/gas_mixture/air1 = airs[AIR1]
var/datum/gas_mixture/air2 = airs[AIR2]
var/datum/gas_mixture/air1 = AIR1
var/datum/gas_mixture/air2 = AIR2
air1.volume = 1000
air2.volume = 1000
@@ -66,8 +66,8 @@ Acts like a normal vent, but has an input AND output.
if(!on)
return 0
var/datum/gas_mixture/air1 = airs[AIR1]
var/datum/gas_mixture/air2 = airs[AIR2]
var/datum/gas_mixture/air1 = AIR1
var/datum/gas_mixture/air2 = AIR2
var/datum/gas_mixture/environment = loc.return_air()
var/environment_pressure = environment.return_pressure()
@@ -89,7 +89,7 @@ Acts like a normal vent, but has an input AND output.
loc.assume_air(removed)
air_update_turf()
var/datum/pipeline/parent1 = parents[PARENT1]
var/datum/pipeline/parent1 = PARENT1
parent1.update = 1
else //external -> output
@@ -109,7 +109,7 @@ Acts like a normal vent, but has an input AND output.
air2.merge(removed)
air_update_turf()
var/datum/pipeline/parent2 = parents[PARENT2]
var/datum/pipeline/parent2 = PARENT2
parent2.update = 1
return 1
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+2 -2
View File
@@ -40,8 +40,8 @@ Passive gate is similar to the regular pump except:
if(!on)
return 0
var/datum/gas_mixture/air1 = airs[AIR1]
var/datum/gas_mixture/air2 = airs[AIR2]
var/datum/gas_mixture/air1 = AIR1
var/datum/gas_mixture/air2 = AIR2
var/output_starting_pressure = air2.return_pressure()
var/input_starting_pressure = air1.return_pressure()
code/ATMOSPHERICS/components/binary_devices/pump.dm
+2 -2
View File
@@ -48,8 +48,8 @@ Thus, the two variables affect pump operation are set in New():
if(!on)
return 0
var/datum/gas_mixture/air1 = airs[AIR1]
var/datum/gas_mixture/air2 = airs[AIR2]
var/datum/gas_mixture/air1 = AIR1
var/datum/gas_mixture/air2 = AIR2
var/output_starting_pressure = air2.return_pressure()
code/ATMOSPHERICS/components/binary_devices/valve.dm
+1 -1
View File
@@ -28,7 +28,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
open = 1
update_icon_nopipes()
update_parents()
var/datum/pipeline/parent1 = parents[PARENT1]
var/datum/pipeline/parent1 = PARENT1
parent1.reconcile_air()
investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", "atmos")
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+3 -3
View File
@@ -48,8 +48,8 @@ Thus, the two variables affect pump operation are set in New():
if(!on)
return 0
var/datum/gas_mixture/air1 = airs[AIR1]
var/datum/gas_mixture/air2 = airs[AIR2]
var/datum/gas_mixture/air1 = AIR1
var/datum/gas_mixture/air2 = AIR2
// Pump mechanism just won't do anything if the pressure is too high/too low
@@ -125,7 +125,7 @@ Thus, the two variables affect pump operation are set in New():
on = !on
if("set_transfer_rate" in signal.data)
var/datum/gas_mixture/air1 = airs[AIR1]
var/datum/gas_mixture/air1 = AIR1
transfer_rate = Clamp(
text2num(signal.data["set_transfer_rate"]),
0,