shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removes silly garbage defines

Browse Source
This commit is contained in:
duncathan salt
2017-12-19 08:02:18 -06:00
committed by CitadelStationBot
parent d5708c981a
commit 0f2fd05e87
37 changed files with 184 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+5 -5
View File
@@ -50,7 +50,7 @@
..()
/obj/machinery/atmospherics/components/trinary/filter/update_icon_nopipes()
if(on && NODE1 && NODE2 && NODE3 && is_operational())
if(on && nodes[1] && nodes[2] && nodes[3] && is_operational())
icon_state = "filter_on[flipped?"_f":""]"
return
icon_state = "filter_off[flipped?"_f":""]"
@@ -63,12 +63,12 @@
/obj/machinery/atmospherics/components/trinary/filter/process_atmos()
..()
if(!on || !(NODE1 && NODE2 && NODE3) || !is_operational())
if(!on || !(nodes[1] && nodes[2] && nodes[3]) || !is_operational())
return
var/datum/gas_mixture/air1 = AIR1
var/datum/gas_mixture/air2 = AIR2
var/datum/gas_mixture/air3 = AIR3
var/datum/gas_mixture/air1 = airs[1]
var/datum/gas_mixture/air2 = airs[2]
var/datum/gas_mixture/air3 = airs[3]
var/output_starting_pressure = air3.return_pressure()
code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
+10 -10
View File
@@ -33,7 +33,7 @@
return ..()
/obj/machinery/atmospherics/components/trinary/mixer/update_icon_nopipes()
if(on && NODE1 && NODE2 && NODE3 && is_operational())
if(on && nodes[1] && nodes[2] && nodes[3] && is_operational())
icon_state = "mixer_on[flipped?"_f":""]"
return
icon_state = "mixer_off[flipped?"_f":""]"
@@ -46,18 +46,18 @@
/obj/machinery/atmospherics/components/trinary/mixer/New()
..()
var/datum/gas_mixture/air3 = AIR3
var/datum/gas_mixture/air3 = airs[3]
air3.volume = 300
AIR3 = air3
airs[3] = air3
/obj/machinery/atmospherics/components/trinary/mixer/process_atmos()
..()
if(!on || !(NODE1 && NODE2 && NODE3) && !is_operational())
if(!on || !(nodes[1] && nodes[2] && nodes[3]) && !is_operational())
return
var/datum/gas_mixture/air1 = AIR1
var/datum/gas_mixture/air2 = AIR2
var/datum/gas_mixture/air3 = AIR3
var/datum/gas_mixture/air1 = airs[1]
var/datum/gas_mixture/air2 = airs[2]
var/datum/gas_mixture/air3 = airs[3]
var/output_starting_pressure = air3.return_pressure()
@@ -103,14 +103,14 @@
air3.merge(removed2)
if(transfer_moles1)
var/datum/pipeline/parent1 = PARENT1
var/datum/pipeline/parent1 = parents[1]
parent1.update = TRUE
if(transfer_moles2)
var/datum/pipeline/parent2 = PARENT2
var/datum/pipeline/parent2 = parents[2]
parent2.update = TRUE
var/datum/pipeline/parent3 = PARENT3
var/datum/pipeline/parent3 = parents[3]
parent3.update = TRUE
return