From 4facc9c04eafe8a8afee57d83561638271aaee94 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 27 Oct 2017 00:23:13 -0500 Subject: [PATCH] Update pump.dm --- .../atmospherics/machinery/components/binary_devices/pump.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index cf3c6ad551..97bba0e534 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -178,10 +178,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("Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS) message_admins("Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(user)] at [A]") return TRUE -======= ->>>>>>> e8c2109... Atmos construction rework again (#31944)