From 456076b4e299fa48cb164726ac1b67f6200e9495 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 30 Jun 2021 21:02:26 +0200 Subject: [PATCH] [MIRROR] Fixes relic war hammer typepath (#6600) * Fixes relic war hammer typepath (#59880) This PR fixes a typepath mismatch - /obj/item/nullrod/hammmer and /obj/item/nullrod/hammer, which are supposed to be one item. This mismatch caused relic war hammer not to be able to do kneejerk action, and it also meant that one duplicate nullrod item was showing in the radial menu for the null rod reskin variant selection. * Fixes relic war hammer typepath * Update belts.dm Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com> Co-authored-by: Gandalf --- code/game/objects/items/holy_weapons.dm | 2 +- .../modules/customization/modules/clothing/storage/belts.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 191c3ac8256..d214cfc20e1 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -561,7 +561,7 @@ tool_behaviour = TOOL_SAW toolspeed = 0.5 //faster than normal saw -/obj/item/nullrod/hammmer +/obj/item/nullrod/hammer name = "relic war hammer" desc = "This war hammer cost the chaplain forty thousand space dollars." icon_state = "hammeron" diff --git a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm index 1dd655969ca..4d2cbb50e84 100644 --- a/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm +++ b/modular_skyrat/modules/customization/modules/clothing/storage/belts.dm @@ -89,7 +89,7 @@ /obj/item/nullrod/carp, /obj/item/nullrod/chainsaw, /obj/item/nullrod/claymore/bostaff, - /obj/item/nullrod/hammmer, + /obj/item/nullrod/hammer, /obj/item/nullrod/pitchfork, /obj/item/nullrod/pride_hammer, /obj/item/nullrod/spear,