diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index e1a7a3b221..30fafb36a9 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1492,12 +1492,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
var/miss_chance = 100//calculate the odds that a punch misses entirely. considers stamina and brute damage of the puncher. punches miss by default to prevent weird cases
if(user.dna.species.punchdamagelow)
- if(HAS_TRAIT(user, TRAIT_PUGILIST)) //pugilists have a flat 10% miss chance
- miss_chance = 10
if(atk_verb == ATTACK_EFFECT_KICK) //kicks never miss (provided your species deals more than 0 damage)
miss_chance = 0
+ else if(HAS_TRAIT(user, TRAIT_PUGILIST)) //pugilists have a flat 10% miss chance
+ miss_chance = 10
else
- miss_chance = min(10 + ((puncherstam + puncherbrute)*0.5), 100) //probability of miss has a base of 10, and modified based on half brute total. Capped at max 100 to prevent weirdness in prob()
+ miss_chance = min(10 + max(puncherstam * 0.5, puncherbrute * 0.5), 100) //probability of miss has a base of 10, and modified based on half brute total. Capped at max 100 to prevent weirdness in prob()
if(!damage || !affecting || prob(miss_chance))//future-proofing for species that have 0 damage/weird cases where no zone is targeted
playsound(target.loc, user.dna.species.miss_sound, 25, TRUE, -1)
diff --git a/html/changelog.html b/html/changelog.html
index 3f80fd537e..00e2474b4b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,12 @@
-->
+
21 June 2020
+
kevinz000 updated:
+
+ - calculations for punch hit chance has been drastically buffed in favor of the attacker.
+
+
20 June 2020
LetterN updated:
@@ -308,79 +314,6 @@
- newly created areas using blueprints now maintain the previous areas noteleport value
- kudzu seeds now actually spawn vines
-
-
19 April 2020
-
Anonymous updated:
-
- - Xenohybrids will now scream like xeno.
-
-
Arturlang updated:
-
- - You can no longer spam craft things using the crafting menu
-
-
Detective-Google updated:
-
- - uncorks some of Lambda's rooms.
-
-
Ghommie updated:
-
- - Custom skin tone preferences.
- - Normalized box dorm lockers. Also removed a straight jacket found in the same area.
-
-
Jake Park updated:
-
- - fixed path name for youtool vending
-
-
Putnam3145 updated:
-
- - Objectives now clean theirselves up instead of leaving null entries in lists everywhere.
-
-
Seris02 updated:
-
- - stops magboots from not updating slowdowns
-
-
Trilbyspaceclone updated:
-
- - Maints have seen an uptick in left over types of welders, and tools. As well as different types of masks
- - New type of 02 locker - Rng! It can have almost any type of gas/breath mask and almost any type of o2 tank as well as even plasma men internals - Fancy!
- - Tool lockers have 70% odds to have a spare random tool inside!
- - 12 new more drinks for most races!
- - New animations for mauna loa, and colour swap from red to blue for a Paramedic Hardsuit helm
- - Lowers cog champ ((the drink)) flare rate
- - Six more Sci based bounties have been posted at your local Cargo Bounty Request console
- - Mimes have made catnip plants not become invisible. How helpful.
- - Honey Palm now distills into mead rather then wine
-
-
UristMcAstronaut updated:
-
- - Adds circuit analyzers to maps and to integrated circuit printer and circuitry starter crate.
-
-
kappa-sama updated:
-
- - aranesp heals 10 instead of 18 stamina per tick
- - removed roundstart hyper earrape screams from xenohybrids
-
-
kevinz000 updated:
-
- - you can no longer stun xenos
- - Contractor kits are now poplocked to 30 players.
- - Shield bashing has been added
-
-
necromanceranne updated:
-
- - You can now craft armwraps!
- - Pugilists disarm you more easily and are harder to disarm. They also get a discount on disarm.
- - Pugilists only suffer a flat 10% chance to miss you. It's just like old punches! Kinda.
- - Chaplain's armbands are a +2, up from a +1!
- - Martial artists spend stamina when they disarm.
- - Rising Bass had several moves shortened and made stronger. Has a disarm override attack which does stamina damage and trips people on a disarm stun punch.
- - CQC had it's disarm move altered to be a stronger version of Krav Maga's. Dizzies and disarms on a disarm stun punch or just does some stamina damage and brute damage.
- - Sleeping Carp can punch you to the floor on a harm stun punch.
- - Hugs of the Northstar are no longer nodrop.
- - Adding in some overrides and proper flag checks for martial arts.
- - Stun thresholding stops disarm spams at extremely high stamina loss.
- - Ashen Arrows are actually called Ashen Arrows in the crafting menu.
-