From e425a8514ed190ecf70efa581154b5d6b93c3d7a Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 17 May 2018 11:27:29 -0400 Subject: [PATCH 1/2] Fixes sharp weapons deconverting revs (#37871) * Fixes sharp weapons deconverting revs * enhanced commentary --- code/modules/antagonists/revolution/revolution.dm | 1 + code/modules/mob/living/carbon/human/species.dm | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 1f77866d76..d5d7db9ac2 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -207,6 +207,7 @@ owner.current.visible_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.", null, null, null, owner.current) to_chat(owner, "The frame's firmware detects and deletes your neural reprogramming! You remember nothing but the name of the one who flashed you.") +//blunt trauma deconversions call this through species.dm spec_attacked_by() /datum/antagonist/rev/proc/remove_revolutionary(borged, deconverter) log_attack("[owner.current] (Key: [key_name(owner.current)]) has been deconverted from the revolution by [deconverter] (Key: [key_name(deconverter)])!") if(borged) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index a89c966012..fcb0269e35 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1559,9 +1559,9 @@ GLOBAL_LIST_EMPTY(roundstart_races) H.gain_trauma(/datum/brain_trauma/mild/concussion) else if(!I.is_sharp()) - H.adjustBrainLoss(I.force / 5) + H.adjustBrainLoss(I.force * 0.2) - if(prob(I.force + ((100 - H.health)/2)) && H != user) + if(!I.is_sharp() && prob(I.force + ((100 - H.health) * 0.5)) && H != user) // rev deconversion through blunt trauma. var/datum/antagonist/rev/rev = H.mind.has_antag_datum(/datum/antagonist/rev) if(rev) rev.remove_revolutionary(FALSE, user)