diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index e2e1f28e56..6096c66470 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -224,39 +224,42 @@ proc fire_syringe(atom/target, mob/user) - var/turf/trg = get_turf(target) - var/obj/syringe_gun_dummy/D = new/obj/syringe_gun_dummy(get_turf(src)) - var/obj/item/weapon/reagent_containers/syringe/S = syringes[1] - S.reagents.trans_to(D, S.reagents.total_volume) - syringes -= S - del(S) - D.icon_state = "syringeproj" - D.name = "syringe" - playsound(user.loc, 'syringeproj.ogg', 50, 1) + if (locate (/obj/table, src.loc)) + return + else + var/turf/trg = get_turf(target) + var/obj/syringe_gun_dummy/D = new/obj/syringe_gun_dummy(get_turf(src)) + var/obj/item/weapon/reagent_containers/syringe/S = syringes[1] + S.reagents.trans_to(D, S.reagents.total_volume) + syringes -= S + del(S) + D.icon_state = "syringeproj" + D.name = "syringe" + playsound(user.loc, 'syringeproj.ogg', 50, 1) - for(var/i=0, i<6, i++) - if(D.loc == trg) break - step_towards(D,trg) + for(var/i=0, i<6, i++) + if(D.loc == trg) break + step_towards(D,trg) - for(var/mob/living/carbon/M in D.loc) - if(!istype(M,/mob/living/carbon)) continue - if(M == user) continue - D.reagents.trans_to(M, 15) - M.bruteloss += 5 - for(var/mob/O in viewers(world.view, D)) - O.show_message(text("\red [] was hit by the syringe!", M), 1) + for(var/mob/living/carbon/M in D.loc) + if(!istype(M,/mob/living/carbon)) continue + if(M == user) continue + D.reagents.trans_to(M, 15) + M.bruteloss += 5 + for(var/mob/O in viewers(world.view, D)) + O.show_message(text("\red [] was hit by the syringe!", M), 1) - del(D) + del(D) - for(var/atom/A in D.loc) - if(A == user) continue - if(A.density) del(D) + for(var/atom/A in D.loc) + if(A == user) continue + 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) -///////////////////////////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////////////////// \ No newline at end of file + + +//////////////////////////////////////////////////////////////////////////////////////////////////// +//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(" [usr] slices the meatbread! ", 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(" [usr] slices the cheese! ", 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 \ No newline at end of file diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index e02c246eb9..f9cbaedd1f 100644 --- a/code/defines/obj/weapon.dm +++ b/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