diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm
index a8184ac815..ca9d7ca95d 100644
--- a/code/modules/reagents/reagent_containers/food/condiment.dm
+++ b/code/modules/reagents/reagent_containers/food/condiment.dm
@@ -50,8 +50,6 @@
 		user << "<span class='notice'>You swallow some of contents of \the [src].</span>"
 
 	on_reagent_change()
-		if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "flour")
-			return
 		if(reagents.reagent_list.len > 0)
 			switch(reagents.get_master_reagent_id())
 				if("ketchup")
@@ -126,36 +124,46 @@
 		..()
 		reagents.add_reagent("sugar", 50)
 
-/obj/item/weapon/reagent_containers/food/condiment/saltshaker		//Seperate from above since it's a small shaker rather then
-	name = "Salt Shaker"											//	a large one.
-	desc = "Salt. From space oceans, presumably."
-	icon_state = "saltshakersmall"
-	possible_transfer_amounts = list(1,20) //for clown turning the lid off
+/obj/item/weapon/reagent_containers/food/condiment/small
+	possible_transfer_amounts = list(1,20)
 	amount_per_transfer_from_this = 1
 	volume = 20
+	center_of_mass = null
+	on_reagent_change()	return
+
+/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker	//Seperate from above since it's a small shaker rather then
+	name = "salt shaker"											//	a large one.
+	desc = "Salt. From space oceans, presumably."
+	icon_state = "saltshakersmall"
 	New()
 		..()
 		reagents.add_reagent("sodiumchloride", 20)
 
-/obj/item/weapon/reagent_containers/food/condiment/peppermill
-	name = "Pepper Mill"
+/obj/item/weapon/reagent_containers/food/condiment/small/peppermill
+	name = "pepper mill"
 	desc = "Often used to flavor food or make people sneeze."
 	icon_state = "peppermillsmall"
-	possible_transfer_amounts = list(1,20) //for clown turning the lid off
-	amount_per_transfer_from_this = 1
-	volume = 20
 	New()
 		..()
 		reagents.add_reagent("blackpepper", 20)
 
+/obj/item/weapon/reagent_containers/food/condiment/small/sugar
+	name = "sugar"
+	desc = "Sweetness in a bottle"
+	icon_state = "sugarsmall"
+	New()
+		..()
+		reagents.add_reagent("sugar", 20)
+
 /obj/item/weapon/reagent_containers/food/condiment/flour
 	name = "flour sack"
 	desc = "A big bag of flour. Good for baking!"
 	icon = 'icons/obj/food.dmi'
 	icon_state = "flour"
 	item_state = "flour"
+	on_reagent_change()	return
 	New()
 		..()
 		reagents.add_reagent("flour", 30)
 		src.pixel_x = rand(-10.0, 10)
-		src.pixel_y = rand(-10.0, 10)
+		src.pixel_y = rand(-10.0, 10)
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
index 967f92ede3..252ad88bde 100644
Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ