From 22374acfb431a6e1ecd295e7c5ec1097965f8932 Mon Sep 17 00:00:00 2001 From: warior4356 Date: Thu, 1 Apr 2021 01:33:42 -0700 Subject: [PATCH] Changing var name --- code/datums/spell.dm | 4 ++-- code/datums/spells/construct_spells.dm | 18 +++++++++--------- code/game/gamemodes/vampire/vampire_powers.dm | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 96216c017de..7e7c187179a 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -121,7 +121,7 @@ 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_cancast = TRUE //Whether or not the spell functions in a holy place + var/holy_area_cancast = TRUE //Whether or not the spell functions in a holy place var/datum/action/spell_action/action = null var/action_icon = 'icons/mob/actions/actions.dmi' @@ -562,7 +562,7 @@ 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_cancast && user.holy_check()) + if(!holy_area_cancast && user.holy_check()) return 0 if(charge_check) diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm index d49a2cfb8e6..5a05bf773f4 100644 --- a/code/datums/spells/construct_spells.dm +++ b/code/datums/spells/construct_spells.dm @@ -18,7 +18,7 @@ range = 0 summon_type = list(/turf/simulated/floor/engine/cult) centcom_cancast = FALSE //Stop crashing the server by spawning turfs on transit tiles - holy_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel + holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel /obj/effect/proc_holder/spell/aoe_turf/conjure/wall name = "Summon Cult Wall" @@ -33,7 +33,7 @@ range = 0 summon_type = list(/turf/simulated/wall/cult/artificer) //we don't want artificer-based runed metal farms centcom_cancast = FALSE //Stop crashing the server by spawning turfs on transit tiles - holy_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel + holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel /obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced name = "Greater Construction" @@ -45,7 +45,7 @@ invocation_type = "none" range = 0 centcom_cancast = FALSE //Stop crashing the server by spawning turfs on transit tiles - holy_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel + holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel delay = 50 summon_type = list(/turf/simulated/wall/r_wall) @@ -61,7 +61,7 @@ invocation = "none" invocation_type = "none" range = 0 - holy_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel + holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel summon_type = list(/obj/item/soulstone) @@ -81,7 +81,7 @@ invocation = "none" invocation_type = "none" range = 0 - holy_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel + holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel summon_type = list(/obj/structure/cult/functional/pylon) @@ -97,7 +97,7 @@ invocation = "none" invocation_type = "none" range = 0 - holy_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel + holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel summon_type = list(/obj/effect/forcefield/cult) summon_lifespan = 200 @@ -117,7 +117,7 @@ clothes_req = FALSE invocation = "none" invocation_type = "none" - holy_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel + holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel jaunt_in_time = 12 jaunt_in_type = /obj/effect/temp_visual/dir_setting/wraith jaunt_out_type = /obj/effect/temp_visual/dir_setting/wraith/out @@ -139,7 +139,7 @@ clothes_req = FALSE invocation = "none" invocation_type = "none" - holy_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel + holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel proj_lifespan = 10 max_targets = 6 @@ -153,7 +153,7 @@ clothes_req = FALSE invocation = "none" invocation_type = "none" - holy_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel + holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel range = -1 include_user = 1 cooldown_min = 20 //25 deciseconds reduction per rank diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index 6f61663c972..383a6c4370e 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -9,7 +9,7 @@ action_background_icon_state = "bg_vampire" var/required_blood = 0 var/gain_desc = null - holy_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel + holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel /obj/effect/proc_holder/spell/vampire/New() ..()