diff --git a/code/game/objects/items/knitting.dm b/code/game/objects/items/knitting.dm index c8d12d77b82..aa446ce2890 100644 --- a/code/game/objects/items/knitting.dm +++ b/code/game/objects/items/knitting.dm @@ -8,7 +8,7 @@ contained_sprite = TRUE var/working = FALSE var/obj/item/yarn/ball - var/static/list/knitables = list(/obj/item/clothing/accessory/sweater, /obj/item/clothing/suit/storage/toggle/cardigan, /obj/item/clothing/suit/storage/toggle/cardigan/sweater, /obj/item/clothing/suit/storage/toggle/cardigan/argyle, /obj/item/clothing/accessory/sweatervest, /obj/item/clothing/accessory/sweaterturtleneck, /obj/item/clothing/gloves/fingerless/colour/knitted, /obj/item/clothing/gloves/knitted, /obj/item/clothing/ears/bandanna/colorable/knitted, /obj/item/clothing/accessory/scarf) + var/static/list/knitables = list(/obj/item/clothing/accessory/sweater, /obj/item/clothing/suit/storage/toggle/cardigan, /obj/item/clothing/suit/storage/toggle/cardigan/sweater, /obj/item/clothing/suit/storage/toggle/cardigan/argyle, /obj/item/clothing/accessory/sweatervest, /obj/item/clothing/accessory/sweaterturtleneck, /obj/item/clothing/gloves/fingerless/colour/knitted, /obj/item/clothing/gloves/knitted, /obj/item/clothing/accessory/bandanna/colorable/knitted, /obj/item/clothing/accessory/scarf) var/static/list/name2knit /obj/item/knittingneedles/Destroy() diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 9a34c77efa7..b115d3fad45 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -456,3 +456,20 @@ var/obj/item/clothing/accessory/blood_patch/BP = type patches[initial(BP.name)] = type gear_tweaks += new /datum/gear_tweak/path(patches) + +/datum/gear/accessory/bandanna + display_name = "neck bandanna selection" + path = /obj/item/clothing/accessory/bandanna + +/datum/gear/accessory/bandanna/New() + ..() + var/list/bandanna = list() + bandanna["red bandanna"] = /obj/item/clothing/accessory/bandanna + bandanna["blue bandanna"] = /obj/item/clothing/accessory/bandanna/blue + bandanna["black bandanna"] = /obj/item/clothing/accessory/bandanna/black + gear_tweaks += new /datum/gear_tweak/path(bandanna) + +/datum/gear/accessory/bandanna_colorable + display_name = "neck bandanna (colorable)" + path = /obj/item/clothing/accessory/bandanna/colorable + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_ears.dm b/code/modules/client/preference_setup/loadout/loadout_ears.dm index 72bfc322558..6ecb13d18bc 100644 --- a/code/modules/client/preference_setup/loadout/loadout_ears.dm +++ b/code/modules/client/preference_setup/loadout/loadout_ears.dm @@ -9,23 +9,6 @@ path = /obj/item/clothing/ears/earmuffs slot = null -/datum/gear/ears/bandanna - display_name = "neck bandanna selection" - path = /obj/item/clothing/ears/bandanna - -/datum/gear/ears/bandanna/New() - ..() - var/list/bandanna = list() - bandanna["red bandanna"] = /obj/item/clothing/ears/bandanna - bandanna["blue bandanna"] = /obj/item/clothing/ears/bandanna/blue - bandanna["black bandanna"] = /obj/item/clothing/ears/bandanna/black - gear_tweaks += new /datum/gear_tweak/path(bandanna) - -/datum/gear/ears/bandanna_colorable - display_name = "neck bandanna (colorable)" - path = /obj/item/clothing/ears/bandanna/colorable - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION - /datum/gear/ears/double/headphones display_name = "headphones" path = /obj/item/clothing/ears/earmuffs/headphones diff --git a/code/modules/clothing/ears/bandanna.dm b/code/modules/clothing/ears/bandanna.dm index e55fd23b3e4..cdcae1bd932 100644 --- a/code/modules/clothing/ears/bandanna.dm +++ b/code/modules/clothing/ears/bandanna.dm @@ -2,36 +2,39 @@ Bandannas and the like */ -/obj/item/clothing/ears/bandanna +/obj/item/clothing/accessory/bandanna name = "red bandanna" desc = "A plain red bandanna." icon = 'icons/obj/clothing/ears.dmi' icon_state = "band_r" item_state = "band_r" w_class = ITEMSIZE_TINY - slot_flags = SLOT_EARS + slot_flags = SLOT_MASK | SLOT_EARS | SLOT_TIE -/obj/item/clothing/ears/bandanna/get_ear_examine_text(var/mob/user, var/ear_text = "left") +/obj/item/clothing/accessory/bandanna/get_ear_examine_text(var/mob/user, var/ear_text = "left") return "around [user.get_pronoun("his")] neck" -/obj/item/clothing/ears/bandanna/blue +/obj/item/clothing/accessory/bandanna/get_mask_examine_text(var/mob/user) + return "around [user.get_pronoun("his")] neck" + +/obj/item/clothing/accessory/bandanna/blue name = "blue bandanna" desc = "A plain blue bandanna." icon_state = "band_bl" item_state = "band_bl" -/obj/item/clothing/ears/bandanna/black +/obj/item/clothing/accessory/bandanna/black name = "black bandanna" desc = "A plain black bandanna." icon_state = "band_bk" item_state = "band_bk" -/obj/item/clothing/ears/bandanna/colorable +/obj/item/clothing/accessory/bandanna/colorable name = "neck bandanna" desc = "A bandanna in 16,777,216 designer colors that goes around the neck." icon_state = "band_wh" item_state = "band_wh" -/obj/item/clothing/ears/bandanna/colorable/knitted +/obj/item/clothing/accessory/bandanna/colorable/knitted name = "knitted neck bandanna" desc = "A hand knitted neck bandanna. It looks quite soft." diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index bf6e32033e0..e858d945f45 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -55,7 +55,7 @@ All custom items with worn sprites must follow the contained sprite system: http contained_sprite = TRUE -/obj/item/clothing/ears/bandanna/fluff/kir_bandanna //Kir's Bandanna - Kir Iziki - araskael +/obj/item/clothing/accessory/bandanna/fluff/kir_bandanna //Kir's Bandanna - Kir Iziki - araskael name = "purple bandanna" desc = "A worn and faded purple bandanna with a knotted, dragon-like design on it." icon = 'icons/obj/custom_items/kir_bandanna.dmi' diff --git a/code/modules/item_worth/worths_list.dm b/code/modules/item_worth/worths_list.dm index 74e276fcc06..5bbaf442f9a 100644 --- a/code/modules/item_worth/worths_list.dm +++ b/code/modules/item_worth/worths_list.dm @@ -415,7 +415,7 @@ var/list/worths = list( //CLOTHING, //EARS, /obj/item/clothing/ears/skrell = 100, - /obj/item/clothing/ears/bandanna = 20, + /obj/item/clothing/accessory/bandanna = 20, //GLASSES, /obj/item/clothing/glasses/meson/prescription = 880, /obj/item/clothing/glasses/meson = 800, diff --git a/html/changelogs/NeckBandannaAcc.yml b/html/changelogs/NeckBandannaAcc.yml new file mode 100644 index 00000000000..efb84c31656 --- /dev/null +++ b/html/changelogs/NeckBandannaAcc.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - rscadd: "Neck bandannas now fit in both the mask slot and on suits/uniforms as accessories, in addition to the ears. They will need to be re-selected in the loadout under accessories." diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 759d1670c36..33261a37663 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 5e2f1883e4d..4662bc322d0 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/custom_items/kir_bandanna.dmi b/icons/obj/custom_items/kir_bandanna.dmi index ad26dac34f3..248d3aa47c2 100644 Binary files a/icons/obj/custom_items/kir_bandanna.dmi and b/icons/obj/custom_items/kir_bandanna.dmi differ