From ba8052af3fb4e973a036a14c19d040db78209f6a Mon Sep 17 00:00:00 2001 From: warior4356 Date: Thu, 15 Jul 2021 18:44:23 -0700 Subject: [PATCH] Apply suggestions from code review Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/datums/spell.dm | 5 +++-- code/modules/mob/mob.dm | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 7e7c187179a..edb327582c8 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -121,7 +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 - var/holy_area_cancast = TRUE //Whether or not the spell functions in a holy place + /// 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' @@ -563,7 +564,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) return 0 if(!holy_area_cancast && user.holy_check()) - return 0 + return FALSE if(charge_check) switch(charge_type) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 395d4ce7765..3685fca62ac 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1461,7 +1461,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ return GLOBAL_LIST_INIT(holy_areas, typecacheof(list( - /area/chapel))) + /area/chapel +))) /mob/proc/holy_check() if(!is_type_in_typecache(loc.loc, GLOB.holy_areas))