From 4265ca3d210cfa65031f99ef32e176afc1e770c2 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 08:10:41 +0300
Subject: [PATCH 01/32] Update clown_items.dm
---
.../game/objects/items/weapons/clown_items.dm | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 63944c940776..d8413b01672a 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -92,6 +92,30 @@
target.clean_blood()
return
+/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
+ if(!proximity || ishuman(target)) return
+
+ if(user.client && (target in user.client.screen))
+ to_chat(user, "You need to take that [target.name] off before cleaning it.")
+ else if(istype(target,/obj/effect/decal/cleanable))
+ to_chat(user, "You scrub \the [target.name] out.")
+ qdel(target)
+ else
+ to_chat(user, "You clean \the [target.name].")
+ // пальчики
+ if(target.fingerprints)
+ target.fingerprints = null
+
+ // фибры
+ if(target.suit_fibers)
+ target.suit_fibers = null
+
+ target.clean_blood()
+
+ // бонус месейдж
+ to_chat(user, "Следы взаимодействия были очищены.")
+ return
+
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone)
if(user.a_intent == INTENT_HARM)
..()
From 59f3ef502e9b3f0911908fc7d62f93820c79823f Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 08:12:31 +0300
Subject: [PATCH 02/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index d8413b01672a..e9a5caeb2b97 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -101,7 +101,7 @@
to_chat(user, "You scrub \the [target.name] out.")
qdel(target)
else
- to_chat(user, "You clean \the [target.name].")
+ to_chat(user, "You FULLY clean \the [target.name].")
// пальчики
if(target.fingerprints)
target.fingerprints = null
@@ -111,9 +111,6 @@
target.suit_fibers = null
target.clean_blood()
-
- // бонус месейдж
- to_chat(user, "Следы взаимодействия были очищены.")
return
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone)
From a3838c169f0dea0603da1e5c44a4f503e7880109 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 08:16:09 +0300
Subject: [PATCH 03/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index e9a5caeb2b97..148ef01dba8b 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -94,23 +94,20 @@
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target)) return
-
if(user.client && (target in user.client.screen))
to_chat(user, "You need to take that [target.name] off before cleaning it.")
else if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
qdel(target)
else
- to_chat(user, "You FULLY clean \the [target.name].")
- // пальчики
if(target.fingerprints)
target.fingerprints = null
-
- // фибры
+ else
if(target.suit_fibers)
target.suit_fibers = null
-
target.clean_blood()
+ else
+ to_chat(user, "You FULLY clean \the [target.name].")
return
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone)
From f1ee2091b1617c7a41367f0cceb81971c24a0604 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 08:42:40 +0300
Subject: [PATCH 04/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 3 ---
1 file changed, 3 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 148ef01dba8b..36fa351352f3 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -99,14 +99,11 @@
else if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
qdel(target)
- else
if(target.fingerprints)
target.fingerprints = null
- else
if(target.suit_fibers)
target.suit_fibers = null
target.clean_blood()
- else
to_chat(user, "You FULLY clean \the [target.name].")
return
From 80ae3b6f0cadc1127698535205f41d1dadf69517 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:37:50 +0300
Subject: [PATCH 05/32] Update clown_items.dm
---
.../game/objects/items/weapons/clown_items.dm | 28 ++++++++++---------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 36fa351352f3..ad73884cbcf2 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -93,19 +93,21 @@
return
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
- if(!proximity || ishuman(target)) return
- if(user.client && (target in user.client.screen))
- to_chat(user, "You need to take that [target.name] off before cleaning it.")
- else if(istype(target,/obj/effect/decal/cleanable))
- to_chat(user, "You scrub \the [target.name] out.")
- qdel(target)
- if(target.fingerprints)
- target.fingerprints = null
- if(target.suit_fibers)
- target.suit_fibers = null
- target.clean_blood()
- to_chat(user, "You FULLY clean \the [target.name].")
- return
+ if(!proximity || ishuman(target))
+ return
+ if(!isturf(target.loc))
+ to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
+ return
+ if(!istype(target,/obj/effect/decal/cleanable))
+ to_chat(user, "You scrub \the [target.name] out.")
+ qdel(target)
+ if(target.fingerprints)
+ target.fingerprints = null
+ if(target.suit_fibers)
+ target.suit_fibers = null
+ target.clean_blood()
+ to_chat(user, "You FULLY clean \the [target.name].")
+ return
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone)
if(user.a_intent == INTENT_HARM)
From 1d6188e28e8f4613267c4ee377fbd8b180eb8bb1 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:39:59 +0300
Subject: [PATCH 06/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 1 -
1 file changed, 1 deletion(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index ad73884cbcf2..a64758927190 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -94,7 +94,6 @@
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target))
- return
if(!isturf(target.loc))
to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
return
From 98270f2b0241a7a1725ab6f1c9e14690944d19cc Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:41:56 +0300
Subject: [PATCH 07/32] 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 a64758927190..bae7740e3485 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -93,7 +93,7 @@
return
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
- if(!proximity || ishuman(target))
+ if(!proximity || ishuman(target)) return
if(!isturf(target.loc))
to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
return
From c0ae3e8d941ea77624b82b400ea872ec55e6c6a8 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:45:27 +0300
Subject: [PATCH 08/32] 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 bae7740e3485..c5e9ee358dee 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -97,7 +97,7 @@
if(!isturf(target.loc))
to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
return
- if(!istype(target,/obj/effect/decal/cleanable))
+ else if(!istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
qdel(target)
if(target.fingerprints)
From efffba985fc3716aa658b9eac7b3d833c7913d42 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:48:45 +0300
Subject: [PATCH 09/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index c5e9ee358dee..a2460521359e 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -94,16 +94,15 @@
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target)) return
- if(!isturf(target.loc))
- to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
- return
- else if(!istype(target,/obj/effect/decal/cleanable))
+ if(user.client && (target in user.client.screen))
+ to_chat(user, "You need to take that [target.name] off before cleaning it.")
+ else if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
qdel(target)
- if(target.fingerprints)
- target.fingerprints = null
- if(target.suit_fibers)
- target.suit_fibers = null
+ if(target.fingerprints)
+ target.fingerprints = null
+ if(target.suit_fibers)
+ target.suit_fibers = null
target.clean_blood()
to_chat(user, "You FULLY clean \the [target.name].")
return
From 5151846db3941184db93a4713b27b35fc5ce51a2 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:54:41 +0300
Subject: [PATCH 10/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index a2460521359e..547864f088a0 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -94,9 +94,10 @@
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target)) return
- if(user.client && (target in user.client.screen))
- to_chat(user, "You need to take that [target.name] off before cleaning it.")
- else if(istype(target,/obj/effect/decal/cleanable))
+ if(!isturf(target.loc))
+ to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
+ return
+ if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
qdel(target)
if(target.fingerprints)
From a8f31204eb0207bb06f99d0085e9ff13253fedb9 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 12:55:49 +0300
Subject: [PATCH 11/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 547864f088a0..80f0268a958e 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -94,9 +94,8 @@
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target)) return
- if(!isturf(target.loc))
+ else if(!isturf(target.loc))
to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
- return
if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
qdel(target)
From ea4347555daa98f7b26de1a720a68dbc74e43045 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 13:44:24 +0300
Subject: [PATCH 12/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 80f0268a958e..17f52aef571b 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -94,18 +94,18 @@
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target)) return
- else if(!isturf(target.loc))
- to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
- if(istype(target,/obj/effect/decal/cleanable))
+ if(user.client && (target in user.client.screen))
+ to_chat(user, "You need to take that [target.name] off before cleaning it.")
+ else if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
qdel(target)
if(target.fingerprints)
target.fingerprints = null
if(target.suit_fibers)
target.suit_fibers = null
- target.clean_blood()
- to_chat(user, "You FULLY clean \the [target.name].")
- return
+ target.clean_blood()
+ to_chat(user, "You FULLY clean \the [target.name].")
+ return
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone)
if(user.a_intent == INTENT_HARM)
From c28d7504c62e74d87fa04157f4faf3b3c84d6de7 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 15:54:00 +0300
Subject: [PATCH 13/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 17f52aef571b..618c629c8ff1 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -94,17 +94,11 @@
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target)) return
- if(user.client && (target in user.client.screen))
- to_chat(user, "You need to take that [target.name] off before cleaning it.")
- else if(istype(target,/obj/effect/decal/cleanable))
+ if(!isturf(target.loc))
+ to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
+ if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
qdel(target)
- if(target.fingerprints)
- target.fingerprints = null
- if(target.suit_fibers)
- target.suit_fibers = null
- target.clean_blood()
- to_chat(user, "You FULLY clean \the [target.name].")
return
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone)
From d49da34d0269b76f1629c7342541fd24589d081b Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 15:55:36 +0300
Subject: [PATCH 14/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 618c629c8ff1..d6299598fb58 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -99,6 +99,12 @@
if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
qdel(target)
+ if(target.fingerprints)
+ target.fingerprints = null
+ if(target.suit_fibers)
+ target.suit_fibers = null
+ target.clean_blood()
+ to_chat(user, "You FULLY clean \the [target.name].")
return
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone)
From 3de8ba3172b985a88dcdbae7cc271306accf5b4d Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 15:59:47 +0300
Subject: [PATCH 15/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index d6299598fb58..ea5a7a4c287e 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -95,10 +95,9 @@
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target)) return
if(!isturf(target.loc))
- to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
- if(istype(target,/obj/effect/decal/cleanable))
+ to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.") return
+ if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
- qdel(target)
if(target.fingerprints)
target.fingerprints = null
if(target.suit_fibers)
From 4c44a5f6c45232cec66c24e8392fbe0c30b0cb43 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:00:58 +0300
Subject: [PATCH 16/32] 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 ea5a7a4c287e..b6e346d57b48 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -95,7 +95,7 @@
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target)) return
if(!isturf(target.loc))
- to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.") return
+ to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
if(target.fingerprints)
From 3a638fc5cfdb57f614ac919c2c62c18f2ceb9f5e Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:05:08 +0300
Subject: [PATCH 17/32] 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 b6e346d57b48..9948c05c4d30 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -96,7 +96,7 @@
if(!proximity || ishuman(target)) return
if(!isturf(target.loc))
to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
- if(istype(target,/obj/effect/decal/cleanable))
+ else if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
if(target.fingerprints)
target.fingerprints = null
From 072be175e77895fff752eb8c5a79cad6862e7e82 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:08:21 +0300
Subject: [PATCH 18/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 9948c05c4d30..c2eaac93dae4 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -96,7 +96,8 @@
if(!proximity || ishuman(target)) return
if(!isturf(target.loc))
to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
- else if(istype(target,/obj/effect/decal/cleanable))
+ return
+ if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
if(target.fingerprints)
target.fingerprints = null
From 7451840e2bf5014a3abf7874d0777ef6197f34b9 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:11:13 +0300
Subject: [PATCH 19/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index c2eaac93dae4..e6c7bca85679 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -94,15 +94,14 @@
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target)) return
- if(!isturf(target.loc))
+ if(user.client && (target in user.client.screen))
to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
- return
- if(istype(target,/obj/effect/decal/cleanable))
+ if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
- if(target.fingerprints)
- target.fingerprints = null
- if(target.suit_fibers)
- target.suit_fibers = null
+ if(target.fingerprints)
+ target.fingerprints = null
+ if(target.suit_fibers)
+ target.suit_fibers = null
target.clean_blood()
to_chat(user, "You FULLY clean \the [target.name].")
return
From 736e6226de88ed6cb6a32dddbeef3d8d91170fe7 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:13:17 +0300
Subject: [PATCH 20/32] Update clown_items.dm
---
.../game/objects/items/weapons/clown_items.dm | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index e6c7bca85679..e4dbab30f0d5 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -93,18 +93,18 @@
return
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
- if(!proximity || ishuman(target)) return
+ if(!proximity || ishuman(target)) return
if(user.client && (target in user.client.screen))
- to_chat(user, "You need to take that [target.name] off and get some distance before cleaning it.")
- if(istype(target,/obj/effect/decal/cleanable))
- to_chat(user, "You scrub \the [target.name] out.")
- if(target.fingerprints)
- target.fingerprints = null
- if(target.suit_fibers)
- target.suit_fibers = null
- target.clean_blood()
- to_chat(user, "You FULLY clean \the [target.name].")
- return
+ to_chat(user, "You need to take that [target.name] off before cleaning it.")
+ else if(istype(target,/obj/effect/decal/cleanable))
+ to_chat(user, "You scrub \the [target.name] out.")
+ if(target.fingerprints)
+ target.fingerprints = null
+ if(target.suit_fibers)
+ target.suit_fibers = null
+ target.clean_blood()
+ to_chat(user, "You FULLY clean \the [target.name].")
+ return
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone)
if(user.a_intent == INTENT_HARM)
From 51e95327a331db8f038ee3bfa279a28f48ab1c42 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:20:47 +0300
Subject: [PATCH 21/32] Update clown_items.dm
---
.../game/objects/items/weapons/clown_items.dm | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index e4dbab30f0d5..d8ddc6ecbb93 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -93,17 +93,17 @@
return
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
- if(!proximity || ishuman(target)) return
- if(user.client && (target in user.client.screen))
+ if(!proximity || ishuman(target)) return
+ if(!isturf(target.loc))
to_chat(user, "You need to take that [target.name] off before cleaning it.")
- else if(istype(target,/obj/effect/decal/cleanable))
- to_chat(user, "You scrub \the [target.name] out.")
- if(target.fingerprints)
- target.fingerprints = null
- if(target.suit_fibers)
- target.suit_fibers = null
- target.clean_blood()
- to_chat(user, "You FULLY clean \the [target.name].")
+ else if(istype(target,/obj/effect/decal/cleanable))
+ to_chat(user, "You scrub \the [target.name] out.")
+ if(target.fingerprints)
+ target.fingerprints = null
+ if(target.suit_fibers)
+ target.suit_fibers = null
+ target.clean_blood()
+ to_chat(user, "You FULLY clean \the [target.name].")
return
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone)
From 8fedeaed2b4f74652f3912249e2ec5f3181aa663 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:23:54 +0300
Subject: [PATCH 22/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index d8ddc6ecbb93..b26f60288997 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -93,7 +93,8 @@
return
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
- if(!proximity || ishuman(target)) return
+ if(!proximity || ishuman(target))
+ return
if(!isturf(target.loc))
to_chat(user, "You need to take that [target.name] off before cleaning it.")
else if(istype(target,/obj/effect/decal/cleanable))
From 012e423cbd95eebd0b2ddafe2f434980dcbc990f Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:26:26 +0300
Subject: [PATCH 23/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 1 -
1 file changed, 1 deletion(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index b26f60288997..1a4a2afffa8a 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -94,7 +94,6 @@
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target))
- return
if(!isturf(target.loc))
to_chat(user, "You need to take that [target.name] off before cleaning it.")
else if(istype(target,/obj/effect/decal/cleanable))
From 8ad704e148305d7cc0ea9ceb1990e80e1e91d3bd Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:29:37 +0300
Subject: [PATCH 24/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 1a4a2afffa8a..fba71ba4b988 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -93,10 +93,10 @@
return
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
- if(!proximity || ishuman(target))
- if(!isturf(target.loc))
+ if(!proximity || ishuman(target)) return
+ if(user.client && (target in user.client.screen))
to_chat(user, "You need to take that [target.name] off before cleaning it.")
- else if(istype(target,/obj/effect/decal/cleanable))
+ else if(istype(target,/obj/effect/decal/cleanable))
to_chat(user, "You scrub \the [target.name] out.")
if(target.fingerprints)
target.fingerprints = null
From 39d85cf70238ad0fd0109a3f982eaf4053051d6d Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 19:26:53 +0300
Subject: [PATCH 25/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index fba71ba4b988..e4dbab30f0d5 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -97,13 +97,13 @@
if(user.client && (target in user.client.screen))
to_chat(user, "You need to take that [target.name] off before cleaning it.")
else if(istype(target,/obj/effect/decal/cleanable))
- to_chat(user, "You scrub \the [target.name] out.")
- if(target.fingerprints)
- target.fingerprints = null
- if(target.suit_fibers)
- target.suit_fibers = null
- target.clean_blood()
- to_chat(user, "You FULLY clean \the [target.name].")
+ to_chat(user, "You scrub \the [target.name] out.")
+ if(target.fingerprints)
+ target.fingerprints = null
+ if(target.suit_fibers)
+ target.suit_fibers = null
+ target.clean_blood()
+ to_chat(user, "You FULLY clean \the [target.name].")
return
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone)
From 60d5093cd10f7ce74adbde9564a1d556053ccf47 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:06:30 +0300
Subject: [PATCH 26/32] Update clown_items.dm
---
.../game/objects/items/weapons/clown_items.dm | 30 +++++++++++--------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index e4dbab30f0d5..be21a1f18ee6 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -92,19 +92,23 @@
target.clean_blood()
return
-/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
- if(!proximity || ishuman(target)) return
- if(user.client && (target in user.client.screen))
- to_chat(user, "You need to take that [target.name] off before cleaning it.")
- else if(istype(target,/obj/effect/decal/cleanable))
- to_chat(user, "You scrub \the [target.name] out.")
- if(target.fingerprints)
- target.fingerprints = null
- if(target.suit_fibers)
- target.suit_fibers = null
- target.clean_blood()
- to_chat(user, "You FULLY clean \the [target.name].")
- return
+obj/item/weapon/reagent_containers/food/snacks/soap/afterattack(atom/target, mob/user, proximity, params)
+ if(!proximity || ishuman(target)) return
+ if(user.client && (target in user.client.screen))
+ to_chat(user, "You need to take that [target.name] off before cleaning it.")
+ else if(istype(target,/obj/effect/decal/cleanable))
+ to_chat(user, "You scrub \the [target.name] out.")
+ qdel(target)
+ else
+ if(target.fingerprints)
+ target.fingerprints = null
+ if(target.suit_fibers)
+ target.suit_fibers = null
+ target.clean_blood()
+ to_chat(user, "You FULLY clean \the [target.name].")
+ target.desc += "\nБлестит как никогда раньше..."
+ return
+
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone)
if(user.a_intent == INTENT_HARM)
From 43695fd7b35feb1147e61f40f962dca3979e2f18 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:08:12 +0300
Subject: [PATCH 27/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index be21a1f18ee6..7ff33be8a9d7 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -106,10 +106,12 @@ obj/item/weapon/reagent_containers/food/snacks/soap/afterattack(atom/target, mob
target.suit_fibers = null
target.clean_blood()
to_chat(user, "You FULLY clean \the [target.name].")
+ target.clean_blood()
target.desc += "\nБлестит как никогда раньше..."
return
+
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone)
if(user.a_intent == INTENT_HARM)
..()
From 999d0fd9ea98ad01a2c4a2fd940fc6b8a0caba8c Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:11:13 +0300
Subject: [PATCH 28/32] 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 7ff33be8a9d7..e30ef17654bc 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -92,7 +92,7 @@
target.clean_blood()
return
-obj/item/weapon/reagent_containers/food/snacks/soap/afterattack(atom/target, mob/user, proximity, params)
+ /obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target)) return
if(user.client && (target in user.client.screen))
to_chat(user, "You need to take that [target.name] off before cleaning it.")
From e0b1f7ff4c8d9eba9725dd122ffd4a3e3363f771 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:17:19 +0300
Subject: [PATCH 29/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index e30ef17654bc..fa3e56721a5a 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -94,6 +94,8 @@
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target)) return
+ // I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing.
+ // So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
if(user.client && (target in user.client.screen))
to_chat(user, "You need to take that [target.name] off before cleaning it.")
else if(istype(target,/obj/effect/decal/cleanable))
@@ -104,10 +106,9 @@
target.fingerprints = null
if(target.suit_fibers)
target.suit_fibers = null
- target.clean_blood()
to_chat(user, "You FULLY clean \the [target.name].")
target.clean_blood()
- target.desc += "\nБлестит как никогда раньше..."
+ target.desc += "\nЗачистили до блеска..."
return
From b6776dcb88f319c7e94296a53e1b8505a346476a Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:18:22 +0300
Subject: [PATCH 30/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 1 -
1 file changed, 1 deletion(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index fa3e56721a5a..20bf5b484455 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -108,7 +108,6 @@
target.suit_fibers = null
to_chat(user, "You FULLY clean \the [target.name].")
target.clean_blood()
- target.desc += "\nЗачистили до блеска..."
return
From ca538fa4dc965950d4da4433c121a8a8ad4519fd Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:22:29 +0300
Subject: [PATCH 31/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 20bf5b484455..6364e708332b 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -92,7 +92,8 @@
target.clean_blood()
return
- /obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
+
+/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target)) return
// I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing.
// So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
@@ -108,6 +109,7 @@
target.suit_fibers = null
to_chat(user, "You FULLY clean \the [target.name].")
target.clean_blood()
+ target.desc += "\nSomeone cleaned it up to a shine..."
return
From 56c205f5a1432360b377bb203039f967e85a9776 Mon Sep 17 00:00:00 2001
From: TheDratutiHyDa <118916774+TheDratutiHyDa@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:34:19 +0300
Subject: [PATCH 32/32] Update clown_items.dm
---
code/game/objects/items/weapons/clown_items.dm | 3 ---
1 file changed, 3 deletions(-)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 6364e708332b..727947fc8144 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -92,7 +92,6 @@
target.clean_blood()
return
-
/obj/item/weapon/reagent_containers/food/snacks/soap/syndie/afterattack(atom/target, mob/user, proximity, params)
if(!proximity || ishuman(target)) return
// I couldn't feasibly fix the overlay bugs caused by cleaning items we are wearing.
@@ -112,8 +111,6 @@
target.desc += "\nSomeone cleaned it up to a shine..."
return
-
-
/obj/item/weapon/reagent_containers/food/snacks/soap/attack(mob/target, mob/user, def_zone)
if(user.a_intent == INTENT_HARM)
..()