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 fff73a0662..d15452a8bc 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -193,10 +193,10 @@ base_icon = "psychbed" /obj/structure/bed/psych/Initialize(mapload) - . = ..(mapload,MAT_WOOD,MAT_LEATHER) + . = ..(mapload, MAT_WOOD, MAT_LEATHER) /obj/structure/bed/padded/Initialize(mapload) - . = ..(mapload,MAT_PLASTIC,MAT_COTTON) + . = ..(mapload, MAT_PLASTIC, MAT_CLOTH) /obj/structure/bed/double name = "double bed" @@ -204,7 +204,7 @@ base_icon = "doublebed" /obj/structure/bed/double/padded/Initialize(mapload) - . = ..(mapload,MAT_WOOD,MAT_COTTON) + . = ..(mapload, MAT_WOOD, MAT_CLOTH) /obj/structure/bed/double/post_buckle_mob(mob/living/M as mob) if(M.buckled == src) diff --git a/code/modules/materials/materials/organic/cloth.dm b/code/modules/materials/materials/organic/cloth.dm index 669f81146e..5c05274bbf 100644 --- a/code/modules/materials/materials/organic/cloth.dm +++ b/code/modules/materials/materials/organic/cloth.dm @@ -150,6 +150,7 @@ conductive = 0 hardness = 5 integrity = 10 + stack_type = /obj/item/stack/material/cotton /datum/material/fibers name = MAT_FIBERS diff --git a/code/modules/materials/sheets/organic/textiles.dm b/code/modules/materials/sheets/organic/textiles.dm index 26d02007a4..090ad70123 100644 --- a/code/modules/materials/sheets/organic/textiles.dm +++ b/code/modules/materials/sheets/organic/textiles.dm @@ -23,6 +23,18 @@ /obj/item/stack/material/cloth/diyaab color = "#c6ccf0" + +/obj/item/stack/material/cotton + name = MAT_COTTON + desc = "It's so FLUFFY!" + icon_state = "sheet-cloth" + default_type = MAT_COTTON + no_variants = FALSE + pass_color = TRUE + strict_color_stacking = TRUE + drop_sound = 'sound/items/drop/clothing.ogg' + pickup_sound = 'sound/items/pickup/clothing.ogg' + /obj/item/stack/material/fiber name = "plant fiber" desc = "Some all-natural plant fibers." diff --git a/code/modules/mining/shelter_atoms_vr.dm b/code/modules/mining/shelter_atoms_vr.dm index 6ee8e81938..2848293a62 100644 --- a/code/modules/mining/shelter_atoms_vr.dm +++ b/code/modules/mining/shelter_atoms_vr.dm @@ -565,7 +565,7 @@ GLOBAL_LIST_EMPTY(unique_deployable) icon_state = "bed" /obj/structure/bed/pod/Initialize(mapload) - . = ..(mapload, MAT_STEEL, MAT_COTTON) + . = ..(mapload, MAT_STEEL, MAT_CLOTH) //Survival Storage Unit /obj/machinery/smartfridge/survival_pod