[MIRROR] SM, Tesla, and general engineering adjustments [MDB IGNORE] [IDB IGNORE] (#12603)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>

code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm

@@ -227,6 +227,8 @@
 	turbine = null
 	if(src.loc && anchored)
 		turbine = locate(/obj/machinery/atmospherics/pipeturbine) in get_step(src,dir)
+		if(!turbine)
+			return
 		if (turbine.stat & (BROKEN) || !turbine.anchored || turn(turbine.dir,180) != dir)
 			turbine = null
 

code/ATMOSPHERICS/components/binary_devices/pump.dm

@@ -255,30 +255,30 @@ Thus, the two variables affect pump operation are set in New():
 			"You hear ratchet.")
 		deconstruct()
 
-//CHOMPEdit Start - Adds TGStation keybinds to save our engineers some time.
 /obj/machinery/atmospherics/binary/pump/click_alt(mob/user)
 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
-	if(allowed(user))
-		to_chat(user, span_notice("You set the [name] to max output"))
-		target_pressure = max_pressure_setting
-		add_fingerprint(user)
-	else
+	if(!allowed(user))
 		to_chat(user, span_warning("Access denied."))
+		return CLICK_ACTION_BLOCKING
+
+	to_chat(user, span_notice("You set the [name] to max output"))
+	target_pressure = max_pressure_setting
+	add_fingerprint(user)
+	return CLICK_ACTION_SUCCESS
+
 
 /obj/machinery/atmospherics/binary/pump/click_ctrl(mob/user)
 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
-	if(allowed(user))
-		update_use_power(!use_power)
-		update_icon()
-		add_fingerprint(user)
-		if(use_power)
-			to_chat(user, span_notice("You toggle the [name] on."))
-		else
-			to_chat(user, span_notice("You toggle the [name] off."))
-
-	else
+	if(!allowed(user))
 		to_chat(user, span_warning("Access denied."))
-//CHOMPEdit End
+		return CLICK_ACTION_BLOCKING
+
+	update_use_power(!use_power)
+	update_icon()
+	add_fingerprint(user)
+	to_chat(user, span_notice("You toggle the [name] [use_power ? "on" : "off"]."))
+
+	return CLICK_ACTION_SUCCESS
 
 /obj/machinery/atmospherics/binary/pump/high_power
 	icon = 'icons/atmos/volume_pump.dmi'

code/ATMOSPHERICS/components/binary_devices/volume_pump.dm

@@ -303,5 +303,29 @@ Thus, the two variables affect pump operation are set in New():
 		to_chat(user, span_notice("The pump quiets down as you turn its limiters back on."))
 	update_icon()
 
+/obj/machinery/atmospherics/binary/volume_pump/click_alt(mob/user)
+	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	if(!allowed(user))
+		to_chat(user, span_warning("Access denied."))
+		return CLICK_ACTION_BLOCKING
+
+	to_chat(user, span_notice("You set the [name] to max output"))
+	transfer_rate = max_transfer_rate
+	add_fingerprint(user)
+	return CLICK_ACTION_SUCCESS
+
+
+/obj/machinery/atmospherics/binary/volume_pump/click_ctrl(mob/user)
+	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
+	if(!allowed(user))
+		to_chat(user, span_warning("Access denied."))
+		return CLICK_ACTION_BLOCKING
+
+	update_use_power(!use_power)
+	update_icon()
+	add_fingerprint(user)
+	to_chat(user, span_notice("You toggle the [name] [use_power ? "on" : "off"]."))
+	return CLICK_ACTION_SUCCESS
+
 #undef VOLUME_PUMP_MAX_OUTPUT_PRESSURE
 #undef VOLUME_PUMP_LEAK_AMOUNT