From a662254beb233c3dabe516c96d9f0eb2a892f25b Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Sun, 21 Nov 2021 19:32:31 +0100
Subject: [PATCH] fixes urns not being able to pick up ashes (#12777)

---
 code/game/objects/items/weapons/chaplain_items.dm | 3 ++-
 html/changelogs/AshUrns.yml                       | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/AshUrns.yml

diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm
index 606a12432fa..06b12bf60a4 100644
--- a/code/game/objects/items/weapons/chaplain_items.dm
+++ b/code/game/objects/items/weapons/chaplain_items.dm
@@ -184,8 +184,9 @@
 	icon_state = "urn"
 	applies_material_colour = TRUE
 	w_class = ITEMSIZE_SMALL
+	flags = NOBLUDGEON
 
-/obj/item/material/urn/attack(var/obj/A, var/mob/user, var/proximity)
+/obj/item/material/urn/afterattack(var/obj/A, var/mob/user, var/proximity)
 	if(!istype(A, /obj/effect/decal/cleanable/ash))
 		return ..()
 	else if(proximity)
diff --git a/html/changelogs/AshUrns.yml b/html/changelogs/AshUrns.yml
new file mode 100644
index 00000000000..d2d205f40bb
--- /dev/null
+++ b/html/changelogs/AshUrns.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "Urns can now contain ashes again."