diff --git a/code/modules/clothing/shoes/clown.dm b/code/modules/clothing/shoes/clown.dm
index 7220868c900..dea346b8613 100644
--- a/code/modules/clothing/shoes/clown.dm
+++ b/code/modules/clothing/shoes/clown.dm
@@ -53,10 +53,3 @@
 	desc = "The adorable sound they make when you walk will mean making friends is more likely."
 	icon_state = "meown_shoes"
 	squeak_sound = list('sound/effects/footstep/meowstep1.ogg'=1) //mew mew mew mew
-
-/obj/item/clothing/shoes/clown_shoes/ducky_shoes
-	name = "ducky shoes"
-	desc = "I got boots, that go *quack quack quack quack quack."
-	icon_state = "ducky_shoes"
-	inhand_icon_state = "ducky_shoes"
-	squeak_sound = list('sound/effects/quack.ogg'=1) //quack quack quack quack
diff --git a/code/modules/clothing/shoes/costume.dm b/code/modules/clothing/shoes/costume.dm
index 9a521f42109..ca16c5d6560 100644
--- a/code/modules/clothing/shoes/costume.dm
+++ b/code/modules/clothing/shoes/costume.dm
@@ -83,3 +83,24 @@
 	desc = "Officially branded Saints sneakers. Incredibly valuable!"
 	icon_state = "saints_shoes"
 	inhand_icon_state = null
+
+/obj/item/clothing/shoes/ducky_shoes
+	name = "ducky shoes"
+	desc = "I got boots, that go *quack quack quack quack quack."
+	icon_state = "ducky_shoes"
+	inhand_icon_state = "ducky_shoes"
+
+/obj/item/clothing/shoes/ducky_shoes/Initialize(mapload)
+	. = ..()
+
+	create_storage(storage_type = /datum/storage/pockets/shoes)
+	LoadComponent(/datum/component/squeak, list('sound/effects/quack.ogg' = 1), 50, falloff_exponent = 20)
+
+/obj/item/clothing/shoes/ducky_shoes/equipped(mob/living/user, slot)
+	. = ..()
+	if(slot & ITEM_SLOT_FEET)
+		user.AddElement(/datum/element/waddling)
+
+/obj/item/clothing/shoes/ducky_shoes/dropped(mob/living/user)
+	. = ..()
+	user.RemoveElement(/datum/element/waddling)
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 794a18571fb..f171d989221 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -200,7 +200,7 @@
 		/obj/item/clothing/head/costume/powdered_wig = 1,
 		/obj/item/clothing/head/costume/tv_head = 1,
 		/obj/item/clothing/mask/muzzle = 2,
-		/obj/item/clothing/shoes/clown_shoes/ducky_shoes = 1,
+		/obj/item/clothing/shoes/ducky_shoes = 1,
 		/obj/item/clothing/shoes/clown_shoes/meown_shoes = 1,
 		/obj/item/clothing/suit/costume/judgerobe = 1,
 		/obj/item/clothing/head/costume/lobsterhat = 1,