Merge pull request #569 from NicoDeLuna/Ascotscarf

Ascots! New red scarf type
Monkestation · Nov 17, 2023 · 07417d5 · 07417d5
2 parents adb827d + 86002c9
commit 07417d5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
@@ -21,6 +21,7 @@
 				/obj/item/clothing/neck/scarf = 6,
 				/obj/item/clothing/neck/large_scarf = 6,
 				/obj/item/clothing/neck/infinity_scarf = 6,
+				/obj/item/clothing/neck/ascot = 6,
 				/obj/item/clothing/neck/tie = 6,
 				/obj/item/clothing/head/rasta = 3,
 				/obj/item/clothing/head/chaplain/kippah = 3,

diff --git a/monkestation/code/modules/clothing/neck/cloaks.dm b/monkestation/code/modules/clothing/neck/cloaks.dm
@@ -41,3 +41,11 @@
 	worn_icon = 'monkestation/icons/mob/clothing/neck.dmi'
 	icon_state = "beecloak"
 	worn_icon_state = "beecloak"
+
+/obj/item/clothing/neck/ascot
+	name = "Ascot"
+	desc = "A fancy scarf to keep your neck warm and ward off sharp objects"
+	icon = 'monkestation/icons/obj/clothing/necks.dmi'
+	worn_icon = 'monkestation/icons/mob/clothing/neck.dmi'
+	icon_state = "ascot"
+	worn_icon_state = "ascot"
diff --git a/monkestation/code/modules/loadouts/items/neck.dm b/monkestation/code/modules/loadouts/items/neck.dm
@@ -90,6 +90,11 @@ GLOBAL_LIST_INIT(loadout_necks, generate_loadout_items(/datum/loadout_item/neck)
 	name = "Infinity Scarf"
 	item_path = /obj/item/clothing/neck/infinity_scarf
 
+/datum/loadout_item/neck/ascot
+	name = "Ascot"
+	item_path = /obj/item/clothing/neck/ascot
+	requires_purchase = FALSE
+
 /*
 *	NECKTIES
 */

diff --git a/monkestation/icons/mob/clothing/neck.dmi b/monkestation/icons/mob/clothing/neck.dmi
diff --git a/monkestation/icons/obj/clothing/necks.dmi b/monkestation/icons/obj/clothing/necks.dmi