diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index a6ef402ecad4..15d23e49970e 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -863,3 +863,48 @@
 	var/mutable_appearance/base_overlay_among = mutable_appearance(icon, "plushie_among_visor")
 	base_overlay_among.appearance_flags = RESET_COLOR
 	add_overlay(base_overlay_among)
+
+/obj/item/choice_beacon/plushie
+	name = "box of plushes"
+	desc = "Contains two plushies!"
+	uses = 2
+
+/obj/item/choice_beacon/plushie/generate_display_names()
+	var/static/list/plushies
+	if(!plushies)
+		plushies = list()
+		var/list/templist = list(
+			/obj/item/toy/plush/carpplushie,
+			/obj/item/toy/plush/lizardplushie,
+			/obj/item/toy/plush/snakeplushie,
+			/obj/item/toy/plush/slimeplushie,
+			/obj/item/toy/plush/beeplushie,
+			/obj/item/toy/plush/realgoat,
+			/obj/item/toy/plush/moth,
+			/obj/item/toy/plush/moth/luna,
+			/obj/item/toy/plush/moth/atlas,
+			/obj/item/toy/plush/moth/redish,
+			/obj/item/toy/plush/moth/royal,
+			/obj/item/toy/plush/moth/gothic,
+			/obj/item/toy/plush/moth/lovers,
+			/obj/item/toy/plush/moth/whitefly,
+			/obj/item/toy/plush/moth/punished,
+			/obj/item/toy/plush/moth/firewatch,
+			/obj/item/toy/plush/moth/deadhead,
+			/obj/item/toy/plush/moth/poison,
+			/obj/item/toy/plush/moth/ragged,
+			/obj/item/toy/plush/moth/snow,
+			/obj/item/toy/plush/moth/moonfly,
+			/obj/item/toy/plush/spider,
+			/obj/item/toy/plush/flushed,
+			/obj/item/toy/plush/blahaj,
+			/obj/item/toy/plush/rilena,
+			/obj/item/toy/plush/tali,
+			/obj/item/toy/plush/sharai,
+			/obj/item/toy/plush/xader,
+			/obj/item/toy/plush/mora,
+			/obj/item/toy/plush/kari)
+		for(var/V in templist)
+			var/atom/A = V
+			plushies[initial(A.name)] = A
+	return plushies
diff --git a/code/modules/client/loadout/loadout_general.dm b/code/modules/client/loadout/loadout_general.dm
index 6277a8a3a601..a5b9cbb60526 100644
--- a/code/modules/client/loadout/loadout_general.dm
+++ b/code/modules/client/loadout/loadout_general.dm
@@ -94,49 +94,9 @@
 	display_name = "cane"
 	path = /obj/item/cane
 
-/datum/gear/lizard
-	display_name = "toy, lizard plushie"
-	path = /obj/item/toy/plush/lizardplushie
-
-/datum/gear/snake
-	display_name = "toy, snake plushie"
-	path = /obj/item/toy/plush/snakeplushie
-
-/datum/gear/moth
-	display_name = "toy, moth plushie"
-	path = /obj/item/toy/plush/moth
-
-/datum/gear/hornet
-	display_name = "toy, marketable hornet plushie"
-	path = /obj/item/toy/plush/hornet
-
-/datum/gear/gayhornet
-	display_name = "toy, gay hornet plushie"
-	path = /obj/item/toy/plush/hornet/gay
-	description = "Hornet says lesbian rights."
-
-/datum/gear/knight
-	display_name = "toy, marketable knight plushie"
-	path = /obj/item/toy/plush/knight
-
-/datum/gear/ri
-	display_name = "toy, rilena ri plushie"
-	path = /obj/item/toy/plush/rilena
-
-/datum/gear/tali
-	display_name = "toy, rilena tali plushie"
-	path = /obj/item/toy/plush/tali
-
-// Shiptest edit
-/datum/gear/amongus
-	display_name = "toy, suspicious pill plushie"
-	path = /obj/item/toy/plush/among
-
-/datum/gear/amongus/New()
-	. = ..()
-	var/obj/item/toy/plush/among/temp = new path()
-	description = "[capitalize(pick(temp.among_colors))] sus."
-	qdel(temp)
+/datum/gear/plushie
+	display_name = "box of plushes"
+	path = /obj/item/choice_beacon/plushie
 
 /datum/gear/hairspray
 	display_name = "hair dye"
@@ -150,8 +110,6 @@
 	display_name = "table bell, brass"
 	path = /obj/item/table_bell/brass
 
-// End Shiptest
-
 /datum/gear/flashlight
 	display_name = "tool, flashlight"
 	path = /obj/item/flashlight