More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347)

* A more lenient soft stamina crit.

* Yea, your shots are gonna go straight toh.

* accuracy whacks (leaves the bow as is for now).

* Fixing stam penalties calculations, spread the range.

* aaaaaah

* 1.4 seconds delay vs 1.2

* Thanks, linter.

* Missed one.

code/__DEFINES/combat.dm

@@ -61,10 +61,18 @@
 #define CHECK_STAMCRIT(mob)					((mob.combat_flags & COMBAT_FLAG_HARD_STAMCRIT)? HARD_STAMCRIT : ((mob.combat_flags & COMBAT_FLAG_SOFT_STAMCRIT)? SOFT_STAMCRIT : NOT_STAMCRIT))
 
 //stamina stuff
-#define STAMINA_SOFTCRIT					100 //softcrit for stamina damage. prevents standing up, prevents performing actions that cost stamina, etc, but doesn't force a rest or stop movement
-#define STAMINA_CRIT						140 //crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit
-#define STAMINA_SOFTCRIT_TRADITIONAL		0	//same as STAMINA_SOFTCRIT except for the more traditional health calculations
-#define STAMINA_CRIT_TRADITIONAL			-40 //ditto, but for STAMINA_CRIT
+///Threshold over which attacks start being hindered.
+#define STAMINA_NEAR_SOFTCRIT				90
+///softcrit for stamina damage. prevents standing up, some actions that cost stamina, etc, but doesn't force a rest or stop movement
+#define STAMINA_SOFTCRIT					100
+///sanity cap to prevent stamina actions (that are still performable) from sending you into crit.
+#define STAMINA_NEAR_CRIT					130
+///crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit
+#define STAMINA_CRIT						140
+///same as STAMINA_SOFTCRIT except for the more traditional health calculations
+#define STAMINA_SOFTCRIT_TRADITIONAL		0
+///ditto, but for STAMINA_CRIT
+#define STAMINA_CRIT_TRADITIONAL			-40
 
 #define CRAWLUNDER_DELAY							30 //Delay for crawling under a standing mob
 
@@ -182,6 +190,9 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define EGUN_SELFCHARGE 1
 #define EGUN_SELFCHARGE_BORG 2
 
+///Time to spend without clicking on other things required for your shots to become accurate.
+#define GUN_AIMING_TIME (2 SECONDS)
+
 //Object/Item sharpness
 #define IS_BLUNT			0
 #define IS_SHARP			1
@@ -249,6 +260,21 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define STAM_COST_W_CLASS_MULT		1.25
 #define STAM_COST_THROW_MULT		2
 
+///Multiplier of the (STAMINA_NEAR_CRIT - user current stamina loss) : (STAMINA_NEAR_CRIT - STAMINA_SOFTCRIT) ratio used in damage penalties when stam soft-critted.
+#define STAM_CRIT_ITEM_ATTACK_PENALTY	0.66
+/// changeNext_move penalty multiplier of the above.
+#define STAM_CRIT_ITEM_ATTACK_DELAY		1.75
+/// Damage penalty when fighting prone.
+#define LYING_DAMAGE_PENALTY			0.5
+/// Added delay when firing guns stam-softcritted. Summed with a hardset CLICK_CD_RANGE delay, similar to STAM_CRIT_DAMAGE_DELAY otherwise.
+#define STAM_CRIT_GUN_DELAY			2.75
+
+/**
+  * should the current-attack-damage be lower than the item force multiplied by this value,
+  * a "inefficiently" prefix will be added to the message.
+  */
+#define INEFFICIENT_ATTACK_MSG_THRESHOLD 0.7
+
 
 //bullet_act() return values
 #define BULLET_ACT_HIT				"HIT"		//It's a successful hit, whatever that means in the context of the thing it's hitting.

code/__DEFINES/obj_flags.dm

@@ -18,18 +18,29 @@
 // Flags for the item_flags var on /obj/item
 
 #define BEING_REMOVED						(1<<0)
-#define IN_INVENTORY						(1<<1)	//is this item equipped into an inventory slot or hand of a mob? used for tooltips
-#define FORCE_STRING_OVERRIDE				(1<<2)	//used for tooltips
-#define NEEDS_PERMIT						(1<<3)	//Used by security bots to determine if this item is safe for public use.
+///is this item equipped into an inventory slot or hand of a mob? used for tooltips
+#define IN_INVENTORY						(1<<1)
+///used for tooltips
+#define FORCE_STRING_OVERRIDE				(1<<2)
+///Used by security bots to determine if this item is safe for public use.
+#define NEEDS_PERMIT						(1<<3)
 #define SLOWS_WHILE_IN_HAND					(1<<4)
-#define NO_MAT_REDEMPTION					(1<<5)	//Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
-#define DROPDEL								(1<<6)	//When dropped, it calls qdel on itself
-#define NOBLUDGEON							(1<<7)	//when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
-#define ABSTRACT							(1<<8) 	//for all things that are technically items but used for various different stuff
-#define IMMUTABLE_SLOW          			(1<<9)	//When players should not be able to change the slowdown of the item (Speed potions, ect)
-#define SURGICAL_TOOL						(1<<10)	//Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes)
-#define NO_UNIFORM_REQUIRED					(1<<11) //Can be worn on certain slots (currently belt and id) that would otherwise require an uniform.
-#define NO_ATTACK_CHAIN_SOFT_STAMCRIT		(1<<12)		//Entirely blocks melee_attack_chain() if user is soft stamcritted. Uses getStaminaLoss() to check at this point in time. THIS DOES NOT BLOCK RANGED AFTERATTACK()S, ONLY MELEE RANGE AFTERATTACK()S.
+///Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
+#define NO_MAT_REDEMPTION					(1<<5)
+///When dropped, it calls qdel on itself
+#define DROPDEL								(1<<6)
+///when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
+#define NOBLUDGEON							(1<<7)
+///for all things that are technically items but used for various different stuff
+#define ABSTRACT							(1<<8)
+///When players should not be able to change the slowdown of the item (Speed potions, ect)
+#define IMMUTABLE_SLOW          			(1<<9)
+///Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes)
+#define SURGICAL_TOOL						(1<<10)
+///Can be worn on certain slots (currently belt and id) that would otherwise require an uniform.
+#define NO_UNIFORM_REQUIRED					(1<<11)
+///Damage when attacking people is not affected by combat mode.
+#define NO_COMBAT_MODE_FORCE_MODIFIER		(1<<12)
 
 // Flags for the clothing_flags var on /obj/item/clothing