Fixes sharp weapons deconverting revs (#37871)

* Fixes sharp weapons deconverting revs

* enhanced commentary
This commit is contained in:
ShizCalev
2018-05-17 11:27:29 -04:00
committed by letterjay
parent 56544307ec
commit e425a8514e
2 changed files with 3 additions and 2 deletions
@@ -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)