confirmed working

Monkestation · Oct 3, 2024 · 399f039 · 399f039
1 parent de24740
commit 399f039
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 4 deletions.
diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm
@@ -1299,3 +1299,13 @@
 	name = "Manipulator Hand"
 	icon_file = 'monkestation/code/modules/factory_type_beat/icons/big_manipulator_hand.dmi'
 	json_config = 'code/datums/greyscale/json_configs/manipulator_hand.json'
+
+/datum/greyscale_config/crew_wizhat
+	name = "Wizard Hat"
+	icon_file = 'monkestation/icons/obj/clothing/hats.dmi'
+	json_config = 'code/datums/greyscale/json_configs/crew_wizhat.json'
+
+/datum/greyscale_config/crew_wizhat_worn
+	name = "Worn Wizard Hat"
+	icon_file = 'monkestation/icons/mob/clothing/head.dmi'
+	json_config = 'code/datums/greyscale/json_configs/crew_wizhat_worn.json'
diff --git a/code/datums/greyscale/json_configs/crew_wizhat.json b/code/datums/greyscale/json_configs/crew_wizhat.json
@@ -0,0 +1,10 @@
+{
+    "crew_wizhat": [
+        {
+            "type": "icon_state",
+            "icon_state": "crew_wizhat",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        }
+    ]
+}
diff --git a/code/datums/greyscale/json_configs/crew_wizhat_worn.json b/code/datums/greyscale/json_configs/crew_wizhat_worn.json
@@ -0,0 +1,10 @@
+{
+    "crew_wizhat": [
+        {
+            "type": "icon_state",
+            "icon_state": "crew_wizhat",
+            "blend_mode": "overlay",
+            "color_ids": [ 1 ]
+        }
+    ]
+}
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
@@ -85,7 +85,7 @@
 				/obj/item/clothing/head/costume/witchwig = 1,
 				/obj/item/staff/broom = 1,
 				/obj/item/clothing/suit/wizrobe/fake = 1,
-				/obj/item/clothing/head/wizard/fake = 1,
+				/obj/item/clothing/head/costume/crew_wizhat = 1,
 				/obj/item/staff = 3,
 				/obj/item/clothing/head/costume/shrine_wig = 1,
 				/obj/item/clothing/suit/costume/shrine_maiden = 1,

diff --git a/monkestation/code/modules/clothing/head/costume.dm b/monkestation/code/modules/clothing/head/costume.dm
@@ -172,3 +172,15 @@ BUNNY EARS
 /*
 END OF BUNNY EARS
 */
+
+/obj/item/clothing/head/costume/crew_wizhat
+	name = "wizard hat"
+	desc = "Just a regular wizard hat. There is nothing magical about this."
+	icon = 'monkestation/icons/obj/clothing/hats.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/head.dmi'
+	icon_state = "crew_wizhat"
+	worn_icon_state = "crew_wizhat"
+	greyscale_colors = "#555555"
+	greyscale_config = /datum/greyscale_config/crew_wizhat
+	greyscale_config_worn = /datum/greyscale_config/crew_wizhat_worn
+	flags_1 = IS_PLAYER_COLORABLE_1
diff --git a/monkestation/code/modules/loadouts/items/heads.dm b/monkestation/code/modules/loadouts/items/heads.dm
@@ -228,9 +228,9 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
 	name = "Griffon Head"
 	item_path = /obj/item/clothing/head/costume/griffin
 
-/datum/loadout_item/head/wizard
-	name = "Wizard Hat"
-	item_path = /obj/item/clothing/head/wizard/fake
+/datum/loadout_item/head/wizhat
+	name = "Colorable Wizard Hat"
+	item_path = /obj/item/clothing/head/costume/crew_wizhat
 
 /datum/loadout_item/head/witch
 	name = "Witch Hat"

diff --git a/monkestation/icons/mob/clothing/head.dmi b/monkestation/icons/mob/clothing/head.dmi
diff --git a/monkestation/icons/obj/clothing/hats.dmi b/monkestation/icons/obj/clothing/hats.dmi