diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 678cfb80e62..f0a307cc549 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -72,7 +72,6 @@ icon_state = "studentuni" inhand_icon_state = "studentuni" body_parts_covered = ARMS|CHEST - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) /obj/item/clothing/head/helmet/chaplain/cage name = "cage" @@ -191,7 +190,7 @@ /obj/item/nullrod name = "null rod" - desc = "A rod of pure obsidian; its very presence disrupts and dampens the powers of Nar'Sie's followers." + desc = "A rod of pure obsidian; its very presence disrupts and dampens 'magical forces'. That's what the guidebook says, anyway." icon_state = "nullrod" inhand_icon_state = "nullrod" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' @@ -200,6 +199,7 @@ throw_speed = 3 throw_range = 4 throwforce = 10 + slot_flags = ITEM_SLOT_BELT w_class = WEIGHT_CLASS_TINY obj_flags = UNIQUE_RENAME wound_bonus = -10 @@ -311,12 +311,12 @@ /obj/item/nullrod/claymore icon_state = "claymore_gold" inhand_icon_state = "claymore_gold" - worn_icon_state = "claymore" + worn_icon_state = "claymore_gold" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' name = "holy claymore" desc = "A weapon fit for a crusade!" - w_class = WEIGHT_CLASS_HUGE + w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT block_chance = 30 sharpness = SHARP_EDGED @@ -330,20 +330,21 @@ return ..() /obj/item/nullrod/claymore/darkblade + name = "dark blade" + desc = "Spread the glory of the dark gods!" icon_state = "cultblade" inhand_icon_state = "cultblade" + worn_icon_state = "cultblade" lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi' righthand_file = 'icons/mob/inhands/64x64_righthand.dmi' inhand_x_dimension = 64 inhand_y_dimension = 64 - name = "dark blade" - desc = "Spread the glory of the dark gods!" - slot_flags = ITEM_SLOT_BACK hitsound = 'sound/hallucinations/growl1.ogg' /obj/item/nullrod/claymore/chainsaw_sword icon_state = "chainswordon" inhand_icon_state = "chainswordon" + worn_icon_state = "chainswordon" name = "sacred chainsaw sword" desc = "Suffer not a heretic to live." slot_flags = ITEM_SLOT_BELT @@ -359,7 +360,6 @@ worn_icon_state = "swordon" name = "force weapon" desc = "The blade glows with the power of faith. Or possibly a battery." - slot_flags = ITEM_SLOT_BELT /obj/item/nullrod/claymore/katana name = "\improper Hanzo steel" @@ -367,14 +367,14 @@ icon_state = "katana" inhand_icon_state = "katana" worn_icon_state = "katana" - slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK /obj/item/nullrod/claymore/multiverse name = "extradimensional blade" desc = "Once the harbinger of an interdimensional war, its sharpness fluctuates wildly." icon_state = "multiverse" inhand_icon_state = "multiverse" - slot_flags = ITEM_SLOT_BELT + worn_icon_state = "multiverse" + slot_flags = ITEM_SLOT_BACK /obj/item/nullrod/claymore/multiverse/attack(mob/living/carbon/M, mob/living/carbon/user) force = rand(1, 30) @@ -386,19 +386,22 @@ icon = 'icons/obj/transforming_energy.dmi' icon_state = "swordblue" inhand_icon_state = "swordblue" - desc = "If you strike me down, I shall become more robust than you can possibly imagine." + worn_icon_state = "swordblue" slot_flags = ITEM_SLOT_BELT + desc = "If you strike me down, I shall become more robust than you can possibly imagine." /obj/item/nullrod/claymore/saber/red name = "dark energy sword" icon_state = "swordred" inhand_icon_state = "swordred" + worn_icon_state = "swordred" desc = "Woefully ineffective when used on steep terrain." /obj/item/nullrod/claymore/saber/pirate name = "nautical energy sword" icon_state = "cutlass1" inhand_icon_state = "cutlass1" + worn_icon_state = "swordred" desc = "Convincing HR that your religion involved piracy was no mean feat." /obj/item/nullrod/sord @@ -406,11 +409,12 @@ desc = "This thing is so unspeakably HOLY you are having a hard time even holding it." icon_state = "sord" inhand_icon_state = "sord" + worn_icon_state = "sord" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - slot_flags = ITEM_SLOT_BELT force = 4.13 throwforce = 1 + slot_flags = ITEM_SLOT_BELT hitsound = 'sound/weapons/bladeslice.ogg' attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") @@ -436,6 +440,7 @@ /obj/item/nullrod/scythe/vibro icon_state = "hfrequency0" inhand_icon_state = "hfrequency1" + worn_icon_state = "hfrequency0" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' name = "high frequency blade" @@ -449,6 +454,7 @@ inhand_icon_state = "spellblade" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + worn_icon_state = "spellblade" icon = 'icons/obj/guns/magic.dmi' name = "dormant spellblade" desc = "The blade grants the wielder nearly limitless power...if they can figure out how to turn it on, that is." @@ -459,6 +465,7 @@ inhand_icon_state = "talking_sword" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + worn_icon_state = "talking_sword" name = "possessed blade" desc = "When the station falls into chaos, it's nice to have a friend by your side." attack_verb_continuous = list("chops", "slices", "cuts") @@ -509,6 +516,7 @@ /obj/item/nullrod/scythe/talking/chainsword icon_state = "chainswordon" inhand_icon_state = "chainswordon" + worn_icon_state = "chainswordon" name = "possessed chainsaw sword" desc = "Suffer not a heretic to live." chaplain_spawnable = FALSE @@ -521,14 +529,14 @@ toolspeed = 0.5 //faster than normal saw /obj/item/nullrod/hammmer - icon_state = "hammeron" - inhand_icon_state = "hammeron" - lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi' name = "relic war hammer" desc = "This war hammer cost the chaplain forty thousand space dollars." - slot_flags = ITEM_SLOT_BELT - w_class = WEIGHT_CLASS_HUGE + icon_state = "hammeron" + inhand_icon_state = "hammeron" + worn_icon_state = "hammeron" + lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi' + w_class = WEIGHT_CLASS_BULKY attack_verb_continuous = list("smashes", "bashes", "hammers", "crunches") attack_verb_simple = list("smash", "bash", "hammer", "crunch") @@ -554,23 +562,28 @@ AddComponent(/datum/component/butchering, 30, 100, 0, hitsound) /obj/item/nullrod/clown + name = "clown dagger" + desc = "Used for absolutely hilarious sacrifices." icon = 'icons/obj/wizard.dmi' icon_state = "clownrender" inhand_icon_state = "render" - name = "clown dagger" - desc = "Used for absolutely hilarious sacrifices." + worn_icon_state = "render" hitsound = 'sound/items/bikehorn.ogg' sharpness = SHARP_EDGED attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut") /obj/item/nullrod/pride_hammer - icon_state = "pride" name = "Pride-struck Hammer" desc = "It resonates an aura of Pride." + icon_state = "pride" + inhand_icon_state = "pride" + worn_icon_state = "pride" + lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi' force = 16 throwforce = 15 - w_class = 4 + w_class = WEIGHT_CLASS_BULKY slot_flags = ITEM_SLOT_BACK attack_verb_continuous = list("attacks", "smashes", "crushes", "splatters", "cracks") attack_verb_simple = list("attack", "smash", "crush", "splatter", "crack") @@ -644,6 +657,7 @@ icon = 'icons/obj/plushes.dmi' icon_state = "carpplush" inhand_icon_state = "carp_plushie" + worn_icon_state = "nullrod" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' force = 15 @@ -679,12 +693,12 @@ /obj/item/nullrod/tribal_knife icon_state = "crysknife" + desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn." inhand_icon_state = "crysknife" lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' name = "arrhythmic knife" w_class = WEIGHT_CLASS_HUGE - desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn." sharpness = SHARP_EDGED slot_flags = null hitsound = 'sound/weapons/bladeslice.ogg' @@ -709,12 +723,15 @@ wielder.update_equipment_speed_mods() /obj/item/nullrod/pitchfork + name = "unholy pitchfork" + desc = "Holding this makes you look absolutely devilish." icon_state = "pitchfork0" + worn_icon_state = "pitchfork0" lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi' - name = "unholy pitchfork" - w_class = WEIGHT_CLASS_NORMAL - desc = "Holding this makes you look absolutely devilish." + worn_icon_state = "pitchfork0" + w_class = WEIGHT_CLASS_BULKY + slot_flags = ITEM_SLOT_BACK attack_verb_continuous = list("pokes", "impales", "pierces", "jabs") attack_verb_simple = list("poke", "impale", "pierce", "jab") hitsound = 'sound/weapons/bladeslice.ogg' @@ -728,21 +745,24 @@ inhand_icon_state = "pharoah_sceptre" lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' + worn_icon_state = "pharoah_sceptre" w_class = WEIGHT_CLASS_NORMAL + slot_flags = ITEM_SLOT_BACK attack_verb_continuous = list("bashes", "smacks", "whacks") attack_verb_simple = list("bash", "smack", "whack") /obj/item/nullrod/hypertool + name = "hypertool" + desc = "A tool so powerful even you cannot perfectly use it." icon = 'icons/obj/device.dmi' icon_state = "hypertool" inhand_icon_state = "hypertool" + worn_icon_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 + armour_penetration = 35 attack_verb_continuous = list("pulses", "mends", "cuts") attack_verb_simple = list("pulse", "mend", "cut") hitsound = 'sound/effects/sparks4.ogg' @@ -750,15 +770,15 @@ /obj/item/nullrod/spear name = "ancient spear" desc = "An ancient spear made of brass, I mean gold, I mean bronze. It looks highly mechanical." + icon = 'icons/obj/clockwork_objects.dmi' icon_state = "ratvarian_spear" inhand_icon_state = "ratvarian_spear" lefthand_file = 'icons/mob/inhands/antag/clockwork_lefthand.dmi' righthand_file = 'icons/mob/inhands/antag/clockwork_righthand.dmi' - icon = 'icons/obj/clockwork_objects.dmi' slot_flags = ITEM_SLOT_BELT armour_penetration = 10 sharpness = SHARP_POINTY - w_class = WEIGHT_CLASS_BULKY + w_class = WEIGHT_CLASS_HUGE attack_verb_continuous = list("stabs", "pokes", "slashes", "clocks") attack_verb_simple = list("stab", "poke", "slash", "clock") hitsound = 'sound/weapons/bladeslice.ogg' diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index 15384d70145..9883782b86f 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -36,6 +36,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", icon = 'icons/obj/storage.dmi' icon_state = "bible" inhand_icon_state = "bible" + worn_icon_state = "bible" lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi' var/mob/affecting = null diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index f4091817d18..5026d453f84 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 6fd46bd8157..45c3b4e732e 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi index c33639dd438..dac7a1483ce 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ diff --git a/icons/mob/inhands/weapons/hammers_lefthand.dmi b/icons/mob/inhands/weapons/hammers_lefthand.dmi index 16efca26203..d957f1932d8 100644 Binary files a/icons/mob/inhands/weapons/hammers_lefthand.dmi and b/icons/mob/inhands/weapons/hammers_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/hammers_righthand.dmi b/icons/mob/inhands/weapons/hammers_righthand.dmi index fbe4a7cda72..65970f8ba69 100644 Binary files a/icons/mob/inhands/weapons/hammers_righthand.dmi and b/icons/mob/inhands/weapons/hammers_righthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_lefthand.dmi b/icons/mob/inhands/weapons/swords_lefthand.dmi index 6e0ee789b09..1645ec66c8f 100644 Binary files a/icons/mob/inhands/weapons/swords_lefthand.dmi and b/icons/mob/inhands/weapons/swords_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi index ee52a1156cd..7fd3b1daf58 100644 Binary files a/icons/mob/inhands/weapons/swords_righthand.dmi and b/icons/mob/inhands/weapons/swords_righthand.dmi differ