From 2ad341babfc234c2db34cc8cfe80d3dd95780e1c Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Thu, 26 Aug 2021 11:44:33 +1000 Subject: [PATCH] Merge pull request #8241 from Cerebulon/disky Sleep Tight Disky --- code/game/objects/structures/stool_bed_chair_nest/bed.dm | 7 +++++++ 1 file changed, 7 insertions(+) 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 e858ad6ac6..f226af1afe 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -127,6 +127,13 @@ playsound(src, W.usesound, 100, 1) remove_padding() + else if(istype(W, /obj/item/weapon/disk) || (istype(W, /obj/item/toy/plushie))) + user.drop_from_inventory(W, get_turf(src)) + W.pixel_x = 10 //make sure they reach the pillow + W.pixel_y = -6 + if(istype(W, /obj/item/weapon/disk)) + user.visible_message("[src] sleeps soundly. Sleep tight, disky.") + else if(istype(W, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = W var/mob/living/affecting = G.affecting