diff --git a/resources/[inventory]/cs_shops/config/config.lua b/resources/[inventory]/cs_shops/config/config.lua index f1f857988..bd5f3415a 100644 --- a/resources/[inventory]/cs_shops/config/config.lua +++ b/resources/[inventory]/cs_shops/config/config.lua @@ -2616,7 +2616,7 @@ CodeStudio.Shops = { vector4(377.5420, 331.1830, 103.5637, 163.5450), vector4(-1149.9005, -2797.5676, 21.3616, 257.0023), - -- LTD Gasoline Locations + -- Gas Stations Shops vector4(-47.02, -1758.23, 29.42, 45.05), vector4(-706.06, -913.97, 19.22, 88.04), vector4(-1820.02, 794.03, 138.09, 135.45), @@ -2624,6 +2624,8 @@ CodeStudio.Shops = { vector4(1697.87, 4922.96, 42.06, 324.71), vector4(1697.87, 4922.96, 42.06, 324.71), vector4(2005.3311, 3784.2839, 32.2014, 119.1002), + vector4(650.0884, 260.1908, 104.3210, 58.0985), -- Globe Oil Vinewood + }, @@ -2632,7 +2634,7 @@ CodeStudio.Shops = { targetLabel = '24/7 öffnen', spawnPed = 'mp_m_shopkeep_01', -- Put false if you dont need ped scenario = 'WORLD_HUMAN_STAND_MOBILE', --Ped Scenario Animation put false if you dont need - radius = 2.5, + radius = 2.0, }, Blips = { Enable = true, @@ -2854,6 +2856,8 @@ CodeStudio.Shops = { vector4(-3038.8118, 584.8466, 7.9064, 3), vector4(24.7082, -1347.5961, 29.4945, 3), + vector4(647.2603, 259.4702, 103.3210, 3) -- Globe Oil Vinewood + }, Interaction = { targetIcon = 'fas fa-shopping-basket', diff --git a/resources/[jobs]/[crime]/lation_247robbery/data/default.lua b/resources/[jobs]/[crime]/lation_247robbery/data/default.lua index 467938d27..327b9263d 100644 --- a/resources/[jobs]/[crime]/lation_247robbery/data/default.lua +++ b/resources/[jobs]/[crime]/lation_247robbery/data/default.lua @@ -16,6 +16,7 @@ return { vec3(1164.1452, -322.7899, 69.3824), -- Mirror Park Blvd vec3(29.1228, -1341.5043, 29.4944), -- Innocence Blvd vec3(-1232.8734, -1440.0337, 4.3739) -- Aguja Street + vec3(649.1432, 260.0526, 103.5256) -- Globe Oil Vinewood }, computers = { vec3(24.7435, -1339.3319, 29.4941), -- Innocence Blvd @@ -34,6 +35,7 @@ return { vec3(1158.9605, -315.2624, 69.2748), -- Mirror Park Blvd vec3(24.7447, -1339.3311, 29.4941), -- Innocence Blvd vec3(-1236.2167, -1438.5101, 4.3739) -- Aguja Street + vec3(655.9440, 264.1430, 103.5607) -- Globe Oil Vinewood }, safes = { @@ -53,5 +55,6 @@ return { vec3(1159.0540, -314.1202, 68.5665), -- Mirror Park Blvd vec3(24.6812, -1340.9744, 29.4941), -- Innocence Blvd vec3(-1234.1045, -1436.7537, 4.3739) -- Aguja Street + vec3(653.6609, 259.0182, 103.3211) -- Globe Oil Vinewood } } \ No newline at end of file diff --git a/resources/[qb]/qb-core/shared/weapons.lua b/resources/[qb]/qb-core/shared/weapons.lua index 0bab8e972..fdb302e27 100644 --- a/resources/[qb]/qb-core/shared/weapons.lua +++ b/resources/[qb]/qb-core/shared/weapons.lua @@ -26,7 +26,7 @@ QBShared.Weapons = { [`weapon_bread`] = { name = 'weapon_bread', label = 'Baquette', weapontype = 'Melee', ammotype = nil, damagereason = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered' }, [`weapon_stone_hatchet`] = { name = 'weapon_stone_hatchet', label = 'Stone Hatchet', weapontype = 'Melee', ammotype = nil, damagereason = 'Knifed / Stabbed / Eviscerated' }, [`weapon_candycane`] = { name = 'weapon_candycane', label = 'Candy Cane', weapontype = 'Melee', ammotype = nil, damagereason = 'Melee Killed / Whacked / Executed / Beat down / Musrdered / Battered / Candy Caned' }, - + [`w_me_colbaton`] = { name = 'w_me_colbaton', label = 'Teleskopschlagstock', weapontype = 'Melee', ammotype = nil, damagereason = 'Melee killed / Whacked / Executed / Beat down / Murdered / Battered' }, -- Handguns [`weapon_pistol`] = { name = 'weapon_pistol', label = 'Pistol', weapontype = 'Pistol', ammotype = 'AMMO_PISTOL', damagereason = 'Pistoled / Blasted / Plugged / Bust a cap in' }, [`weapon_pistol_mk2`] = { name = 'weapon_pistol_mk2', label = 'Pistol Mk2', weapontype = 'Pistol', ammotype = 'AMMO_PISTOL', damagereason = 'Pistoled / Blasted / Plugged / Bust a cap in' },