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

4-17-2020 #1

Merged
merged 71 commits into from
Apr 18, 2020
Merged

4-17-2020 #1

merged 71 commits into from
Apr 18, 2020

Conversation

Drewscriver
Copy link
Owner

Summary

SUMMARY: Infrastructure "Bring it up to date."

Purpose of change

Don't work on out-of-date code

Describe the solution

Bring my repository up to date

Describe alternatives you've considered

Making a new branch every time

Testing

It wouldn't have been committed if it didn't work, right?

Additional context

Trying things

Competently-Incompetent and others added 30 commits April 5, 2020 18:38
Military pilot added to the overrun and helicopter crash scenarios
Added leg ammo pouch and an additional magazine
This might make the trait work?
Co-Authored-By: anothersimulacrum <anothersimulacrum@gmail.com>
Co-Authored-By: anothersimulacrum <anothersimulacrum@gmail.com>
Co-Authored-By: anothersimulacrum <anothersimulacrum@gmail.com>
Co-Authored-By: anothersimulacrum <anothersimulacrum@gmail.com>
Hopefully this will pass the test
Co-Authored-By: Anton Burmistrov <Night_Pryanik@mail.ru>
got rid of full stop
ralreegorganon and others added 29 commits April 16, 2020 19:59
Remove WAIST tag from utility vest
Add documentation on interface accessibility
Use correct sh syntax for string comparison
Fix items spawning with fewer charges than defined in their item group entry
* Created json-variants of above-ground and underground sections of cave location and made it spawn

* Removed hardcoded cave mapgen
* Colorize butchering tool info

* Match quality color
Remove table buff/debuff for medicine
Build and use json_formatter in Visual Studio
Adds post apoc prices to corpses, generic, and gunmods. (part 10 of reworking all prices)
Adds post apoc prices to magazines. (part 11 of reworking all prices)
Adds post apoc prices to resources. (part 12 of reworking all prices)
Adds post apoc prices to tools. (part 13 of reworking all prices)
Add prices to vehicle parts. (part 14 of reworking all prices)
Adds prices to unsorted json. (part 15 of reworking all prices)
Fix display of item info in crafting UI
Update docs for the new activty actor system
Remove modularvest items
@Drewscriver Drewscriver merged commit 1bbfd5d into Drewscriver:master Apr 18, 2020
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.