Merge pull request #11627 from kevinz000/combat_rework

"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
parent 9215b484f4 b3afed69f4
commit bfe8ccdfb5
83 changed files with 2073 additions and 462 deletions
@@ -119,6 +119,8 @@
 	if(hud_icon)
 		hud_icon.combat_on = FALSE
 		hud_icon.update_icon()
+	source.stop_active_blocking()
+	source.end_parry_sequence()

 ///Changes the user direction to (try) keep match the pointer.
 /datum/component/combat_mode/proc/on_move(atom/movable/source, dir, atom/oldloc, forced)