diff --git a/code/__defines/color.dm b/code/__defines/color.dm index 0cf687df09..e7afdf9121 100644 --- a/code/__defines/color.dm +++ b/code/__defines/color.dm @@ -128,6 +128,7 @@ #define WOOD_COLOR_BLACK "#332521" #define WOOD_COLOR_CHOCOLATE "#543c30" #define WOOD_COLOR_YELLOW "#e3994e" +#define WOOD_COLOR_FURNITURE "#824b28" #define GLASS_COLOR "#74c1ee" #define GLASS_COLOR_PHORON "#7c3a9a" diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 9891f82513..9066187d15 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -20,11 +20,10 @@ var/datum/material/material var/datum/material/padding_material var/base_icon = "bed" - var/applies_material_colour = 1 + var/applies_material_colour = 1 //Set to 0 whenever defining a custom colour or it will apply additively to the material, or when no colour overlay should be present. /obj/structure/bed/New(var/newloc, var/new_material, var/new_padding_material) ..(newloc) - color = null if(!new_material) new_material = DEFAULT_WALL_MATERIAL material = get_material_by_name(new_material) @@ -47,7 +46,7 @@ var/cache_key = "[base_icon]-[material.name]" if(isnull(stool_cache[cache_key])) var/image/I = image(icon, base_icon) - if(applies_material_colour) //VOREStation Add - Goes with added var + if(applies_material_colour) I.color = material.icon_colour stool_cache[cache_key] = I add_overlay(stool_cache[cache_key]) @@ -290,7 +289,7 @@ /obj/structure/bed/roller/Moved(atom/old_loc, direction, forced = FALSE) . = ..() - + playsound(src, 'sound/effects/roll.ogg', 100, 1) /obj/structure/bed/roller/post_buckle_mob(mob/living/M as mob) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 57c2e330cf..a0e9c714d9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -2,7 +2,6 @@ name = "chair" desc = "You sit in this. Either by will or force." icon_state = "chair_preview" - color = "#666666" base_icon = "chair" buckle_dir = 0 buckle_lying = 0 //force people to sit up in chairs when buckled @@ -216,22 +215,53 @@ /obj/structure/bed/chair/wood name = "wooden chair" desc = "Old is never too old to not be in fashion." - icon_state = "wooden_chair" + base_icon = "wooden_chair" + icon_state = "wooden_chair_preview" + color = WOOD_COLOR_FURNITURE + applies_material_colour = 0 /obj/structure/bed/chair/wood/update_icon() return +/obj/structure/bed/chair/wood/walnut + name = "walnut chair" + color = WOOD_COLOR_RICH + +/obj/structure/bed/chair/wood/pine + name = "pinewood chair" + color = WOOD_COLOR_PALE + +/obj/structure/bed/chair/wood/ebony + name = "ebony chair" + color = WOOD_COLOR_BLACK + +/obj/structure/bed/chair/wood/mahogany + name = "mahogany chair" + color = WOOD_COLOR_CHOCOLATE + /obj/structure/bed/chair/wood/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/stack) || W.is_wirecutter()) return ..() -/obj/structure/bed/chair/wood/New(var/newloc) +/obj/structure/bed/chair/wood/New(var/newloc, var/newmaterial) ..(newloc, "wood") /obj/structure/bed/chair/wood/wings icon_state = "wooden_chair_wings" +/obj/structure/bed/chair/wood/walnut/wings + icon_state = "wooden_chair_wings" + +/obj/structure/bed/chair/wood/pine/wings + icon_state = "wooden_chair_wings" + +/obj/structure/bed/chair/wood/ebony/wings + icon_state = "wooden_chair_wings" + +/obj/structure/bed/chair/wood/mahogany/wings + icon_state = "wooden_chair_wings" + //Eris Chairs /obj/structure/bed/chair/modern_chair @@ -249,7 +279,7 @@ I.plane = MOB_PLANE overlays |= I -/obj/structure/bed/chair/bar_stool +/obj/structure/bed/chair/modern_bar_stool name = "bar stool" desc = "How vibrant!" icon_state = "modern_stool" diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 64980e672a..3982bfe31b 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -49,7 +49,7 @@ var/global/list/stool_cache = list() //haha stool if(padding_material) var/padding_cache_key = "[base_icon]-padding-[padding_material.name]" if(isnull(stool_cache[padding_cache_key])) - var/image/I = image(icon, "stool_padding") + var/image/I = image(icon, "[base_icon]_padding") I.color = padding_material.icon_colour stool_cache[padding_cache_key] = I add_overlay(stool_cache[padding_cache_key]) @@ -150,7 +150,7 @@ var/global/list/stool_cache = list() //haha stool else ..() -/obj/item/weapon/stool/baystool +/obj/item/weapon/stool/barstool name = "bar stool" desc = "Apply butt." icon = 'icons/obj/furniture.dmi' @@ -163,8 +163,8 @@ var/global/list/stool_cache = list() //haha stool base_icon = "bar_stool_base" anchored = 1 -/obj/item/weapon/stool/baystool/padded +/obj/item/weapon/stool/barstool/padded icon_state = "bar_stool_padded_preview" //set for the map -/obj/item/weapon/stool/baystool/padded/New(var/newloc, var/new_material) +/obj/item/weapon/stool/barstool/padded/New(var/newloc, var/new_material) ..(newloc, "steel", "carpet") \ No newline at end of file diff --git a/code/modules/materials/sheets/organic/wood.dm b/code/modules/materials/sheets/organic/wood.dm index d3d1fd6418..eb95131425 100644 --- a/code/modules/materials/sheets/organic/wood.dm +++ b/code/modules/materials/sheets/organic/wood.dm @@ -18,7 +18,7 @@ icon_state = "sheet-log" default_type = MAT_LOG no_variants = FALSE - color = "#824B28" + color = WOOD_COLOR_FURNITURE max_amount = 25 w_class = ITEMSIZE_HUGE description_info = "Use inhand to craft things, or use a sharp and edged object on this to convert it into two wooden planks." diff --git a/code/modules/tables/presets.dm b/code/modules/tables/presets.dm index 0663a899c9..ee081f7525 100644 --- a/code/modules/tables/presets.dm +++ b/code/modules/tables/presets.dm @@ -43,7 +43,7 @@ /obj/structure/table/wooden_reinforced icon_state = "reinf_preview" - color = "#824B28" + color = WOOD_COLOR_FURNITURE /obj/structure/table/wooden_reinforced/New() material = get_material_by_name("wood") @@ -52,15 +52,15 @@ /obj/structure/table/woodentable icon_state = "plain_preview" - color = "#824B28" + color = WOOD_COLOR_FURNITURE /obj/structure/table/woodentable/New() material = get_material_by_name("wood") ..() -/obj/structure/table/sifwoodentable +/obj/structure/table/sifwoodentable //Shouldn't these be blue? icon_state = "plain_preview" - color = "#824B28" + color = WOOD_COLOR_FURNITURE /obj/structure/table/sifwoodentable/New() material = get_material_by_name("alien wood") @@ -68,7 +68,7 @@ /obj/structure/table/sifwooden_reinforced icon_state = "reinf_preview" - color = "#824B28" + color = WOOD_COLOR_FURNITURE /obj/structure/table/sifwooden_reinforced/New() material = get_material_by_name("alien wood") @@ -179,7 +179,7 @@ */ /obj/structure/table/bench/wooden icon_state = "plain_preview" - color = "#824B28" + color = WOOD_COLOR_FURNITURE /obj/structure/table/bench/wooden/New() material = get_material_by_name("wood") @@ -187,7 +187,7 @@ /obj/structure/table/bench/sifwooden icon_state = "plain_preview" - color = "#824B28" + color = WOOD_COLOR_FURNITURE /obj/structure/table/bench/sifwooden/New() material = get_material_by_name("alien wood") diff --git a/icons/obj/barsigns.dmi b/icons/obj/barsigns.dmi index 4aacc36336..025addf25d 100644 Binary files a/icons/obj/barsigns.dmi and b/icons/obj/barsigns.dmi differ diff --git a/icons/obj/furniture.dmi b/icons/obj/furniture.dmi index 0e96dd9a40..7e0badd1e8 100644 Binary files a/icons/obj/furniture.dmi and b/icons/obj/furniture.dmi differ