Merge pull request #14482 from silicons/combat_v7

Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.

code/controllers/configuration/entries/game_options.dm

@@ -269,6 +269,15 @@
 		/mob/living/carbon/alien/humanoid/royal/queen = 2
 	)
 
+/datum/config_entry/number/sprintless_stagger_slowdown
+	config_entry_value = 0
+
+/datum/config_entry/number/melee_stagger_factor
+	config_entry_value = 1
+
+/datum/config_entry/number/sprintless_off_balance_slowdown
+	config_entry_value = 0.85
+
 /datum/config_entry/number/movedelay	//Used for modifying movement speed for mobs.
 	abstract_type = /datum/config_entry/number/movedelay
 	integer = FALSE

code/controllers/configuration/entries/stamina_combat.dm

@@ -12,11 +12,7 @@
 
 /// Base regeneration per second
 /datum/config_entry/number/stamina_combat/base_regeneration
-	config_entry_value = 0.5
-
-/// Combat mode regeneration per second
-/datum/config_entry/number/stamina_combat/combat_regeneration
-	config_entry_value = 5
+	config_entry_value = 3.5
 
 /// After out_of_combat_timer elapses, additionally regenerate this percent of total stamina per second. Unaffected by combat mode.
 /datum/config_entry/number/stamina_combat/percent_regeneration_out_of_combat