From d2b296aa39dfe8b6321b04b827aa6e795b09222b Mon Sep 17 00:00:00 2001 From: macky4546 <44586121+macky4546@users.noreply.github.com> Date: Mon, 14 Jun 2021 13:42:51 -0700 Subject: [PATCH 1/2] update shred with meth --- shared.lua | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/shared.lua b/shared.lua index 078cf68..5ca9b76 100644 --- a/shared.lua +++ b/shared.lua @@ -253,9 +253,16 @@ QBShared.Items = { ["firstaid"] = {["name"] = "firstaid", ["label"] = "First Aid", ["weight"] = 2500, ["type"] = "item", ["image"] = "firstaid.png", ["unique"] = false, ["useable"] = true, ["shouldClose"] = true, ["combinable"] = nil, ["description"] = "You can use this First Aid kit to get people back on their feet."}, ["printerdocument"] = {["name"] = "printerdocument", ["label"] = "Document", ["weight"] = 500, ["type"] = "item", ["image"] = "printerdocument.png", ["unique"] = false, ["useable"] = true, ["shouldClose"] = true, ["combinable"] = nil, ["description"] = "A nice document"}, ["weaponlicense"] = {["name"] = "weaponlicense", ["label"] = "Weapon License", ["weight"] = 0, ["type"] = "item", ["image"] = "weapon_license.png", ["unique"] = true, ["useable"] = true, ["shouldClose"] = true, ["combinable"] = nil, ["description"] = "Weapon License"}, - ["oxy"] = {["name"] = "oxy", ["label"] = "Prescription Oxy", ["weight"] = 0, ["type"] = "item", ["image"] = "oxy.png", ["unique"] = false, ["useable"] = true, ["shouldClose"] = true, ["combinable"] = nil, ["description"] = "The Label Has Been Ripped Off"}, + ["oxy"] = {["name"] = "oxy", ["label"] = "Prescription Oxy", ["weight"] = 0, ["type"] = "item", ["image"] = "oxy.png", ["unique"] = false, ["useable"] = true, ["shouldClose"] = true, ["combinable"] = nil, ["description"] = "The Label Has Been Ripped Off"}, ["visa"] = {["name"] = "visa", ["label"] = "Visa Card", ["weight"] = 0, ["type"] = "item", ["image"] = "visacard.png", ["unique"] = true, ["useable"] = true, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "Visa can be used via ATM"}, ["mastercard"] = {["name"] = "mastercard", ["label"] = "Master Card", ["weight"] = 0, ["type"] = "item", ["image"] = "mastercard.png", ["unique"] = true, ["useable"] = true, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "MasterCard can be used via ATM."}, + ["ephedrine"] = {["name"] = "ephedrine", ["label"] = "ephedrine", ["weight"] = 200, ["type"] = "item", ["image"] = "chemical1.png", ["unique"] = true, ["useable"] = true, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "make some meth"}, + ["hydrochloricacid"] = {["name"] = "hydrochloricacid", ["label"] = "hydrochloricacid", ["weight"] = 200, ["type"] = "item", ["image"] = "chemical1.png", ["unique"] = true, ["useable"] = true, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "make some meth"}, + ["acetone"] = {["name"] = "acetone", ["label"] = "acetone", ["weight"] = 200, ["type"] = "item", ["image"] = "chemical2.png", ["unique"] = true, ["useable"] = true, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "make some meth"}, + ["puremeth"] = {["name"] = "puremeth", ["label"] = "meth", ["weight"] = 100, ["type"] = "item", ["image"] = "meth10g.png", ["unique"] = true, ["useable"] = true, ["shouldClose"] = true, ["combinable"] = nil, ["description"] = "Sell some Meth"}, + ["meth"] = {["name"] = "meth", ["label"] = "meth", ["weight"] = 100, ["type"] = "item", ["image"] = "meth10g.png", ["unique"] = true, ["useable"] = true, ["shouldClose"] = true, ["combinable"] = nil, ["description"] = "Sell some Meth"}, + ["methtray"] = {["name"] = "methtray", ["label"] = "Meth Tray", ["weight"] = 200, ["type"] = "item", ["image"] = "methbrick.png", ["unique"] = true, ["useable"] = false, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "make some meth"}, + ["puremethtray"] = {["name"] = "puremethtray", ["label"] = "Pure Meth Tray", ["weight"] = 200, ["type"] = "item", ["image"] = "methbrick.png", ["unique"] = true, ["useable"] = false, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "make some meth"}, ["grape"] = {["name"] = "grape", ["label"] = "Grape", ["weight"] = 100, ["type"] = "item", ["image"] = "grape.png", ["unique"] = false, ["useable"] = true, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "Mmmmh yummie, grapes."}, ["wine"] = {["name"] = "wine", ["label"] = "Wine", ["weight"] = 300, ["type"] = "item", ["image"] = "wine.png", ["unique"] = false, ["useable"] = true, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "Some good wine to drink on a fine evening."}, ["grapejuice"] = {["name"] = "grapejuice", ["label"] = "Grape Juice", ["weight"] = 200, ["type"] = "item", ["image"] = "grapejuice.png", ["unique"] = false, ["useable"] = true, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "Grape juice is said to be healthy.."}, From 7b8c58718911af32b3afe2abbfcfc37b1e06a986 Mon Sep 17 00:00:00 2001 From: macky4546 <44586121+macky4546@users.noreply.github.com> Date: Tue, 15 Jun 2021 08:21:51 -0700 Subject: [PATCH 2/2] Update shared.lua --- shared.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/shared.lua b/shared.lua index 5ca9b76..9e95cea 100644 --- a/shared.lua +++ b/shared.lua @@ -266,6 +266,7 @@ QBShared.Items = { ["grape"] = {["name"] = "grape", ["label"] = "Grape", ["weight"] = 100, ["type"] = "item", ["image"] = "grape.png", ["unique"] = false, ["useable"] = true, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "Mmmmh yummie, grapes."}, ["wine"] = {["name"] = "wine", ["label"] = "Wine", ["weight"] = 300, ["type"] = "item", ["image"] = "wine.png", ["unique"] = false, ["useable"] = true, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "Some good wine to drink on a fine evening."}, ["grapejuice"] = {["name"] = "grapejuice", ["label"] = "Grape Juice", ["weight"] = 200, ["type"] = "item", ["image"] = "grapejuice.png", ["unique"] = false, ["useable"] = true, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "Grape juice is said to be healthy.."}, + ["cocaleaf"] = {["name"] = "cocaleaf", ["label"] = "Cocaine Leaf", ["weight"] = 200, ["type"] = "item", ["image"] = "cocaineleaf.png", ["unique"] = false, ["useable"] = true, ["shouldClose"] = false, ["combinable"] = nil, ["description"] = "Make that white girl"}, } -- // HASH WEAPON ITEMS, NEED SOMETIMES TO GET INFO FOR CLIENT