From 46c1fc90d17e89ed6e2002ae8546bf6d193f3c7f Mon Sep 17 00:00:00 2001
From: Aronai Sieyes <arokha@arokha.com>
Date: Thu, 26 Aug 2021 12:52:54 -0400
Subject: [PATCH] Merge pull request #11493 from
 VOREStation/upstream-merge-8241

[MIRROR] 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 87fc1ba5c6..962b17754b 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -131,6 +131,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("<span class='notice'>[src] sleeps soundly. Sleep tight, disky.</span>")
+
 	else if(istype(W, /obj/item/weapon/grab))
 		var/obj/item/weapon/grab/G = W
 		var/mob/living/affecting = G.affecting