Merge pull request #33933 from coiax/wizard-late-joining

Late joiners also get summoned guns/magic

code/game/gamemodes/wizard/artefact.dm

@@ -121,11 +121,20 @@
 	force = 15
 	hitsound = 'sound/items/welder2.ogg'
 
+	var/xray_granted = FALSE
+
+/obj/item/scrying/equipped(mob/user)
+	if(!xray_granted && ishuman(user))
+		var/mob/living/carbon/human/H = user
+		if(!(H.dna.check_mutation(XRAY)))
+			H.dna.add_mutation(XRAY)
+			xray_granted = TRUE
+	. = ..()
+
 /obj/item/scrying/attack_self(mob/user)
 	to_chat(user, "<span class='notice'>You can see...everything!</span>")
 	visible_message("<span class='danger'>[user] stares into [src], their eyes glazing over.</span>")
 	user.ghostize(1)
-	return
 
 /////////////////////////////////////////Necromantic Stone///////////////////
 

code/game/gamemodes/wizard/spellbook.dm

@@ -318,12 +318,6 @@
 	item_path = /obj/item/scrying
 	category = "Defensive"
 
-/datum/spellbook_entry/item/scryingorb/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
-	if(..())
-		if (!(user.dna.check_mutation(XRAY)))
-			user.dna.add_mutation(XRAY)
-	return 1
-
 /datum/spellbook_entry/item/soulstones
 	name = "Six Soul Stone Shards and the spell Artificer"
 	desc = "Soul Stone Shards are ancient tools capable of capturing and harnessing the spirits of the dead and dying. The spell Artificer allows you to create arcane machines for the captured souls to pilot."
@@ -482,7 +476,7 @@
 
 /datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
 	SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
-	rightandwrong(0, user, 25)
+	rightandwrong(SUMMON_GUNS, user, 25)
 	active = 1
 	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
 	to_chat(user, "<span class='notice'>You have cast summon guns!</span>")
@@ -499,7 +493,7 @@
 
 /datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
 	SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
-	rightandwrong(1, user, 25)
+	rightandwrong(SUMMON_MAGIC, user, 25)
 	active = 1
 	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
 	to_chat(user, "<span class='notice'>You have cast summon magic!</span>")