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 cd220b550c..9b62a14ef4 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -99,7 +99,7 @@ padding_type = "carpet" else if(istype(W,/obj/item/stack/material)) var/obj/item/stack/material/M = W - if(M.material && (M.material.name in list("leather", "cloth"))) + if(M.material && (M.material.flags & MATERIAL_PADDING)) padding_type = "[M.material.name]" if(!padding_type) user << "You cannot pad \the [src] with that." 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 910c92bc85..2228345ebb 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -126,7 +126,7 @@ var/global/list/stool_cache = list() //haha stool padding_type = "carpet" else if(istype(W,/obj/item/stack/material)) var/obj/item/stack/material/M = W - if(M.material && (M.material.name in list("leather", "cloth"))) + if(M.material && (M.material.flags & MATERIAL_PADDING)) padding_type = "[M.material.name]" if(!padding_type) user << "You cannot pad \the [src] with that." diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index ac306a82e8..fba95aeed2 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -369,6 +369,7 @@ var/list/name_to_material name = "cloth" stack_origin_tech = "materials=2" door_icon_base = "wood" + flags = MATERIAL_PADDING /material/cult name = "cult" @@ -408,56 +409,66 @@ var/list/name_to_material name = "leather" icon_colour = "#5C4831" stack_origin_tech = "materials=2" + flags = MATERIAL_PADDING /material/carpet name = "carpet" display_name = "comfy" use_name = "red upholstery" icon_colour = "#DA020A" + flags = MATERIAL_PADDING /material/cotton name = "cotton" display_name ="cotton" icon_colour = "#FFFFFF" + flags = MATERIAL_PADDING /material/cloth_teal name = "teal" display_name ="teal" use_name = "teal cloth" icon_colour = "#00EAFA" + flags = MATERIAL_PADDING /material/cloth_black name = "black" display_name = "black" use_name = "black cloth" icon_colour = "#505050" + flags = MATERIAL_PADDING /material/cloth_green name = "green" display_name = "green" use_name = "green cloth" icon_colour = "#01C608" + flags = MATERIAL_PADDING /material/cloth_puple name = "purple" display_name = "purple" use_name = "purple cloth" icon_colour = "#9C56C4" + flags = MATERIAL_PADDING /material/cloth_blue name = "blue" display_name = "blue" use_name = "blue cloth" icon_colour = "#6B6FE3" + flags = MATERIAL_PADDING /material/cloth_beige name = "beige" display_name = "beige" use_name = "beige cloth" icon_colour = "#E8E7C8" + flags = MATERIAL_PADDING /material/cloth_lime name = "lime" display_name = "lime" use_name = "lime cloth" icon_colour = "#62E36C" + flags = MATERIAL_PADDING diff --git a/code/setup.dm b/code/setup.dm index cbd079c9a5..51fd28bc90 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -981,6 +981,7 @@ var/list/be_special_flags = list( #define MATERIAL_UNMELTABLE 1 #define MATERIAL_BRITTLE 2 +#define MATERIAL_PADDING 4 #define TABLE_BRITTLE_MATERIAL_MULTIPLIER 4 // Amount table damage is multiplied by if it is made of a brittle material (e.g. glass)