[MIRROR] Cotton bedfix (#11875)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-10-26 15:59:26 -07:00
committed by GitHub
parent 105f5fa8ce
commit f0a9cfe371
4 changed files with 17 additions and 4 deletions

View File

@@ -193,10 +193,10 @@
base_icon = "psychbed" base_icon = "psychbed"
/obj/structure/bed/psych/Initialize(mapload) /obj/structure/bed/psych/Initialize(mapload)
. = ..(mapload,MAT_WOOD,MAT_LEATHER) . = ..(mapload, MAT_WOOD, MAT_LEATHER)
/obj/structure/bed/padded/Initialize(mapload) /obj/structure/bed/padded/Initialize(mapload)
. = ..(mapload,MAT_PLASTIC,MAT_COTTON) . = ..(mapload, MAT_PLASTIC, MAT_CLOTH)
/obj/structure/bed/double /obj/structure/bed/double
name = "double bed" name = "double bed"
@@ -204,7 +204,7 @@
base_icon = "doublebed" base_icon = "doublebed"
/obj/structure/bed/double/padded/Initialize(mapload) /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) /obj/structure/bed/double/post_buckle_mob(mob/living/M as mob)
if(M.buckled == src) if(M.buckled == src)

View File

@@ -150,6 +150,7 @@
conductive = 0 conductive = 0
hardness = 5 hardness = 5
integrity = 10 integrity = 10
stack_type = /obj/item/stack/material/cotton
/datum/material/fibers /datum/material/fibers
name = MAT_FIBERS name = MAT_FIBERS

View File

@@ -23,6 +23,18 @@
/obj/item/stack/material/cloth/diyaab /obj/item/stack/material/cloth/diyaab
color = "#c6ccf0" 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 /obj/item/stack/material/fiber
name = "plant fiber" name = "plant fiber"
desc = "Some all-natural plant fibers." desc = "Some all-natural plant fibers."

View File

@@ -565,7 +565,7 @@ GLOBAL_LIST_EMPTY(unique_deployable)
icon_state = "bed" icon_state = "bed"
/obj/structure/bed/pod/Initialize(mapload) /obj/structure/bed/pod/Initialize(mapload)
. = ..(mapload, MAT_STEEL, MAT_COTTON) . = ..(mapload, MAT_STEEL, MAT_CLOTH)
//Survival Storage Unit //Survival Storage Unit
/obj/machinery/smartfridge/survival_pod /obj/machinery/smartfridge/survival_pod