Skip to content

Commit

Permalink
🔥
Browse files Browse the repository at this point in the history
  • Loading branch information
timchigaming committed Oct 13, 2024
1 parent 73fc3e3 commit d59f11c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 3 additions & 0 deletions code/datums/spell.dm
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,9 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
to_chat(user, span_warning("You shouldn't have this spell! Something's wrong."))
return FALSE

if(HAS_TRAIT(user, TRAIT_NOSPELLS))
return FALSE

if(!centcom_cancast) //Certain spells are not allowed on the centcom zlevel
var/turf/user_turf = get_turf(user)
if(user_turf && is_admin_level(user_turf.z))
Expand Down
1 change: 0 additions & 1 deletion code/datums/spells/wizard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,6 @@
action.button_icon_state = "fireball[active]"
action.UpdateButtonIcon()


/obj/effect/proc_holder/spell/fireball/cast(list/targets, mob/living/user = usr)
var/target = targets[1] //There is only ever one target for fireball
var/turf/T = user.loc
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@


/obj/effect/proc_holder/spell/vampire/lunge/can_cast(mob/living/carbon/user = usr, charge_check = TRUE, show_message = FALSE)
if(user.incapacitated(INC_IGNORE_RESTRAINED|INC_IGNORE_GRABBED) || user.buckled || (iscarbon(user) && user.legcuffed) || HAS_TRAIT(user, TRAIT_CANNOT_CAST_SPELLS))
if(user.incapacitated(INC_IGNORE_RESTRAINED|INC_IGNORE_GRABBED) || user.buckled || (iscarbon(user) && user.legcuffed))
if(show_message)
to_chat(user, span_warning("You can't use this ability right now!"))
return FALSE
Expand Down Expand Up @@ -962,7 +962,7 @@
to_chat(user, span_warning("You are too weak to use this ability!"))
return FALSE

if(!isturf(user.loc) || HAS_TRAIT(user, TRAIT_ISMMI))
if(!isturf(user.loc) || HAS_TRAIT(user, TRAIT_NOSPELLS))
if(show_message)
to_chat(user, span_warning("You can't use this ability inside [user.loc]!"))
return FALSE
Expand Down

0 comments on commit d59f11c

Please sign in to comment.