From 2b699d8d73b5a9e7e56e4b1b8e489a393b9004d9 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 27 Oct 2017 00:05:28 -0500 Subject: [PATCH] Update volume_pump.dm --- .../machinery/components/binary_devices/volume_pump.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index 16f1f8e10d..b154c0d3e4 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -174,10 +174,7 @@ Thus, the two variables affect pump operation are set in New(): if(. && on && is_operational()) to_chat(user, "You cannot unwrench [src], turn it off first!") return FALSE -<<<<<<< HEAD else investigate_log("Volume Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS) message_admins("Volume Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(usr)] at [A]") return -======= ->>>>>>> e8c2109... Atmos construction rework again (#31944)