From 6f7e908c8900ae6a4fa76b40e057689150e13052 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 17 Jul 2017 02:54:17 -0500 Subject: [PATCH] RPDs can now place disposals pipes on dense non-wall turfs (#2035) --- code/__DEFINES/is_helpers.dm | 4 ++++ code/game/objects/items/weapons/RPD.dm | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 1b239f5fc6..57fde17adc 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -9,12 +9,16 @@ //Turfs #define isopenturf(A) (istype(A, /turf/open)) +#define isindestructiblefloor(A) (istype(A, /turf/open/indestructible)) + #define isspaceturf(A) (istype(A, /turf/open/space)) #define isfloorturf(A) (istype(A, /turf/open/floor)) #define isclosedturf(A) (istype(A, /turf/closed)) +#define isindestructiblewall(A) (istype(A, /turf/closed/indestructible)) + #define iswallturf(A) (istype(A, /turf/closed/wall)) #define ismineralturf(A) (istype(A, /turf/closed/mineral)) diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 8c13ba2a68..bd608e6b72 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -570,8 +570,8 @@ GLOBAL_LIST_INIT(RPD_recipes, list( new /obj/item/pipe_meter(A) if(DISPOSALS_MODE) //Making disposals pipes - if(is_anchored_dense_turf(A)) - to_chat(user, "The [src]'s error light flickers; there's something in the way!") + if(isclosedturf(A)) + to_chat(user, "[src]'s error light flickers; there's something in the way!") return to_chat(user, "You start building a disposals pipe...") playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)