mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 12:41:09 +01:00
you can no longer use spells while in rod form (#66029)
* does the thing * EVERY SPELL OH NO * bluh
This commit is contained in:
@@ -426,6 +426,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
|
||||
// Normally only present in the mind of a Research Director.
|
||||
#define TRAIT_ROD_SUPLEX "rod_suplex"
|
||||
|
||||
/// This mob is currently in rod form.
|
||||
#define TRAIT_ROD_FORM "rod_form"
|
||||
|
||||
//SKILLS
|
||||
#define TRAIT_UNDERWATER_BASKETWEAVING_KNOWLEDGE "underwater_basketweaving"
|
||||
#define TRAIT_WINE_TASTER "wine_taster"
|
||||
|
||||
@@ -187,7 +187,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
|
||||
to_chat(user, span_warning("Magic seems to flee from you, you can't gather enough power to cast this spell."))
|
||||
return FALSE
|
||||
|
||||
if(!phase_allowed && istype(user.loc, /obj/effect/dummy))
|
||||
if(!phase_allowed && istype(user.loc, /obj/effect/dummy) || HAS_TRAIT(user, TRAIT_ROD_FORM))
|
||||
to_chat(user, span_warning("[name] cannot be cast unless you are completely manifested in the material plane!"))
|
||||
return FALSE
|
||||
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
rod_max_distance,
|
||||
rod_damage_bonus,
|
||||
)
|
||||
ADD_TRAIT(caster, TRAIT_ROD_FORM, MAGIC_TRAIT)
|
||||
|
||||
/// Wizard Version of the Immovable Rod.
|
||||
/obj/effect/immovablerod/wizard
|
||||
@@ -137,5 +138,6 @@
|
||||
wizard.notransform = FALSE
|
||||
wizard.forceMove(get_turf(src))
|
||||
our_wizard = null
|
||||
REMOVE_TRAIT(wizard, TRAIT_ROD_FORM, MAGIC_TRAIT)
|
||||
|
||||
#undef BASE_WIZ_ROD_RANGE
|
||||
|
||||
Reference in New Issue
Block a user