shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6774 from Citadel-Station-13/upstream-merge-37871

Browse Source 
[MIRROR] Fixes sharp weapons deconverting revs
This commit is contained in:
deathride58
2018-05-17 18:06:45 +00:00
committed by GitHub
parent c8fa81e395 a9664ac343
commit 24d87f2884
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/antagonists/revolution/revolution.dm
View File

@@ -207,6 +207,7 @@
owner.current.visible_message("<span class='deconversion_message'>The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.</span>", null, null, null, owner.current)
to_chat(owner, "<span class='userdanger'>The frame's firmware detects and deletes your neural reprogramming! You remember nothing but the name of the one who flashed you.</span>")
//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)

4
code/modules/mob/living/carbon/human/species.dm
View File

@@ -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)