Merge remote-tracking branch 'citadel/master' into tgsync

2021-01-09 14:56:32 -08:00
parent e680d58a03 b50c23a82a
commit 9733305997
39 changed files with 211 additions and 65 deletions
@@ -18,6 +18,7 @@
 /obj/item/paicard/Initialize()
 	SSpai.pai_card_list += src
 	add_overlay("pai-off")
+	AddElement(/datum/element/bed_tuckable, 6, -5, 90)
 	return ..()

 /obj/item/paicard/Destroy()