Merge pull request #3667 from Citadel-Station-13/upstream-merge-32141

[MIRROR] Allows RPD to place pipes on catwalks/girders
This commit is contained in:
LetterJay
2017-10-29 04:23:46 -04:00
committed by GitHub
+1 -1
View File
@@ -548,7 +548,7 @@ GLOBAL_LIST_INIT(RPD_recipes, list(
//make sure what we're clicking is valid for the current mode
var/is_paintable = (p_class == PAINT_MODE && istype(A, /obj/machinery/atmospherics/pipe))
var/is_consumable = (p_class == EATING_MODE && (istype(A, /obj/item/pipe) || istype(A, /obj/item/pipe_meter) || istype(A, /obj/structure/disposalconstruct)))
var/can_make_pipe = ((atmos_piping_mode || p_class == DISPOSALS_MODE) && isturf(A))
var/can_make_pipe = ((atmos_piping_mode || p_class == DISPOSALS_MODE) && (isturf(A)) || istype(A, /obj/structure/lattice/catwalk) || istype(A, /obj/structure/girder))
if(!is_paintable && !is_consumable && !can_make_pipe)
return ..()