Skip to content

Commit

Permalink
[MIRROR] Fingerprints are transferred from pipe fittings to newly-sec…
Browse files Browse the repository at this point in the history
…ured 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()
  • Loading branch information
CitadelStationBot authored and Poojawa committed Feb 5, 2018
1 parent 19a8b66 commit d346420
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions code/game/machinery/pipe/construction.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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( \
Expand Down

0 comments on commit d346420

Please sign in to comment.