From bbef99ce617fb112b05b8d350d340c26c151f7ef Mon Sep 17 00:00:00 2001 From: TDSSS <32099540+TDSSS@users.noreply.github.com> Date: Mon, 5 Aug 2019 23:01:01 +0200 Subject: [PATCH] Give cult talisman different icons --- code/game/gamemodes/cult/talisman.dm | 12 ++++++++++++ code/modules/paperwork/paper.dm | 2 +- icons/obj/paper.dmi | Bin 2160 -> 2744 bytes 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 92fc09490ec..e2ff5a809e5 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -1,4 +1,5 @@ /obj/item/paper/talisman + icon = 'icons/obj/paper.dmi' icon_state = "paper_talisman" var/cultist_name = "talisman" var/cultist_desc = "A basic talisman. It serves no purpose." @@ -49,6 +50,7 @@ //Supply Talisman: Has a few unique effects. Granted only to starter cultists. /obj/item/paper/talisman/supply cultist_name = "Supply Talisman" + icon_state = "supply" cultist_desc = "A multi-use talisman that can create various objects. Intended to increase the cult's strength early on." invocation = null uses = 3 @@ -117,6 +119,7 @@ //Rite of Translocation: Same as rune /obj/item/paper/talisman/teleport cultist_name = "Talisman of Teleportation" + icon_state = "teleport" cultist_desc = "A single-use talisman that will teleport a user to a random rune of the same keyword." invocation = "Sas'so c'arta forbici!" health_cost = 5 @@ -159,6 +162,7 @@ /obj/item/paper/talisman/summon_tome cultist_name = "Talisman of Tome Summoning" + icon_state = "tome" cultist_desc = "A one-use talisman that will call an untranslated tome from the archives of a cult." invocation = "N'ath reth sh'yro eth d'raggathnor!" health_cost = 1 @@ -173,6 +177,7 @@ /obj/item/paper/talisman/true_sight cultist_name = "Talisman of Veiling" + icon_state = "veil" cultist_desc = "A multi-use talisman that hides nearby runes. On its second use, will reveal nearby runes." invocation = "Kla'atu barada nikt'o!" health_cost = 1 @@ -197,6 +202,7 @@ //Rite of False Truths: Same as rune /obj/item/paper/talisman/make_runes_fake cultist_name = "Talisman of Disguising" + icon_state = "disguising" cultist_desc = "A talisman that will make nearby runes appear fake." invocation = "By'o nar'nar!" @@ -212,6 +218,7 @@ //Rite of Disruption: Weaker than rune /obj/item/paper/talisman/emp cultist_name = "Talisman of Electromagnetic Pulse" + icon_state = "emp" cultist_desc = "A talisman that will cause a moderately-sized electromagnetic pulse." invocation = "Ta'gh fara'qha fel d'amar det!" health_cost = 5 @@ -226,6 +233,7 @@ //Rite of Disorientation: Stuns and inhibit speech on a single target for quite some time /obj/item/paper/talisman/stun cultist_name = "Talisman of Stunning" + icon_state = "stunning" cultist_desc = "A talisman that will stun and inhibit speech on a single target. To use, attack target directly." invocation = "Dream sign:Evil sealing talisman!" health_cost = 10 @@ -271,6 +279,7 @@ //Rite of Arming: Equips cultist armor on the user, where available /obj/item/paper/talisman/armor cultist_name = "Talisman of Arming" + icon_state = "arming" cultist_desc = "A talisman that will equip the invoker with cultist equipment if there is a slot to equip it to." invocation = "N'ath reth sh'yro eth draggathnor!" @@ -301,6 +310,7 @@ //Talisman of Horrors: Breaks the mind of the victim with nightmarish hallucinations /obj/item/paper/talisman/horror cultist_name = "Talisman of Horrors" + icon_state = "horror" cultist_desc = "A talisman that will break the mind of the victim with nightmarish hallucinations." invocation = "Lo'Nab Na'Dm!" @@ -316,6 +326,7 @@ //Talisman of Fabrication: Creates a construct shell out of 25 metal sheets. /obj/item/paper/talisman/construction cultist_name = "Talisman of Construction" + icon_state = "construction" cultist_desc = "Use this talisman on at least twenty-five metal sheets to create an empty construct shell or on plasteel to make runed metal" invocation = "Ethra p'ni dedol!" uses = 25 @@ -360,6 +371,7 @@ //Talisman of Shackling: Applies special cuffs directly from the talisman /obj/item/paper/talisman/shackle cultist_name = "Talisman of Shackling" + icon_state = "shackling" cultist_desc = "Use this talisman on a victim to handcuff them with dark bindings." invocation = "In'totum Lig'abis!" uses = 4 diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 23a37e06409..86c460f53de 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -54,7 +54,7 @@ /obj/item/paper/update_icon() ..() - if(icon_state == "paper_talisman") + if(istype(src, /obj/item/paper/talisman))//let's not override talisman sprites, tyvm return if(info) icon_state = "paper_words" diff --git a/icons/obj/paper.dmi b/icons/obj/paper.dmi index ce3c79adc7351e9f424891dbe093de2f6ed3b113..5578107683332ff3509ac54e614f6c34aa14e0aa 100644 GIT binary patch delta 2456 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 Hu0mjf8XumE