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

Professions start with magazines/holsters loaded with their items + missing batteries #33912

Merged
merged 13 commits into from Sep 11, 2019

Conversation

ghost
Copy link

@ghost ghost commented Sep 9, 2019

Summary

SUMMARY: Content "Professions have batteries for their devices, and use their holsters/pouches"

Purpose of change

Fixes #33824, completes #33366, and streamlines having to holster/load all the profession spawn items that should've been holstered/loaded already.

Describe the solution

1.Created new charged_mp3, charged_tazer, and charged_two_way_radio item groups, and changed the charged_flashlight & cellphone item groups to reflect the change to individual batteries. This will make it easier to buff/nerf later, as you'd otherwise have to find each item and change their first acceptable magazine to change the battery each starts with.
2. Went through all professions except C.R.I.T.(Have asked Soupster if he'll do it in #33556, will do second PR if not) and used entries to make use of all holsters/magazines a profession has if they also have an item that fits inside said holster/mag.
3. Corrected Archaelogist missing the 7 rounds from their revolver.
4. Added missing batteries to electronic devices.
5. Changed Miner's disposable batteries to ones that fit the given charge.
6. Added police duty belt to Bionic Police Officer. I forgot to re-add the belt while fixing the chestrig in #33878. 😛

Describe alternatives you've considered

None.

Additional context

This fix would be considered a buff to many professions, due to the batteries being given for their devices.

@ZhilkinSerg ZhilkinSerg added <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies labels Sep 9, 2019
Fris0uman wants it consistent across both genders due to Foodperson NPC
@ghost ghost requested a review from kevingranade September 10, 2019 03:54
@Soupster89
Copy link
Contributor

Interesting! That would help greatly, as I feel my classes are rather clunky when you have to continue pulling out 4 gun mods out of the holster and then to add further insult, install them all one by one.

Honestly I'll have to look through your code to understand what you did to solve this, and I'm still on a mini-hiatus so it will be a few days once I finish sorting irl stuff again.

@Rivet-the-Zombie Rivet-the-Zombie merged commit aaeaf8b into CleverRaven:master Sep 11, 2019
@ghost ghost deleted the LoadedProfessions branch September 12, 2019 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Riot Control Officer is born w/o batteries in his tazer and two-way radio
5 participants