mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-29 16:10:02 +01:00
Removes Weapons (#7415)
* Adds icon and hitsound where needed. * Moves alt_attack to /obj/item and deletes weapons.dm * Replaced /obj/item/weapon with /obj/item * Fixes merge issues. * Fix merge issues.
This commit is contained in:
Werner
@@ -38,14 +38,14 @@
|
||||
if(istype(target, /mob/living))
|
||||
charged_item = mob_charge(target)
|
||||
|
||||
if(istype(target, /obj/item/weapon/grab))
|
||||
var/obj/item/weapon/grab/G = target
|
||||
if(istype(target, /obj/item/grab))
|
||||
var/obj/item/grab/G = target
|
||||
if(G.affecting)
|
||||
var/mob/M = G.affecting
|
||||
charged_item = mob_charge(M)
|
||||
|
||||
if(istype(target, /obj/item/weapon/cell/))
|
||||
var/obj/item/weapon/cell/C = target
|
||||
if(istype(target, /obj/item/cell/))
|
||||
var/obj/item/cell/C = target
|
||||
if(prob(80))
|
||||
C.maxcharge -= 200
|
||||
if(C.maxcharge <= 1) //Div by 0 protection
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
/obj/effect/forcefield/attackby(var/obj/item/I, var/mob/user)
|
||||
..()
|
||||
if(istype(I, /obj/item/weapon/nullrod))
|
||||
if(istype(I, /obj/item/nullrod))
|
||||
to_chat(user, "<span class='notice'>\the [src] dissipates at the touch of the \the [I].</span>")
|
||||
qdel(src)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
//////////////////////Scrying orb//////////////////////
|
||||
|
||||
/obj/item/weapon/scrying
|
||||
/obj/item/scrying
|
||||
name = "scrying orb"
|
||||
desc = "An incandescent orb of otherworldly energy, staring into it gives you vision beyond mortal means."
|
||||
icon = 'icons/obj/projectiles.dmi'
|
||||
@@ -12,7 +12,7 @@
|
||||
force = 10
|
||||
hitsound = 'sound/items/welder2.ogg'
|
||||
|
||||
/obj/item/weapon/scrying/attack_self(mob/living/user as mob)
|
||||
/obj/item/scrying/attack_self(mob/living/user as mob)
|
||||
if(!user.is_wizard())
|
||||
if(istype(user, /mob/living/carbon/human))
|
||||
//Save the users active hand
|
||||
@@ -43,7 +43,7 @@
|
||||
announce_ghost_joinleave(user.teleop, 1, "You feel that they used a powerful artifact to [pick("invade","disturb","disrupt","infest","taint","spoil","blight")] this place with their presence.")
|
||||
return
|
||||
|
||||
/obj/item/weapon/melee/energy/wizard
|
||||
/obj/item/melee/energy/wizard
|
||||
name = "rune sword"
|
||||
desc = "A large sword engraved with arcane markings, it seems to reverberate with unearthly powers."
|
||||
icon = 'icons/obj/sword.dmi'
|
||||
@@ -69,19 +69,19 @@
|
||||
can_block_bullets = 1
|
||||
shield_power = 150
|
||||
|
||||
/obj/item/weapon/melee/energy/wizard/activate(mob/living/user)
|
||||
/obj/item/melee/energy/wizard/activate(mob/living/user)
|
||||
..()
|
||||
icon_state = "runesword1"
|
||||
item_state = "runesword1"
|
||||
to_chat(user, "<span class='notice'>\The [src] surges to life!.</span>")
|
||||
|
||||
/obj/item/weapon/melee/energy/wizard/deactivate(mob/living/user)
|
||||
/obj/item/melee/energy/wizard/deactivate(mob/living/user)
|
||||
..()
|
||||
icon_state = "runesword0"
|
||||
item_state = "runesword0"
|
||||
to_chat(user, "<span class='notice'>\The [src] slowly dies out.</span>")
|
||||
|
||||
/obj/item/weapon/melee/energy/wizard/attack(mob/living/M, mob/living/user, var/target_zone)
|
||||
/obj/item/melee/energy/wizard/attack(mob/living/M, mob/living/user, var/target_zone)
|
||||
if(user.is_wizard())
|
||||
return ..()
|
||||
|
||||
@@ -120,7 +120,7 @@
|
||||
species_restricted = list("Skeleton")
|
||||
armor = list(melee = 50, bullet = 40, laser = 50, energy = 25, bomb = 30, bio = 0, rad = 0)
|
||||
|
||||
/obj/item/weapon/material/twohanded/spear/bone
|
||||
/obj/item/material/twohanded/spear/bone
|
||||
desc = "A spear crafted with bones of some long forgotten creature."
|
||||
default_material = "cursed bone"
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
|
||||
/obj/item/phylactery/attackby(var/obj/item/I, var/mob/user)
|
||||
..()
|
||||
if(istype(I, /obj/item/weapon/nullrod))
|
||||
if(istype(I, /obj/item/nullrod))
|
||||
src.visible_message("\The [src] twists violently and explodes!")
|
||||
gibs(src.loc)
|
||||
qdel(src)
|
||||
@@ -257,7 +257,7 @@
|
||||
if(isflamesource(W))
|
||||
fire_act()
|
||||
|
||||
if(istype(W, /obj/item/weapon/melee/baton))
|
||||
if(istype(W, /obj/item/melee/baton))
|
||||
H.electrocute_act(W.force * 2, W, def_zone = target_zone)
|
||||
playsound(get_turf(H), 'sound/weapons/Egloves.ogg', 50, 1, -1)
|
||||
|
||||
@@ -275,7 +275,7 @@
|
||||
H.emote("me", 1, "gasps for air!")
|
||||
H.losebreath += 5
|
||||
|
||||
if(istype(W, /obj/item/weapon/bikehorn))
|
||||
if(istype(W, /obj/item/bikehorn))
|
||||
playsound(get_turf(H), 'sound/items/bikehorn.ogg', 50, 1, -1)
|
||||
|
||||
if(W.edge)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
//////////////////////////////Construct Spells/////////////////////////
|
||||
|
||||
proc/findNullRod(var/atom/target)
|
||||
if(istype(target,/obj/item/weapon/nullrod))
|
||||
if(istype(target,/obj/item/nullrod))
|
||||
return 1
|
||||
else if(target.contents)
|
||||
for(var/atom/A in target.contents)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/item/weapon/contract
|
||||
/obj/item/contract
|
||||
name = "contract"
|
||||
desc = "written in the blood of some unfortunate fellow."
|
||||
icon = 'icons/mob/screen/spells.dmi'
|
||||
@@ -7,7 +7,7 @@
|
||||
var/contract_master = null
|
||||
var/list/contract_spells = list(/spell/contract/reward,/spell/contract/punish,/spell/contract/return_master)
|
||||
|
||||
/obj/item/weapon/contract/attack_self(mob/user as mob)
|
||||
/obj/item/contract/attack_self(mob/user as mob)
|
||||
if(contract_master == null)
|
||||
to_chat(user, "<span class='notice'>You bind the contract to your soul, making you the recipient of whatever poor fool's soul that decides to contract with you.</span>")
|
||||
contract_master = user
|
||||
@@ -36,16 +36,16 @@
|
||||
log_and_message_admins("signed their soul over to \the [contract_master] using \the [src].", user)
|
||||
qdel(src)
|
||||
|
||||
/obj/item/weapon/contract/proc/contract_effect(mob/user as mob)
|
||||
/obj/item/contract/proc/contract_effect(mob/user as mob)
|
||||
to_chat(user, "<span class='warning'>You've signed your soul over to \the [contract_master] and with that your unbreakable vow of servitude begins.</span>")
|
||||
return 1
|
||||
|
||||
/obj/item/weapon/contract/apprentice
|
||||
/obj/item/contract/apprentice
|
||||
name = "apprentice wizarding contract"
|
||||
desc = "a wizarding school contract for those who want to sign their soul for a piece of the magic pie."
|
||||
color = "#993300"
|
||||
|
||||
/obj/item/weapon/contract/apprentice/contract_effect(mob/user as mob)
|
||||
/obj/item/contract/apprentice/contract_effect(mob/user as mob)
|
||||
if(user.mind.assigned_role == "Apprentice")
|
||||
to_chat(user, "<span class='warning'>You are already a wizarding apprentice!</span>")
|
||||
return 0
|
||||
@@ -54,7 +54,7 @@
|
||||
to_chat(user, "<span class='notice'>With the signing of this paper you agree to become \the [contract_master]'s apprentice in the art of wizardry.</span>")
|
||||
user.faction = "Space Wizard"
|
||||
wizards.add_antagonist_mind(user.mind,1)
|
||||
var/obj/item/I = new /obj/item/weapon/spellbook/student(get_turf(user))
|
||||
var/obj/item/I = new /obj/item/spellbook/student(get_turf(user))
|
||||
user.put_in_hands(I)
|
||||
new /obj/item/clothing/shoes/sandal(get_turf(user))
|
||||
new /obj/item/clothing/suit/wizrobe(get_turf(user))
|
||||
@@ -62,15 +62,15 @@
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/obj/item/weapon/contract/wizard //contracts that involve making a deal with the Wizard Acadamy (or NON PLAYERS)
|
||||
/obj/item/contract/wizard //contracts that involve making a deal with the Wizard Acadamy (or NON PLAYERS)
|
||||
contract_master = "\improper Wizard Academy"
|
||||
|
||||
/obj/item/weapon/contract/wizard/xray
|
||||
/obj/item/contract/wizard/xray
|
||||
name = "xray vision contract"
|
||||
desc = "This contract is almost see-through..."
|
||||
color = "#339900"
|
||||
|
||||
/obj/item/weapon/contract/wizard/xray/contract_effect(mob/user as mob)
|
||||
/obj/item/contract/wizard/xray/contract_effect(mob/user as mob)
|
||||
..()
|
||||
if (!(XRAY in user.mutations))
|
||||
user.mutations.Add(XRAY)
|
||||
@@ -81,12 +81,12 @@
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/obj/item/weapon/contract/wizard/tk
|
||||
/obj/item/contract/wizard/tk
|
||||
name = "telekinesis contract"
|
||||
desc = "This contract makes your mind buzz. It promises to give you the ability to move things with your mind. At a price."
|
||||
color = "#990033"
|
||||
|
||||
/obj/item/weapon/contract/wizard/tk/contract_effect(mob/user as mob)
|
||||
/obj/item/contract/wizard/tk/contract_effect(mob/user as mob)
|
||||
..()
|
||||
if(!(TK in user.mutations))
|
||||
user.mutations.Add(TK)
|
||||
@@ -94,12 +94,12 @@
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/obj/item/weapon/contract/boon
|
||||
/obj/item/contract/boon
|
||||
name = "boon contract"
|
||||
desc = "this contract grants you a boon for signing it."
|
||||
var/path
|
||||
|
||||
/obj/item/weapon/contract/boon/New(var/newloc, var/new_path)
|
||||
/obj/item/contract/boon/New(var/newloc, var/new_path)
|
||||
..(newloc)
|
||||
if(new_path)
|
||||
path = new_path
|
||||
@@ -112,7 +112,7 @@
|
||||
item_name = initial(S.name)
|
||||
name = "[item_name] contract"
|
||||
|
||||
/obj/item/weapon/contract/boon/contract_effect(mob/user as mob)
|
||||
/obj/item/contract/boon/contract_effect(mob/user as mob)
|
||||
..()
|
||||
if(ispath(path,/spell))
|
||||
user.add_spell(new path)
|
||||
@@ -122,56 +122,56 @@
|
||||
playsound(get_turf(usr),'sound/effects/phasein.ogg',50,1)
|
||||
return 1
|
||||
|
||||
/obj/item/weapon/contract/boon/wizard
|
||||
/obj/item/contract/boon/wizard
|
||||
contract_master = "\improper Wizard Academy"
|
||||
|
||||
/obj/item/weapon/contract/boon/wizard/artificer
|
||||
/obj/item/contract/boon/wizard/artificer
|
||||
name = "artificer contract"
|
||||
path = /spell/aoe_turf/conjure/construct
|
||||
desc = "This contract has a passage dedicated to an entity known as 'Nar-Sie'"
|
||||
|
||||
/obj/item/weapon/contract/boon/wizard/fireball
|
||||
/obj/item/contract/boon/wizard/fireball
|
||||
name = "fireball contract"
|
||||
path = /spell/targeted/projectile/dumbfire/fireball
|
||||
desc = "This contract feels warm to the touch."
|
||||
|
||||
/obj/item/weapon/contract/boon/wizard/smoke
|
||||
/obj/item/contract/boon/wizard/smoke
|
||||
name = "smoke contract"
|
||||
path = /spell/aoe_turf/smoke
|
||||
desc = "This contract smells as dank as they come."
|
||||
|
||||
/obj/item/weapon/contract/boon/wizard/mindswap
|
||||
/obj/item/contract/boon/wizard/mindswap
|
||||
name = "mindswap contract"
|
||||
path = /spell/targeted/mind_transfer
|
||||
desc = "This contract looks ragged and torn."
|
||||
|
||||
/obj/item/weapon/contract/boon/wizard/forcewall
|
||||
/obj/item/contract/boon/wizard/forcewall
|
||||
name = "forcewall contract"
|
||||
path = /spell/aoe_turf/conjure/forcewall
|
||||
contract_master = "\improper Mime Federation"
|
||||
desc = "This contract has a dedication to mimes everywhere at the top."
|
||||
|
||||
/obj/item/weapon/contract/boon/wizard/knock
|
||||
/obj/item/contract/boon/wizard/knock
|
||||
name = "knock contract"
|
||||
path = /spell/aoe_turf/knock
|
||||
desc = "This contract is hard to hold still."
|
||||
|
||||
/obj/item/weapon/contract/boon/wizard/horsemask
|
||||
/obj/item/contract/boon/wizard/horsemask
|
||||
name = "horsemask contract"
|
||||
path = /spell/targeted/equip_item/horsemask
|
||||
desc = "This contract is more horse than your mind has room for."
|
||||
|
||||
/obj/item/weapon/contract/boon/wizard/charge
|
||||
/obj/item/contract/boon/wizard/charge
|
||||
name = "charge contract"
|
||||
path = /spell/aoe_turf/charge
|
||||
desc = "This contract is made of 100% post-consumer wizard."
|
||||
|
||||
/obj/item/weapon/contract/boon/wizard/gestalt
|
||||
/obj/item/contract/boon/wizard/gestalt
|
||||
name = "conjure gestalt contract"
|
||||
path = /spell/aoe_turf/conjure/grove/gestalt
|
||||
desc = "This contract is a druid's favorite."
|
||||
|
||||
/obj/item/weapon/contract/boon/wizard/statue
|
||||
/obj/item/contract/boon/wizard/statue
|
||||
name = "flesh to stone contract"
|
||||
path = /spell/targeted/flesh_to_stone
|
||||
desc = "This contract is truly petrifying."
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
..()
|
||||
|
||||
/obj/effect/decal/wizard_mark/attackby(var/obj/item/I, var/mob/user)
|
||||
if(istype(I, /obj/item/weapon/nullrod) || istype(I, /obj/item/weapon/spellbook))
|
||||
if(istype(I, /obj/item/nullrod) || istype(I, /obj/item/spellbook))
|
||||
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
src.visible_message("\The [src] fades away!")
|
||||
qdel(src)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/item/weapon/monster_manual
|
||||
/obj/item/monster_manual
|
||||
name = "bestiarum"
|
||||
desc = "A book detailing various magical creatures."
|
||||
icon = 'icons/obj/library.dmi'
|
||||
@@ -23,7 +23,7 @@
|
||||
"The more carnivorous and knowledge hungry cousin of the space carp. Keep away from books."
|
||||
)
|
||||
|
||||
/obj/item/weapon/monster_manual/attack_self(mob/living/user as mob)
|
||||
/obj/item/monster_manual/attack_self(mob/living/user as mob)
|
||||
if(!user)
|
||||
return
|
||||
if(!user.is_wizard())
|
||||
@@ -35,7 +35,7 @@
|
||||
user.set_machine(src)
|
||||
interact(user)
|
||||
|
||||
/obj/item/weapon/monster_manual/interact(mob/user as mob)
|
||||
/obj/item/monster_manual/interact(mob/user as mob)
|
||||
var/dat
|
||||
if(temp)
|
||||
dat = "[temp]<br><a href='byond://?src=\ref[src];temp=1'>Return</a>"
|
||||
@@ -48,7 +48,7 @@
|
||||
user << browse(dat,"window=monstermanual")
|
||||
onclose(user,"monstermanual")
|
||||
|
||||
/obj/item/weapon/monster_manual/Topic(href, href_list)
|
||||
/obj/item/monster_manual/Topic(href, href_list)
|
||||
..()
|
||||
if(!Adjacent(usr))
|
||||
usr << browse(null,"window=monstermanual")
|
||||
|
||||
@@ -2,20 +2,20 @@
|
||||
#define CAN_MAKE_CONTRACTS 4
|
||||
|
||||
var/list/artefact_feedback = list(/obj/structure/closet/wizard/armor = "HS",
|
||||
/obj/item/weapon/gun/energy/staff/focus = "MF",
|
||||
/obj/item/weapon/monster_manual = "MA",
|
||||
/obj/item/weapon/contract/apprentice = "CP",
|
||||
/obj/item/gun/energy/staff/focus = "MF",
|
||||
/obj/item/monster_manual = "MA",
|
||||
/obj/item/contract/apprentice = "CP",
|
||||
/obj/structure/closet/wizard/souls = "SS",
|
||||
/obj/item/weapon/contract/wizard/tk = "TK",
|
||||
/obj/item/contract/wizard/tk = "TK",
|
||||
/obj/structure/closet/wizard/scrying = "SO",
|
||||
/obj/item/weapon/teleportation_scroll = "TS",
|
||||
/obj/item/weapon/gun/energy/staff = "ST",
|
||||
/obj/item/weapon/gun/energy/staff/animate = "SA",
|
||||
/obj/item/weapon/melee/energy/wizard = "WS",
|
||||
/obj/item/weapon/gun/energy/staff/chaos = "SC",
|
||||
/obj/item/weapon/storage/belt/wands/full = "WB")
|
||||
/obj/item/teleportation_scroll = "TS",
|
||||
/obj/item/gun/energy/staff = "ST",
|
||||
/obj/item/gun/energy/staff/animate = "SA",
|
||||
/obj/item/melee/energy/wizard = "WS",
|
||||
/obj/item/gun/energy/staff/chaos = "SC",
|
||||
/obj/item/storage/belt/wands/full = "WB")
|
||||
|
||||
/obj/item/weapon/spellbook
|
||||
/obj/item/spellbook
|
||||
name = "master spell book"
|
||||
desc = "The legendary book of spells of the wizard."
|
||||
icon = 'icons/obj/wizard.dmi'
|
||||
@@ -28,11 +28,11 @@ var/list/artefact_feedback = list(/obj/structure/closet/wizard/armor = "HS",
|
||||
var/datum/spellbook/spellbook
|
||||
var/spellbook_type = /datum/spellbook/ //for spawning specific spellbooks.
|
||||
|
||||
/obj/item/weapon/spellbook/New()
|
||||
/obj/item/spellbook/New()
|
||||
..()
|
||||
set_spellbook(spellbook_type)
|
||||
|
||||
/obj/item/weapon/spellbook/proc/set_spellbook(var/type)
|
||||
/obj/item/spellbook/proc/set_spellbook(var/type)
|
||||
if(spellbook)
|
||||
qdel(spellbook)
|
||||
spellbook = new type()
|
||||
@@ -40,7 +40,7 @@ var/list/artefact_feedback = list(/obj/structure/closet/wizard/armor = "HS",
|
||||
name = spellbook.name
|
||||
desc = spellbook.desc
|
||||
|
||||
/obj/item/weapon/spellbook/attack_self(mob/user as mob)
|
||||
/obj/item/spellbook/attack_self(mob/user as mob)
|
||||
if(!user)
|
||||
return
|
||||
if(!(user.faction == "Space Wizard"))
|
||||
@@ -66,7 +66,7 @@ var/list/artefact_feedback = list(/obj/structure/closet/wizard/armor = "HS",
|
||||
else
|
||||
interact(user)
|
||||
|
||||
/obj/item/weapon/spellbook/interact(mob/user as mob)
|
||||
/obj/item/spellbook/interact(mob/user as mob)
|
||||
var/dat = null
|
||||
if(temp)
|
||||
dat = "[temp]<br><a href='byond://?src=\ref[src];temp=1'>Return</a>"
|
||||
@@ -113,7 +113,7 @@ var/list/artefact_feedback = list(/obj/structure/closet/wizard/armor = "HS",
|
||||
dat += "<center><A href='byond://?src=\ref[src];lock=1'>[spellbook.book_flags & LOCKED ? "Unlock" : "Lock"] the spellbook.</a></center>"
|
||||
user << browse(dat,"window=spellbook")
|
||||
|
||||
/obj/item/weapon/spellbook/Topic(href,href_list)
|
||||
/obj/item/spellbook/Topic(href,href_list)
|
||||
..()
|
||||
|
||||
var/mob/living/carbon/human/H = usr
|
||||
@@ -155,7 +155,7 @@ var/list/artefact_feedback = list(/obj/structure/closet/wizard/armor = "HS",
|
||||
if(!(spellbook.book_flags & CAN_MAKE_CONTRACTS))
|
||||
return //no
|
||||
spellbook.max_uses -= spellbook.spells[path] //no basksies
|
||||
var/obj/O = new /obj/item/weapon/contract/boon(get_turf(usr),path)
|
||||
var/obj/O = new /obj/item/contract/boon(get_turf(usr),path)
|
||||
temp = "You have purchased \the [O]."
|
||||
else
|
||||
if(ispath(path,/spell))
|
||||
@@ -179,7 +179,7 @@ var/list/artefact_feedback = list(/obj/structure/closet/wizard/armor = "HS",
|
||||
src.interact(usr)
|
||||
|
||||
|
||||
/obj/item/weapon/spellbook/proc/send_feedback(var/path)
|
||||
/obj/item/spellbook/proc/send_feedback(var/path)
|
||||
if(ispath(path,/datum/spellbook))
|
||||
var/datum/spellbook/S = path
|
||||
feedback_add_details("wizard_spell_learned","[initial(S.feedback)]")
|
||||
@@ -190,7 +190,7 @@ var/list/artefact_feedback = list(/obj/structure/closet/wizard/armor = "HS",
|
||||
feedback_add_details("wizard_spell_learned","[artefact_feedback[path]]")
|
||||
|
||||
|
||||
/obj/item/weapon/spellbook/proc/add_spell(var/mob/user, var/spell_path)
|
||||
/obj/item/spellbook/proc/add_spell(var/mob/user, var/spell_path)
|
||||
for(var/spell/S in user.spell_list)
|
||||
if(istype(S,spell_path))
|
||||
if(!S.can_improve())
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/item/weapon/spellbook/battlemage
|
||||
/obj/item/spellbook/battlemage
|
||||
spellbook_type = /datum/spellbook/battlemage
|
||||
|
||||
|
||||
@@ -26,10 +26,10 @@
|
||||
/spell/aoe_turf/blink = 1,
|
||||
/spell/noclothes = 1,
|
||||
/obj/structure/closet/wizard/armor = 1,
|
||||
/obj/item/weapon/gun/energy/staff/focus = 1,
|
||||
/obj/item/weapon/gun/energy/staff/chaos = 1,
|
||||
/obj/item/weapon/storage/belt/wands/full = 2,
|
||||
/obj/item/weapon/melee/energy/wizard = 2,
|
||||
/obj/item/weapon/monster_manual = 2,
|
||||
/obj/item/weapon/contract/apprentice = 1
|
||||
/obj/item/gun/energy/staff/focus = 1,
|
||||
/obj/item/gun/energy/staff/chaos = 1,
|
||||
/obj/item/storage/belt/wands/full = 2,
|
||||
/obj/item/melee/energy/wizard = 2,
|
||||
/obj/item/monster_manual = 2,
|
||||
/obj/item/contract/apprentice = 1
|
||||
)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/item/weapon/spellbook/cleric
|
||||
/obj/item/spellbook/cleric
|
||||
spellbook_type = /datum/spellbook/cleric
|
||||
|
||||
/datum/spellbook/cleric
|
||||
@@ -29,8 +29,8 @@
|
||||
/spell/aoe_turf/conjure/forcewall = 1,
|
||||
/spell/targeted/subjugation = 1,
|
||||
/spell/targeted/mindcontrol = 2,
|
||||
/obj/item/weapon/gun/energy/staff/focus = 2,
|
||||
/obj/item/weapon/storage/belt/wands/full = 2,
|
||||
/obj/item/weapon/contract/apprentice = 1,
|
||||
/obj/item/gun/energy/staff/focus = 2,
|
||||
/obj/item/storage/belt/wands/full = 2,
|
||||
/obj/item/contract/apprentice = 1,
|
||||
/obj/item/poppet = 1
|
||||
)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/item/weapon/spellbook/druid
|
||||
/obj/item/spellbook/druid
|
||||
spellbook_type = /datum/spellbook/druid
|
||||
|
||||
/datum/spellbook/druid
|
||||
@@ -28,7 +28,7 @@
|
||||
/spell/targeted/flesh_to_stone = 1,
|
||||
/spell/aoe_turf/conjure/golem = 1,
|
||||
/obj/structure/closet/wizard/souls = 1,
|
||||
/obj/item/weapon/monster_manual = 1,
|
||||
/obj/item/weapon/contract/apprentice = 1,
|
||||
/obj/item/monster_manual = 1,
|
||||
/obj/item/contract/apprentice = 1,
|
||||
/obj/item/poppet = 1
|
||||
)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/item/weapon/spellbook/necromancer
|
||||
/obj/item/spellbook/necromancer
|
||||
spellbook_type = /datum/spellbook/necromancer
|
||||
|
||||
|
||||
@@ -27,5 +27,5 @@
|
||||
/obj/structure/closet/wizard/armor = 1,
|
||||
/obj/structure/closet/wizard/scrying = 2,
|
||||
/obj/structure/closet/wizard/souls = 1,
|
||||
/obj/item/weapon/contract/apprentice = 1
|
||||
/obj/item/contract/apprentice = 1
|
||||
)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/item/weapon/spellbook/spatial
|
||||
/obj/item/spellbook/spatial
|
||||
spellbook_type = /datum/spellbook/spatial
|
||||
|
||||
/datum/spellbook/spatial
|
||||
@@ -22,9 +22,9 @@
|
||||
/spell/targeted/subjugation = 1,
|
||||
/spell/aoe_turf/smoke = 1,
|
||||
/spell/aoe_turf/conjure/summon/bats = 3,
|
||||
/obj/item/weapon/contract/wizard/tk = 5,
|
||||
/obj/item/contract/wizard/tk = 5,
|
||||
/obj/structure/closet/wizard/scrying = 2,
|
||||
/obj/item/weapon/storage/belt/wands/full = 4,
|
||||
/obj/item/weapon/teleportation_scroll = 1,
|
||||
/obj/item/weapon/contract/apprentice = 1
|
||||
/obj/item/storage/belt/wands/full = 4,
|
||||
/obj/item/teleportation_scroll = 1,
|
||||
/obj/item/contract/apprentice = 1
|
||||
)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/item/weapon/spellbook/standard
|
||||
/obj/item/spellbook/standard
|
||||
spellbook_type = /datum/spellbook/standard
|
||||
|
||||
/datum/spellbook/standard
|
||||
@@ -24,12 +24,12 @@
|
||||
/spell/targeted/ethereal_jaunt = 1,
|
||||
/spell/aoe_turf/knock = 1,
|
||||
/spell/noclothes = 2,
|
||||
/obj/item/weapon/gun/energy/staff = 1,
|
||||
/obj/item/weapon/gun/energy/staff/focus = 1,
|
||||
/obj/item/gun/energy/staff = 1,
|
||||
/obj/item/gun/energy/staff/focus = 1,
|
||||
/obj/structure/closet/wizard/souls = 1,
|
||||
/obj/structure/closet/wizard/armor = 1,
|
||||
/obj/item/weapon/gun/energy/staff/animate = 1,
|
||||
/obj/item/gun/energy/staff/animate = 1,
|
||||
/obj/structure/closet/wizard/scrying = 1,
|
||||
/obj/item/weapon/monster_manual = 2,
|
||||
/obj/item/weapon/contract/apprentice = 1
|
||||
/obj/item/monster_manual = 2,
|
||||
/obj/item/contract/apprentice = 1
|
||||
)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/obj/item/weapon/spellbook/student
|
||||
/obj/item/spellbook/student
|
||||
spellbook_type = /datum/spellbook/student
|
||||
|
||||
/obj/item/weapon/spellbook/student/attack_self(mob/living/user as mob)
|
||||
/obj/item/spellbook/student/attack_self(mob/living/user as mob)
|
||||
if(user.is_wizard(TRUE))
|
||||
to_chat(user, "<span class='warning'>This books is written for students, not for a true wizard like yourself!</span>")
|
||||
return
|
||||
@@ -21,7 +21,7 @@
|
||||
spells = list(/spell/aoe_turf/knock = 1,
|
||||
/spell/targeted/ethereal_jaunt = 1,
|
||||
/spell/targeted/projectile/magic_missile = 1,
|
||||
/obj/item/weapon/gun/energy/staff/focus = 1,
|
||||
/obj/item/weapon/storage/belt/wands/full = 2,
|
||||
/obj/item/weapon/contract/wizard/xray = 1
|
||||
/obj/item/gun/energy/staff/focus = 1,
|
||||
/obj/item/storage/belt/wands/full = 2,
|
||||
/obj/item/contract/wizard/xray = 1
|
||||
)
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
|
||||
/obj/structure/closet/wizard/scrying/fill()
|
||||
..()
|
||||
new /obj/item/weapon/scrying(src)
|
||||
new /obj/item/weapon/contract/wizard/xray(src)
|
||||
new /obj/item/scrying(src)
|
||||
new /obj/item/contract/wizard/xray(src)
|
||||
|
||||
/obj/structure/closet/wizard/souls
|
||||
name = "soul shard belt"
|
||||
@@ -38,5 +38,5 @@
|
||||
|
||||
/obj/structure/closet/wizard/souls/fill()
|
||||
..()
|
||||
new /obj/item/weapon/contract/boon/wizard/artificer(src)
|
||||
new /obj/item/weapon/storage/belt/soulstone/full(src)
|
||||
new /obj/item/contract/boon/wizard/artificer(src)
|
||||
new /obj/item/storage/belt/soulstone/full(src)
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
hud_state = "purge1"
|
||||
|
||||
equipped_summons = list("active hand" = /obj/item/weapon/nullrod)
|
||||
equipped_summons = list("active hand" = /obj/item/nullrod)
|
||||
|
||||
/spell/targeted/equip_item/holy_relic/cast(list/targets, mob/user = usr)
|
||||
..()
|
||||
|
||||
@@ -17,19 +17,19 @@
|
||||
hud_state = "wiz_party"
|
||||
|
||||
compatible_mobs = list(/mob/living/carbon/human)
|
||||
equipped_summons = list("active hand" = /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer)
|
||||
equipped_summons = list("active hand" = /obj/item/reagent_containers/food/drinks/bottle/small/beer)
|
||||
|
||||
/spell/targeted/equip_item/party_hardy/empower_spell()
|
||||
if(!..())
|
||||
return 0
|
||||
switch(spell_levels[Sp_POWER])
|
||||
if(1)
|
||||
equipped_summons = list("active hand" = /obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,
|
||||
"off hand" = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel)
|
||||
equipped_summons = list("active hand" = /obj/item/reagent_containers/food/drinks/bottle/small/beer,
|
||||
"off hand" = /obj/item/reagent_containers/food/snacks/poppypretzel)
|
||||
return "The spell will now give everybody a preztel as well."
|
||||
if(2)
|
||||
equipped_summons = list("active hand" = /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe,
|
||||
"off hand" = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel,
|
||||
equipped_summons = list("active hand" = /obj/item/reagent_containers/food/drinks/bottle/absinthe,
|
||||
"off hand" = /obj/item/reagent_containers/food/snacks/poppypretzel,
|
||||
"[slot_head]" = /obj/item/clothing/head/collectable/wizard)
|
||||
return "Woo! Now everybody gets a cool wizard hat and MORE BOOZE!"
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
charge_type = Sp_RECHARGE
|
||||
charge_max = 900
|
||||
cooldown_min = 300
|
||||
equipped_summons = list("off hand" = /obj/item/weapon/shield/)
|
||||
equipped_summons = list("off hand" = /obj/item/shield/)
|
||||
duration = 300
|
||||
delete_old = 0
|
||||
var/item_color = "#6666ff"
|
||||
@@ -24,7 +24,7 @@
|
||||
hud_state = "wiz_shield"
|
||||
|
||||
/spell/targeted/equip_item/shield/summon_item(var/new_type)
|
||||
var/obj/item/weapon/shield/I = new new_type()
|
||||
var/obj/item/shield/I = new new_type()
|
||||
I.icon_state = "buckler"
|
||||
I.color = item_color
|
||||
I.name = "Wizard's Shield"
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
to_chat(user, "<span class='warning'>\The [H] is brainless!</span>")
|
||||
return FALSE
|
||||
|
||||
for (var/obj/item/weapon/implant/loyalty/I in H)
|
||||
for (var/obj/item/implant/loyalty/I in H)
|
||||
if (I.implanted)
|
||||
to_chat(src, "<span class='warning'>[H]'s mind is shielded against your powers!</span>")
|
||||
return FALSE
|
||||
|
||||
@@ -121,7 +121,7 @@
|
||||
//equips the skeleton war gear
|
||||
F.equip_to_slot_or_del(new /obj/item/clothing/under/gladiator(F), slot_w_uniform)
|
||||
F.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(F), slot_shoes)
|
||||
F.equip_to_slot_or_del(new /obj/item/weapon/material/twohanded/spear/bone(F), slot_back)
|
||||
F.equip_to_slot_or_del(new /obj/item/material/twohanded/spear/bone(F), slot_back)
|
||||
F.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/bone(F), slot_head)
|
||||
F.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/bone(F), slot_wear_suit)
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
for(var/mob/living/M in targets)
|
||||
if(istype(M,/mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/H = M
|
||||
var/obj/item/weapon/handcuffs/wizard/cuffs = new()
|
||||
var/obj/item/handcuffs/wizard/cuffs = new()
|
||||
cuffs.forceMove(H)
|
||||
H.handcuffed = cuffs
|
||||
H.update_inv_handcuffed()
|
||||
@@ -33,13 +33,13 @@
|
||||
apply_spell_damage(M)
|
||||
|
||||
|
||||
/obj/item/weapon/handcuffs/wizard
|
||||
/obj/item/handcuffs/wizard
|
||||
name = "beams of light"
|
||||
desc = "Undescribable and unpenetrable. Or so they say."
|
||||
|
||||
breakouttime = 300 //30 seconds
|
||||
|
||||
/obj/item/weapon/handcuffs/wizard/dropped(var/mob/user)
|
||||
/obj/item/handcuffs/wizard/dropped(var/mob/user)
|
||||
..()
|
||||
qdel(src)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user