From 68ad5c2e5c6db6badfea8ecd22f50ee5b88bb436 Mon Sep 17 00:00:00 2001 From: Putnam Date: Tue, 30 Mar 2021 23:56:12 -0700 Subject: [PATCH] disposability --- code/game/machinery/pipe/construction.dm | 1 + code/game/objects/items/RPD.dm | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index d825cb5a23..5b30105409 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -21,6 +21,7 @@ Buildable meters level = 2 var/piping_layer = PIPING_LAYER_DEFAULT var/RPD_type + var/disposable = TRUE /obj/item/pipe/directional RPD_type = PIPE_UNARY diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 70e4441c66..635ea97902 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -375,12 +375,14 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( . = TRUE if((mode & DESTROY_MODE) && istype(A, /obj/item/pipe) || istype(A, /obj/structure/disposalconstruct) || istype(A, /obj/structure/c_transit_tube) || istype(A, /obj/structure/c_transit_tube_pod) || istype(A, /obj/item/pipe_meter)) - to_chat(user, "You start destroying a pipe...") - playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) - if(do_after(user, destroy_speed, target = A)) - activate() - qdel(A) - return + var/obj/item/pipe/P = A + if(!istype(P) || P.disposable) + to_chat(user, "You start destroying a pipe...") + playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) + if(do_after(user, destroy_speed, target = A)) + activate() + qdel(A) + return if((mode & PAINT_MODE)) if(istype(A, /obj/machinery/atmospherics/pipe) && !istype(A, /obj/machinery/atmospherics/pipe/layer_manifold))