From c239289e0b13458faff761132d92647ddd73f2ce Mon Sep 17 00:00:00 2001 From: KnighTheThrasher Date: Mon, 12 Aug 2024 13:59:36 +0200 Subject: [PATCH 1/2] fixes collars --- .../modules/clothing/neck/collars.dm | 22 +++++++++++-------- .../loadout_items/loadout_datum_neck.dm | 11 ++++++---- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/modular_nova/modules/customization/modules/clothing/neck/collars.dm b/modular_nova/modules/customization/modules/clothing/neck/collars.dm index 3878f12e325b..22ef69106ed1 100644 --- 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,22 +13,26 @@ /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 = "collar" 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 - name = "thin choker" + name = "thin collar" desc = "Like the normal one, but thinner!" icon_state = "thinchoker" greyscale_config = /datum/greyscale_config/collar/thinchoker greyscale_config_worn = /datum/greyscale_config/collar/thinchoker/worn greyscale_colors = "#222222" -*/ +/obj/item/clothing/neck/human_petcollar/spike + name = "spiked collar" + 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 index 5e63567a86b3..36944be83f64 100644 --- 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" + name = "Collar" item_path = /obj/item/clothing/neck/human_petcollar/choker /datum/loadout_item/neck/thinchoker - name = "Thin Choker" + name = "Thin Collar" item_path = /obj/item/clothing/neck/human_petcollar/thinchoker -*/ + +/datum/loadout_item/neck/spike + name = "Spiked Collar" + item_path = /obj/item/clothing/neck/human_petcollar/spike + /* * PONCHOS */ From cde2eec86eb4e3069b6a4814ba9d5b43ba96a1f4 Mon Sep 17 00:00:00 2001 From: KnigTheThrasher <152086196+KnigTheThrasher@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:17:13 +0200 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: SynthTee <127706731+SynthTwo@users.noreply.github.com> --- .../modules/customization/modules/clothing/neck/collars.dm | 6 +++--- .../modules/loadouts/loadout_items/loadout_datum_neck.dm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modular_nova/modules/customization/modules/clothing/neck/collars.dm b/modular_nova/modules/customization/modules/clothing/neck/collars.dm index 22ef69106ed1..238e5e36dbc7 100644 --- a/modular_nova/modules/customization/modules/clothing/neck/collars.dm +++ b/modular_nova/modules/customization/modules/clothing/neck/collars.dm @@ -14,7 +14,7 @@ return is_type_in_typecache(inserted, storage.can_hold) /obj/item/clothing/neck/human_petcollar/choker - name = "collar" + name = "choker" desc = "Quite fashionable... if you're an edgy teen." icon_state = "choker" greyscale_config = /datum/greyscale_config/collar/choker @@ -22,7 +22,7 @@ greyscale_colors = "#222222" /obj/item/clothing/neck/human_petcollar/thinchoker - name = "thin collar" + name = "thin choker" desc = "Like the normal one, but thinner!" icon_state = "thinchoker" greyscale_config = /datum/greyscale_config/collar/thinchoker @@ -30,7 +30,7 @@ greyscale_colors = "#222222" /obj/item/clothing/neck/human_petcollar/spike - name = "spiked collar" + 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 diff --git a/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm b/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm index 36944be83f64..cbbd6ba9d8cd 100644 --- a/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm +++ b/modular_nova/modules/loadouts/loadout_items/loadout_datum_neck.dm @@ -121,15 +121,15 @@ */ /datum/loadout_item/neck/choker - name = "Collar" + name = "Choker" item_path = /obj/item/clothing/neck/human_petcollar/choker /datum/loadout_item/neck/thinchoker - name = "Thin Collar" + name = "Thin Choker" item_path = /obj/item/clothing/neck/human_petcollar/thinchoker /datum/loadout_item/neck/spike - name = "Spiked Collar" + name = "Spiked Choker" item_path = /obj/item/clothing/neck/human_petcollar/spike /*