diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index ee046a33062..2fa09a584a4 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -910,6 +910,15 @@ ///Add a spell to the mobs spell list /mob/proc/AddSpell(obj/effect/proc_holder/spell/S) + // HACK: Preferences menu creates one of every selectable species. + // Some species, like vampires, create spells when they're made. + // The "action" is created when those spells Initialize. + // Preferences menu can create these assets at *any* time, primarily before + // the atoms SS initializes. + // That means "action" won't exist. + if (isnull(S.action)) + return + LAZYADD(mob_spell_list, S) S.action.Grant(src) diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/SpeciesPage.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/SpeciesPage.tsx index 27c98ba946b..b3b6cbe1e65 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/SpeciesPage.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/SpeciesPage.tsx @@ -259,33 +259,33 @@ const SpeciesPageInner = (props: { - + {species.map(([speciesKey, species]) => { return ( - - - + ); })} - +