From 1dff5ee873385935fcc6128be78aeb8fdfdd51d6 Mon Sep 17 00:00:00 2001 From: Casey Date: Fri, 12 Nov 2021 05:04:39 -0500 Subject: [PATCH] Fixes invisible Heat Exchange Pipes --- code/game/machinery/pipe/pipe_recipes.dm | 4 ++++ code/game/objects/items/weapons/RPD_vr.dm | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/pipe/pipe_recipes.dm b/code/game/machinery/pipe/pipe_recipes.dm index 4175efc3ff..487a463716 100644 --- a/code/game/machinery/pipe/pipe_recipes.dm +++ b/code/game/machinery/pipe/pipe_recipes.dm @@ -134,9 +134,13 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( dirtype = initial(construction_type.dispenser_class) if (dirtype == PIPE_TRIN_M) icon_state_m = "[icon_state]m" +<<<<<<< HEAD // YW Edit: Add HE pipes to non-paintable objects list. paintable = ispath(path, /obj/machinery/atmospherics/pipe) && !(ispath(path, /obj/machinery/atmospherics/pipe/vent)) && !(ispath(path, /obj/machinery/atmospherics/pipe/simple/heat_exchanging)) // VOREStation Add +======= + paintable = !ispath(path, /obj/machinery/atmospherics/pipe/simple/heat_exchanging) && ispath(path, /obj/machinery/atmospherics/pipe) && !(ispath(path, /obj/machinery/atmospherics/pipe/vent)) // VOREStation Add +>>>>>>> ae163eb20b... Merge pull request #11812 from FartMaster69420/Fix-HE-Pipes // diff --git a/code/game/objects/items/weapons/RPD_vr.dm b/code/game/objects/items/weapons/RPD_vr.dm index e5ed4e79f5..0b6f15258c 100644 --- a/code/game/objects/items/weapons/RPD_vr.dm +++ b/code/game/objects/items/weapons/RPD_vr.dm @@ -16,7 +16,7 @@ item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_vr.dmi', - ) + ) flags = NOBLUDGEON force = 10 throwforce = 10 @@ -184,9 +184,9 @@ activate() animate_deletion(A) return - + if((mode & PAINT_MODE)) //Paint pipes - if(istype(A, /obj/machinery/atmospherics/pipe)) + if(!istype(A, /obj/machinery/atmospherics/pipe/simple/heat_exchanging) && istype(A, /obj/machinery/atmospherics/pipe)) var/obj/machinery/atmospherics/pipe/P = A playsound(src, 'sound/machines/click.ogg', 50, 1) P.change_color(pipe_colors[paint_color])