Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a smash windshield when eject from vehicle #287

Open
wants to merge 2,998 commits into
base: oss
Choose a base branch
from

Conversation

TheAzylium
Copy link

For #286

joelwurtz and others added 30 commits November 19, 2023 22:23
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Rigonkmalk and others added 29 commits December 6, 2023 21:22
# Conflicts:
#	resources/[mapping]/[mapping-prod]/soz-mtpetrol-v2/stream/ymap/hei_cs1_02_strm_0.ymap
#	resources/[soz]/soz-core/src/client/weapon/weapon.gunsmith.provider.ts
#	resources/[soz]/soz-core/src/nui/components/Menu/Job/MenuNews.tsx
#	resources/[soz]/soz-inventory/client/player.lua
#	resources/[soz]/soz-inventory/server/main.lua
#	resources/[soz]/soz-jobs/server/jobs/baun.lua
#	resources/[soz]/soz-phone/src/nui/apps/twitch-news/utils/isPolice.ts
fix(lowr): fixed pants texture misplaced
…elay-per-player

Revert to gunshot alert per player
…h-menu

Prevent use of vehicle menu when in coma
…not-visible

Regularly freeze payer ped when coma to try to avoid desync
…itoring

Fix monitoring import for hunting no spawn
…-alert

Send police alert for drug sell at begin/middle of animation
feat(housing): fixing v_studio_lo portals

feat(housing): add new housing from Oneiluj new housing batch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants