Skip to content

Fix Purple Dildo and Silver Vibrator weapon names #3801

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from

Conversation

Fernando-A-Rocha
Copy link
Contributor

Fixes #514

@TheNormalnij
Copy link
Member

Let's merge it with 1.6.1 release, to avoid potential regression.

@TheNormalnij TheNormalnij added backwards-incompatible Should be merged after the release of 1.6.1 bugfix Solution to a bug of any kind labels Oct 16, 2024
@TheNormalnij TheNormalnij added this to the 1.6.1 milestone Oct 16, 2024
@imsensacion
Copy link

😶‍🌫️

@Fernando-A-Rocha
Copy link
Contributor Author

Fernando-A-Rocha commented Jun 4, 2025

@PlatinMTA found that Silver Vibrator ID 13 has been considered as an invalid ID (can't use in functions like giveWeapon and it's missing from the wiki weapons list!), but it's perfectly valid.....
So I updated IsValidWeaponID to not prevent it from being spawned, and now you can spawn a silver vibrator lol. Do note that it's always been a valid weapon ID on samp, with object model ID 324.

@Fernando-A-Rocha
Copy link
Contributor Author

image

@Fernando-A-Rocha
Copy link
Contributor Author

✅ Thanks @AlexTMjugador for noticing the need for editing pickup weapon object model ids lists

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backwards-incompatible Should be merged after the release of 1.6.1 bugfix Solution to a bug of any kind
Projects
None yet
Development

Successfully merging this pull request may close these issues.

getWeaponNameFromID() returns duplicate ID's for 10/11 and 12/13
5 participants