Up091124 #117
Merged
Up091124 #117
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* tire changes Moved to 64x64. Added 4 directions and more variety. * updates to PR changed png name and updated yml and meta data * yml update yml update * Update junktire3.png * Update meta.json * tile additions Added road tiles and new swampland * Update floors.yml * rails fix Aligned rails to be omni directional. Should now match all sets. * adjusted milk and cream decreased size of milk and cream bottles * created new message board
* Yao Guai Bearger Commit * Second batch of recipes * Many recipes fixed - onto plants next. * Basic recipe changes have had their first pass done! Lots more food now! * BIG ASS DOWNSTREAM RECIPE MIGRATION * Done, unless there are bugs to fix. * Let's see if we're missing anything else * GOT THEM ALL TRACKED * Syntax Stomped * Peppers added to Migration entries * This commit has several fatal errors when attempting to run a server * Update cooking.yml * Update cooking.yml * Just the weird invalid mapping bug to fix? How did that even happen * Soft Taco Bug * progress on fixes * progress * Revert "Auxiliary commit to revert individual files from 0acb273" This reverts commit 3eb2dd465122c6c5f24872dbbbe84af077199dee. * fixes 2 * fix lint --------- Co-authored-by: Peptide90 <[email protected]> Co-authored-by: Peptide90 <[email protected]>
…ult-Overseers#642) * added pets.yaml, added Pets texture folder, added Shopkeepers cat * fixed id and sprite path, hopefully * Update pets.yml * meta added, PLEASE BE THE FINAL ONE * final final forrealsies this time * Update pets.yml --------- Co-authored-by: the-adom <[email protected]> Co-authored-by: Peptide90 <[email protected]>
* fix master * fix brotherhood door IDs
This fixes radios with speakers spamming ghost chat.
…r Paladins and Paladin Commanders, fixed up some loadout description issues and small fixes (Vault-Overseers#657) * updated Midwest scribe sprites, added a new non Power-armor option for Paladins and Paladin Commanders, fixed up some loadout description issues and small fixes * fixed the referencing issue for helmets, cant figure out what the other errors telling me though * webbing fix and field scribe jumpsuit for kit * loadout time req fix * fix for loadout fix --------- Co-authored-by: the-adom <[email protected]>
* actually adding a spawner for haggis * random names? if i havent missed a step here --------- Co-authored-by: the-adom <[email protected]>
* added bunk beds * added cryopods and a new fridge * trimmed yml for shelters * Update meta.json * Update meta.json * Update meta.json * adjusted for animations * removed ss14 access * commented out animations * Update shelter.yml
…t-Overseers#665) Co-authored-by: the-adom <[email protected]>
Add files via upload
fixed typo, removed some UI code though it still persists
* Update SatiateHunger.cs Food satiates hunger 15% less. * Update HungerComponent.cs Get hungry 20% faster.
This reverts commit 88db9a0.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Недельный апстрим