diff --git a/code/game/objects/items/weapons/melee/shock_maul.dm b/code/game/objects/items/weapons/melee/shock_maul.dm index a692713ea7..5cfd508f34 100644 --- a/code/game/objects/items/weapons/melee/shock_maul.dm +++ b/code/game/objects/items/weapons/melee/shock_maul.dm @@ -69,7 +69,7 @@ update_icon() ..() -/obj/item/weapon/melee/shock_maul/New() +/obj/item/weapon/melee/shock_maul/Initialize() //CHOMPedit ..() update_held_icon() return @@ -284,4 +284,4 @@ results += ..() - return results \ No newline at end of file + return results diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index 2717932ee3..392a99986a 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -361,6 +361,10 @@ icon_state = initial(G.base_icon) if(ispath(item, /obj/item/weapon/reagent_containers/hypospray/autoinjector)) icon_state += "0" + //CHOMPadd start + if(ispath(item, /obj/item/weapon/melee/shock_maul)) + icon_state += "0" + //CHOMPadd end var/icon/I diff --git a/modular_chomp/code/game/objects/items/weapons/melee/shock_maul.dm b/modular_chomp/code/game/objects/items/weapons/melee/shock_maul.dm index e9149e2cd9..e4326348ff 100644 --- a/modular_chomp/code/game/objects/items/weapons/melee/shock_maul.dm +++ b/modular_chomp/code/game/objects/items/weapons/melee/shock_maul.dm @@ -3,10 +3,3 @@ desc = "A variant of the concussion maul that staggers and weakens victims. Despite their screams, does no real damage." damtype = HALLOSS launch_force = 0 - -//something borked, trying to fix it -/obj/item/weapon/melee/shock_maul - name = "concussion maul" - icon = 'icons/obj/weapons.dmi' - icon_state = "forcemaul0" - item_state = "forcemaul0" \ No newline at end of file