Merge branch 'master' of https://git.evolution-state-life.de/Evolution-State-Life/Main

resources/[inventory]/cs_shops/config/config.lua

@@ -580,6 +580,69 @@ CodeStudio.Products = {
                 itemPrice = 100,
                 itemInfo = "",
             },
+            ['weapon_hatchet'] = {
+                itemName = "Beil",
+                itemStock = 150,
+                itemPrice = 600,
+                itemInfo = "",
+            },
+            ['butcherknife'] = {
+                itemName = "Schlachtermesser",
+                itemStock = 150,
+                itemPrice = 400,
+                itemInfo = "",
+            }, 
+            ['gussform'] = {
+                itemName = "Gussform",
+                itemStock = 150,
+                itemPrice = 1000,
+                itemInfo = "",
+            },              
+            ['shovel'] = {
+                itemName = "Schaufel",
+                itemStock = 150,
+                itemPrice = 600,
+                itemInfo = "",
+            },  
+            ['bucket'] = {
+                itemName = "Eimer",
+                itemStock = 150,
+                itemPrice = 60,
+                itemInfo = "",
+            },                          
+            ['anglegrinder'] = {
+                itemName = "Flex",
+                itemStock = 150,
+                itemPrice = 800,
+                itemInfo = "",
+            },  
+            ['cuttingdisc'] = {
+                itemName = "Trennscheibe",
+                itemStock = 150,
+                itemPrice = 20,
+                itemInfo = "",
+            },    
+            ['drill'] = {
+                itemName = "Flex",
+                itemStock = 150,
+                itemPrice = 800,
+                itemInfo = "",
+            },  
+            ['Steinbohrer'] = {
+                itemName = "Steinbohrer",
+                itemStock = 150,
+                itemPrice = 60,
+                itemInfo = "",
+            }, 
+            ['knife'] = {
+                itemName = "Messer",
+                itemStock = 150,
+                itemPrice = 600,
+                itemInfo = "",
+            }, 
+
+
+
 
         }
     },

resources/[inventory]/lusty94_smoking/shared/config.lua

@@ -104,7 +104,7 @@ Config.Consumables = {
         dict = 'amb@prop_human_parking_meter@female@base',
         anim = 'base_female',
         flags = 49,
-        prop = 'v_ret_ml_cigs',
+        prop = 'bzzz_cigarpack_cig003',
         bone = 57005,
         pos = vec3(0.14, 0.01, -0.03),
         rot = vec3(2.0, 68.0, -32.0),

resources/[inventory]/mr-consumables/config/sh_config.lua

@@ -3351,7 +3351,7 @@ Config = {
                     }
                 },
                 Rewards = {
-                    hunger = 10,
+                    hunger = 15,
                 }
             },  
             ["scookie"] = {
@@ -4934,7 +4934,7 @@ Config = {
                     }
                 },
                 Rewards = { -- The Reward Will Set Metadata And Will Be Set When Item Is Used (When Drinked Or Eaten Once)
-                    thirst = 100,
+                    thirst = 20,
                 },
             },                
             ["slushi"] = {
@@ -5144,7 +5144,7 @@ Config = {
                     }
                 },
                 Rewards = { -- The Reward Will Set Metadata And Will Be Set When Item Is Used (When Drinked Or Eaten Once)
-                    thirst = 50,
+                    thirst = 20,
                  }, 
             }, 
             ["ecola_zero_dose"] = {
@@ -6928,7 +6928,7 @@ Config = {
                     }
                 },
                 Rewards = {
-                    thirst = 20,
+                    thirst = 25,
                 }     
             },
             ["cerveza_barracho"] = {

resources/[props]/bzzz_garden_grill/fxmanifest.lua

@@ -0,0 +1,11 @@
+fx_version 'cerulean'
+game { 'gta5' }
+author 'BzZz'
+description 'Bzzz - Garden grill'
+version '1.1.0'
+
+
+
+data_file 'DLC_ITYP_REQUEST' 'stream/bzzz_grill_a.ytyp'
+
+

resources/[props]/bzzz_garden_grill/readme.txt

@@ -0,0 +1,30 @@
+Hi,
+thank you for your purchase.
+
+
+--------------------------------------------------
+
+My contact: 
+Cfx forum:			 https://forum.cfx.re/u/bzzzi/summary
+Tebex:				 https://bzzz.tebex.io/
+Discord:			 https://discord.gg/PpAHBCMW97
+--------------------------------------------------
+
+
+
+Installation:
+1) Insert folder "bzzz_garden_grill" to resources folder
+2) Add to server.cfg
+3) Restart server
+
+
+
+
+--------------------------------------------------
+If you stream props in another resource, you must edit the fxmanifest.
+Add this line:
+data_file 'DLC_ITYP_REQUEST' 'stream/bzzz_grill_a.ytyp'
+
+Then the server must be restarted. 
+YTYP loads properties of props.
+--------------------------------------------------

resources/[props]/bzzz_milk_automat/data/anim_coords.lua

@@ -0,0 +1,8 @@
+   ["box_milk"] = {"mp_player_intdrink", "loop_bottle", "Box milk", AnimationOptions =
+   {
+    Prop = "bzzz_machines_milk_box",
+    PropBone = 18905,
+    PropPlacement = {0.12, -0.04, 0.06, -65.0, 85.0, -20.0},
+    EmoteLoop = true,
+    EmoteMoving = true,
+   }},

resources/[props]/bzzz_milk_automat/fxmanifest.lua

@@ -0,0 +1,15 @@
+fx_version 'cerulean'
+game { 'gta5' }
+author 'BzZz'
+description 'Milk automat'
+version '1.1.0'
+
+
+
+
+
+-- loading prop --
+data_file 'DLC_ITYP_REQUEST' 'stream/bzzz_machines_milk_automat.ytyp'
+
+
+

resources/[props]/bzzz_milk_automat/readme.txt

@@ -0,0 +1,30 @@
+Hi,
+thank you for your purchase.
+
+--------------------------------------------------
+
+My contact: 
+Cfx forum:			 https://forum.cfx.re/u/bzzzi/summary
+Tebex:				 https://bzzz.tebex.io/
+Discord:			 https://discord.gg/PpAHBCMW97
+Wiki:				 https://bzzz.wiki/
+--------------------------------------------------
+
+
+
+Installation:
+1) Insert folder "bzzz_milk_automat" to resources folder
+2) Add to server.cfg
+3) Restart server
+
+
+
+
+--------------------------------------------------
+If you stream props in another resource, you must edit the fxmanifest.
+Add this line:
+data_file 'DLC_ITYP_REQUEST' 'stream/bzzz_machines_milk_automat.ytyp'
+
+Then the server must be restarted. 
+YTYP loads properties of props.
+--------------------------------------------------