changes

2020-07-20 11:35:10 -07:00
parent 98d3ac80d9
commit 416b989e12
23 changed files with 39 additions and 71 deletions
@@ -80,7 +80,7 @@

 	user.do_attack_animation(M)
 	M.attacked_by(src, user, attackchain_flags, damage_multiplier)
-	SetAttackCooldown(user, M)
+	ApplyAttackCooldown(user, M)

 	log_combat(user, M, "attacked", src.name, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
 	add_fingerprint(user)
@@ -97,7 +97,7 @@
 		return
 	user.do_attack_animation(O)
 	O.attacked_by(src, user)
-	SetAttackCooldown(user, O)
+	ApplyAttackCooldown(user, O)
 	var/weight = getweight(user, STAM_COST_ATTACK_OBJ_MULT)
 	if(weight)
 		user.adjustStaminaLossBuffered(weight)//CIT CHANGE - makes attacking things cause stamina loss