From 214b6d39eedeeaba99d8584842400fc8c79aac2f Mon Sep 17 00:00:00 2001
From: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Date: Fri, 2 Jun 2023 18:36:50 +0200
Subject: [PATCH] Decals now do not decline your action (#21055)

* decal location melee attack chain added

* supports hulk, simple animals, hand attack(touches)
---
 code/game/objects/effects/effects.dm | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/effects/effects.dm b/code/game/objects/effects/effects.dm
index 3adbee6f4bc..e69c30f4a39 100644
--- a/code/game/objects/effects/effects.dm
+++ b/code/game/objects/effects/effects.dm
@@ -12,9 +12,6 @@
 /obj/effect/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
 	return
 
-/obj/effect/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
-	return FALSE
-
 /obj/effect/singularity_act()
 	qdel(src)
 	return FALSE
@@ -104,6 +101,20 @@
 /obj/effect/decal/attackby(obj/item/I, mob/user)
 	if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks))
 		scoop(I, user)
+	else if(issimulatedturf(loc))
+		I.melee_attack_chain(user, loc)
+
+/obj/effect/decal/attack_animal(mob/living/simple_animal/M)
+	if(issimulatedturf(loc))
+		loc.attack_animal(M)
+
+/obj/effect/decal/attack_hand(mob/living/user)
+	if(issimulatedturf(loc))
+		loc.attack_hand(user)
+
+/obj/effect/decal/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE)
+	if(issimulatedturf(loc))
+		loc.attack_hulk(user, does_attack_animation)
 
 /obj/effect/decal/proc/scoop(obj/item/I, mob/user)
 	if(reagents && I.reagents && !no_scoop)