diff --git a/code/modules/cooking/recipes/recipes_breakfast.dm b/code/modules/cooking/recipes/recipes_breakfast.dm
index 7e9af06f93b..e24ab36bd01 100644
--- a/code/modules/cooking/recipes/recipes_breakfast.dm
+++ b/code/modules/cooking/recipes/recipes_breakfast.dm
@@ -97,7 +97,6 @@
 
 /decl/recipe/pancakes
 	appliance = SKILLET
-	fruit = list("berries" = 2)
 	items = list(
 		/obj/item/reagent_containers/food/snacks/sliceable/flatdough,
 		/obj/item/reagent_containers/food/snacks/sliceable/flatdough
@@ -105,6 +104,10 @@
 	result = /obj/item/reagent_containers/food/snacks/pancakes
 	result_quantity = 2
 
+/decl/recipe/pancakes/berry
+	fruit = list("berries" = 2)
+	result = /obj/item/reagent_containers/food/snacks/pancakes/berry
+
 /decl/recipe/waffles
 	appliance = SKILLET
 	reagents = list(/decl/reagent/sugar = 10)
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index ddc4074bcd3..6be3c268bd6 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -4209,14 +4209,18 @@
 
 /obj/item/reagent_containers/food/snacks/pancakes
 	name = "pancakes"
-	desc = "Pancakes with berries, delicious."
+	desc = "Pancakes, delicious."
 	icon_state = "pancakes"
 	trash = /obj/item/trash/plate
-	center_of_mass = "x=15;y=11"
 	reagents_to_add = list(/decl/reagent/nutriment = 8)
 	reagent_data = list(/decl/reagent/nutriment = list("pancake" = 8))
 	bitesize = 2
 	filling_color = "#EDF291"
+	
+/obj/item/reagent_containers/food/snacks/pancakes/berry
+	name = "berry pancakes"
+	desc = "Pancakes with berries, delicious."
+	icon_state = "berry_pancakes"
 
 /obj/item/reagent_containers/food/snacks/classichotdog
 	name = "classic hotdog"
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index d772dde64c5..60634037d32 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -193,7 +193,7 @@
 
 	else if (istype (I, /obj/item/material/ashtray) && user.a_intent != I_HURT)
 		var/obj/item/material/ashtray/A = I
-		if(A.emptyout(get_turf(src)))
+		if(A.emptyout(src))
 			user.visible_message("<b>[user]</b> pours [I] out into [src].", SPAN_NOTICE("You pour [I] out into [src]."))
 		return TRUE
 
diff --git a/html/changelogs/service_buff_changelog.yml b/html/changelogs/service_buff_changelog.yml
new file mode 100644
index 00000000000..2596e417011
--- /dev/null
+++ b/html/changelogs/service_buff_changelog.yml
@@ -0,0 +1,8 @@
+author: Granodd
+
+delete-after: True
+
+changes:
+  - imageadd: "Adds a sprite for non-berry pancakes."
+  - tweak: "Creates a non-berry version of pancakes and makes berry pancakes a subtype of it."
+  - bugfix: "Makes ashtrays actually empty into the bin instead of onto the floor."
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
index 79509e4fba7..54b18ea7473 100644
Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ