diff --git a/code/datums/spells/projectile.dm b/code/datums/spells/projectile.dm index 31530d33808..b255e84523a 100644 --- a/code/datums/spells/projectile.dm +++ b/code/datums/spells/projectile.dm @@ -16,7 +16,7 @@ var/proj_lingering = 0 //if it lingers or disappears upon hitting an obstacle var/proj_homing = 1 //if it follows the target var/proj_insubstantial = 0 //if it can pass through dense objects or not - var/proj_trigger_range = 1 //the range from target at which the projectile triggers cast(target) + var/proj_trigger_range = 0 //the range from target at which the projectile triggers cast(target) var/proj_lifespan = 15 //in deciseconds * proj_step_delay var/proj_step_delay = 1 //lower = faster @@ -39,6 +39,8 @@ var/current_loc = usr.loc + projectile.loc = current_loc + for(var/i = 0,i < proj_lifespan,i++) if(!projectile) break diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 6f368ae3d60..42dbaa3cdcb 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -922,6 +922,7 @@ var/temp = null var/spell_type = "verb" var/max_uses = 5 + var/op = 1 /obj/item/weapon/spellbook/object_type_spells //used for giving out object spells as opposed to verb spells spell_type = "object" diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 90263fe24eb..29867b5dd97 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -25,7 +25,8 @@ dat += "Mutate (60)
" dat += "Ethereal Jaunt (60)
" dat += "Knock (10)
" - dat += "Summon Guns (One time use, global spell)
" + if(op) + dat += "Summon Guns (One time use, global spell)
" dat += "
" dat += "Artefacts:
" dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of spells.
" @@ -35,7 +36,8 @@ dat += "
" dat += "Six Soul Stone Shards and the spell Artificer
" dat += "
" - dat += "Veil Render
" + if(op) + dat += "Veil Render
" dat += "
" dat += "Re-memorize Spells
" user << browse(dat, "window=radio")