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

Merge pull request #1034 from Citadel-Station-13/upstream-merge-27368

Browse Source 
[MIRROR] Fixes bane runtimes
This commit is contained in:
LetterJay
2017-05-19 05:32:31 -04:00
committed by GitHub
parent cb5e0eba3a fe89b9ea8a
commit af815195bc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/living.dm
+1 -1
View File
@@ -823,7 +823,7 @@
/mob/living/proc/has_bane(banetype)
var/datum/antagonist/devil/devilInfo = is_devil(src)
return (banetype == devilInfo.bane)
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))