Merge branch 'master' into hopefully-fixed-abandoned-c-site

Monkestation · Feb 21, 2025 · 23b30f7 · 23b30f7
2 parents d15f6d8 + 27e802a
commit 23b30f7
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 0 deletions.
diff --git a/code/modules/clothing/masks/costume.dm b/code/modules/clothing/masks/costume.dm
@@ -75,5 +75,6 @@
 			"Happy" = "happy",
 			"Bloodied" = "bloodied",
 			"Stop me" = "stop_me",
+			"Cracked bloodied" = "cracked_bloodied",
 			"Cracked" = "cracked",
 	)
diff --git a/html/changelogs/AutoChangeLog-pr-5504.yml b/html/changelogs/AutoChangeLog-pr-5504.yml
@@ -0,0 +1,4 @@
+author: "TheColorCyan"
+delete-after: True
+changes:
+  - rscadd: "manhunt mask is now purchaseable in the loadout store"
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
diff --git a/monkestation/code/modules/loadouts/items/masks.dm b/monkestation/code/modules/loadouts/items/masks.dm
@@ -129,6 +129,10 @@ GLOBAL_LIST_INIT(loadout_masks, generate_loadout_items(/datum/loadout_item/mask)
 /datum/loadout_item/mask/kitsune
 	name = "Greyscale Kitsune Mask"
 	item_path = /obj/item/clothing/mask/kitsune
+
+/datum/loadout_item/mask/manhunt
+	name = "Smiley Mask"
+	item_path = /obj/item/clothing/mask/joy/manhunt
 /*
 *	DONATOR
 */

diff --git a/monkestation/code/modules/store/store_items/masks.dm b/monkestation/code/modules/store/store_items/masks.dm
@@ -122,3 +122,8 @@ GLOBAL_LIST_INIT(store_masks, generate_store_items(/datum/store_item/mask))
 	name = "Ook Mask"
 	item_path = /obj/item/clothing/mask/ookmask
 	item_cost = 15000
+
+/datum/store_item/mask/manhunt
+	name = "Smiley Mask"
+	item_path = /obj/item/clothing/mask/joy/manhunt
+	item_cost = 5000