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
@@ -48,6 +48,7 @@
 /obj/item/toy/plush/Initialize(mapload, set_snowflake_id)
 	. = ..()
 	AddComponent(/datum/component/squeak, squeak_override)
+	AddElement(/datum/element/bed_tuckable, 6, -5, 90)

 	//have we decided if Pinocchio goes in the blue or pink aisle yet?
 	if(gender == NEUTER)