diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 0fb6c2a943e..8db843a3108 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -386,6 +386,19 @@ attack_verb = list("chopped", "sliced", "cut", "zandatsu'd") hitsound = 'sound/weapons/rapierhit.ogg' +/obj/item/nullrod/Hypertool + icon = 'icons/obj/device.dmi' + icon_state = "hypertool" + item_state = "hypertool" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + slot_flags = ITEM_SLOT_BELT + name = "hypertool" + desc = "A tool so powerful even you cannot perfectly use it." + armour_penetration = 35 + damtype = BRAIN + attack_verb = list("pulsed", "mended", "cut") + hitsound = 'sound/effects/sparks4.ogg' /obj/item/nullrod/scythe/spellblade icon_state = "spellblade" diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index b7ecc8da6bf..08e14416838 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -17,11 +17,11 @@ /obj/item/storage/book/attack_self(mob/user) to_chat(user, "The pages of [title] have been cut out!") -GLOBAL_LIST_INIT(biblenames, list("Bible", "Quran", "Scrapbook", "Burning Bible", "Clown Bible", "Banana Bible", "Creeper Bible", "White Bible", "Holy Light", "The God Delusion", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "Melted Bible", "Necronomicon")) +GLOBAL_LIST_INIT(biblenames, list("Bible", "Quran", "Scrapbook", "Burning Bible", "Clown Bible", "Banana Bible", "Creeper Bible", "White Bible", "Holy Light", "The God Delusion", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "Melted Bible", "Necronomicon","Insulationism")) //If you get these two lists not matching in size, there will be runtimes and I will hurt you in ways you couldn't even begin to imagine // if your bible has no custom itemstate, use one of the existing ones -GLOBAL_LIST_INIT(biblestates, list("bible", "koran", "scrapbook", "burning", "honk1", "honk2", "creeper", "white", "holylight", "atheist", "tome", "kingyellow", "ithaqua", "scientology", "melted", "necronomicon")) -GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", "honk1", "honk2", "creeper", "white", "holylight", "atheist", "tome", "kingyellow", "ithaqua", "scientology", "melted", "necronomicon")) +GLOBAL_LIST_INIT(biblestates, list("bible", "koran", "scrapbook", "burning", "honk1", "honk2", "creeper", "white", "holylight", "atheist", "tome", "kingyellow", "ithaqua", "scientology", "melted", "necronomicon","insuls")) +GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", "honk1", "honk2", "creeper", "white", "holylight", "atheist", "tome", "kingyellow", "ithaqua", "scientology", "melted", "necronomicon", "kingyellow")) /mob/proc/bible_check() //The bible, if held, might protect against certain things var/obj/item/storage/book/bible/B = locate() in src @@ -78,7 +78,13 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", var/mob/living/carbon/human/H = usr H.dna.add_mutation(CLOWNMUT) H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(H), SLOT_WEAR_MASK) - + if(icon_state == "insuls") + var/mob/living/carbon/human/H =usr + var/obj/item/clothing/gloves/color/fyellow/insuls = new + insuls.name = "insuls" + insuls.desc = "A mere copy of the true insuls." + insuls.siemens_coefficient = 0.99999 + H.equip_to_slot(insuls, ITEM_SLOT_GLOVES) GLOB.bible_icon_state = icon_state GLOB.bible_item_state = item_state diff --git a/icons/mob/inhands/equipment/tools_lefthand.dmi b/icons/mob/inhands/equipment/tools_lefthand.dmi index 5b497afe539..03bcfc1df1e 100644 Binary files a/icons/mob/inhands/equipment/tools_lefthand.dmi and b/icons/mob/inhands/equipment/tools_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/tools_righthand.dmi b/icons/mob/inhands/equipment/tools_righthand.dmi index dbed4c43d2d..201d27d8a89 100644 Binary files a/icons/mob/inhands/equipment/tools_righthand.dmi and b/icons/mob/inhands/equipment/tools_righthand.dmi differ