From 522e77752f5a392fab0d0c359b4c31dbe76d16f6 Mon Sep 17 00:00:00 2001 From: Firecage Date: Tue, 5 May 2015 17:36:51 +0200 Subject: [PATCH 1/2] Removes the ability to clean Overlays --- code/game/objects/items/weapons/mop.dm | 4 ++-- code/game/objects/structures/janicart.dm | 2 +- code/game/objects/structures/watercloset.dm | 2 +- code/modules/mob/living/silicon/robot/robot.dm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 5b719a3f190..68272dd432b 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -26,7 +26,7 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A) if(istype(F)) F.dirt = 0 for(var/obj/effect/O in A) - if(istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay)) + if(istype(O,/obj/effect/decal/cleanable)) qdel(O) reagents.reaction(A, TOUCH, 10) //10 is the multiplier for the reaction effect. probably needed to wet the floor properly. reagents.remove_any(1) //reaction() doesn't use up the reagents @@ -40,7 +40,7 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A) return var/turf/simulated/turf = A - if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay)) + if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable)) turf = A.loc A = null diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 7a677e8fa42..bcf52ca3ebb 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -185,7 +185,7 @@ F.dirt = 0 for(var/A in tile) if(istype(A, /obj/effect)) - if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay)) + if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable)) qdel(A) /obj/structure/stool/bed/chair/janicart/examine(mob/user) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 69e34eab25a..5284db054a4 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -307,7 +307,7 @@ var/turf/tile = loc loc.clean_blood() for(var/obj/effect/E in tile) - if(istype(E,/obj/effect/rune) || istype(E,/obj/effect/decal/cleanable) || istype(E,/obj/effect/overlay)) + if(istype(E,/obj/effect/rune) || istype(E,/obj/effect/decal/cleanable)) qdel(E) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 1842c6f157f..c95940db57b 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -862,7 +862,7 @@ F.dirt = 0 for(var/A in tile) if(istype(A, /obj/effect)) - if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay)) + if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable)) qdel(A) else if(istype(A, /obj/item)) var/obj/item/cleaned_item = A From c0c2c8b09745d65e7433f5ed7804b4693297c9c4 Mon Sep 17 00:00:00 2001 From: Firecage Date: Tue, 5 May 2015 18:51:44 +0200 Subject: [PATCH 2/2] cleanable #define --- code/game/objects/items/weapons/mop.dm | 6 ++++-- code/game/objects/structures/janicart.dm | 2 +- code/game/objects/structures/watercloset.dm | 2 +- code/modules/mob/living/silicon/robot/robot.dm | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 68272dd432b..5f0cc8c1eb1 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -1,3 +1,5 @@ +#define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune)) + /obj/item/weapon/mop desc = "The world of janitalia wouldn't be complete without a mop." name = "mop" @@ -26,7 +28,7 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A) if(istype(F)) F.dirt = 0 for(var/obj/effect/O in A) - if(istype(O,/obj/effect/decal/cleanable)) + if(is_cleanable(O)) qdel(O) reagents.reaction(A, TOUCH, 10) //10 is the multiplier for the reaction effect. probably needed to wet the floor properly. reagents.remove_any(1) //reaction() doesn't use up the reagents @@ -40,7 +42,7 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A) return var/turf/simulated/turf = A - if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable)) + if(is_cleanable(A)) turf = A.loc A = null diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index bcf52ca3ebb..96b25f1c921 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -185,7 +185,7 @@ F.dirt = 0 for(var/A in tile) if(istype(A, /obj/effect)) - if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable)) + if(is_cleanable(A)) qdel(A) /obj/structure/stool/bed/chair/janicart/examine(mob/user) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 5284db054a4..e578721f6ec 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -307,7 +307,7 @@ var/turf/tile = loc loc.clean_blood() for(var/obj/effect/E in tile) - if(istype(E,/obj/effect/rune) || istype(E,/obj/effect/decal/cleanable)) + if(is_cleanable(E)) qdel(E) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index c95940db57b..6b27200d447 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -862,7 +862,7 @@ F.dirt = 0 for(var/A in tile) if(istype(A, /obj/effect)) - if(istype(A, /obj/effect/rune) || istype(A, /obj/effect/decal/cleanable)) + if(is_cleanable(A)) qdel(A) else if(istype(A, /obj/item)) var/obj/item/cleaned_item = A