Merge pull request #1027 from FernandoJ8/splashy-splash

It is now possible to splash liquid containers while using Intents
Monkestation · Jan 26, 2024 · 48aeee5 · 48aeee5
2 parents a53cf7f + 735abc7
commit 48aeee5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
@@ -146,7 +146,7 @@
 /obj/item/reagent_containers/pre_attack_secondary(atom/target, mob/living/user, params)
 	if(HAS_TRAIT(target, TRAIT_DO_NOT_SPLASH))
 		return ..()
-	if(!(user.istate & ISTATE_HARM))
+	if(!(user.istate & ISTATE_HARM) && istype(user.client?.imode, /datum/interaction_mode/combat_mode))
 		return ..()
 	if (try_splash(user, target))
 		return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN