cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-31 07:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes destruction banishment condition.

Browse Source
This commit is contained in:
alex-gh
2019-01-13 12:00:52 +01:00
parent 8516957898
commit 8047769ad2
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/devil/devilinfo.dm
+7 -9
View File
@@ -383,29 +383,27 @@ var/global/list/lawlorify = list (
to_chat(owner.current, "<span class='danger'>You seem to have resurrected without your hellish powers.</span>")
/datum/devilinfo/proc/check_banishment(mob/living/body)
if(QDELETED(body)) //Allow ressurection if the body has been destroyed
return 0
switch(banish)
if(BANISH_WATER)
if(iscarbon(body))
if(!QDELETED(body) && iscarbon(body))
var/mob/living/carbon/H = body
return H.reagents.has_reagent("holy water")
return 0
if(BANISH_COFFIN)
return (body && istype(body.loc, /obj/structure/closet/coffin))
return (!QDELETED(body) && istype(body.loc, /obj/structure/closet/coffin))
if(BANISH_FORMALDYHIDE)
if(iscarbon(body))
if(!QDELETED(body) && iscarbon(body))
var/mob/living/carbon/H = body
return H.reagents.has_reagent("formaldehyde")
return 0
if(BANISH_RUNES)
if(body)
if(!QDELETED(body))
for(var/obj/effect/decal/cleanable/crayon/R in range(0,body))
if (R.name == "rune")
return 1
return 0
if(BANISH_CANDLES)
if(body)
if(!QDELETED(body))
var/count = 0
for(var/obj/item/candle/C in range(1,body))
count += C.lit
@@ -413,11 +411,11 @@ var/global/list/lawlorify = list (
return 1
return 0
if(BANISH_DESTRUCTION)
if(body)
if(!QDELETED(body))
return 0
return 1
if(BANISH_FUNERAL_GARB)
if(iscarbon(body))
if(!QDELETED(body) && iscarbon(body))
var/mob/living/carbon/human/H = body
if(H.w_uniform && istype(H.w_uniform, /obj/item/clothing/under/burial))
return 1