From 2551794b5d71e76d9bc3ef0c51412ae2d6a32014 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Fri, 14 Jul 2017 15:25:12 -0400 Subject: [PATCH 1/3] RPDs can now place pipes on walls --- code/__DEFINES/is_helpers.dm | 4 ++++ code/game/objects/items/weapons/RPD.dm | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 1372e99a8e9..935cceaa99e 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/close/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 8c13ba2a686..22f68c88e6a 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -570,8 +570,7 @@ 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(isindestructiblewall(A)) return to_chat(user, "You start building a disposals pipe...") playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1) From 99d07d5bc7161360e9d57d70825f7b13cb1e5799 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Fri, 14 Jul 2017 15:35:07 -0400 Subject: [PATCH 2/3] close but not quite closed --- code/__DEFINES/is_helpers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 935cceaa99e..66149504a78 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -17,7 +17,7 @@ #define isclosedturf(A) (istype(A, /turf/closed)) -#define isindestructiblewall(A) (istype(A, /turf/close/indestructible)) +#define isindestructiblewall(A) (istype(A, /turf/closed/indestructible)) #define iswallturf(A) (istype(A, /turf/closed/wall)) From 6b1bc117e2c210edf011f8d04c8e12fe004be009 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Fri, 14 Jul 2017 15:40:24 -0400 Subject: [PATCH 3/3] as done --- code/game/objects/items/weapons/RPD.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm index 22f68c88e6a..bd608e6b725 100644 --- a/code/game/objects/items/weapons/RPD.dm +++ b/code/game/objects/items/weapons/RPD.dm @@ -570,7 +570,8 @@ GLOBAL_LIST_INIT(RPD_recipes, list( new /obj/item/pipe_meter(A) if(DISPOSALS_MODE) //Making disposals pipes - if(isindestructiblewall(A)) + 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)