diff --git a/code/__DEFINES/magic.dm b/code/__DEFINES/magic.dm index 4b16c141af0..34ec4b6659b 100644 --- a/code/__DEFINES/magic.dm +++ b/code/__DEFINES/magic.dm @@ -54,8 +54,8 @@ #define SPELL_CASTABLE_WHILE_PHASED (1 << 3) /// Whether the spell can be cast while the user has antimagic on them that corresponds to the spell's own antimagic flags. #define SPELL_REQUIRES_NO_ANTIMAGIC (1 << 4) -/// Whether the spell can be cast on the centcom z level. -#define SPELL_REQUIRES_OFF_CENTCOM (1 << 5) +/// Whether the spell requires being on the station z-level to be cast. +#define SPELL_REQUIRES_STATION (1 << 5) /// Whether the spell must be cast by someone with a mind datum. #define SPELL_REQUIRES_MIND (1 << 6) /// Whether the spell requires the caster have a mime vow (mindless mobs will succeed this check regardless). @@ -72,7 +72,7 @@ DEFINE_BITFIELD(spell_requirements, list( "SPELL_REQUIRES_MIME_VOW" = SPELL_REQUIRES_MIME_VOW, "SPELL_REQUIRES_MIND" = SPELL_REQUIRES_MIND, "SPELL_REQUIRES_NO_ANTIMAGIC" = SPELL_REQUIRES_NO_ANTIMAGIC, - "SPELL_REQUIRES_OFF_CENTCOM" = SPELL_REQUIRES_OFF_CENTCOM, + "SPELL_REQUIRES_STATION" = SPELL_REQUIRES_STATION, "SPELL_REQUIRES_WIZARD_GARB" = SPELL_REQUIRES_WIZARD_GARB, )) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index c8aa474f15d..d5a90d79eca 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -977,8 +977,8 @@ GLOBAL_PROTECT(admin_verbs_poll) real_reqs += "Must have a mind" if(reqs & SPELL_REQUIRES_NO_ANTIMAGIC) real_reqs += "Must have no antimagic" - if(reqs & SPELL_REQUIRES_OFF_CENTCOM) - real_reqs += "Must be off central command z-level" + if(reqs & SPELL_REQUIRES_STATION) + real_reqs += "Must be on the station z-level" if(reqs & SPELL_REQUIRES_WIZARD_GARB) real_reqs += "Must have wizard clothes" diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index 0925ea531f2..8bc805bf5e2 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -98,7 +98,7 @@ return // Register some signals so our button's icon stays up to date - if(spell_requirements & SPELL_REQUIRES_OFF_CENTCOM) + if(spell_requirements & SPELL_REQUIRES_STATION) RegisterSignal(owner, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(update_status_on_signal)) if(spell_requirements & (SPELL_REQUIRES_NO_ANTIMAGIC|SPELL_REQUIRES_WIZARD_GARB)) RegisterSignal(owner, COMSIG_MOB_EQUIPPED_ITEM, PROC_REF(update_status_on_signal)) @@ -150,7 +150,8 @@ // Certain spells are not allowed on the centcom zlevel var/turf/caster_turf = get_turf(owner) - if((spell_requirements & SPELL_REQUIRES_OFF_CENTCOM) && is_centcom_level(caster_turf.z)) + // Spells which require being on the station + if((spell_requirements & SPELL_REQUIRES_STATION) && !is_station_level(caster_turf.z)) if(feedback) to_chat(owner, span_warning("You can't cast [src] here!")) return FALSE diff --git a/code/modules/spells/spell_types/pointed/swap.dm b/code/modules/spells/spell_types/pointed/swap.dm index 965bf51af91..bbb80cc0212 100644 --- a/code/modules/spells/spell_types/pointed/swap.dm +++ b/code/modules/spells/spell_types/pointed/swap.dm @@ -13,7 +13,7 @@ cast_range = 9 invocation = "FRO' BRT'TRO, DA!" invocation_type = INVOCATION_SHOUT - spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC|SPELL_REQUIRES_OFF_CENTCOM + spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC|SPELL_REQUIRES_STATION active_msg = "You prepare to swap locations with a target..." smoke_type = /datum/effect_system/fluid_spread/smoke diff --git a/code/modules/spells/spell_types/self/lichdom.dm b/code/modules/spells/spell_types/self/lichdom.dm index cf5e3d0893a..94bafc5280c 100644 --- a/code/modules/spells/spell_types/self/lichdom.dm +++ b/code/modules/spells/spell_types/self/lichdom.dm @@ -12,7 +12,7 @@ invocation = "NECREM IMORTIUM!" invocation_type = INVOCATION_SHOUT - spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC|SPELL_REQUIRES_OFF_CENTCOM|SPELL_REQUIRES_MIND + spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC|SPELL_REQUIRES_STATION|SPELL_REQUIRES_MIND spell_max_level = 1 /datum/action/cooldown/spell/lichdom/can_cast_spell(feedback = TRUE) diff --git a/code/modules/spells/spell_types/self/rod_form.dm b/code/modules/spells/spell_types/self/rod_form.dm index 467271e5433..fd9a52be412 100644 --- a/code/modules/spells/spell_types/self/rod_form.dm +++ b/code/modules/spells/spell_types/self/rod_form.dm @@ -13,7 +13,7 @@ invocation = "CLANG!" invocation_type = INVOCATION_SHOUT - spell_requirements = SPELL_REQUIRES_WIZARD_GARB|SPELL_REQUIRES_NO_ANTIMAGIC|SPELL_REQUIRES_OFF_CENTCOM + spell_requirements = SPELL_REQUIRES_WIZARD_GARB|SPELL_REQUIRES_NO_ANTIMAGIC|SPELL_REQUIRES_STATION /// The extra distance we travel per additional spell level. var/distance_per_spell_rank = 3 diff --git a/code/modules/spells/spell_types/self/spacetime_distortion.dm b/code/modules/spells/spell_types/self/spacetime_distortion.dm index d01a98055fe..976d83e8a30 100644 --- a/code/modules/spells/spell_types/self/spacetime_distortion.dm +++ b/code/modules/spells/spell_types/self/spacetime_distortion.dm @@ -8,7 +8,7 @@ school = SCHOOL_EVOCATION cooldown_time = 30 SECONDS - spell_requirements = SPELL_REQUIRES_WIZARD_GARB|SPELL_REQUIRES_NO_ANTIMAGIC|SPELL_REQUIRES_OFF_CENTCOM + spell_requirements = SPELL_REQUIRES_WIZARD_GARB|SPELL_REQUIRES_NO_ANTIMAGIC|SPELL_REQUIRES_STATION spell_max_level = 1 /// Weather we're ready to cast again yet or not diff --git a/code/modules/spells/spell_types/self/splattercasting_spell.dm b/code/modules/spells/spell_types/self/splattercasting_spell.dm index a34e4d5eac9..1af0cacd2aa 100644 --- a/code/modules/spells/spell_types/self/splattercasting_spell.dm +++ b/code/modules/spells/spell_types/self/splattercasting_spell.dm @@ -11,7 +11,7 @@ invocation = "THE STARS ALIGN! THE COSMOS BLEEDS!" invocation_type = INVOCATION_SHOUT - spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC|SPELL_REQUIRES_OFF_CENTCOM|SPELL_REQUIRES_MIND + spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC|SPELL_REQUIRES_STATION|SPELL_REQUIRES_MIND antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY spell_max_level = 1