diff --git a/resources/24ramambo/stream/24ramambo.ytd b/resources/24ramambo/stream/24ramambo.ytd
index d7f054575..ef3cae019 100644
--- a/resources/24ramambo/stream/24ramambo.ytd
+++ b/resources/24ramambo/stream/24ramambo.ytd
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:717ce0f1c5de6a54c507f2c8b9a8f726cf9f244b6e83e7420155388bf3a5e27d
-size 9309264
+oid sha256:2be2c49e22ad6301859822b43546747e8d2a0cf48343621b53876147e81dd914
+size 9503548
diff --git a/resources/751/vehicles.meta b/resources/751/vehicles.meta
index 18456981d..b8030ea81 100644
--- a/resources/751/vehicles.meta
+++ b/resources/751/vehicles.meta
@@ -15,7 +15,7 @@
null
null
- WINDSOR
+ str392m
LAYOUT_STANDARD
SHERIFF_COVER_OFFSET_INFO
EXPLOSION_INFO_DEFAULT
diff --git a/resources/Ped-Props/fxmanifest.lua b/resources/Ped-Props/fxmanifest.lua
deleted file mode 100644
index c13961204..000000000
--- a/resources/Ped-Props/fxmanifest.lua
+++ /dev/null
@@ -1,19 +0,0 @@
-fx_version 'adamant'
-
-game 'gta5'
-
-name 'B1G'
-author 'B1G - https://github.com/CarlosVergikosk'
-version 'v1.0'
-
-client_script {
- 'prop.lua'
-}
-
-
-exports {
- 'attach',
- 'removeall'
-}
-
-
diff --git a/resources/Ped-Props/prop.lua b/resources/Ped-Props/prop.lua
deleted file mode 100644
index 3162a3eb9..000000000
--- a/resources/Ped-Props/prop.lua
+++ /dev/null
@@ -1,194 +0,0 @@
-local holdingPackage = false
-local dropkey = 246 -- Key to drop/get the props
-local closestEntity = 0
-
-
--- Proplist, you can add as much as you want
-attachPropList = {
- {["model"] = 'prop_roadcone02a', ["name"] = "cone", ["bone"] = 28422, ["x"] = 0.6, ["y"] = -0.15, ["z"] = -0.1, ["xR"] = 315.0, ["yR"] = 288.0, ["zR"] = 0.0, ["anim"] = 'pick' }, -- Done
- {["model"] = 'prop_cs_trolley_01', ["name"] = "trolley", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.6, ["z"] = -0.8, ["xR"] = -180.0,["yR"] = -165.0,["zR"] = 90.0, ["anim"] = 'hold' }, -- Done
- {["model"] = 'prop_table_03', ["name"] = "table", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.8, ["z"] = -0.7, ["xR"] = -180.0,["yR"] = -165.0,["zR"] = 90.0, ["anim"] = 'hold' }, -- Done
- {["model"] = 'prop_tool_box_04', ["name"] = "tools", ["bone"] = 28422, ["x"] = 0.4, ["y"] = -0.1, ["z"] = -0.1, ["xR"] = 315.0, ["yR"] = 288.0, ["zR"] = 0.0, ["anim"] = 'pick' }, -- Done
- {["model"] = "xm_prop_smug_crate_s_medical", ["name"] = "MedBox", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.1, ["z"] = -0.1, ["xR"] = 0.0, ["yR"] = 0.0, ["zR"] = 0.0, ["anim"] = 'hold' }, -- Done
- {["model"] = 'xm_prop_x17_bag_med_01a', ["name"] = "MedBag", ["bone"] = 28422, ["x"] = 0.4, ["y"] = -0.1, ["z"] = -0.1, ["xR"] = 315.0, ["yR"] = 298.0, ["zR"] = 0.0, ["anim"] = 'pick' }, -- Done
- {["model"] = "imp_prop_impexp_car_door_04a", ["name"] = "door", ["bone"] = 28422, ["x"] = -0.5, ["y"] = -0.15, ["z"] = 0.4, ["xR"] = 0.0, ["yR"] = 0.0, ["zR"] = 90.0 , ["anim"] = 'hold' }, -- Done
- {["model"] = "imp_prop_impexp_front_bars_01a", ["name"] = "bar", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.25, ["z"] = -0.1, ["xR"] = 0.0, ["yR"] = 0.0, ["zR"] = 0.0 , ["anim"] = 'hold' }, -- Done
- {["model"] = "imp_prop_impexp_bonnet_03a", ["name"] = "bonnet", ["bone"] = 28422, ["x"] = 0.2, ["y"] = 0.2, ["z"] = -0.1, ["xR"] = -0.0, ["yR"] = 0.0, ["zR"] = 180.0 ,["anim"] = 'hold' }, -- Done
- {["model"] = "imp_prop_impexp_front_bumper_02a", ["name"] = "bumpers", ["bone"] = 28422, ["x"] = 0.0, ["y"] = 0.1, ["z"] = 0.05, ["xR"] = 0.0, ["yR"] = 0.0, ["zR"] = 0.0 , ["anim"] = 'hold' }, -- Done
- {["model"] = "prop_car_battery_01", ["name"] = "battery", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.1, ["z"] = -0.05, ["xR"] = 0.0, ["yR"] = 0.0, ["zR"] = 0.0 , ["anim"] = 'hold' }, -- Done
- {["model"] = "prop_wheel_tyre", ["name"] = "tire", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.1, ["z"] = -0.05, ["xR"] = 0.0, ["yR"] = 0.0, ["zR"] = 0.0 , ["anim"] = 'hold' }, -- Done
- {["model"] = "prop_table_03_chr", ["name"] = "chair", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.2, ["z"] = -0.6, ["xR"] = 0.0, ["yR"] = 0.0, ["zR"] = 0.0 , ["anim"] = 'hold' }, -- Done
- {["model"] = 'prop_engine_hoist', ["name"] = "hoist", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.5, ["z"] = -1.3, ["xR"] = -195.0,["yR"] = -180.0,["zR"] = 180.0, ["anim"] = 'hold' }, -- Done
- {["model"] = "ex_office_swag_guns03", ["name"] = "weapons", ["bone"] = 28422, ["x"] = 0.0, ["y"] = 0.0, ["z"] = -0.05, ["xR"] = 90.0, ["yR"] = 180.0, ["zR"] = 90.0 , ["anim"] = 'hold' }, -- Done
- {["model"] = 'prop_cs_cardbox_01', ["name"] = "cardbox", ["bone"] = 28422, ["x"] = 0.01, ["y"] = 0.01, ["z"] = 0.0, ["xR"] = -255.0,["yR"] = -120.0,["zR"] = 40.0, ["anim"] = 'hold' }, -- Done
- {["model"] = "imp_prop_impexp_lappy_01a", ["name"] = "laptop", ["bone"] = 28422, ["x"] = 0.0, ["y"] = 0.0, ["z"] = -0.15, ["xR"] = 0.0, ["yR"] = 0.0, ["zR"] = 0.0 , ["anim"] = 'hold' }, -- Done
- {["model"] = 'xm_prop_x17_bag_01a', ["name"] = "bag", ["bone"] = 28422, ["x"] = 0.4, ["y"] = -0.1, ["z"] = -0.1, ["xR"] = 315.0, ["yR"] = 298.0, ["zR"] = 0.0, ["anim"] = 'pick' }, -- Done
- {["model"] = "p_ld_soc_ball_01", ["name"] = "ball", ["bone"] = 28422, ["x"] = 0.0, ["y"] = 0.0, ["z"] = 0.0, ["xR"] = 0.0, ["yR"] = 0.0, ["zR"] = 0.0 , ["anim"] = 'hold' }, -- Done
- {["model"] = "p_gcase_s", ["name"] = "guncase", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.25, ["z"] = -0.1, ["xR"] = 0.0, ["yR"] = 0.0, ["zR"] = 0.0 , ["anim"] = 'hold' }, -- Done
- {["model"] = 'prop_cleaning_trolly', ["name"] = "CleaningTrolley", ["bone"] = 28422, ["x"] = -0.2, ["y"] = -0.4, ["z"] = -1.2, ["xR"] = -188.0,["yR"] = -178.0,["zR"] = 180.0, ["anim"] = 'hold' }, -- Done
- {["model"] = "prop_mp_drug_package", ["name"] = "drugs", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.25, ["z"] = -0.05, ["xR"] = 0.0, ["yR"] = 0.0, ["zR"] = 0.0 , ["anim"] = 'hold' },
- {["model"] = 'prop_premier_fence_02', ["name"] = "sponsorfence", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.6, ["z"] = -0.2, ["xR"] = -180.0,["yR"] = -165.0,["zR"] = 90.0, ["anim"] = 'hold' }, -- Done
- {["model"] = 'prop_premier_fence_01', ["name"] = "fence", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.6, ["z"] = -0.8, ["xR"] = -180.0,["yR"] = -165.0,["zR"] = 90.0, ["anim"] = 'hold' }, -- Done
- {["model"] = 'prop_kino_light_02', ["name"] = "light", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.6, ["z"] = -0.8, ["xR"] = -180.0,["yR"] = -165.0,["zR"] = 90.0, ["anim"] = 'hold' }, -- Done
- {["model"] = "prop_cash_case_01", ["name"] = "moneycase", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.1, ["z"] = -0.1, ["xR"] = 0.0, ["yR"] = 0.0, ["zR"] = 0.0, ["anim"] = 'hold' }, -- Done
- {["model"] = "prop_cs_dildo_01", ["name"] = "dildo", ["bone"] = 28422, ["x"] = 0.0, ["y"] = -0.1, ["z"] = -0.1, ["xR"] = 0.0, ["yR"] = 0.0, ["zR"] = 0.0, ["anim"] = 'hold' } -- Done
-}
-
-RegisterNetEvent('inrp_propsystem:attachProp')
-AddEventHandler('inrp_propsystem:attachProp', function(attachModelSent,boneNumberSent,x,y,z,xR,yR,zR)
- notifi("~r~Y~w~ to pickup/drop ~r~ /r~w~ to remove", true, false, 120)
- closestEntity = 0
- holdingPackage = true
- local attachModel = GetHashKey(attachModelSent)
- SetCurrentPedWeapon(GetPlayerPed(-1), 0xA2719263)
- local bone = GetPedBoneIndex(GetPlayerPed(-1), boneNumberSent)
- RequestModel(attachModel)
- while not HasModelLoaded(attachModel) do
- Citizen.Wait(0)
- end
- closestEntity = CreateObject(attachModel, 1.0, 1.0, 1.0, 1, 1, 0)
- for i=1 ,#attachPropList , 1 do
- if (attachPropList[i].model == attachModelSent) and (attachPropList[i].anim == 'hold') then
- holdAnim()
- end
- end
- Citizen.Wait(200)
- AttachEntityToEntity(closestEntity, GetPlayerPed(-1), bone, x, y, z, xR, yR, zR, 1, 1, 0, true, 2, 1)
-end)
-
-function notifi(text)
- BeginTextCommandDisplayHelp("STRING")
- AddTextComponentSubstringPlayerName(text)
- EndTextCommandDisplayHelp(0, false, false, 3000)
-end
-
-function loadAnimDict(dict)
- while (not HasAnimDictLoaded(dict)) do
- RequestAnimDict(dict)
- Citizen.Wait(0)
- end
-end
-
-function randPickupAnim()
- local randAnim = math.random(7)
- loadAnimDict('random@domestic')
- TaskPlayAnim(GetPlayerPed(-1),'random@domestic', 'pickup_low',5.0, 1.0, 1.0, 48, 0.0, 0, 0, 0)
-end
-
-function holdAnim()
- loadAnimDict( "anim@heists@box_carry@" )
- TaskPlayAnim((GetPlayerPed(-1)),"anim@heists@box_carry@","idle",4.0, 1.0, -1,49,0, 0, 0, 0)
-end
-
-Citizen.CreateThread( function()
- while true do
- Citizen.Wait(10)
- if IsPedOnFoot(GetPlayerPed(-1)) and not IsPedDeadOrDying(GetPlayerPed(-1)) then
- if IsControlJustReleased(0, dropkey) then
- local playerPed = PlayerPedId()
- local coords = GetEntityCoords(playerPed)
- local closestDistance = -1
- closestEntity = 0
- for i=1, #attachPropList, 1 do
- local object = GetClosestObjectOfType(coords, 1.5, GetHashKey(attachPropList[i].model), false, false, false)
- if DoesEntityExist(object) then
- local objCoords = GetEntityCoords(object)
- local distance = GetDistanceBetweenCoords(coords, objCoords, true)
- if closestDistance == -1 or closestDistance > distance then
- closestDistance = distance
- closestEntity = object
- if not holdingPackage then
- local dst = GetDistanceBetweenCoords(GetEntityCoords(closestEntity) ,GetEntityCoords(GetPlayerPed(-1)),true)
- if dst < 2 then
- holdingPackage = true
- if attachPropList[i].anim == 'pick' then
- randPickupAnim()
- elseif attachPropList[i].anim == 'hold' then
- holdAnim()
- end
- Citizen.Wait(550)
- NetworkRequestControlOfEntity(closestEntity)
- while not NetworkHasControlOfEntity(closestEntity) do
- Wait(0)
- end
- SetEntityAsMissionEntity(closestEntity, true, true)
- while not IsEntityAMissionEntity(closestEntity) do
- Wait(0)
- end
- SetEntityHasGravity(closestEntity, true)
- AttachEntityToEntity(closestEntity, GetPlayerPed(-1),GetPedBoneIndex(GetPlayerPed(-1), attachPropList[i].bone), attachPropList[i].x, attachPropList[i].y, attachPropList[i].z, attachPropList[i].xR, attachPropList[i].yR, attachPropList[i].zR, 1, 1, 0, true, 2, 1)
- end
- else
- holdingPackage = false
- if attachPropList[i].anim == 'pick' then
- randPickupAnim()
- end
- Citizen.Wait(350)
- DetachEntity(closestEntity)
- ClearPedTasks(GetPlayerPed(-1))
- ClearPedSecondaryTask(GetPlayerPed(-1))
- end
- end
- break
- end
- end
- end
- else
- Citizen.Wait(500)
- end
- end
-end)
-
-function removeAttachedProp()
- if DoesEntityExist(closestEntity) then
- DeleteEntity(closestEntity)
- end
-end
-
-function attach(prop)
- TriggerEvent("inrp_propsystem:attachItem",prop)
-end
-
-function removeall()
- TriggerEvent("RemoveItems",false)
- ClearPedTasks(GetPlayerPed(-1))
- ClearPedSecondaryTask(GetPlayerPed(-1))
-end
-
-RegisterNetEvent('inrp_propsystem:attachItem')
-AddEventHandler('inrp_propsystem:attachItem', function(item)
- for i=1 ,#attachPropList , 1 do
- if (attachPropList[i].model == item) then
- TriggerEvent("inrp_propsystem:attachProp",attachPropList[i].model, attachPropList[i].bone, attachPropList[i].x, attachPropList[i].y, attachPropList[i].z, attachPropList[i].xR, attachPropList[i].yR, attachPropList[i].zR)
- end
- end
-end)
-
-RegisterNetEvent("RemoveItems")
-AddEventHandler("RemoveItems", function(sentinfo)
- SetCurrentPedWeapon(GetPlayerPed(-1), GetHashKey("weapon_unarmed"), 1)
- removeAttachedProp()
- holdingPackage = false
-end)
-
-
-Citizen.CreateThread( function()
- RegisterCommand("r", function()
- removeall()
- end, false)
-
- for i=1, #attachPropList, 1 do
- RegisterCommand(attachPropList[i].name, function(source, args, raw)
- local arg = args[1]
-
- if arg == nil then
- attach(attachPropList[i].model)
- end
-
- end, false)
- end
-
-end)
-
-
-Citizen.CreateThread(function() while true do Citizen.Wait(30000) collectgarbage() end end) -- Prevents RAM LEAKS :)
diff --git a/server.cfg b/server.cfg
index da72fd7b3..0dd9f1811 100644
--- a/server.cfg
+++ b/server.cfg
@@ -98,7 +98,7 @@ ensure Weaponry
ensure StreetLabel
ensure EGRP-HUD
ensure rpemotesreborn1.6.0
-ensure enhancedcamera
+//ensure enhancedcamera
ensure FiveM-Vote
//ensure Lightbars-Menu
//ensure Lightbars-Script
@@ -121,7 +121,7 @@ ensure Player-Tracer
ensure 3dme
ensure Custom-Commands
ensure Push-Vehicle
-ensure CinematicCam
+//ensure CinematicCam
ensure spotlight
ensure CarryPeople
ensure Police-Shield