diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index fe5fcd7953a..1d0ac22c81c 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -55,18 +55,18 @@ /obj/item/weapon/paper/talisman/supply/invoke(mob/living/user, successfuluse = 1) var/dat = list() - dat = jointext(dat, "There are [uses] bloody runes on the parchment.
") - dat = jointext(dat, "Please choose the chant to be imbued into the fabric of reality.
") - dat = jointext(dat, "
") - dat = jointext(dat, "N'ath reth sh'yro eth d'raggathnor! - Summons an arcane tome, used to scribe runes and communicate with other cultists.
") - dat = jointext(dat, "Sas'so c'arta forbici! - Allows you to move to a selected teleportation rune.
") - dat = jointext(dat, "Ta'gh fara'qha fel d'amar det! - Allows you to destroy technology in a short range.
") - dat = jointext(dat, "Fuu ma'jin! - Allows you to stun a person by attacking them with the talisman.
") - dat = jointext(dat, "Kla'atu barada nikt'o! - Two use talisman, first use makes all nearby runes invisible, second use reveals nearby hidden runes.
") - dat = jointext(dat, "Kal'om neth! - Summons a soul stone, used to capure the spirits of dead or dying humans.
") - dat = jointext(dat, "Daa'ig osk! - Summons a construct shell for use with soulstone-captured souls. It is too large to carry on your person.
") + dat += "There are [uses] bloody runes on the parchment.
" + dat += "Please choose the chant to be imbued into the fabric of reality.
" + dat += "
" + dat += "N'ath reth sh'yro eth d'raggathnor! - Summons an arcane tome, used to scribe runes and communicate with other cultists.
" + dat += "Sas'so c'arta forbici! - Allows you to move to a selected teleportation rune.
" + dat += "Ta'gh fara'qha fel d'amar det! - Allows you to destroy technology in a short range.
" + dat += "Fuu ma'jin! - Allows you to stun a person by attacking them with the talisman.
" + dat += "Kla'atu barada nikt'o! - Two use talisman, first use makes all nearby runes invisible, second use reveals nearby hidden runes.
" + dat += "Kal'om neth! - Summons a soul stone, used to capure the spirits of dead or dying humans.
" + dat += "Daa'ig osk! - Summons a construct shell for use with soulstone-captured souls. It is too large to carry on your person.
" var/datum/browser/popup = new(user, "talisman", "", 400, 400) - popup.set_content(dat) + popup.set_content(jointext(dat, "")) popup.open() return 0 @@ -331,6 +331,7 @@ qdel(src) return if(istype(target, /obj/item/stack/sheet/plasteel)) + var/turf/T = get_turf(target) var/quantity = min(target.amount, uses) uses -= quantity new /obj/item/stack/sheet/runed_metal(T,quantity) @@ -401,4 +402,4 @@ /obj/item/weapon/restraints/handcuffs/energy/cult/used/dropped(mob/user) user.visible_message("[user]'s shackles shatter in a discharge of dark magic!", \ "Your [src] shatters in a discharge of dark magic!") - qdel(src) \ No newline at end of file + qdel(src) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e019eebeb62..509d6adb0a7 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -239,4 +239,4 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \ /obj/item/stack/sheet/runed_metal/New(var/loc, var/amount=null) recipes = runed_metal_recipes - return ..() \ No newline at end of file + return ..()