Merge pull request #15757 from warior4356/holy-chapel

Makes the chapel holy once more.
This commit is contained in:
variableundefined
2021-07-25 08:37:18 -04:00
committed by GitHub
15 changed files with 123 additions and 12 deletions
+5
View File
@@ -121,6 +121,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
var/critfailchance = 0
var/centcom_cancast = TRUE //Whether or not the spell should be allowed on the admin zlevel
/// Whether or not the spell functions in a holy place
var/holy_area_cancast = TRUE
var/datum/action/spell_action/action = null
var/action_icon = 'icons/mob/actions/actions.dmi'
@@ -561,6 +563,9 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
if(is_admin_level(user.z) && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel
return 0
if(!holy_area_cancast && user.holy_check())
return FALSE
if(charge_check)
switch(charge_type)
if("recharge")