diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index ad1797756ca..375c6727eab 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -101,6 +101,78 @@ LINEN BINS icon_state = "sheetbrown" item_state = "sheetbrown" +/obj/item/weapon/bedsheet/ian + icon_state = "sheetian" + item_state = "bedsheet" + +/obj/item/weapon/bedsheet/double + icon_state = "doublesheet" + item_state = "bedsheet" + +/obj/item/weapon/bedsheet/bluedouble + icon_state = "doublesheetblue" + item_state = "sheetblue" + +/obj/item/weapon/bedsheet/greendouble + icon_state = "doublesheetgreen" + item_state = "sheetgreen" + +/obj/item/weapon/bedsheet/orangedouble + icon_state = "doublesheetorange" + item_state = "sheetorange" + +/obj/item/weapon/bedsheet/purpledouble + icon_state = "doublesheetpurple" + item_state = "sheetpurple" + +/obj/item/weapon/bedsheet/doublerainbow //all the way across the sky. + icon_state = "doublesheetrainbow" + item_state = "sheetrainbow" + +/obj/item/weapon/bedsheet/doublered + icon_state = "doublesheetred" + item_state = "sheetred" + +/obj/item/weapon/bedsheet/doubleyellow + icon_state = "doublesheetyellow" + item_state = "sheetyellow" + +/obj/item/weapon/bedsheet/doublemime + icon_state = "doublesheetmime" + item_state = "sheetmime" + +/obj/item/weapon/bedsheet/doubleclown + icon_state = "doublesheetclown" + item_state = "sheetclown" + +/obj/item/weapon/bedsheet/doublecaptain + icon_state = "doublesheetcaptain" + item_state = "sheetcaptain" + +/obj/item/weapon/bedsheet/doublerd + icon_state = "doublesheetrd" + item_state = "sheetrd" + +/obj/item/weapon/bedsheet/doublehos + icon_state = "doublesheethos" + item_state = "sheethos" + +/obj/item/weapon/bedsheet/doublehop + icon_state = "doublesheethop" + item_state = "sheethop" + +/obj/item/weapon/bedsheet/doublece + icon_state = "doublesheetce" + item_state = "sheetce" + +/obj/item/weapon/bedsheet/doublebrown + icon_state = "doublesheetbrown" + item_state = "sheetbrown" + +/obj/item/weapon/bedsheet/doubleian + icon_state = "doublesheetian" + item_state = "bedsheet" + /obj/structure/bedsheetbin name = "linen bin" 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 73914e113cc..511709200c9 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -176,6 +176,19 @@ /obj/structure/bed/alien/New(var/newloc) ..(newloc,"resin") +/obj/structure/bed/double + name = "double bed" + icon_state = "doublebed" + base_icon = "doublebed" + +/obj/structure/bed/double/post_buckle_mob(mob/living/M as mob) + if(M == buckled_mob) + M.pixel_y = 13 + M.old_y = 13 + else + M.pixel_y = 0 + M.old_y = 0 + /* * Roller beds */ diff --git a/icons/obj/furniture.dmi b/icons/obj/furniture.dmi index 952fc829fab..547ea932e3f 100644 Binary files a/icons/obj/furniture.dmi and b/icons/obj/furniture.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 615be07ebf5..53836c99c5e 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ