diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm index cd536147891..6c9b84be7ec 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm @@ -445,7 +445,7 @@ "EF" = ( /obj/effect/decal/remains/human, /obj/item/clothing/under/misc/overalls, -/obj/item/clothing/mask/bandana/color/green, +/obj/item/clothing/mask/bandana/green, /turf/open/misc/asteroid/basalt/wasteland, /area/ruin/unpowered/elephant_graveyard) "EI" = ( diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 41f1b4c8a7b..a399d92aafd 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -11542,7 +11542,7 @@ }, /obj/item/storage/bag/plants/portaseeder, /obj/item/plant_analyzer, -/obj/item/clothing/mask/bandana/color/striped/botany, +/obj/item/clothing/mask/bandana/striped/botany, /obj/item/hatchet, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark{ @@ -11758,7 +11758,7 @@ }, /obj/item/clothing/suit/apron, /obj/item/storage/bag/plants/portaseeder, -/obj/item/clothing/mask/bandana/color/striped/botany, +/obj/item/clothing/mask/bandana/striped/botany, /obj/item/cultivator, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark{ diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm index eabdd87f8b1..950c9896acf 100644 --- a/code/datums/components/crafting/tailoring.dm +++ b/code/datums/components/crafting/tailoring.dm @@ -37,7 +37,7 @@ /datum/crafting_recipe/durathread_bandana name = "Durathread Bandana" - result = /obj/item/clothing/mask/bandana/color/durathread + result = /obj/item/clothing/mask/bandana/durathread reqs = list(/obj/item/stack/sheet/durathread = 1) time = 25 category = CAT_CLOTHING diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 851b7a2c916..bd1875c4822 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -71,16 +71,14 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_CENTCOM = /obj/item/clothing/gloves/combat ), DYE_REGISTRY_BANDANA = list( - DYE_RED = /obj/item/clothing/mask/bandana/color/red, - DYE_ORANGE = /obj/item/clothing/mask/bandana/color/orange, - DYE_YELLOW = /obj/item/clothing/mask/bandana/color/gold, - DYE_GREEN = /obj/item/clothing/mask/bandana/color/green, - DYE_BLUE = /obj/item/clothing/mask/bandana/color/blue, - DYE_PURPLE = /obj/item/clothing/mask/bandana/color/purple, - DYE_BLACK = /obj/item/clothing/mask/bandana/color/black, - DYE_WHITE = /obj/item/clothing/mask/bandana/color/white, - DYE_MIME = /obj/item/clothing/mask/bandana/color/striped/black, - DYE_SYNDICATE = /obj/item/clothing/mask/bandana/color/skull/black + DYE_RED = /obj/item/clothing/mask/bandana/red, + DYE_ORANGE = /obj/item/clothing/mask/bandana/orange, + DYE_YELLOW = /obj/item/clothing/mask/bandana/gold, + DYE_GREEN = /obj/item/clothing/mask/bandana/green, + DYE_BLUE = /obj/item/clothing/mask/bandana/blue, + DYE_PURPLE = /obj/item/clothing/mask/bandana/purple, + DYE_BLACK = /obj/item/clothing/mask/bandana/black, + DYE_WHITE = /obj/item/clothing/mask/bandana/white ), DYE_REGISTRY_SNEAKERS = list( DYE_RED = /obj/item/clothing/shoes/sneakers/red, diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 485423f381f..35dc58d86b8 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -361,7 +361,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("white jumpsuit", /obj/item/clothing/under/color/white, 3), \ new/datum/stack_recipe("white shoes", /obj/item/clothing/shoes/sneakers/white, 2), \ new/datum/stack_recipe("white scarf", /obj/item/clothing/neck/scarf, 1), \ - new/datum/stack_recipe("white bandana", /obj/item/clothing/mask/bandana/color/white, 2), \ + new/datum/stack_recipe("white bandana", /obj/item/clothing/mask/bandana/white, 2), \ null, \ new/datum/stack_recipe("backpack", /obj/item/storage/backpack, 4), \ new/datum/stack_recipe("duffel bag", /obj/item/storage/backpack/duffelbag, 6), \ @@ -420,7 +420,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \ new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/misc/durathread, 4, time = 40), new/datum/stack_recipe("durathread beret", /obj/item/clothing/head/beret/durathread, 2, time = 40), \ new/datum/stack_recipe("durathread beanie", /obj/item/clothing/head/beanie/durathread, 2, time = 40), \ - new/datum/stack_recipe("durathread bandana", /obj/item/clothing/mask/bandana/color/durathread, 1, time = 25), \ + new/datum/stack_recipe("durathread bandana", /obj/item/clothing/mask/bandana/durathread, 1, time = 25), \ )) /obj/item/stack/sheet/durathread diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index b02f7e9e74a..ecdddcdea10 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -125,7 +125,7 @@ /obj/item/clothing/shoes/jackboots = 3, /obj/item/clothing/head/beret/sec = 3, /obj/item/clothing/head/soft/sec = 3, - /obj/item/clothing/mask/bandana/color/red = 2) + /obj/item/clothing/mask/bandana/red = 2) generate_items_inside(items_inside,src) return @@ -212,9 +212,9 @@ /obj/item/clothing/head/soft/black = 2) generate_items_inside(items_inside,src) if(prob(40)) - new /obj/item/clothing/mask/bandana/color/skull/black(src) + new /obj/item/clothing/mask/bandana/skull/black(src) if(prob(40)) - new /obj/item/clothing/mask/bandana/color/skull/black(src) + new /obj/item/clothing/mask/bandana/skull/black(src) return @@ -299,7 +299,7 @@ /obj/item/clothing/suit/apron = 2, /obj/item/clothing/suit/apron/overalls = 2, /obj/item/clothing/under/rank/civilian/hydroponics = 3, - /obj/item/clothing/mask/bandana/color/striped/botany = 3) + /obj/item/clothing/mask/bandana/striped/botany = 3) generate_items_inside(items_inside,src) /obj/structure/closet/wardrobe/curator diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 4f8f7b504be..0da4df23fdc 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -45,10 +45,10 @@ new /obj/item/clothing/head/that(src) for(var/i in 1 to 3) new /obj/item/clothing/head/soft/black(src) - new /obj/item/clothing/mask/bandana/color/black(src) - new /obj/item/clothing/mask/bandana/color/black(src) + new /obj/item/clothing/mask/bandana/black(src) + new /obj/item/clothing/mask/bandana/black(src) if(prob(40)) - new /obj/item/clothing/mask/bandana/color/skull/black(src) + new /obj/item/clothing/mask/bandana/skull/black(src) return @@ -63,8 +63,8 @@ new /obj/item/clothing/under/color/jumpskirt/green(src) for(var/i in 1 to 3) new /obj/item/clothing/shoes/sneakers/black(src) - new /obj/item/clothing/mask/bandana/color/green(src) - new /obj/item/clothing/mask/bandana/color/green(src) + new /obj/item/clothing/mask/bandana/green(src) + new /obj/item/clothing/mask/bandana/green(src) return @@ -94,8 +94,8 @@ new /obj/item/clothing/under/color/jumpskirt/yellow(src) for(var/i in 1 to 3) new /obj/item/clothing/shoes/sneakers/orange(src) - new /obj/item/clothing/mask/bandana/color/gold(src) - new /obj/item/clothing/mask/bandana/color/gold(src) + new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/mask/bandana/gold(src) return @@ -112,8 +112,8 @@ new /obj/item/clothing/shoes/sneakers/white(src) for(var/i in 1 to 3) new /obj/item/clothing/head/soft/mime(src) - new /obj/item/clothing/mask/bandana/color/white(src) - new /obj/item/clothing/mask/bandana/color/white(src) + new /obj/item/clothing/mask/bandana/white(src) + new /obj/item/clothing/mask/bandana/white(src) return /obj/structure/closet/wardrobe/pjs @@ -146,8 +146,8 @@ if(prob(50)) new /obj/item/storage/backpack/duffelbag(src) if(prob(40)) - new /obj/item/clothing/mask/bandana/color/black(src) - new /obj/item/clothing/mask/bandana/color/black(src) + new /obj/item/clothing/mask/bandana/black(src) + new /obj/item/clothing/mask/bandana/black(src) if(prob(40)) new /obj/item/clothing/under/misc/assistantformal(src) if(prob(40)) @@ -187,9 +187,9 @@ new /obj/item/clothing/under/color/jumpskirt/teal(src) new /obj/item/clothing/under/color/lightpurple(src) new /obj/item/clothing/under/color/jumpskirt/lightpurple(src) - new /obj/item/clothing/mask/bandana/color/red(src) - new /obj/item/clothing/mask/bandana/color/blue(src) - new /obj/item/clothing/mask/bandana/color/gold(src) + new /obj/item/clothing/mask/bandana/red(src) + new /obj/item/clothing/mask/bandana/blue(src) + new /obj/item/clothing/mask/bandana/gold(src) new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/clothing/shoes/sneakers/white(src) diff --git a/code/modules/antagonists/gang/gang.dm b/code/modules/antagonists/gang/gang.dm index e91246495be..4a094184cd4 100644 --- a/code/modules/antagonists/gang/gang.dm +++ b/code/modules/antagonists/gang/gang.dm @@ -298,7 +298,7 @@ acceptable_clothes = list(/obj/item/clothing/under/suit/checkered, /obj/item/clothing/head/fedora, /obj/item/clothing/neck/scarf/green, - /obj/item/clothing/mask/bandana/color/green) + /obj/item/clothing/mask/bandana/green) free_clothes = list(/obj/item/clothing/head/fedora, /obj/item/clothing/under/suit/checkered, /obj/item/toy/crayon/spraycan) @@ -321,7 +321,7 @@ gang_id = "TS" acceptable_clothes = list(/obj/item/clothing/under/pants/classicjeans, /obj/item/clothing/suit/jacket, - /obj/item/clothing/mask/bandana/color/skull/black) + /obj/item/clothing/mask/bandana/skull/black) free_clothes = list(/obj/item/clothing/suit/jacket, /obj/item/clothing/under/pants/classicjeans, /obj/item/toy/crayon/spraycan) @@ -346,7 +346,7 @@ /obj/item/clothing/under/suit/henchmen, /obj/item/clothing/neck/scarf/yellow, /obj/item/clothing/head/beanie/yellow, - /obj/item/clothing/mask/bandana/color/gold, + /obj/item/clothing/mask/bandana/gold, /obj/item/storage/backpack/henchmen) free_clothes = list(/obj/item/storage/backpack/henchmen, /obj/item/clothing/under/suit/henchmen, @@ -372,7 +372,7 @@ /obj/item/clothing/shoes/yakuza, /obj/item/clothing/neck/scarf/yellow, /obj/item/clothing/head/beanie/yellow, - /obj/item/clothing/mask/bandana/color/gold, + /obj/item/clothing/mask/bandana/gold, /obj/item/clothing/head/hardhat, /obj/item/clothing/suit/yakuza) free_clothes = list(/obj/item/clothing/under/costume/yakuza, @@ -401,7 +401,7 @@ /obj/item/clothing/under/costume/jackbros, /obj/item/clothing/shoes/jackbros, /obj/item/clothing/head/jackbros, - /obj/item/clothing/mask/bandana/color/blue) + /obj/item/clothing/mask/bandana/blue) free_clothes = list(/obj/item/clothing/under/costume/jackbros, /obj/item/clothing/shoes/jackbros, /obj/item/clothing/head/jackbros, @@ -428,7 +428,7 @@ /obj/item/clothing/under/costume/dutch, /obj/item/clothing/suit/dutch, /obj/item/clothing/head/bowler, - /obj/item/clothing/mask/bandana/color/black) + /obj/item/clothing/mask/bandana/black) free_clothes = list(/obj/item/clothing/under/costume/dutch, /obj/item/clothing/head/bowler, /obj/item/clothing/suit/dutch, diff --git a/code/modules/antagonists/thief/thief.dm b/code/modules/antagonists/thief/thief.dm index aed3f24543c..529bcab630b 100644 --- a/code/modules/antagonists/thief/thief.dm +++ b/code/modules/antagonists/thief/thief.dm @@ -154,7 +154,7 @@ glasses = /obj/item/clothing/glasses/night gloves = /obj/item/clothing/gloves/color/latex back = /obj/item/storage/backpack/duffelbag/syndie - mask = /obj/item/clothing/mask/bandana/color/red + mask = /obj/item/clothing/mask/bandana/red /datum/outfit/thief/post_equip(mob/living/carbon/human/thief, visualsOnly=FALSE) // This outfit is used by the assets SS, which is ran before the atoms SS diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index ffe993e09cb..ab3c51db1d1 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -76,7 +76,7 @@ /obj/item/clothing/suit/jacket/leather/overcoat, /obj/item/clothing/gloves/color/black, /obj/item/clothing/head/soft, - /obj/item/clothing/mask/bandana/color/skull/black)//so you can properly #cargoniabikergang + /obj/item/clothing/mask/bandana/skull/black)//so you can properly #cargoniabikergang crate_name = "biker kit" crate_type = /obj/structure/closet/crate/large diff --git a/code/modules/clothing/masks/bandana.dm b/code/modules/clothing/masks/bandana.dm index 4e15c34cfc8..5b702027319 100644 --- a/code/modules/clothing/masks/bandana.dm +++ b/code/modules/clothing/masks/bandana.dm @@ -3,40 +3,10 @@ flags_cover = MASKCOVERSMOUTH flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT visor_flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT - visor_flags_cover = MASKCOVERSMOUTH | PEPPERPROOF + visor_flags_cover = MASKCOVERSMOUTH slot_flags = ITEM_SLOT_MASK adjusted_flags = ITEM_SLOT_HEAD species_exception = list(/datum/species/golem) - -/obj/item/clothing/mask/bandana/attack_self(mob/user) - adjustmask(user) - -/obj/item/clothing/mask/bandana/AltClick(mob/user) - . = ..() - if(iscarbon(user) && user.is_holding(src)) - var/mob/living/carbon/C = user - if((C.get_item_by_slot(ITEM_SLOT_HEAD == src)) || (C.get_item_by_slot(ITEM_SLOT_MASK) == src)) - to_chat(user, span_warning("You can't tie [src] while wearing it!")) - return - if(slot_flags & ITEM_SLOT_HEAD) - to_chat(user, span_warning("You must undo [src] before you can tie it into a neckerchief!")) - return - if(slot_flags & ITEM_SLOT_NECK) - name = initial(name) - desc = initial(desc) - slot_flags = initial(slot_flags) - worn_y_offset = initial(worn_y_offset) - user.visible_message(span_notice("[user] unties the neckercheif back into a [name]."), span_notice("You untie the neckercheif back into a [name].")) - else - name = "[name] neckerchief" - desc = "[desc] It's tied up like a neckerchief." - slot_flags = ITEM_SLOT_NECK - worn_y_offset = -3 - user.visible_message(span_notice("[user] ties [src] up like a neckerchief."), span_notice("You tie [src] up like a neckerchief.")) - else - to_chat(user, span_warning("You must be holding [src] in order to tie it!")) - -/obj/item/clothing/mask/bandana/color dying_key = DYE_REGISTRY_BANDANA flags_1 = IS_PLAYER_COLORABLE_1 name = "bandana" @@ -49,79 +19,109 @@ var/greyscale_config_worn_up = /datum/greyscale_config/bandana_worn_up greyscale_colors = "#2e2e2e" -/obj/item/clothing/mask/bandana/color/attack_self(mob/user) +/obj/item/clothing/mask/bandana/attack_self(mob/user) if(slot_flags & ITEM_SLOT_NECK) to_chat(user, span_warning("You must undo [src] in order to push it into a hat!")) return adjustmask(user) if(greyscale_config == initial(greyscale_config) && greyscale_config_worn == initial(greyscale_config_worn)) worn_icon_state += "_up" + undyeable = TRUE set_greyscale( new_config = greyscale_config_up, new_worn_config = greyscale_config_worn_up ) else worn_icon_state = initial(worn_icon_state) + undyeable = initial(undyeable) set_greyscale( new_config = initial(greyscale_config), new_worn_config = initial(greyscale_config_worn) ) -/obj/item/clothing/mask/bandana/color/red +/obj/item/clothing/mask/bandana/AltClick(mob/user) + . = ..() + if(iscarbon(user)) + var/mob/living/carbon/C = user + var/matrix/widen = matrix() + if(!user.is_holding(src)) + to_chat(user, span_warning("You must be holding [src] in order to tie it!")) + return + if((C.get_item_by_slot(ITEM_SLOT_HEAD == src)) || (C.get_item_by_slot(ITEM_SLOT_MASK) == src)) + to_chat(user, span_warning("You can't tie [src] while wearing it!")) + return + if(slot_flags & ITEM_SLOT_HEAD) + to_chat(user, span_warning("You must undo [src] before you can tie it into a neckerchief!")) + return + if(slot_flags & ITEM_SLOT_MASK) + undyeable = TRUE + slot_flags = ITEM_SLOT_NECK + worn_y_offset = -3 + widen.Scale(1.25, 1) + transform = widen + user.visible_message(span_notice("[user] ties [src] up like a neckerchief."), span_notice("You tie [src] up like a neckerchief.")) + else + undyeable = initial(undyeable) + slot_flags = initial(slot_flags) + worn_y_offset = initial(worn_y_offset) + transform = initial(transform) + user.visible_message(span_notice("[user] unties the neckercheif."), span_notice("You untie the neckercheif.")) + +/obj/item/clothing/mask/bandana/red name = "red bandana" desc = "A fine red bandana with nanotech lining." greyscale_colors = "#A02525" flags_1 = NONE -/obj/item/clothing/mask/bandana/color/blue +/obj/item/clothing/mask/bandana/blue name = "blue bandana" desc = "A fine blue bandana with nanotech lining." greyscale_colors = "#294A98" flags_1 = NONE -/obj/item/clothing/mask/bandana/color/purple +/obj/item/clothing/mask/bandana/purple name = "purple bandana" desc = "A fine purple bandana with nanotech lining." - greyscale_colors = "#8019a0" + greyscale_colors = "#9900CC" flags_1 = NONE -/obj/item/clothing/mask/bandana/color/green +/obj/item/clothing/mask/bandana/green name = "green bandana" desc = "A fine green bandana with nanotech lining." greyscale_colors = "#3D9829" flags_1 = NONE -/obj/item/clothing/mask/bandana/color/gold +/obj/item/clothing/mask/bandana/gold name = "gold bandana" desc = "A fine gold bandana with nanotech lining." greyscale_colors = "#DAC20E" flags_1 = NONE -/obj/item/clothing/mask/bandana/color/orange +/obj/item/clothing/mask/bandana/orange name = "orange bandana" desc = "A fine orange bandana with nanotech lining." greyscale_colors = "#da930e" flags_1 = NONE -/obj/item/clothing/mask/bandana/color/black +/obj/item/clothing/mask/bandana/black name = "black bandana" desc = "A fine black bandana with nanotech lining." greyscale_colors = "#2e2e2e" flags_1 = NONE -/obj/item/clothing/mask/bandana/color/white +/obj/item/clothing/mask/bandana/white name = "white bandana" desc = "A fine white bandana with nanotech lining." greyscale_colors = "#DCDCDC" flags_1 = NONE -/obj/item/clothing/mask/bandana/color/durathread +/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..." greyscale_colors = "#5c6d80" flags_1 = NONE -/obj/item/clothing/mask/bandana/color/striped +/obj/item/clothing/mask/bandana/striped name = "striped bandana" desc = "A fine bandana with nanotech lining and a stripe across." icon_state = "bandstriped" @@ -131,32 +131,51 @@ greyscale_config_up = /datum/greyscale_config/bandstriped_up greyscale_config_worn_up = /datum/greyscale_config/bandstriped_worn_up greyscale_colors = "#2e2e2e#C6C6C6" + undyeable = TRUE -/obj/item/clothing/mask/bandana/color/striped/black +/obj/item/clothing/mask/bandana/striped/black name = "striped bandana" desc = "A fine black and white bandana with nanotech lining and a stripe across." greyscale_colors = "#2e2e2e#C6C6C6" flags_1 = NONE -/obj/item/clothing/mask/bandana/color/striped/security +/obj/item/clothing/mask/bandana/striped/security name = "striped security bandana" desc = "A fine bandana with nanotech lining, a stripe across and security colors." greyscale_colors = "#A02525#2e2e2e" flags_1 = NONE -/obj/item/clothing/mask/bandana/color/striped/science +/obj/item/clothing/mask/bandana/striped/science name = "striped science bandana" desc = "A fine bandana with nanotech lining, a stripe across and science colors." greyscale_colors = "#DCDCDC#8019a0" flags_1 = NONE -/obj/item/clothing/mask/bandana/color/striped/botany +/obj/item/clothing/mask/bandana/striped/engineering + name = "striped engineering bandana" + desc = "A fine bandana with nanotech lining, a stripe across and engineering colors." + greyscale_colors = "#dab50e#ec7404" + flags_1 = NONE + +/obj/item/clothing/mask/bandana/striped/medical + name = "striped medical bandana" + desc = "A fine bandana with nanotech lining, a stripe across and medical colors." + greyscale_colors = "#DCDCDC#5995BA" + flags_1 = NONE + +/obj/item/clothing/mask/bandana/striped/cargo + name = "striped cargo bandana" + desc = "A fine bandana with nanotech lining, a stripe across and cargo colors." + greyscale_colors = "#967032#5F350B" + flags_1 = NONE + +/obj/item/clothing/mask/bandana/striped/botany name = "striped botany bandana" desc = "A fine bandana with nanotech lining, a stripe across and botany colors." greyscale_colors = "#3D9829#294A98" flags_1 = NONE -/obj/item/clothing/mask/bandana/color/skull +/obj/item/clothing/mask/bandana/skull name = "skull bandana" desc = "A fine bandana with nanotech lining and a skull emblem." icon_state = "bandskull" @@ -166,8 +185,9 @@ greyscale_config_up = /datum/greyscale_config/bandskull_up greyscale_config_worn_up = /datum/greyscale_config/bandskull_worn_up greyscale_colors = "#2e2e2e#C6C6C6" + undyeable = TRUE -/obj/item/clothing/mask/bandana/color/skull/black +/obj/item/clothing/mask/bandana/skull/black desc = "A fine black bandana with nanotech lining and a skull emblem." greyscale_colors = "#2e2e2e#C6C6C6" flags_1 = NONE diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 92e5d40e9fe..8e4ba3f3d99 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -422,7 +422,7 @@ ) belt = /obj/item/storage/belt/janitor/full glasses = /obj/item/clothing/glasses/meson - mask = /obj/item/clothing/mask/bandana/color/blue + mask = /obj/item/clothing/mask/bandana/blue l_pocket = /obj/item/grenade/chem_grenade/cleaner r_pocket = /obj/item/grenade/chem_grenade/cleaner l_hand = /obj/item/storage/bag/trash diff --git a/code/modules/mob/living/simple_animal/friendly/trader.dm b/code/modules/mob/living/simple_animal/friendly/trader.dm index b7e27a9aea7..8547c0bb183 100644 --- a/code/modules/mob/living/simple_animal/friendly/trader.dm +++ b/code/modules/mob/living/simple_animal/friendly/trader.dm @@ -225,7 +225,7 @@ mob_biotypes = MOB_UNDEAD|MOB_HUMANOID products = list( /obj/item/clothing/head/helmet/skull = 150, - /obj/item/clothing/mask/bandana/color/skull/black = 50, + /obj/item/clothing/mask/bandana/skull/black = 50, /obj/item/food/cookie/sugar/spookyskull = 10, /obj/item/instrument/trombone/spectral = 10000, /obj/item/shovel/serrated = 150 diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index ffa61a729e8..358ea734e18 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -25,9 +25,9 @@ /obj/item/clothing/head/beret/black = 3, /obj/item/clothing/head/kippah = 3, /obj/item/clothing/head/taqiyahred = 3, - /obj/item/clothing/mask/bandana/color = 3, - /obj/item/clothing/mask/bandana/color/striped = 3, - /obj/item/clothing/mask/bandana/color/skull = 3, + /obj/item/clothing/mask/bandana = 3, + /obj/item/clothing/mask/bandana/striped = 3, + /obj/item/clothing/mask/bandana/skull = 3, /obj/item/clothing/gloves/fingerless = 2, /obj/item/clothing/neck/scarf/pink = 3, /obj/item/clothing/neck/scarf/red = 3, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 65ed1c37292..e3b298191ed 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -23,7 +23,7 @@ /obj/item/clothing/shoes/jackboots = 3, /obj/item/clothing/head/beret/sec = 3, /obj/item/clothing/head/soft/sec = 3, - /obj/item/clothing/mask/bandana/color/striped/security = 3, + /obj/item/clothing/mask/bandana/striped/security = 3, /obj/item/clothing/gloves/color/black = 3, /obj/item/clothing/under/rank/security/officer/skirt = 3, /obj/item/clothing/under/rank/security/officer/grey = 3, @@ -55,6 +55,7 @@ /obj/item/clothing/under/rank/medical/paramedic/skirt = 4, /obj/item/clothing/head/nursehat = 4, /obj/item/clothing/head/beret/medical = 4, + /obj/item/clothing/mask/bandana/striped/medical = 4, /obj/item/clothing/under/rank/medical/doctor = 4, /obj/item/clothing/under/rank/medical/doctor/skirt = 4, /obj/item/clothing/under/rank/medical/scrubs/blue = 4, @@ -91,7 +92,7 @@ /obj/item/clothing/suit/hazardvest = 3, /obj/item/clothing/shoes/workboots = 3, /obj/item/clothing/head/beret/engi = 3, - /obj/item/clothing/mask/bandana/color/gold = 3, + /obj/item/clothing/mask/bandana/striped/engineering = 3, /obj/item/clothing/head/hardhat = 3, /obj/item/clothing/head/hardhat/weldhat = 3) refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe @@ -137,6 +138,7 @@ /obj/item/clothing/shoes/sneakers/black = 3, /obj/item/clothing/gloves/fingerless = 3, /obj/item/clothing/head/beret/cargo = 3, + /obj/item/clothing/mask/bandana/striped/cargo = 3, /obj/item/clothing/head/soft = 3, /obj/item/radio/headset/headset_cargo = 3 ) @@ -165,7 +167,7 @@ /obj/item/clothing/shoes/sneakers/black = 2, /obj/item/clothing/gloves/fingerless = 2, /obj/item/clothing/head/soft/black = 2, - /obj/item/clothing/mask/bandana/color/skull/black = 2) + /obj/item/clothing/mask/bandana/skull/black = 2) contraband = list(/obj/item/clothing/suit/hooded/techpriest = 2, /obj/item/clothing/under/costume/mech_suit = 2, /obj/item/organ/tongue/robot = 2) @@ -187,7 +189,7 @@ /obj/item/storage/backpack/duffelbag/science = 3, /obj/item/clothing/head/beret/science = 3, /obj/item/clothing/head/beret/science/fancy = 3, - /obj/item/clothing/mask/bandana/color/striped/science = 3, + /obj/item/clothing/mask/bandana/striped/science = 3, /obj/item/clothing/suit/hooded/wintercoat/science = 3, /obj/item/clothing/under/rank/rnd/scientist = 3, /obj/item/clothing/under/rank/rnd/scientist/skirt = 3, @@ -215,7 +217,7 @@ /obj/item/clothing/suit/apron/waders = 3, /obj/item/clothing/under/rank/civilian/hydroponics = 3, /obj/item/clothing/under/rank/civilian/hydroponics/skirt = 3, - /obj/item/clothing/mask/bandana/color/striped/botany = 3, + /obj/item/clothing/mask/bandana/striped/botany = 3, /obj/item/clothing/accessory/armband/hydro = 3) refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe payment_department = ACCOUNT_SRV @@ -320,7 +322,7 @@ /obj/item/clothing/suit/hooded/wintercoat/janitor = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/head/soft/purple = 2, - /obj/item/clothing/mask/bandana/color/purple = 2, + /obj/item/clothing/mask/bandana/purple = 2, /obj/item/pushbroom = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2,