From 82454c1b07f6dd603df30de77385c8340f369377 Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 02:14:03 +0100 Subject: [PATCH 1/4] Fixing Advanced soap --- code/game/objects/items/weapons/clown_items.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index 1bf562320e..a4fcde9c15 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -47,7 +47,10 @@ T.clean(src, user) else if(istype(target,/obj/structure/sink)) to_chat(user, "You wet \the [src] in the sink.") - wet() + if(tile_clean_amount) + wet(tile_clean_amount ) + else + wet(5) else to_chat(user, "You clean \the [target.name].") target.clean_blood() From 6c9ead53060ca2ac14ac12f838a826ad6cc181fb Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 02:29:07 +0100 Subject: [PATCH 2/4] Update clown_items.dm --- code/game/objects/items/weapons/clown_items.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index a4fcde9c15..6da1b23deb 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -48,7 +48,7 @@ else if(istype(target,/obj/structure/sink)) to_chat(user, "You wet \the [src] in the sink.") if(tile_clean_amount) - wet(tile_clean_amount ) + wet(tile_clean_amount) else wet(5) else From bf114611ef98df466694f03c60f31760c2194ada Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 02:30:47 +0100 Subject: [PATCH 3/4] Update weapon.dm --- code/defines/obj/weapon.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 75c95d0b0c..67ee71ecd8 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -35,6 +35,7 @@ throwforce = 0 throw_speed = 4 throw_range = 20 + var/tile_clean_amount = 5 /obj/item/weapon/soap/nanotrasen desc = "A NanoTrasen-brand bar of soap. Smells of phoron." From c71715ff366e117ed51d69503dbdb630f384311c Mon Sep 17 00:00:00 2001 From: Sharkmare <34294231+Sharkmare@users.noreply.github.com> Date: Mon, 18 Mar 2019 02:31:34 +0100 Subject: [PATCH 4/4] Update drone_unify.dm --- code/modules/mob/living/silicon/robot/drone/drone_unify.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_unify.dm b/code/modules/mob/living/silicon/robot/drone/drone_unify.dm index da88e8d667..106c1351c6 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_unify.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_unify.dm @@ -52,7 +52,7 @@ //TODO: Move Advanced soap here. /obj/item/weapon/soap/drone name = "Advanced Soap" - var/tile_clean_amount = 100 + tile_clean_amount = 100 /obj/item/weapon/soap/drone/New() ..()