From d346420e9f621a17d9c81f9a7c18859fa28a20ac Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 4 Feb 2018 22:46:58 -0600 Subject: [PATCH] [MIRROR] Fingerprints are transferred from pipe fittings to newly-secured pipes, and migrates securing them to wrench_act() from attackby() (#5265) * Merge pull request #35210 from Xhuis/pipe_fingerprints Fingerprints are transferred from pipe fittings to newly-secured pipes, and migrates securing them to wrench_act() from attackby() * Fingerprints are transferred from pipe fittings to newly-secured pipes, and migrates securing them to wrench_act() from attackby() --- code/game/machinery/pipe/construction.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index d724770a7b..63189ddfbc 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -125,11 +125,10 @@ Buildable meters setDir(turn(dir,-90)) fixdir() -/obj/item/pipe/attackby(obj/item/W, mob/user, params) - if (!istype(W, /obj/item/wrench)) - return ..() - if (!isturf(loc)) +/obj/item/pipe/wrench_act(mob/living/user, obj/item/wrench/W) + if(!isturf(loc)) return TRUE + add_fingerprint(user) fixdir() @@ -150,6 +149,7 @@ Buildable meters var/obj/machinery/atmospherics/A = new pipe_type(loc) build_pipe(A) A.on_construction(color, piping_layer) + transfer_fingerprints_to(A) playsound(src, W.usesound, 50, 1) user.visible_message( \