From b1bf6acab0f726c652cac0e36175e2ca1f98ac7e Mon Sep 17 00:00:00 2001 From: AnturK Date: Tue, 17 Nov 2015 15:17:46 +0100 Subject: [PATCH] Changes spellbook description Picks types from list --- code/game/gamemodes/wizard/spellbook.dm | 6 ++++-- code/modules/projectiles/projectile/magic.dm | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 609cfc3999b..9b6a9c366ff 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -268,7 +268,7 @@ /datum/spellbook_entry/item/staffdoor name = "Staff of Door Creation" - desc = "A particular staff that can mold solid metal into ornate wooden doors. Useful for getting around in the absence of other transportation. Does not work on glass." + desc = "A particular staff that can mold solid metal into ornate doors. Useful for getting around in the absence of other transportation. Does not work on glass." item_path = /obj/item/weapon/gun/magic/staff/door log_name = "SD" cost = 1 @@ -792,6 +792,7 @@ for(var/V in stored_swap.mind.special_verbs) stored_swap.verbs -= V + var/mob/dead/observer/ghost = stored_swap.ghostize(0) user.mind.transfer_to(stored_swap) @@ -801,7 +802,8 @@ user.verbs += V ghost.mind.transfer_to(user) - user.key = ghost.key + if(ghost.key) + user.key = ghost.key if(user.mind.special_verbs.len) for(var/V in user.mind.special_verbs) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 4b48fc95418..229007bad91 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -91,6 +91,9 @@ damage = 0 damage_type = OXY nodamage = 1 + var/list/door_types = list(/obj/structure/mineral_door/wood,/obj/structure/mineral_door/iron,/obj/structure/mineral_door/silver,\ + /obj/structure/mineral_door/gold,/obj/structure/mineral_door/uranium,/obj/structure/mineral_door/sandstone,/obj/structure/mineral_door/transparent/plasma,\ + /obj/structure/mineral_door/transparent/diamond) /obj/item/projectile/magic/door/on_hit(atom/target) . = ..() @@ -101,7 +104,7 @@ CreateDoor(T) /obj/item/projectile/magic/door/proc/CreateDoor(turf/T) - var/door_type = pick(typesof(/obj/structure/mineral_door) - /obj/structure/mineral_door) + var/door_type = pick(door_types) new door_type(T) T.ChangeTurf(/turf/simulated/floor/plating)