diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 5199e4212c8..d3c870e3b76 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -13,6 +13,7 @@ throwforce = 10 w_class = 3 var/charged = 1 + hitsound = 'sound/weapons/bladeslice.ogg' /obj/effect/rend name = "tear in the fabric of reality" diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 98055b0dc4f..5d79d667c58 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -264,7 +264,7 @@ if("soulstone") feedback_add_details("wizard_spell_learned","SS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells new /obj/item/weapon/storage/belt/soulstone/full(get_turf(H)) - H.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(H) + H.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(null) temp = "You have purchased a belt full of soulstones and have learned the artificer spell." max_uses-- if("armor") diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 55a172074f4..affe7dc73ca 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -466,9 +466,12 @@ var/list/admin_verbs_hideable = list( set name = "Give Spell" set desc = "Gives a spell to a mob." var/obj/effect/proc_holder/spell/S = input("Choose the spell to give to that guy", "ABRAKADABRA") as null|anything in spells - if(!S || !T.mind) + if(!S) return - T.mind.spell_list += new S + if(T.mind) + T.mind.spell_list += new S + else + T.mob_spell_list += new S feedback_add_details("admin_verb","GS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] gave [key_name(T)] the spell [S].") message_admins("\blue [key_name_admin(usr)] gave [key_name(T)] the spell [S].", 1) diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index 74dbf9301b2..d36aa1afcbd 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -55,9 +55,9 @@ /mob/living/simple_animal/hostile/statue/New() ..() // Give spells - mob_spell_list += new /obj/effect/proc_holder/spell/aoe_turf/flicker_lights(null) - mob_spell_list += new /obj/effect/proc_holder/spell/aoe_turf/blindness(null) - mob_spell_list += new /obj/effect/proc_holder/spell/targeted/night_vision(null) + mob_spell_list += new /obj/effect/proc_holder/spell/aoe_turf/flicker_lights(src) + mob_spell_list += new /obj/effect/proc_holder/spell/aoe_turf/blindness(src) + mob_spell_list += new /obj/effect/proc_holder/spell/targeted/night_vision(src) // Give nightvision see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index b136ec1b2c9..4d4714d0940 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -670,6 +670,7 @@ note dizziness decrements automatically in the mob's Life() proc. continue statpanel(listed_turf.name, null, A) + if(mind) add_spells_to_statpanel(mind.spell_list) add_spells_to_statpanel(mob_spell_list) @@ -686,6 +687,7 @@ note dizziness decrements automatically in the mob's Life() proc. if("holdervar") statpanel("[S.panel]","[S.holder_var_type] [S.holder_var_amount]",S) + // facing verbs /mob/proc/canface() if(!canmove) return 0