cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 12:47:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes invisible Heat Exchange Pipes

Browse Source
This commit is contained in:
Casey
2021-12-10 00:55:14 +00:00
committed by Chompstation Bot
parent e6f330182b
commit 1dff5ee873
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/pipe/pipe_recipes.dm
+4
View File
@@ -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
//
code/game/objects/items/weapons/RPD_vr.dm
+3 -3
View File
@@ -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])