Merge branch 'master' into placeholder

code/game/objects/items/trash.dm

@@ -213,6 +213,18 @@
 	name = "empty rice tub"
 	icon_state = "ricetub"
 
+/obj/item/trash/ricetub/attackby(obj/item/W, mob/living/user)
+	if(istype(W, /obj/item/material/kitchen/utensil/fork/chopsticks))
+		var/obj/item/trash/ricetub_s/T = new()
+		to_chat(user, SPAN_NOTICE("You reattach the [W] to \the [src]"))
+		src.Destroy()
+		W.Destroy()
+		user.put_in_inactive_hand(T) //Because the chopsticks are in the active hand
+
+/obj/item/trash/ricetub_s
+	name = "empty rice tub"
+	icon_state = "ricetub_s"
+
 /obj/item/trash/seaweed
 	name = "empty moss pack"
 	icon_state = "seaweed"

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

@@ -23,6 +23,7 @@
 	var/loaded      //Descriptive string for currently loaded food object.
 	var/is_liquid = FALSE //whether you've got liquid on your utensil
 	var/scoop_food = 1
+	var/transfer_amt = 5
 
 /obj/item/material/kitchen/utensil/New()
 	..()
@@ -80,6 +81,19 @@
 /obj/item/material/kitchen/utensil/fork/plastic
 	default_material = MATERIAL_PLASTIC
 
+/obj/item/material/kitchen/utensil/fork/chopsticks
+	name = "chopsticks"
+	desc = "A pair of chopsticks. The most challenging utensil in the Spur."
+	icon_state = "chopsticks"
+	default_material = MATERIAL_WOOD
+	transfer_amt = 2 //Chopsticks are hard to grab stuff with
+
+/obj/item/material/kitchen/utensil/fork/chopsticks/cheap
+	name = "cheap chopsticks"
+	desc = "A pair of cheap, disposable chopsticks."
+	use_material_name = 0
+	applies_material_colour = 0
+
 /obj/item/material/kitchen/utensil/spoon
 	name = "spoon"
 	desc = "It's a spoon. You can see your own upside-down face in it."