Fixed stuff that went missing in the merge.

Although kept detective's revolver ammo at 5, instead of 7 to which someone had changed it.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@75 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/Chemistry-Tools.dm

@@ -224,39 +224,42 @@
 
 	proc
 		fire_syringe(atom/target, mob/user)
-			var/turf/trg = get_turf(target)
+			if (locate (/obj/table, src.loc))
-			var/obj/syringe_gun_dummy/D = new/obj/syringe_gun_dummy(get_turf(src))
+				return
-			var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]
+			else
-			S.reagents.trans_to(D, S.reagents.total_volume)
+				var/turf/trg = get_turf(target)
-			syringes -= S
+				var/obj/syringe_gun_dummy/D = new/obj/syringe_gun_dummy(get_turf(src))
-			del(S)
+				var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]
-			D.icon_state = "syringeproj"
+				S.reagents.trans_to(D, S.reagents.total_volume)
-			D.name = "syringe"
+				syringes -= S
-			playsound(user.loc, 'syringeproj.ogg', 50, 1)
+				del(S)
+				D.icon_state = "syringeproj"
+				D.name = "syringe"
+				playsound(user.loc, 'syringeproj.ogg', 50, 1)
 
-			for(var/i=0, i<6, i++)
+				for(var/i=0, i<6, i++)
-				if(D.loc == trg) break
+					if(D.loc == trg) break
-				step_towards(D,trg)
+					step_towards(D,trg)
 
-				for(var/mob/living/carbon/M in D.loc)
+					for(var/mob/living/carbon/M in D.loc)
-					if(!istype(M,/mob/living/carbon)) continue
+						if(!istype(M,/mob/living/carbon)) continue
-					if(M == user) continue
+						if(M == user) continue
-					D.reagents.trans_to(M, 15)
+						D.reagents.trans_to(M, 15)
-					M.bruteloss += 5
+						M.bruteloss += 5
-					for(var/mob/O in viewers(world.view, D))
+						for(var/mob/O in viewers(world.view, D))
-						O.show_message(text("\red [] was hit by the syringe!", M), 1)
+							O.show_message(text("\red [] was hit by the syringe!", M), 1)
 
-					del(D)
+						del(D)
 
-				for(var/atom/A in D.loc)
+					for(var/atom/A in D.loc)
-					if(A == user) continue
+						if(A == user) continue
-					if(A.density) del(D)
+						if(A.density) del(D)
 
-				sleep(1)
+					sleep(1)
 
-			spawn(10) del(D)
+				spawn(10) del(D)
 
-			return
+				return
 
 
 
@@ -1289,6 +1292,85 @@
 	amount = 5
 	heal_amt = 2
 
+/obj/item/weapon/reagent_containers/food/snacks/meatbread
+	name = "meatbread loaf"
+	desc = "The culinary base of every self-respecting eloquen/tg/entleman."
+	icon_state = "meatbread"
+	amount = 30
+	heal_amt = 5
+/*	New()
+		var/datum/reagents/R = new/datum/reagents(20)
+		reagents = R
+		R.my_atom = src
+		R.add_reagent("cholesterol", 20)*/
+	heal(var/mob/M)
+		..()
+
+
+/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice
+	name = "meatbread slice"
+	desc = "A slice of delicious meatbread."
+	icon_state = "meatbreadslice"
+	amount = 5
+	heal_amt = 6
+	New()
+/*		var/datum/reagents/R = new/datum/reagents(10)
+		reagents = R
+		R.my_atom = src
+		R.add_reagent("cholesterol", 10)*/
+	heal(var/mob/M)
+		..()
+
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesewheel
+	name = "Cheese wheel"
+	desc = "A big wheel of delcious Cheddar."
+	icon_state = "cheesewheel"
+	amount = 25
+	heal_amt = 3
+	heal(var/mob/M)
+		..()
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
+	name = "Cheese wedge"
+	desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far."
+	icon_state = "cheesewedge"
+	amount = 4
+	heal_amt = 4
+	heal(var/mob/M)
+		..()
+
+/obj/item/weapon/reagent_containers/food/snacks/omelette
+	name = "Omelette Du Fromage"
+	desc = "That's all you can say!"
+	icon_state = "omelette"
+	amount = 15
+	heal_amt = 3
+	heal(var/mob/M)
+		..()
+	attackby(obj/item/weapon/W as obj, mob/user as mob)
+		if(istype(W,/obj/item/weapon/kitchen/utensil/fork))
+			W.icon = 'kitchen.dmi'
+			W.icon_state = "forkloaded"
+			world << "[user] takes a piece of omelette with his fork!"
+
+/obj/item/weapon/reagent_containers/food/snacks/omeletteforkload
+	name = "Omelette Du Fromage"
+	desc = "That's all you can say!"
+	amount = 1
+	heal_amt = 4
+	heal(var/mob/M)
+		..()
+
+/obj/item/weapon/reagent_containers/food/snacks/muffin
+	name = "Muffin"
+	desc = "A delicious and spongy little cake"
+	icon_state = "muffin"
+	amount = 4
+	heal_amt = 6
+	heal(var/mob/M)
+		..()
+
 /obj/item/weapon/reagent_containers/food/snacks/roburger
 	name = "roburger"
 	desc = "The lettuce is the only organic component. Beep."
@@ -1458,5 +1540,32 @@
 		..()
 		reagents.add_reagent("beer",1000)
 
-/////////////////////////////////////////////////////////////////////////////////////////////////////
+
-/////////////////////////////////////////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+//Meatbread slicing RIGHT BELOW*************
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+/obj/item/weapon/reagent_containers/food/snacks/meatbread/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/kitchenknife /*|| /obj/item/weapon/scalpel*/))
+		W.visible_message(" <B>[usr] slices the meatbread! </B>", 1)
+		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice (src.loc)
+		del(src)
+		return
+
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesewheel/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/kitchenknife /* || /obj/item/weapon/scalpel*/))
+		W.visible_message(" <B>[usr] slices the cheese! </B>", 1)
+		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
+		new /obj/item/weapon/reagent_containers/food/snacks/cheesewedge (src.loc)
+		del(src)
+		return

code/defines/obj/weapon.dm

@@ -1232,6 +1232,33 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	throw_range = 7
 	w_class = 3.0
 
+/obj/item/weapon/kitchenknife
+	name = "Kitchen knife"
+	icon = 'kitchen.dmi'
+	icon_state = "knife"
+	desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
+	flags = FPRINT | TABLEPASS | CONDUCT
+	force = 10.0
+	w_class = 3.0
+	throwforce = 6.0
+	throw_speed = 3
+	throw_range = 6
+	m_amt = 12000
+
+/obj/item/weapon/tray
+	name = "Tray"
+	icon = 'food.dmi'
+	icon_state = "tray"
+	desc = "A metal tray to lay food on."
+	throwforce = 12.0
+	throwforce = 10.0
+	throw_speed = 1
+	throw_range = 5
+	w_class = 3.0
+	flags = FPRINT | TABLEPASS | CONDUCT
+	m_amt = 3000
+
+
 /obj/item/weapon/kitchen/utensil
 	force = 5.0
 	w_class = 1.0