Updates to tgstation commit 78e471d

2018-07-05 01:22:27 -04:00
parent ac6fddcfb3
commit 3e18d8208e
107 changed files with 1054 additions and 1013 deletions
@@ -1,12 +1,12 @@
 //node2, air2, network2 correspond to input
 //node1, air1, network1 correspond to output
-#define CIRCULATOR_COLD 0
-#define CIRCULATOR_HOT 1
+#define CIRCULATOR_HOT 0
+#define CIRCULATOR_COLD 1

 /obj/machinery/atmospherics/components/binary/circulator
 	name = "circulator/heat exchanger"
 	desc = "A gas circulator pump and heat exchanger."
-	icon_state = "circ-off"
+	icon_state = "circ-off-0"

 	var/active = FALSE

@@ -185,4 +185,4 @@

 	flipped = !flipped
 	to_chat(usr, "<span class='notice'>You flip [src].</span>")
-	update_icon()
+	update_icon()
@@ -79,7 +79,7 @@ Thus, the two variables affect pump operation are set in New():
 	if((input_starting_pressure < 0.01) || (output_starting_pressure > 9000))
 		return

-	var/transfer_ratio = min(1, transfer_rate/air1.volume)
+	var/transfer_ratio = transfer_rate/air1.volume

 	var/datum/gas_mixture/removed = air1.remove_ratio(transfer_ratio)