diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm index 2798629813f..2e0b437b7d4 100644 --- a/code/modules/client/preference/loadout/loadout_general.dm +++ b/code/modules/client/preference/loadout/loadout_general.dm @@ -157,6 +157,10 @@ display_name = "Fannypack" path = /obj/item/storage/belt/fannypack +/datum/gear/whitebandana + display_name = "Bandana, white" + path = /obj/item/clothing/mask/bandana + /datum/gear/blackbandana display_name = "Bandana, black" path = /obj/item/clothing/mask/bandana/black diff --git a/code/modules/clothing/masks/misc_masks.dm b/code/modules/clothing/masks/misc_masks.dm index 2af039e79ee..6d340c5b1d9 100644 --- a/code/modules/clothing/masks/misc_masks.dm +++ b/code/modules/clothing/masks/misc_masks.dm @@ -328,13 +328,13 @@ // Bandanas /obj/item/clothing/mask/bandana - name = "bandana" + name = "white bandana" desc = "A colorful bandana." flags_inv = HIDEFACE flags_cover = MASKCOVERSMOUTH w_class = WEIGHT_CLASS_TINY adjusted_flags = ITEM_SLOT_HEAD - icon_state = "bandbotany" + icon_state = "bandana" // Default white bandana dyeable = TRUE dyeing_key = DYE_REGISTRY_BANDANA can_toggle = TRUE @@ -418,36 +418,44 @@ /obj/item/clothing/mask/bandana/red name = "red bandana" - icon_state = "bandred" desc = "It's a red bandana." + color = "#c43638" // Red /obj/item/clothing/mask/bandana/blue name = "blue bandana" - icon_state = "bandblue" desc = "It's a blue bandana." + color = "#537bc6" // Blue /obj/item/clothing/mask/bandana/gold name = "gold bandana" - icon_state = "bandgold" desc = "It's a gold bandana." + color = "#fcba22" // Yellow /obj/item/clothing/mask/bandana/green name = "green bandana" - icon_state = "bandgreen" desc = "It's a green bandana." + color = "#5dca3f" // Green /obj/item/clothing/mask/bandana/orange name = "orange bandana" - icon_state = "bandorange" desc = "It's an orange bandana." + color = "#fc8422" // Orange /obj/item/clothing/mask/bandana/purple name = "purple bandana" - icon_state = "bandpurple" desc = "It's a purple bandana." + color = "#ab73ce" // Purple + +/obj/item/clothing/mask/bandana/black + name = "black bandana" + desc = "It's a black bandana." + color = "#4A4A4B" // Black + +// These bandanas use unique sprites /obj/item/clothing/mask/bandana/botany name = "botany bandana" + icon_state = "bandbotany" desc = "It's a green bandana with some fine nanotech lining." /obj/item/clothing/mask/bandana/skull @@ -455,11 +463,6 @@ desc = "It's a black bandana with a skull pattern." icon_state = "bandskull" -/obj/item/clothing/mask/bandana/black - name = "black bandana" - icon_state = "bandblack" - desc = "It's a black bandana." - /obj/item/clothing/mask/bandana/durathread name = "durathread bandana" desc = "A bandana made from durathread, you wish it would provide some protection to its wearer, but it's far too thin..." diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index b622a977ed4..328b83269e8 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index d0721641982..96ce96dcc39 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi index 1da9a0268f0..9e54bb89c26 100644 Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ diff --git a/icons/mob/clothing/species/drask/mask.dmi b/icons/mob/clothing/species/drask/mask.dmi index 555e9368e4f..d8d34fead52 100644 Binary files a/icons/mob/clothing/species/drask/mask.dmi and b/icons/mob/clothing/species/drask/mask.dmi differ diff --git a/icons/mob/clothing/species/grey/mask.dmi b/icons/mob/clothing/species/grey/mask.dmi index 7bd1ee8a5ec..a8725d12c78 100644 Binary files a/icons/mob/clothing/species/grey/mask.dmi and b/icons/mob/clothing/species/grey/mask.dmi differ diff --git a/icons/mob/clothing/species/grey/neck.dmi b/icons/mob/clothing/species/grey/neck.dmi index 79d6be6a217..3fcf2deaecb 100644 Binary files a/icons/mob/clothing/species/grey/neck.dmi and b/icons/mob/clothing/species/grey/neck.dmi differ diff --git a/icons/mob/clothing/species/skrell/mask.dmi b/icons/mob/clothing/species/skrell/mask.dmi index 1e274f8deb5..65f617a604d 100644 Binary files a/icons/mob/clothing/species/skrell/mask.dmi and b/icons/mob/clothing/species/skrell/mask.dmi differ diff --git a/icons/mob/clothing/species/tajaran/mask.dmi b/icons/mob/clothing/species/tajaran/mask.dmi index 2a2c6d39492..cbbc968481d 100644 Binary files a/icons/mob/clothing/species/tajaran/mask.dmi and b/icons/mob/clothing/species/tajaran/mask.dmi differ diff --git a/icons/mob/clothing/species/unathi/mask.dmi b/icons/mob/clothing/species/unathi/mask.dmi index 686c842d9e1..54f560e7a63 100644 Binary files a/icons/mob/clothing/species/unathi/mask.dmi and b/icons/mob/clothing/species/unathi/mask.dmi differ diff --git a/icons/mob/clothing/species/vox/mask.dmi b/icons/mob/clothing/species/vox/mask.dmi index ebce5166bc8..b0dccbf6595 100644 Binary files a/icons/mob/clothing/species/vox/mask.dmi and b/icons/mob/clothing/species/vox/mask.dmi differ diff --git a/icons/mob/clothing/species/vox/neck.dmi b/icons/mob/clothing/species/vox/neck.dmi index 048cc68787c..d7c17c401c1 100644 Binary files a/icons/mob/clothing/species/vox/neck.dmi and b/icons/mob/clothing/species/vox/neck.dmi differ diff --git a/icons/mob/clothing/species/vulpkanin/mask.dmi b/icons/mob/clothing/species/vulpkanin/mask.dmi index 7ed51283ee2..698d6185510 100644 Binary files a/icons/mob/clothing/species/vulpkanin/mask.dmi and b/icons/mob/clothing/species/vulpkanin/mask.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 757c0e92656..629c325615a 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index 9a86d73f1d7..bf32b773d45 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ