diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm index 6c9b84be7ec..cd536147891 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/green, +/obj/item/clothing/mask/bandana/color/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 66c3cd3b788..e4cd273c509 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -12091,7 +12091,7 @@ }, /obj/item/clothing/suit/apron, /obj/item/storage/bag/plants/portaseeder, -/obj/item/clothing/mask/bandana, +/obj/item/clothing/mask/bandana/color/striped/botany, /obj/item/cultivator, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark{ @@ -12142,7 +12142,7 @@ }, /obj/item/storage/bag/plants/portaseeder, /obj/item/plant_analyzer, -/obj/item/clothing/mask/bandana, +/obj/item/clothing/mask/bandana/color/striped/botany, /obj/item/hatchet, /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark{ diff --git a/code/__DEFINES/dye_keys.dm b/code/__DEFINES/dye_keys.dm index 928e75c6042..96eaeb1c743 100644 --- a/code/__DEFINES/dye_keys.dm +++ b/code/__DEFINES/dye_keys.dm @@ -1,6 +1,7 @@ #define DYE_REGISTRY_UNDER "under" #define DYE_REGISTRY_JUMPSKIRT "jumpskirt" #define DYE_REGISTRY_GLOVES "gloves" +#define DYE_REGISTRY_BANDANA "bandana" #define DYE_REGISTRY_SNEAKERS "sneakers" #define DYE_REGISTRY_FANNYPACK "fannypack" #define DYE_REGISTRY_BEDSHEET "bedsheet" diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm index 950c9896acf..eabdd87f8b1 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/durathread + result = /obj/item/clothing/mask/bandana/color/durathread reqs = list(/obj/item/stack/sheet/durathread = 1) time = 25 category = CAT_CLOTHING diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm index c68d6ebbc0a..9943bc62b12 100644 --- a/code/datums/greyscale/config_types/greyscale_configs.dm +++ b/code/datums/greyscale/config_types/greyscale_configs.dm @@ -453,4 +453,62 @@ icon_file = 'icons/mob/clothing/suits/moth.dmi' json_config = 'code/datums/greyscale/json_configs/moth_coat_winter_worn.json' +/datum/greyscale_config/bandana + name = "Bandana" + icon_file = 'icons/obj/clothing/masks.dmi' + json_config = 'code/datums/greyscale/json_configs/bandana.json' +/datum/greyscale_config/bandana_up + name = "Bandana Up" + icon_file = 'icons/obj/clothing/masks.dmi' + json_config = 'code/datums/greyscale/json_configs/bandana_up.json' + +/datum/greyscale_config/bandana_worn + name = "Worn Bandana" + icon_file = 'icons/mob/clothing/mask.dmi' + json_config = 'code/datums/greyscale/json_configs/bandana_worn.json' + +/datum/greyscale_config/bandana_worn_up + name = "Worn Bandana Up" + icon_file = 'icons/mob/clothing/mask.dmi' + json_config = 'code/datums/greyscale/json_configs/bandana_worn_up.json' + +/datum/greyscale_config/bandstriped + name = "Striped Bandana" + icon_file = 'icons/obj/clothing/masks.dmi' + json_config = 'code/datums/greyscale/json_configs/bandstriped.json' + +/datum/greyscale_config/bandstriped_up + name = "Striped Bandana Up" + icon_file = 'icons/obj/clothing/masks.dmi' + json_config = 'code/datums/greyscale/json_configs/bandstriped_up.json' + +/datum/greyscale_config/bandstriped_worn + name = "Worn Striped Bandana" + icon_file = 'icons/mob/clothing/mask.dmi' + json_config = 'code/datums/greyscale/json_configs/bandstriped_worn.json' + +/datum/greyscale_config/bandstriped_worn_up + name = "Worn Striped Bandana Up" + icon_file = 'icons/mob/clothing/mask.dmi' + json_config = 'code/datums/greyscale/json_configs/bandstriped_worn_up.json' + +/datum/greyscale_config/bandskull + name = "Skull Bandana" + icon_file = 'icons/obj/clothing/masks.dmi' + json_config = 'code/datums/greyscale/json_configs/bandskull.json' + +/datum/greyscale_config/bandskull_up + name = "Skull Bandana Up" + icon_file = 'icons/obj/clothing/masks.dmi' + json_config = 'code/datums/greyscale/json_configs/bandskull_up.json' + +/datum/greyscale_config/bandskull_worn + name = "Worn Skull Bandana" + icon_file = 'icons/mob/clothing/mask.dmi' + json_config = 'code/datums/greyscale/json_configs/bandskull_worn.json' + +/datum/greyscale_config/bandskull_worn_up + name = "Worn Skull Bandana Up" + icon_file = 'icons/mob/clothing/mask.dmi' + json_config = 'code/datums/greyscale/json_configs/bandskull_worn_up.json' diff --git a/code/datums/greyscale/json_configs/bandana.json b/code/datums/greyscale/json_configs/bandana.json new file mode 100644 index 00000000000..a56d9b18265 --- /dev/null +++ b/code/datums/greyscale/json_configs/bandana.json @@ -0,0 +1,10 @@ +{ + "bandana": [ + { + "type": "icon_state", + "icon_state": "bandana_cloth", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bandana_up.json b/code/datums/greyscale/json_configs/bandana_up.json new file mode 100644 index 00000000000..393d7b0710f --- /dev/null +++ b/code/datums/greyscale/json_configs/bandana_up.json @@ -0,0 +1,10 @@ +{ + "bandana_up": [ + { + "type": "icon_state", + "icon_state": "bandana_cloth_up", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bandana_worn.json b/code/datums/greyscale/json_configs/bandana_worn.json new file mode 100644 index 00000000000..bc0e6c002d5 --- /dev/null +++ b/code/datums/greyscale/json_configs/bandana_worn.json @@ -0,0 +1,10 @@ +{ + "bandana_worn": [ + { + "type": "icon_state", + "icon_state": "bandana_cloth_worn", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bandana_worn_up.json b/code/datums/greyscale/json_configs/bandana_worn_up.json new file mode 100644 index 00000000000..b5375d5dfa0 --- /dev/null +++ b/code/datums/greyscale/json_configs/bandana_worn_up.json @@ -0,0 +1,10 @@ +{ + "bandana_worn_up": [ + { + "type": "icon_state", + "icon_state": "bandana_cloth_worn_up", + "blend_mode": "overlay", + "color_ids": [ 1 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bandskull.json b/code/datums/greyscale/json_configs/bandskull.json new file mode 100644 index 00000000000..18344d5d13a --- /dev/null +++ b/code/datums/greyscale/json_configs/bandskull.json @@ -0,0 +1,16 @@ +{ + "bandskull": [ + { + "type": "icon_state", + "icon_state": "bandana_cloth", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "bandana_skull", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bandskull_up.json b/code/datums/greyscale/json_configs/bandskull_up.json new file mode 100644 index 00000000000..c01dc7bcf43 --- /dev/null +++ b/code/datums/greyscale/json_configs/bandskull_up.json @@ -0,0 +1,16 @@ +{ + "bandskull_up": [ + { + "type": "icon_state", + "icon_state": "bandana_cloth_up", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "bandana_skull_up", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bandskull_worn.json b/code/datums/greyscale/json_configs/bandskull_worn.json new file mode 100644 index 00000000000..3d2e34688c9 --- /dev/null +++ b/code/datums/greyscale/json_configs/bandskull_worn.json @@ -0,0 +1,16 @@ +{ + "bandskull_worn": [ + { + "type": "icon_state", + "icon_state": "bandana_cloth_worn", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "bandana_skull_worn", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bandskull_worn_up.json b/code/datums/greyscale/json_configs/bandskull_worn_up.json new file mode 100644 index 00000000000..be37d2ee2b8 --- /dev/null +++ b/code/datums/greyscale/json_configs/bandskull_worn_up.json @@ -0,0 +1,16 @@ +{ + "bandskull_worn_up": [ + { + "type": "icon_state", + "icon_state": "bandana_cloth_worn_up", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "bandana_skull_worn_up", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bandstriped.json b/code/datums/greyscale/json_configs/bandstriped.json new file mode 100644 index 00000000000..e31fb50309f --- /dev/null +++ b/code/datums/greyscale/json_configs/bandstriped.json @@ -0,0 +1,16 @@ +{ + "bandstriped": [ + { + "type": "icon_state", + "icon_state": "bandana_cloth", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "bandana_stripe", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bandstriped_up.json b/code/datums/greyscale/json_configs/bandstriped_up.json new file mode 100644 index 00000000000..da464432cd4 --- /dev/null +++ b/code/datums/greyscale/json_configs/bandstriped_up.json @@ -0,0 +1,16 @@ +{ + "bandstriped_up": [ + { + "type": "icon_state", + "icon_state": "bandana_cloth_up", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "bandana_stripe_up", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bandstriped_worn.json b/code/datums/greyscale/json_configs/bandstriped_worn.json new file mode 100644 index 00000000000..89d729aa4c9 --- /dev/null +++ b/code/datums/greyscale/json_configs/bandstriped_worn.json @@ -0,0 +1,16 @@ +{ + "bandstriped_worn": [ + { + "type": "icon_state", + "icon_state": "bandana_cloth_worn", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "bandana_stripe_worn", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/datums/greyscale/json_configs/bandstriped_worn_up.json b/code/datums/greyscale/json_configs/bandstriped_worn_up.json new file mode 100644 index 00000000000..7d08ea651ac --- /dev/null +++ b/code/datums/greyscale/json_configs/bandstriped_worn_up.json @@ -0,0 +1,16 @@ +{ + "bandstriped_worn_up": [ + { + "type": "icon_state", + "icon_state": "bandana_cloth_worn_up", + "blend_mode": "overlay", + "color_ids": [ 1 ] + }, + { + "type": "icon_state", + "icon_state": "bandana_stripe_worn_up", + "blend_mode": "overlay", + "color_ids": [ 2 ] + } + ] +} diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index d6b90d4c0b6..1115da8f929 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -70,6 +70,18 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_SYNDICATE = /obj/item/clothing/gloves/combat, 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_REGISTRY_SNEAKERS = list( DYE_RED = /obj/item/clothing/shoes/sneakers/red, DYE_ORANGE = /obj/item/clothing/shoes/sneakers/orange, diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index b5feb656197..86f8994efe5 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -362,6 +362,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), \ 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 +421,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/durathread, 1, time = 25), \ + new/datum/stack_recipe("durathread bandana", /obj/item/clothing/mask/bandana/color/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 008f22e9d44..69991d161c1 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -126,7 +126,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/red = 2) + /obj/item/clothing/mask/bandana/color/red = 2) generate_items_inside(items_inside,src) return @@ -213,9 +213,9 @@ /obj/item/clothing/head/soft/black = 2) generate_items_inside(items_inside,src) if(prob(40)) - new /obj/item/clothing/mask/bandana/skull(src) + new /obj/item/clothing/mask/bandana/color/skull/black(src) if(prob(40)) - new /obj/item/clothing/mask/bandana/skull(src) + new /obj/item/clothing/mask/bandana/color/skull/black(src) return diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 2b09f494733..4f8f7b504be 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/black(src) - new /obj/item/clothing/mask/bandana/black(src) + new /obj/item/clothing/mask/bandana/color/black(src) + new /obj/item/clothing/mask/bandana/color/black(src) if(prob(40)) - new /obj/item/clothing/mask/bandana/skull(src) + new /obj/item/clothing/mask/bandana/color/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/green(src) - new /obj/item/clothing/mask/bandana/green(src) + new /obj/item/clothing/mask/bandana/color/green(src) + new /obj/item/clothing/mask/bandana/color/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/gold(src) - new /obj/item/clothing/mask/bandana/gold(src) + new /obj/item/clothing/mask/bandana/color/gold(src) + new /obj/item/clothing/mask/bandana/color/gold(src) return @@ -112,6 +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) return /obj/structure/closet/wardrobe/pjs @@ -144,8 +146,8 @@ if(prob(50)) new /obj/item/storage/backpack/duffelbag(src) if(prob(40)) - new /obj/item/clothing/mask/bandana/black(src) - new /obj/item/clothing/mask/bandana/black(src) + new /obj/item/clothing/mask/bandana/color/black(src) + new /obj/item/clothing/mask/bandana/color/black(src) if(prob(40)) new /obj/item/clothing/under/misc/assistantformal(src) if(prob(40)) @@ -185,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/red(src) - new /obj/item/clothing/mask/bandana/blue(src) - new /obj/item/clothing/mask/bandana/gold(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/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 7041dc46ebd..e91246495be 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/green) + /obj/item/clothing/mask/bandana/color/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/skull) + /obj/item/clothing/mask/bandana/color/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/gold, + /obj/item/clothing/mask/bandana/color/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/gold, + /obj/item/clothing/mask/bandana/color/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/blue) + /obj/item/clothing/mask/bandana/color/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/black) + /obj/item/clothing/mask/bandana/color/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 63a7618fb7a..d387d866281 100644 --- a/code/modules/antagonists/thief/thief.dm +++ b/code/modules/antagonists/thief/thief.dm @@ -93,7 +93,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/red + mask = /obj/item/clothing/mask/bandana/color/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 b5eb1db1b7e..97f4f020d50 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/skull)//so you can properly #cargoniabikergang + /obj/item/clothing/mask/bandana/color/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 a764f4d8132..4e15c34cfc8 100644 --- a/code/modules/clothing/masks/bandana.dm +++ b/code/modules/clothing/masks/bandana.dm @@ -1,6 +1,4 @@ /obj/item/clothing/mask/bandana - name = "botany bandana" - desc = "A fine bandana with nanotech lining and a hydroponics pattern." w_class = WEIGHT_CLASS_TINY flags_cover = MASKCOVERSMOUTH flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT @@ -8,7 +6,6 @@ visor_flags_cover = MASKCOVERSMOUTH | PEPPERPROOF slot_flags = ITEM_SLOT_MASK adjusted_flags = ITEM_SLOT_HEAD - icon_state = "bandbotany" species_exception = list(/datum/species/golem) /obj/item/clothing/mask/bandana/attack_self(mob/user) @@ -16,61 +13,161 @@ /obj/item/clothing/mask/bandana/AltClick(mob/user) . = ..() - if(iscarbon(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!")) - else - if(user.is_holding(src)) - var/obj/item/clothing/neck/neckerchief/nk = new(src) - nk.name = "[name] neckerchief" - nk.desc = "[desc] It's tied up like a neckerchief." - nk.icon_state = icon_state - nk.item_flags = item_flags - nk.worn_icon = 'icons/misc/hidden.dmi' //hide underlying neckerchief object while it applies its own mutable appearance - nk.sourceBandanaType = src.type - var/currentHandIndex = user.get_held_index_of_item(src) - user.transferItemToLoc(src, null) - user.put_in_hand(nk, currentHandIndex) - user.visible_message(span_notice("[user] ties [src] up like a neckerchief."), span_notice("You tie [src] up like a neckerchief.")) - qdel(src) + 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 - to_chat(user, span_warning("You must be holding [src] in order to tie it!")) + 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/red +/obj/item/clothing/mask/bandana/color + dying_key = DYE_REGISTRY_BANDANA + flags_1 = IS_PLAYER_COLORABLE_1 + name = "bandana" + desc = "A fine bandana with nanotech lining." + icon_state = "bandana" + worn_icon_state = "bandana_worn" + greyscale_config = /datum/greyscale_config/bandana + greyscale_config_worn = /datum/greyscale_config/bandana_worn + var/greyscale_config_up = /datum/greyscale_config/bandana_up + var/greyscale_config_worn_up = /datum/greyscale_config/bandana_worn_up + greyscale_colors = "#2e2e2e" + +/obj/item/clothing/mask/bandana/color/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" + set_greyscale( + new_config = greyscale_config_up, + new_worn_config = greyscale_config_worn_up + ) + else + worn_icon_state = initial(worn_icon_state) + set_greyscale( + new_config = initial(greyscale_config), + new_worn_config = initial(greyscale_config_worn) + ) + +/obj/item/clothing/mask/bandana/color/red name = "red bandana" desc = "A fine red bandana with nanotech lining." - icon_state = "bandred" + greyscale_colors = "#A02525" + flags_1 = NONE -/obj/item/clothing/mask/bandana/blue +/obj/item/clothing/mask/bandana/color/blue name = "blue bandana" desc = "A fine blue bandana with nanotech lining." - icon_state = "bandblue" + greyscale_colors = "#294A98" + flags_1 = NONE -/obj/item/clothing/mask/bandana/green +/obj/item/clothing/mask/bandana/color/purple + name = "purple bandana" + desc = "A fine purple bandana with nanotech lining." + greyscale_colors = "#8019a0" + flags_1 = NONE + +/obj/item/clothing/mask/bandana/color/green name = "green bandana" desc = "A fine green bandana with nanotech lining." - icon_state = "bandgreen" + greyscale_colors = "#3D9829" + flags_1 = NONE -/obj/item/clothing/mask/bandana/gold +/obj/item/clothing/mask/bandana/color/gold name = "gold bandana" desc = "A fine gold bandana with nanotech lining." - icon_state = "bandgold" + greyscale_colors = "#DAC20E" + flags_1 = NONE -/obj/item/clothing/mask/bandana/black +/obj/item/clothing/mask/bandana/color/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 name = "black bandana" desc = "A fine black bandana with nanotech lining." - icon_state = "bandblack" + greyscale_colors = "#2e2e2e" + flags_1 = NONE -/obj/item/clothing/mask/bandana/skull - name = "skull bandana" - desc = "A fine black bandana with nanotech lining and a skull emblem." - icon_state = "bandskull" +/obj/item/clothing/mask/bandana/color/white + name = "white bandana" + desc = "A fine white bandana with nanotech lining." + greyscale_colors = "#DCDCDC" + flags_1 = NONE -/obj/item/clothing/mask/bandana/durathread +/obj/item/clothing/mask/bandana/color/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..." - icon_state = "banddurathread" + greyscale_colors = "#5c6d80" + flags_1 = NONE + +/obj/item/clothing/mask/bandana/color/striped + name = "striped bandana" + desc = "A fine bandana with nanotech lining and a stripe across." + icon_state = "bandstriped" + worn_icon_state = "bandstriped_worn" + greyscale_config = /datum/greyscale_config/bandstriped + greyscale_config_worn = /datum/greyscale_config/bandstriped_worn + greyscale_config_up = /datum/greyscale_config/bandstriped_up + greyscale_config_worn_up = /datum/greyscale_config/bandstriped_worn_up + greyscale_colors = "#2e2e2e#C6C6C6" + +/obj/item/clothing/mask/bandana/color/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 + 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 + 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 + 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 + name = "skull bandana" + desc = "A fine bandana with nanotech lining and a skull emblem." + icon_state = "bandskull" + worn_icon_state = "bandskull_worn" + greyscale_config = /datum/greyscale_config/bandskull + greyscale_config_worn = /datum/greyscale_config/bandskull_worn + greyscale_config_up = /datum/greyscale_config/bandskull_up + greyscale_config_worn_up = /datum/greyscale_config/bandskull_worn_up + greyscale_colors = "#2e2e2e#C6C6C6" + +/obj/item/clothing/mask/bandana/color/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/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index bd4341b819a..91151e23189 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -231,36 +231,6 @@ else to_chat(user, span_warning("There is no export value for [I] or any items within it.")) - -/obj/item/clothing/neck/neckerchief - icon = 'icons/obj/clothing/masks.dmi' //In order to reuse the bandana sprite - w_class = WEIGHT_CLASS_TINY - var/sourceBandanaType - -/obj/item/clothing/neck/neckerchief/worn_overlays(mutable_appearance/standing, isinhands) - . = ..() - if(!isinhands) - var/mutable_appearance/realOverlay = mutable_appearance('icons/mob/clothing/mask.dmi', icon_state) - realOverlay.pixel_y = -3 - . += realOverlay - -/obj/item/clothing/neck/neckerchief/AltClick(mob/user) - . = ..() - if(iscarbon(user)) - var/mob/living/carbon/C = user - if(C.get_item_by_slot(ITEM_SLOT_NECK) == src) - to_chat(user, span_warning("You can't untie [src] while wearing it!")) - return - if(user.is_holding(src)) - var/obj/item/clothing/mask/bandana/newBand = new sourceBandanaType(user) - var/currentHandIndex = user.get_held_index_of_item(src) - var/oldName = src.name - qdel(src) - user.put_in_hand(newBand, currentHandIndex) - user.visible_message(span_notice("You untie [oldName] back into a [newBand.name]."), span_notice("[user] unties [oldName] back into a [newBand.name].")) - else - to_chat(user, span_warning("You must be holding [src] in order to untie it!")) - /obj/item/clothing/neck/beads name = "plastic bead necklace" desc = "A cheap, plastic bead necklace. Show team spirit! Collect them! Throw them away! The posibilites are endless!" diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index a2da482e2eb..e0019b2106b 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -423,7 +423,7 @@ ) belt = /obj/item/storage/belt/janitor/full glasses = /obj/item/clothing/glasses/meson - mask = /obj/item/clothing/mask/bandana/blue + mask = /obj/item/clothing/mask/bandana/color/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 00c30fcbcc0..b7e27a9aea7 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/skull = 50, + /obj/item/clothing/mask/bandana/color/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 e58fe9b1e51..3a0a3d1c880 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -25,6 +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/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 e9196e3cfd8..c2bc34cfe4b 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/red = 3, + /obj/item/clothing/mask/bandana/color/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, @@ -91,6 +91,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/head/hardhat = 3, /obj/item/clothing/head/hardhat/weldhat = 3) refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe @@ -164,7 +165,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/skull = 2) + /obj/item/clothing/mask/bandana/color/skull/black = 2) contraband = list(/obj/item/clothing/suit/hooded/techpriest = 2, /obj/item/organ/tongue/robot = 2) refill_canister = /obj/item/vending_refill/wardrobe/robo_wardrobe @@ -185,6 +186,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/suit/hooded/wintercoat/science = 3, /obj/item/clothing/under/rank/rnd/scientist = 3, /obj/item/clothing/under/rank/rnd/scientist/skirt = 3, @@ -212,7 +214,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 = 3, + /obj/item/clothing/mask/bandana/color/striped/botany = 3, /obj/item/clothing/accessory/armband/hydro = 3) refill_canister = /obj/item/vending_refill/wardrobe/hydro_wardrobe payment_department = ACCOUNT_SRV @@ -318,6 +320,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/pushbroom = 2, /obj/item/paint/paint_remover = 2, /obj/item/melee/flyswatter = 2, diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index 5176c69814a..9beb70449a0 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 8e2a06c61e6..35e00c46ff2 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ