From 4d31f35668ceeef206d5b6b58e3a2c475cd160a7 Mon Sep 17 00:00:00 2001
From: Nick <jughu1@hotmail.com>
Date: Mon, 5 Jan 2026 23:17:20 +0100
Subject: [PATCH] Removes unused wizard_clothes.dm and moves wizard_weapons.dm
 into artefact.dm (#94731)

## About The Pull Request
This PR removes unused wizard_clothes.dm which has a duplicate path
overriding the magus helm armor values
This PR moves wizard_weapons which includes the singularity hammer and
mjollnir into the wizard antag module
This PR moves wizard_robe into wizard antag module

## Why It's Good For The Game

So things are easier to find

## Changelog
:cl: Ezel
fix: fixes the armour value of the magus helm to be the same as all
other wizard gear
/:cl:
---
 code/game/objects/items/wizard_clothes.dm     |  30 ------------------
 .../wizard/equipment}/wiz_robe.dm             |   6 +++-
 .../wizard/equipment/wizard_hammer.dm}        |   2 ++
 icons/map_icons/clothing/head/_head.dmi       | Bin 4481 -> 4479 bytes
 tgstation.dme                                 |   5 ++-
 5 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 code/game/objects/items/wizard_clothes.dm
 rename code/modules/{clothing/suits => antagonists/wizard/equipment}/wiz_robe.dm (97%)
 rename code/{game/objects/items/wizard_weapons.dm => modules/antagonists/wizard/equipment/wizard_hammer.dm} (96%)

diff --git a/code/game/objects/items/wizard_clothes.dm b/code/game/objects/items/wizard_clothes.dm
deleted file mode 100644
index b022fcdd26b..00000000000
--- a/code/game/objects/items/wizard_clothes.dm
+++ /dev/null
@@ -1,30 +0,0 @@
-/obj/item/clothing/head/wizard/magus
-	name = "magus helm"
-	icon_state = "magus"
-	inhand_icon_state = null
-	desc = "A helm worn by the followers of Nar'Sie."
-	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEARS|HIDEEYES|HIDESNOUT
-	armor_type = /datum/armor/wizard_magus
-	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
-
-/datum/armor/wizard_magus
-	melee = 50
-	bullet = 30
-	laser = 50
-	energy = 50
-	bomb = 25
-	bio = 10
-	fire = 10
-	acid = 10
-
-/obj/item/clothing/suit/magusred
-	name = "magus robes"
-	desc = "A set of armored robes worn by the followers of Nar'Sie."
-	icon_state = "magusred"
-	icon = 'icons/obj/clothing/suits/wizard.dmi'
-	worn_icon = 'icons/mob/clothing/suits/wizard.dmi'
-	inhand_icon_state = null
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
-	armor_type = /obj/item/clothing/head/wizard/magus::armor_type
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/antagonists/wizard/equipment/wiz_robe.dm
similarity index 97%
rename from code/modules/clothing/suits/wiz_robe.dm
rename to code/modules/antagonists/wizard/equipment/wiz_robe.dm
index 49c10d2eb9a..9f756be5c59 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/antagonists/wizard/equipment/wiz_robe.dm
@@ -91,8 +91,10 @@
 
 /obj/item/clothing/head/wizard/magus
 	name = "\improper Magus helm"
-	desc = "A mysterious helmet that hums with an unearthly power."
 	icon_state = "magus"
+	desc = "A mysterious helmet that hums with an unearthly power."
+	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEARS|HIDEEYES|HIDESNOUT
+	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	inhand_icon_state = null
 	dog_fashion = null
 
@@ -176,12 +178,14 @@
 	desc = "A set of armored robes that seem to radiate a dark power."
 	icon_state = "magusblue"
 	inhand_icon_state = null
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 
 /obj/item/clothing/suit/wizrobe/magusred
 	name = "\improper Magus robe"
 	desc = "A set of armored robes that seem to radiate a dark power."
 	icon_state = "magusred"
 	inhand_icon_state = null
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 
 /obj/item/clothing/suit/wizrobe/santa
 	name = "Santa's suit"
diff --git a/code/game/objects/items/wizard_weapons.dm b/code/modules/antagonists/wizard/equipment/wizard_hammer.dm
similarity index 96%
rename from code/game/objects/items/wizard_weapons.dm
rename to code/modules/antagonists/wizard/equipment/wizard_hammer.dm
index 5c8eaf4a818..9c6f50392ef 100644
--- a/code/game/objects/items/wizard_weapons.dm
+++ b/code/modules/antagonists/wizard/equipment/wizard_hammer.dm
@@ -1,3 +1,4 @@
+/////////////////////////////////////////Singularity Hammer///////////////////
 /obj/item/singularityhammer
 	name = "singularity hammer"
 	desc = "The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows."
@@ -71,6 +72,7 @@
 	vortex(get_turf(target), user)
 	addtimer(VARSET_CALLBACK(src, charged, TRUE), 10 SECONDS)
 
+/////////////////////////////////////////Mjollnir///////////////////
 /obj/item/mjollnir
 	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."
diff --git a/icons/map_icons/clothing/head/_head.dmi b/icons/map_icons/clothing/head/_head.dmi
index 3db9a6d9d769ac04a024a3baad41c6a181ba8d48..c90615330a23d794d90aa036c59dfd9ca662cd42 100644
GIT binary patch
delta 3495
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
VvAjp@-E9B>002ovPDHLkV1ne}nMMEr

delta 3497
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
X!1b|&JU)_l00000NkvXXu0mjfku{0J

diff --git a/tgstation.dme b/tgstation.dme
index 3a2ad869f73..80f67111dd6 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2612,8 +2612,6 @@
 #include "code\game\objects\items\weaponry.dm"
 #include "code\game\objects\items\wiki_manuals.dm"
 #include "code\game\objects\items\wind_turbine.dm"
-#include "code\game\objects\items\wizard_clothes.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"
@@ -3564,6 +3562,8 @@
 #include "code\modules\antagonists\wizard\equipment\enchanted_clown_suit.dm"
 #include "code\modules\antagonists\wizard\equipment\soulstone.dm"
 #include "code\modules\antagonists\wizard\equipment\teleport_rod.dm"
+#include "code\modules\antagonists\wizard\equipment\wiz_robe.dm"
+#include "code\modules\antagonists\wizard\equipment\wizard_hammer.dm"
 #include "code\modules\antagonists\wizard\equipment\wizard_spellbook.dm"
 #include "code\modules\antagonists\wizard\equipment\spellbook_entries\_entry.dm"
 #include "code\modules\antagonists\wizard\equipment\spellbook_entries\assistance.dm"
@@ -4199,7 +4199,6 @@
 #include "code\modules\clothing\suits\utility.dm"
 #include "code\modules\clothing\suits\wetfloor.dm"
 #include "code\modules\clothing\suits\wintercoats.dm"
-#include "code\modules\clothing\suits\wiz_robe.dm"
 #include "code\modules\clothing\under\_suit_sensor.dm"
 #include "code\modules\clothing\under\_under.dm"
 #include "code\modules\clothing\under\color.dm"