From 4d25d10d91fd817b06a5cb3fb9da2c9014dc358b Mon Sep 17 00:00:00 2001 From: Ikarrus Date: Tue, 3 Mar 2015 00:30:29 -0700 Subject: [PATCH] Increased chance of deconversion when applyinb brute force to head. The more hurt they are, the more likely they are to deconvert. --- code/modules/mob/living/carbon/human/human_defense.dm | 11 ++++++----- code/modules/mob/living/carbon/human/species.dm | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 97fa7f466a3..0748e9d3747 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -179,11 +179,12 @@ emp_act switch(hit_area) if("head") //Harder to score a stun but if you do it lasts a bit longer - if(stat == CONSCIOUS && prob(I.force)) - visible_message("[src] has been knocked unconscious!", \ - "[src] has been knocked unconscious!") - apply_effect(20, PARALYZE, armor) - if(src != user && I.damtype == BRUTE) + if(stat == CONSCIOUS) + if(prob(I.force)) + visible_message("[src] has been knocked unconscious!", \ + "[src] has been knocked unconscious!") + apply_effect(20, PARALYZE, armor) + if(prob(I.force + ((100 - src.health)/2)) && src != user && I.damtype == BRUTE) ticker.mode.remove_revolutionary(mind) ticker.mode.remove_gangster(mind, exclude_bosses=1) if(bloody) //Apply blood diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 8dec2eac8aa..548785e20bb 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -925,11 +925,12 @@ switch(hit_area) if("head") //Harder to score a stun but if you do it lasts a bit longer - if(H.stat == CONSCIOUS && prob(I.force) && armor < 50) - H.visible_message("[H] has been knocked unconscious!", \ - "[H] has been knocked unconscious!") - H.apply_effect(20, PARALYZE, armor) - if(H != user && I.damtype == BRUTE) + if(H.stat == CONSCIOUS && armor < 50) + if(prob(I.force)) + H.visible_message("[H] has been knocked unconscious!", \ + "[H] has been knocked unconscious!") + H.apply_effect(20, PARALYZE, armor) + if(prob(I.force + ((100 - H.health)/2)) && H != user && I.damtype == BRUTE) ticker.mode.remove_revolutionary(H.mind) ticker.mode.remove_gangster(H.mind, exclude_bosses=1)