Merge pull request #12965 from timothyteakettle/end-our-suffering

drastically lowers the damage-related benefits of combat mode
2020-08-01 03:33:43 -07:00
parent 66534fd5b6 e17e1c3a11
commit 2230a3665a
4 changed files with 12 additions and 12 deletions
@@ -44,11 +44,11 @@
 	//Here we roll for our damage to be added into the damage var in the various attack procs. This is changed depending on whether we are in combat mode, lying down, or if our target is in combat mode.
 	var/damage = rand(A.dna.species.punchdamagelow, A.dna.species.punchdamagehigh)
 	if(SEND_SIGNAL(D, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-		damage *= 1.5
+		damage *= 1.2
 	if(!CHECK_MOBILITY(A, MOBILITY_STAND))
-		damage *= 0.5
+		damage *= 0.7
 	if(SEND_SIGNAL(A, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
-		damage *= 0.25
+		damage *= 0.8
 	return damage

 /datum/martial_art/proc/teach(mob/living/carbon/human/H, make_temporary = FALSE)