Merge pull request #2612 from Aurorablade/Guardingthings

Fethas Carnival of Horrors part 4: I am in your greytide guarding ur newbs

code/game/asteroid.dm

@@ -97,7 +97,7 @@ var/global/max_secret_rooms = 6
 			theme = "xenoden"
 			walltypes = list(/turf/simulated/mineral/random/high_chance=1)
 			floortypes = list(/turf/simulated/floor/plating/airless/asteroid, /turf/simulated/floor/beach/sand)
-			treasureitems = list(/obj/item/clothing/mask/facehugger=1,/obj/item/stack/sheet/animalhide/xeno=2,/obj/item/clothing/suit/xenos=2,/obj/item/clothing/head/xenos=2)
+			treasureitems = list(/obj/item/clothing/mask/facehugger=1,/obj/item/stack/sheet/animalhide/xeno=2,/obj/item/clothing/suit/xenos=2,/obj/item/clothing/head/xenos=2,/obj/item/weapon/guardiancreator/biological=1)
 			fluffitems = list(/obj/effect/decal/remains/human=1,/obj/effect/decal/cleanable/blood/xeno=5)
 
 		if("hitech")

code/game/gamemodes/wizard/spellbook.dm

@@ -258,6 +258,13 @@
 	log_name = "BB"
 	limit = 3
 
+/datum/spellbook_entry/item/tarotdeck
+	name = "Tarot Deck"
+	desc = "A deck of tarot cards that can be used to summon a spirit companion for the wizard."
+	item_path = /obj/item/weapon/guardiancreator
+	log_name = "TD"
+	limit = 1
+
 /datum/spellbook_entry/item/scryingorb/Buy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
 	if(..())
 		if (!(XRAY in user.mutations))