Fixing the snore-pocalypse, and another not so critical issue.

2020-06-24 23:08:40 +02:00
parent 07c7432f43
commit fe3932a36e
6 changed files with 23 additions and 16 deletions
@@ -103,6 +103,8 @@
 	take_damage(400, BRUTE, "melee", 0, get_dir(src, B))

 /obj/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, armor_penetration = 0) //used by attack_alien, attack_animal, and attack_slime
+	if(SEND_SIGNAL(src, COMSIG_OBJ_ATTACK_GENERIC, user, damage_amount, damage_type, damage_flag, sound_effect, armor_penetration) & COMPONENT_STOP_GENERIC_ATTACK)
+		return FALSE
 	user.do_attack_animation(src)
 	user.changeNext_move(CLICK_CD_MELEE)
 	return take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user), armor_penetration)