diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index d0c014248b4..503530f918d 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -1007,7 +1007,7 @@
var/uses = 4.0
var/temp = null
var/spell_type = "verb"
- var/max_uses = 5
+ var/max_uses = 4
/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 dc92ea836b9..2efe1775777 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -26,7 +26,12 @@
dat += "Ethereal Jaunt (60)
"
dat += "Knock (10)
"
dat += "
"
- dat += "Re-memorize Spells
"
+ dat += "Artefacts:
"
+ dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of spells.
"
+ dat += "
"
+ dat += "Staff of Change
"
+ dat += "
"
+ dat += "Re-memorize Spells
"
user << browse(dat, "window=radio")
onclose(user, "radio")
return
@@ -97,6 +102,10 @@
usr.verbs += /client/proc/knock
usr.mind.special_verbs += /client/proc/knock
src.temp = "This spell opens nearby doors and does not require wizard garb."
+ if ("14")
+ new /obj/item/weapon/gun/energy/staff(get_turf(usr))
+ src.temp = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
+ src.max_uses--
else if(spell_type == "object")
var/list/available_spells = list("Magic Missile","Fireball","Disintegrate","Disable Tech","Smoke","Blind","Mind Transfer","Forcewall","Blink","Teleport","Mutate","Ethereal Jaunt","Knock")
var/already_knows = 0
@@ -147,7 +156,11 @@
if ("13")
usr.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/knock(usr)
src.temp = "This spell opens nearby doors and does not require wizard garb."
- if (href_list["spell_choice"] == "14")
+ if ("14")
+ new /obj/item/weapon/gun/energy/staff(get_turf(usr))
+ src.temp = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
+ src.max_uses--
+ if (href_list["spell_choice"] == "15")
var/area/wizard_station/A = locate()
if(usr in A.contents)
src.uses = src.max_uses
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index c3b345a278c..63e5798a4b6 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -24,9 +24,10 @@ obj/item/weapon/gun/energy/staff
name = "staff of change"
desc = "an artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
icon = 'gun.dmi'
- icon_state = "staff"
- item_state = "staff"
+ icon_state = "staffofchange"
+ item_state = "staffofchange"
fire_sound = 'emitter.ogg'
+ w_class = 4.0
charge_cost = 200
projectile_type = "/obj/item/projectile/change"
origin_tech = null
diff --git a/html/changelog.html b/html/changelog.html
index 937d11ce4e1..81003be73d5 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -69,6 +69,8 @@ should be listed in the changelog upon commit tho. Thanks. -->
Kor updated:
- Escape pods no longer go to the horrific gibbing chambers. Rather, they will be picked up by a salvage ship in deep space. (This basically changes nothing mechanics wise, just fluff)
+ - The wizard can now purchase magic artefacts in addition to spells in a subsection of the spellbook.
+ - The first (and currently only) new artefact is the Staff of Change, which functions as a self recharging energy weapon with some special effects.
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index 9f531da8f67..75ee0fd4e6a 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index 386ce976595..54e2b9eabf6 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index 1466218ee5a..f329a3deea3 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index ef67c15554d..f3a1087cb64 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -161,7 +161,6 @@
#define FILE_DIR "icons/vending_icons"
#define FILE_DIR "interface"
#define FILE_DIR "maps"
-#define FILE_DIR "maps/backup"
#define FILE_DIR "sound"
#define FILE_DIR "sound/ambience"
#define FILE_DIR "sound/announcer"