Merge branch 'master' into orvilike_bonus

This commit is contained in:
Anonymous
2020-06-21 12:03:28 +03:00
3 changed files with 13 additions and 76 deletions
@@ -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)
+6 -73
View File
@@ -50,6 +50,12 @@
-->
<div class="commit sansserif">
<h2 class="date">21 June 2020</h2>
<h3 class="author">kevinz000 updated:</h3>
<ul class="changes bgimages16">
<li class="balance">calculations for punch hit chance has been drastically buffed in favor of the attacker.</li>
</ul>
<h2 class="date">20 June 2020</h2>
<h3 class="author">LetterN updated:</h3>
<ul class="changes bgimages16">
@@ -308,79 +314,6 @@
<li class="bugfix">newly created areas using blueprints now maintain the previous areas noteleport value</li>
<li class="bugfix">kudzu seeds now actually spawn vines</li>
</ul>
<h2 class="date">19 April 2020</h2>
<h3 class="author">Anonymous updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Xenohybrids will now scream like xeno.</li>
</ul>
<h3 class="author">Arturlang updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">You can no longer spam craft things using the crafting menu</li>
</ul>
<h3 class="author">Detective-Google updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">uncorks some of Lambda's rooms.</li>
</ul>
<h3 class="author">Ghommie updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Custom skin tone preferences.</li>
<li class="tweak">Normalized box dorm lockers. Also removed a straight jacket found in the same area.</li>
</ul>
<h3 class="author">Jake Park updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">fixed path name for youtool vending</li>
</ul>
<h3 class="author">Putnam3145 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Objectives now clean theirselves up instead of leaving null entries in lists everywhere.</li>
</ul>
<h3 class="author">Seris02 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">stops magboots from not updating slowdowns</li>
</ul>
<h3 class="author">Trilbyspaceclone updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Maints have seen an uptick in left over types of welders, and tools. As well as different types of masks</li>
<li class="rscadd">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!</li>
<li class="tweak">Tool lockers have 70% odds to have a spare random tool inside!</li>
<li class="rscadd">12 new more drinks for most races!</li>
<li class="rscadd">New animations for mauna loa, and colour swap from red to blue for a Paramedic Hardsuit helm</li>
<li class="tweak">Lowers cog champ ((the drink)) flare rate</li>
<li class="rscadd">Six more Sci based bounties have been posted at your local Cargo Bounty Request console</li>
<li class="bugfix">Mimes have made catnip plants not become invisible. How helpful.</li>
<li class="rscadd">Honey Palm now distills into mead rather then wine</li>
</ul>
<h3 class="author">UristMcAstronaut updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Adds circuit analyzers to maps and to integrated circuit printer and circuitry starter crate.</li>
</ul>
<h3 class="author">kappa-sama updated:</h3>
<ul class="changes bgimages16">
<li class="balance">aranesp heals 10 instead of 18 stamina per tick</li>
<li class="rscdel">removed roundstart hyper earrape screams from xenohybrids</li>
</ul>
<h3 class="author">kevinz000 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">you can no longer stun xenos</li>
<li class="balance">Contractor kits are now poplocked to 30 players.</li>
<li class="rscadd">Shield bashing has been added</li>
</ul>
<h3 class="author">necromanceranne updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">You can now craft armwraps!</li>
<li class="balance">Pugilists disarm you more easily and are harder to disarm. They also get a discount on disarm.</li>
<li class="balance">Pugilists only suffer a flat 10% chance to miss you. It's just like old punches! Kinda.</li>
<li class="balance">Chaplain's armbands are a +2, up from a +1!</li>
<li class="balance">Martial artists spend stamina when they disarm.</li>
<li class="balance">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.</li>
<li class="balance">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.</li>
<li class="balance">Sleeping Carp can punch you to the floor on a harm stun punch.</li>
<li class="bugfix">Hugs of the Northstar are no longer nodrop.</li>
<li class="bugfix">Adding in some overrides and proper flag checks for martial arts.</li>
<li class="bugfix">Stun thresholding stops disarm spams at extremely high stamina loss.</li>
<li class="tweak">Ashen Arrows are actually called Ashen Arrows in the crafting menu.</li>
</ul>
</div>
<b>GoonStation 13 Development Team</b>
+4
View File
@@ -26022,3 +26022,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- bugfix: Admin matrix right-bracket
bunny232:
- rscdel: Removed unsavory things from the vent clog event
2020-06-21:
kevinz000:
- balance: calculations for punch hit chance has been drastically buffed in favor
of the attacker.