Merge pull request #10892 from UmeFuu/master

New cookies recipe (previous one was a bit silly)

code/game/objects/items/weapons/kitchen.dm

@@ -9,12 +9,16 @@
  *		Rolling Pins
  *		Candy Moulds
  *		Sushi Mat
+ *		Circular cutter
  */
 
 /obj/item/kitchen
 	icon = 'icons/obj/kitchen.dmi'
 	origin_tech = "materials=1"
 
+
+
+
 /*
  * Utensils
  */
@@ -179,6 +183,7 @@
 	origin_tech = "biotech=3;combat=2"
 	attack_verb = list("shanked", "shivved")
 
+
 /*
  * Rolling Pins
  */
@@ -251,7 +256,7 @@
 	desc = "It has the shape of a sucker imprinted into it."
 	icon_state = "mould_loli"
 
-/* 
+/*
  * Sushi Mat
  */
 /obj/item/kitchen/sushimat
@@ -263,4 +268,20 @@
 	throw_speed = 3
 	throw_range = 3
 	w_class = WEIGHT_CLASS_SMALL
-	attack_verb = list("rolled", "cracked", "battered", "thrashed")
+	attack_verb = list("rolled", "cracked", "battered", "thrashed")
+
+
+
+/// circular cutter by Ume
+
+/obj/item/kitchen/cutter
+	name = "generic circular cutter"
+	desc = "A generic circular cutter for cookies and other things."
+	icon = 'icons/obj/kitchen.dmi'
+	icon_state = "circular_cutter"
+	force = 5
+	throwforce = 5
+	throw_speed = 3
+	throw_range = 3
+	w_class = WEIGHT_CLASS_SMALL
+	attack_verb = list("bashed", "slashed", "pricked", "thrashed")

code/game/objects/items/weapons/storage/bags.dm

@@ -460,6 +460,19 @@
 	return ..()
 
 
+/obj/item/storage/bag/tray/cookies_tray
+	var/cookie = /obj/item/reagent_containers/food/snacks/cookie
+
+/obj/item/storage/bag/tray/cookies_tray/New() /// By Azule Utama, thank you a lot!
+	..()
+	for(var/i in 1 to 6)
+		var/obj/item/C = new cookie(src)
+		handle_item_insertion(C)    // Done this way so the tray actually has the cookies visible when spawned
+	rebuild_overlays()
+
+/obj/item/storage/bag/tray/cookies_tray/sugarcookie
+	cookie = /obj/item/reagent_containers/food/snacks/sugarcookie
+
 /*
  *	Chemistry bag
  */