From c41b90451c76dd9705f134dd52a177ef1f0c3150 Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Sun, 12 Apr 2015 20:42:52 +0300 Subject: [PATCH 1/6] Mopping can be done also with a bucket. --- code/modules/reagents/reagent_containers/glass.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 8cf1fb79d65..af0fa0a4be2 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -243,3 +243,12 @@ qdel(src) else ..() + +/obj/item/weapon/reagent_containers/glass/bucket/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/weapon/mop)) + if(reagents.total_volume < 1) + user << "[src] is out of water!" + else + reagents.trans_to(I, 5) + user << "You wet [I] in [src]." + playsound(loc, 'sound/effects/slosh.ogg', 25, 1) From 1f5cb56ff7fa5e4e44164b60674d8c8814e99a07 Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Wed, 15 Apr 2015 21:09:17 +0300 Subject: [PATCH 2/6] Bucket's attackby-procs combined. --- code/game/objects/items/weapons/mop.dm | 2 +- code/modules/reagents/reagent_containers/glass.dm | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 5b719a3f190..997561a72b6 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -49,7 +49,7 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A) if(do_after(user, mopspeed)) clean(turf) - user << "You finish mopping./span>" + user << "You finish mopping." /obj/effect/attackby(obj/item/I, mob/user, params) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index af0fa0a4be2..182330eeb0f 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -238,6 +238,17 @@ if(isprox(D)) user << "You add [D] to [src]." qdel(D) +/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/O, mob/user, params) + if(istype(O, /obj/item/weapon/mop)) + if(reagents.total_volume < 1) + user << "[src] is out of water!" + else + reagents.trans_to(O, 5) + user << "You wet [O] in [src]." + playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + else if(isprox(O)) + user << "You add [O] to [src]." + user.put_in_hands(new /obj/item/weapon/bucket_sensor) user.unEquip(src) qdel(src) @@ -251,4 +262,4 @@ else reagents.trans_to(I, 5) user << "You wet [I] in [src]." - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + playsound(loc, 'sound/effects/slosh.ogg', 25, 1) From 8eec4c9199a4b5a2b565112d1ab16f6a2fbd55c7 Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Wed, 29 Apr 2015 20:19:41 +0300 Subject: [PATCH 3/6] Mop can now be wetted in the sink. --- code/game/objects/structures/watercloset.dm | 7 ++++++- code/modules/reagents/reagent_containers/glass.dm | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 69e34eab25a..6aa76c5c2e3 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -386,7 +386,7 @@ user << "You fill [RG] from [src]." return - else if(istype(O, /obj/item/weapon/melee/baton)) + if(istype(O, /obj/item/weapon/melee/baton)) var/obj/item/weapon/melee/baton/B = O if(B.bcell) if(B.bcell.charge > 0 && B.status == 1) @@ -404,6 +404,11 @@ "[user] was stunned by \his wet [O]!") return + if(istype(O, /obj/item/weapon/mop)) + O.reagents.add_reagent("water", 5) + user << "You wet [O] in [src]." + playsound(loc, 'sound/effects/slosh.ogg', 25, 1) + var/turf/location = user.loc if(!isturf(location)) return diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 182330eeb0f..9d42bc40944 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -241,7 +241,7 @@ /obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/O, mob/user, params) if(istype(O, /obj/item/weapon/mop)) if(reagents.total_volume < 1) - user << "[src] is out of water!" + user << "[src] is out of water!" else reagents.trans_to(O, 5) user << "You wet [O] in [src]." From dcbb071c22316458b039b5c88e2060ef3b2d0a8d Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Fri, 1 May 2015 09:34:54 +0300 Subject: [PATCH 4/6] missed a spanclass --- 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 9d42bc40944..dad72468a73 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -258,7 +258,7 @@ /obj/item/weapon/reagent_containers/glass/bucket/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/mop)) if(reagents.total_volume < 1) - user << "[src] is out of water!" + user << "[src] is out of water!" else reagents.trans_to(I, 5) user << "You wet [I] in [src]." From 9bfe79b760582f391f240f0c3318ed744821eaef Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Fri, 22 May 2015 15:48:09 +0300 Subject: [PATCH 5/6] Everything under one bucket/attackby --- .../reagents/reagent_containers/glass.dm | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index dad72468a73..8dd00bd5f13 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -234,11 +234,10 @@ volume = 70 flags = OPENCONTAINER -/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/D, mob/user as mob, params) - if(isprox(D)) - user << "You add [D] to [src]." - qdel(D) -/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/O, mob/user, params) +/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/O, mob/user as mob, params) + if(isprox(O)) + user << "You add [O] to [src]." + qdel(O) if(istype(O, /obj/item/weapon/mop)) if(reagents.total_volume < 1) user << "[src] is out of water!" @@ -254,12 +253,3 @@ qdel(src) else ..() - -/obj/item/weapon/reagent_containers/glass/bucket/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/mop)) - if(reagents.total_volume < 1) - user << "[src] is out of water!" - else - reagents.trans_to(I, 5) - user << "You wet [I] in [src]." - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) From 6b58fb55fa979e9f81cb314a072b690fa33d310f Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Wed, 3 Jun 2015 19:03:38 +0300 Subject: [PATCH 6/6] Unnecessary isprox-check removed. --- code/modules/reagents/reagent_containers/glass.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 8dd00bd5f13..6ab4cd7fb38 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -235,9 +235,6 @@ flags = OPENCONTAINER /obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/O, mob/user as mob, params) - if(isprox(O)) - user << "You add [O] to [src]." - qdel(O) if(istype(O, /obj/item/weapon/mop)) if(reagents.total_volume < 1) user << "[src] is out of water!" @@ -247,9 +244,9 @@ playsound(loc, 'sound/effects/slosh.ogg', 25, 1) else if(isprox(O)) user << "You add [O] to [src]." - - user.put_in_hands(new /obj/item/weapon/bucket_sensor) + qdel(O) user.unEquip(src) qdel(src) + user.put_in_hands(new /obj/item/weapon/bucket_sensor) else ..()