From dfc8a1dc738e2709b80d83bd9064642e399b9c02 Mon Sep 17 00:00:00 2001
From: Seris02 <49109742+Seris02@users.noreply.github.com>
Date: Wed, 11 Dec 2019 03:08:52 +0800
Subject: [PATCH 1/2] fixes it
if it breaks I blame you again putnam
---
code/modules/mob/living/carbon/human/human_defense.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 05ef815a99..5de6abd31b 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -48,7 +48,7 @@
if(mind)
if (mind.martial_art && mind.martial_art.dodge_chance)
if(!lying && dna && !dna.check_mutation(HULK))
- if(mind.martial_art.dodge_chance >= rand(0,100))
+ if(prob(mind.martial_art.dodge_chance))
var/dodgemessage = pick("dodges under the projectile!","dodges to the right of the projectile!","jumps over the projectile!")
visible_message("[src] [dodgemessage]", "You dodge the projectile!")
return -1
From 4a68a5c33f3c5214d8fdbf0eafb15fb3bfe0a07e Mon Sep 17 00:00:00 2001
From: Seris02 <49109742+Seris02@users.noreply.github.com>
Date: Mon, 16 Dec 2019 12:59:19 +0800
Subject: [PATCH 2/2] fixes combo text
---
code/datums/martial/rising_bass.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/datums/martial/rising_bass.dm b/code/datums/martial/rising_bass.dm
index d175322a7c..01b37c5c65 100644
--- a/code/datums/martial/rising_bass.dm
+++ b/code/datums/martial/rising_bass.dm
@@ -141,7 +141,7 @@
to_chat(usr, "You retreat inward and recall the teachings of the Rising Bass...")
to_chat(usr, "Side Kick: Disarm Harm. Forces opponent to step to the side.")
- to_chat(usr, "Shoulder Flip: Grab Harm Disarm Grab Grab. Flips opponent over your shoulder and stuns.")
+ to_chat(usr, "Shoulder Flip: Grab Harm Disarm Grab Harm Harm. Flips opponent over your shoulder and stuns.")
to_chat(usr, "Repulse Punch: Grab Harm Grab Harm. Slams the opponent far away from you.")
to_chat(usr, "Foot Smash: Harm Harm. Stuns opponent, minor damage.")
to_chat(usr, "Deft Switch: Grab Disarm Disarm. Switches the opponent's held item for your own. Most useful with nothing in your hand.")