From 35574263b1163b379219dbed56d7ab3386f24e3c Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 30 Dec 2017 13:23:02 -0600 Subject: [PATCH] Update outlet_injector.dm --- .../machinery/components/unary_devices/outlet_injector.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index e458e2a3fa..eca11d613c 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -130,13 +130,8 @@ if("set_volume_rate" in signal.data) var/number = text2num(signal.data["set_volume_rate"]) -<<<<<<< HEAD - var/datum/gas_mixture/air_contents = AIR1 - volume_rate = Clamp(number, 0, air_contents.volume) -======= var/datum/gas_mixture/air_contents = airs[1] volume_rate = CLAMP(number, 0, air_contents.volume) ->>>>>>> 6a7dbaa... removes silly garbage defines (#33621) if("status" in signal.data) spawn(2)