You can't attack mobs without combat mode (#580)

* You can't attack mobs without combat mode * fix novaflower burn * whoops
DaedalusDock · Sep 15, 2023 · b08035b · b08035b
1 parent d9f479e
commit b08035b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
@@ -181,6 +181,9 @@
 	if(signal_return & COMPONENT_SKIP_ATTACK)
 		return
 
+	if(!user.combat_mode)
+		return
+
 	SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user, params)
 
 	if(item_flags & NOBLUDGEON)

diff --git a/code/modules/unit_tests/novaflower_burn.dm b/code/modules/unit_tests/novaflower_burn.dm
@@ -21,6 +21,7 @@
 	// And give them the plant safe trait so we don't have to worry about attacks being cancelled
 	ADD_TRAIT(botanist, TRAIT_PLANT_SAFE, "unit_test")
 
+	botanist.set_combat_mode(TRUE)
 	// Now, let's get a smack with the novaflower and see what happens.
 	weapon.melee_attack_chain(botanist, victim)