Merge pull request #535 from FalseIncarnate/master

Kitchen Overhaul

code/game/objects/items/stacks/sheets/mineral.dm

@@ -47,6 +47,14 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \
 	new/datum/stack_recipe("plastic spoon", /obj/item/weapon/kitchen/utensil/pspoon, 1, on_floor = 1), \
 	new/datum/stack_recipe("plastic knife", /obj/item/weapon/kitchen/utensil/pknife, 1, on_floor = 1), \
 	new/datum/stack_recipe("plastic bag", /obj/item/weapon/storage/bag/plasticbag, 3, on_floor = 1), \
+	new/datum/stack_recipe("bear mould", /obj/item/weapon/kitchen/mould/bear, 1, on_floor = 1), \
+	new/datum/stack_recipe("worm mould", /obj/item/weapon/kitchen/mould/worm, 1, on_floor = 1), \
+	new/datum/stack_recipe("bean mould", /obj/item/weapon/kitchen/mould/bean, 1, on_floor = 1), \
+	new/datum/stack_recipe("ball mould", /obj/item/weapon/kitchen/mould/ball, 1, on_floor = 1), \
+	new/datum/stack_recipe("cane mould", /obj/item/weapon/kitchen/mould/cane, 1, on_floor = 1), \
+	new/datum/stack_recipe("cash mould", /obj/item/weapon/kitchen/mould/cash, 1, on_floor = 1), \
+	new/datum/stack_recipe("coin mould", /obj/item/weapon/kitchen/mould/coin, 1, on_floor = 1), \
+	new/datum/stack_recipe("sucker mould", /obj/item/weapon/kitchen/mould/loli, 1, on_floor = 1), \
 	)
 
 var/global/list/datum/stack_recipe/clown_recipes = list ( \

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -81,7 +81,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	throwforce = 10.0
 	flags = CONDUCT
 	origin_tech = "materials=1"
-	
+
 /obj/item/stack/sheet/metal/full/New()
 	..()
 	amount = 50
@@ -126,7 +126,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
 /obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null)
 	recipes = plasteel_recipes
 	return ..()
-		
+
 /obj/item/stack/sheet/plasteel/full/New(var/loc, var/amount=null)
 	amount = 50
 	..(loc, amount)
@@ -188,6 +188,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
 	new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \
 	new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \
 	new/datum/stack_recipe("folder", /obj/item/weapon/folder), \
+	new/datum/stack_recipe("cardboard tube", /obj/item/weapon/c_tube), \
 )
 
 /obj/item/stack/sheet/cardboard	//BubbleWrap

code/game/objects/items/trash.dm

@@ -56,6 +56,10 @@
 	can
 		name = "crushed can"
 		icon_state = "cola"
+	gum
+		name = "chewed gum"
+		desc = "NOT free candy."
+		icon_state = "gum"
 
 /obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
 	return

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

@@ -7,6 +7,7 @@
  *		Kitchen knives
  *		Butcher's cleaver
  *		Rolling Pins
+ *		Candy Moulds
  */
 
 /obj/item/weapon/kitchen
@@ -214,4 +215,59 @@
 	w_class = 3.0
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
 
-/* Trays moved to /obj/item/weapon/storage/bag */
+/* Trays moved to /obj/item/weapon/storage/bag */
+
+/*
+ * Candy Moulds
+ */
+
+/obj/item/weapon/kitchen/mould
+	name = "generic candy mould"
+	desc = "You aren't sure what it's supposed to be."
+	icon_state = "mould"
+	force = 5
+	throwforce = 5
+	throw_speed = 3
+	throw_range = 3
+	w_class = 2.0
+	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
+
+/obj/item/weapon/kitchen/mould/bear
+	name = "bear-shaped candy mould"
+	desc = "It has the shape of a small bear imprinted into it."
+	icon_state = "mould_bear"
+
+/obj/item/weapon/kitchen/mould/worm
+	name = "worm-shaped candy mould"
+	desc = "It has the shape of a worm imprinted into it."
+	icon_state = "mould_worm"
+
+/obj/item/weapon/kitchen/mould/bean
+	name = "bean-shaped candy mould"
+	desc = "It has the shape of a bean imprinted into it."
+	icon_state = "mould_bean"
+
+/obj/item/weapon/kitchen/mould/ball
+	name = "ball-shaped candy mould"
+	desc = "It has a small sphere imprinted into it."
+	icon_state = "mould_ball"
+
+/obj/item/weapon/kitchen/mould/cane
+	name = "cane-shaped candy mould"
+	desc = "It has the shape of a cane imprinted into it."
+	icon_state = "mould_cane"
+
+/obj/item/weapon/kitchen/mould/cash
+	name = "cash-shaped candy mould"
+	desc = "It has the shape and design of fake money imprinted into it."
+	icon_state = "mould_cash"
+
+/obj/item/weapon/kitchen/mould/coin
+	name = "coin-shaped candy mould"
+	desc = "It has the shape of a coin imprinted into it."
+	icon_state = "mould_coin"
+
+/obj/item/weapon/kitchen/mould/loli
+	name = "sucker mould"
+	desc = "It has the shape of a sucker imprinted into it."
+	icon_state = "mould_loli"