From 5fbb93551dcb0a00f60a19f71a9287f2fff2dec6 Mon Sep 17 00:00:00 2001 From: Pear120 Date: Sun, 4 Jun 2017 17:41:41 -0400 Subject: [PATCH 1/6] Allows soap and rags to be wet using buckets --- code/modules/reagents/reagent_containers/glass.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index bd670cc8bc..7fccddecd1 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -249,7 +249,7 @@ user.drop_from_inventory(src) qdel(src) return - else if(istype(D, /obj/item/weapon/mop)) + else if(istype(D, /obj/item/weapon/mop) || istype(D, /obj/item/weapon/soap) || istype(D, /obj/item/weapon/reagent_containers/glass/rag)) if(reagents.total_volume < 1) user << "\The [src] is empty!" else From ae1d77cad00ffc84c7f9ecf2aeaab383d8760157 Mon Sep 17 00:00:00 2001 From: Pear120 Date: Sun, 4 Jun 2017 17:43:38 -0400 Subject: [PATCH 2/6] Allows soap and rags to be wet using mopbuckets --- code/game/objects/structures/mop_bucket.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 5e0c0d5abb..6093dd497f 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -20,7 +20,7 @@ user << "[src] \icon[src] contains [reagents.total_volume] unit\s of water!" /obj/structure/mopbucket/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/mop)) + if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap) || istype(I, /obj/item/weapon/reagent_containers/glass/rag)) if(reagents.total_volume < 1) user << "\The [src] is out of water!" else From 84f17a4b006e8cfba01ea907fc60a47a68a6e050 Mon Sep 17 00:00:00 2001 From: Pear120 Date: Sun, 4 Jun 2017 17:47:28 -0400 Subject: [PATCH 3/6] Rags clean dirt from floors now And can be wet from buckets --- code/modules/detectivework/tools/rag.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index 57af12525d..a09e2db571 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -102,6 +102,10 @@ if(do_after(user,30)) user.visible_message("\The [user] finishes wiping off the [A]!") A.clean_blood() + if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune)) + var/turf/T = get_turf(A) + if(T) + T.clean(src, user) /obj/item/weapon/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag) if(isliving(target)) @@ -132,7 +136,7 @@ if(!proximity) return - if(istype(A, /obj/structure/reagent_dispensers)) + if(istype(A, /obj/structure/reagent_dispensers) || istype(A, /obj/item/weapon/reagent_containers/glass/bucket) || istype(A, /obj/structure/mopbucket)) if(!reagents.get_free_space()) user << "\The [src] is already soaked." return From 7a875b796b81ea76fad5da0bd8e832f75bf1f688 Mon Sep 17 00:00:00 2001 From: Pear120 Date: Sun, 4 Jun 2017 18:24:13 -0400 Subject: [PATCH 4/6] Update mop_bucket.dm --- code/game/objects/structures/mop_bucket.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 6093dd497f..54218cc847 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -20,7 +20,7 @@ user << "[src] \icon[src] contains [reagents.total_volume] unit\s of water!" /obj/structure/mopbucket/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap) || istype(I, /obj/item/weapon/reagent_containers/glass/rag)) + if(istype(I, /obj/item/weapon/mop) || istype(I, /obj/item/weapon/soap) || istype(I, /obj/item/weapon/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on mopbuckets" if(reagents.total_volume < 1) user << "\The [src] is out of water!" else From cf2195f3701e41503cc17ea1f2ed05e1505a7b94 Mon Sep 17 00:00:00 2001 From: Pear120 Date: Sun, 4 Jun 2017 18:26:28 -0400 Subject: [PATCH 5/6] Update rag.dm --- code/modules/detectivework/tools/rag.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/detectivework/tools/rag.dm b/code/modules/detectivework/tools/rag.dm index a09e2db571..bafdddf4ff 100644 --- a/code/modules/detectivework/tools/rag.dm +++ b/code/modules/detectivework/tools/rag.dm @@ -102,10 +102,10 @@ if(do_after(user,30)) user.visible_message("\The [user] finishes wiping off the [A]!") A.clean_blood() - if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune)) + if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune)) //VOREStation Edit - "Allows rags to clean dirt from turfs" var/turf/T = get_turf(A) if(T) - T.clean(src, user) + T.clean(src, user) //VOREStation Edit End /obj/item/weapon/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag) if(isliving(target)) @@ -136,7 +136,7 @@ if(!proximity) return - if(istype(A, /obj/structure/reagent_dispensers) || istype(A, /obj/item/weapon/reagent_containers/glass/bucket) || istype(A, /obj/structure/mopbucket)) + if(istype(A, /obj/structure/reagent_dispensers) || istype(A, /obj/item/weapon/reagent_containers/glass/bucket) || istype(A, /obj/structure/mopbucket)) //VOREStation Edit - "Allows rags to be used on buckets and mopbuckets" if(!reagents.get_free_space()) user << "\The [src] is already soaked." return From 7b65a8836faecd6e66b250916da179d9e84c6358 Mon Sep 17 00:00:00 2001 From: Pear120 Date: Sun, 4 Jun 2017 18:26:59 -0400 Subject: [PATCH 6/6] Update glass.dm --- code/modules/reagents/reagent_containers/glass.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 7fccddecd1..f84a6ff407 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -249,7 +249,7 @@ user.drop_from_inventory(src) qdel(src) return - else if(istype(D, /obj/item/weapon/mop) || istype(D, /obj/item/weapon/soap) || istype(D, /obj/item/weapon/reagent_containers/glass/rag)) + else if(istype(D, /obj/item/weapon/mop) || istype(D, /obj/item/weapon/soap) || istype(D, /obj/item/weapon/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on buckets" if(reagents.total_volume < 1) user << "\The [src] is empty!" else