From 3410f3ccbcc195b2df11d9880ca851019f89b179 Mon Sep 17 00:00:00 2001 From: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com> Date: Fri, 3 Jan 2020 00:51:05 -0600 Subject: [PATCH 1/2] Removes ball-kicking --- code/modules/mob/living/carbon/human/unarmed_attack.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm index 43a5ae66f2..33c02d54df 100644 --- a/code/modules/mob/living/carbon/human/unarmed_attack.dm +++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm @@ -75,7 +75,7 @@ var/global/list/sparring_attack_cache = list() target.set_dir(reverse_dir[target.dir]) target.apply_effect(attack_damage * 0.4, WEAKEN, armour) if(BP_GROIN) - target.visible_message("[target] looks like [TT.he] [TT.is] in pain!", "[(target.gender=="female") ? "Oh god that hurt!" : "Oh no, not your[pick("testicles", "crown jewels", "clockweights", "family jewels", "marbles", "bean bags", "teabags", "sweetmeats", "goolies")]!"]") // I see no easy way to fix this for non-organic or neuter characters. + target.visible_message("[target] looks like [TT.he] [TT.is] in pain!", ""Oh god that hurt!"") // Chompstation edit target.apply_effects(stutter = attack_damage * 2, agony = attack_damage* 3, blocked = armour) if("l_leg", "l_foot", "r_leg", "r_foot") if(!target.lying) @@ -276,4 +276,4 @@ var/global/list/sparring_attack_cache = list() shredding = 0 damage = 0 sharp = 0 - edge = 0 \ No newline at end of file + edge = 0 From d1d447515015bbba46e577d695624af473e0a5c1 Mon Sep 17 00:00:00 2001 From: Shadow Date: Mon, 6 Jan 2020 08:51:23 -0600 Subject: [PATCH 2/2] Whoops --- code/modules/mob/living/carbon/human/unarmed_attack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/unarmed_attack.dm b/code/modules/mob/living/carbon/human/unarmed_attack.dm index 33c02d54df..92d727511a 100644 --- a/code/modules/mob/living/carbon/human/unarmed_attack.dm +++ b/code/modules/mob/living/carbon/human/unarmed_attack.dm @@ -75,7 +75,7 @@ var/global/list/sparring_attack_cache = list() target.set_dir(reverse_dir[target.dir]) target.apply_effect(attack_damage * 0.4, WEAKEN, armour) if(BP_GROIN) - target.visible_message("[target] looks like [TT.he] [TT.is] in pain!", ""Oh god that hurt!"") // Chompstation edit + target.visible_message("[target] looks like [TT.he] [TT.is] in pain!", "Oh god that hurt!") // Chompstation edit target.apply_effects(stutter = attack_damage * 2, agony = attack_damage* 3, blocked = armour) if("l_leg", "l_foot", "r_leg", "r_foot") if(!target.lying)