Merge branch 'master' into placeholder

2026-08-23 21:12:24 +01:00 · 2021-01-14 06:32:08 +01:00
parent ac8fdc729a 6f35ef94d2
commit d1e4ee142e
86 changed files with 1569 additions and 1074 deletions
@@ -165,6 +165,11 @@
 		if(!G.wrapped)
 			user_unbuckle_mob(user)

+	else if(istype(W, /obj/item/disk))
+		user.drop_from_inventory(W, get_turf(src))
+		W.pixel_x = 10 //make sure they reach the pillow
+		W.pixel_y = -6
+
 	else if(!istype(W, /obj/item/bedsheet))
 		..()