Merge pull request #54 from KnigTheThrasher/collars

fixes collars
IrisSS13 · Aug 12, 2024 · 5e0a327 · 5e0a327
2 parents 20ae245 + cde2eec
commit 5e0a327
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/modular_nova/modules/customization/modules/clothing/neck/collars.dm b/modular_nova/modules/customization/modules/clothing/neck/collars.dm
@@ -1,6 +1,6 @@
 /obj/item/clothing/neck/human_petcollar
 	name = "pet collar"
-	desc = "It's for pets. Though you probably could wear it yourself, you'd doubtless be the subject of ridicule."
+	desc = "It's for pets. Though you probably could wear it yourself, you'd doubtless be the subject of ridicule. You're not supposed to have this item, yell at admins or coders."
 	icon_state = "pet"
 	greyscale_config = /datum/greyscale_config/collar/pet
 	greyscale_config_worn = /datum/greyscale_config/collar/pet/worn
@@ -13,14 +13,12 @@
 /obj/item/clothing/neck/human_petcollar/storage_insert_on_interacted_with(datum/storage/storage, obj/item/inserted, mob/living/user)
 	return is_type_in_typecache(inserted, storage.can_hold)
 
-/* Fix these before making them usable pls lol, also don't add more again lmao
-
 /obj/item/clothing/neck/human_petcollar/choker
-	name = "spiked collar"
+	name = "choker"
 	desc = "Quite fashionable... if you're an edgy teen."
-	icon_state = "spike"
-	greyscale_config = /datum/greyscale_config/collar/spike
-	greyscale_config_worn = /datum/greyscale_config/collar/spike/worn
+	icon_state = "choker"
+	greyscale_config = /datum/greyscale_config/collar/choker
+	greyscale_config_worn = /datum/greyscale_config/collar/choker/worn
 	greyscale_colors = "#222222"
 
 /obj/item/clothing/neck/human_petcollar/thinchoker
@@ -31,4 +29,10 @@
 	greyscale_config_worn = /datum/greyscale_config/collar/thinchoker/worn
 	greyscale_colors = "#222222"
 
-*/
+/obj/item/clothing/neck/human_petcollar/spike
+	name = "spiked choker"
+	desc = "For when you really want to be the master of edge."
+	icon_state = "spike"
+	greyscale_config = /datum/greyscale_config/collar/spike
+	greyscale_config_worn = /datum/greyscale_config/collar/spike/worn
+	greyscale_colors = "#292929#C0C0C0"
diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm
@@ -120,15 +120,18 @@
 *	COLLARS
 */
 
-/*
 /datum/loadout_item/neck/choker
 	name = "Choker"
 	item_path = /obj/item/clothing/neck/human_petcollar/choker
 
 /datum/loadout_item/neck/thinchoker
 	name = "Thin Choker"
 	item_path = /obj/item/clothing/neck/human_petcollar/thinchoker
-*/
+
+/datum/loadout_item/neck/spike
+	name = "Spiked Choker"
+	item_path = /obj/item/clothing/neck/human_petcollar/spike
+
 /*
 *	PONCHOS
 */