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

Fixes rev mindswap (#34567)

Browse Source
This commit is contained in:
ShizCalev
2018-01-21 13:28:41 -05:00
committed by CitadelStationBot
parent f692ffaa0c
commit 68cfdb617b
28 changed files with 60 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+2 -2
View File
@@ -819,7 +819,7 @@
/mob/living/proc/return_soul()
hellbound = 0
if(mind)
var/datum/antagonist/devil/devilInfo = mind.soulOwner.has_antag_datum(ANTAG_DATUM_DEVIL)
var/datum/antagonist/devil/devilInfo = mind.soulOwner.has_antag_datum(/datum/antagonist/devil)
if(devilInfo)//Not sure how this could be null, but let's just try anyway.
devilInfo.remove_soul(mind)
mind.soulOwner = mind
@@ -829,7 +829,7 @@
return devilInfo && banetype == devilInfo.bane
/mob/living/proc/check_weakness(obj/item/weapon, mob/living/attacker)
if(mind && mind.has_antag_datum(ANTAG_DATUM_DEVIL))
if(mind && mind.has_antag_datum(/datum/antagonist/devil))
return check_devil_bane_multiplier(weapon, attacker)
return 1