diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/wizard_weapons.dm similarity index 98% rename from code/game/objects/items/singularityhammer.dm rename to code/game/objects/items/wizard_weapons.dm index 50a97c215d8..b16f5be5bfd 100644 --- a/code/game/objects/items/singularityhammer.dm +++ b/code/game/objects/items/wizard_weapons.dm @@ -77,12 +77,12 @@ return . /obj/item/mjollnir - name = "Mjolnir" + name = "Mjollnir" desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy." icon = 'icons/obj/weapons/hammer.dmi' icon_state = "mjollnir0" base_icon_state = "mjollnir" - worn_icon_state = "mjolnir" + worn_icon_state = "mjollnir" lefthand_file = 'icons/mob/inhands/weapons/hammers_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/hammers_righthand.dmi' flags_1 = CONDUCT_1 diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index ab4f8c85f30..9b8417d882b 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 9de6a577042..8cd790be99d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2227,7 +2227,6 @@ #include "code\game\objects\items\shooting_range.dm" #include "code\game\objects\items\shrapnel.dm" #include "code\game\objects\items\signs.dm" -#include "code\game\objects\items\singularityhammer.dm" #include "code\game\objects\items\skub.dm" #include "code\game\objects\items\spear.dm" #include "code\game\objects\items\sticker.dm" @@ -2247,6 +2246,7 @@ #include "code\game\objects\items\wall_mounted.dm" #include "code\game\objects\items\weaponry.dm" #include "code\game\objects\items\wiki_manuals.dm" +#include "code\game\objects\items\wizard_weapons.dm" #include "code\game\objects\items\AI_modules\_AI_modules.dm" #include "code\game\objects\items\AI_modules\freeform.dm" #include "code\game\objects\items\AI_modules\full_lawsets.dm"