Up16112024 #121
Merged
Up16112024 #121
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
…g textures, adding some outer clothing options (Vault-Overseers#668)
* initial push * rolling back file * fix for radios * Update radio.yml * removing * removing more radio to commit on another branch * Update RadioSpeakerComponent.cs * more adjustments * Update radio.yml * Update radio.yml * Update radio.yml
* First Commit * Fix Playtime Tracker, adjust armor stats again
* added some magazine related items and a nuke silo * added Magazine to the tags yml * added magazines
* Recipes, cutlets, and reagents updated * WEIRD bugs coming up now. * Feature complete, creating PR for easier review/testing * Kebabs removed * McRib fix. I wish YAML showed multiple errors but that's life * Did you know we just didn't have our own popcorn entity? My bad. * Bun fixed * Human burger out * Weedbutter fix * Missing entity fixed * Now we're making real headway. * Bacon tweak * Pizza problem * Ready to roll - pizza problem deferred * Finished & Migration check is good! * Minor nutrient tweak for fun * Some tweaks have been made * If this doesn't work someone else has to help me fix it. Deal? Deal
* making WBoS numbers in line with MBoS * Revert "making WBoS numbers in line with MBoS" This reverts commit 86924de. * WBoS role-slot fix * commander 20 hours --------- Co-authored-by: the-adom <[email protected]>
* Add files via upload * radio station edits and additions * removed unnecessary code block was an artifact of previous coding trial * Update RadioSpeakerComponent.cs * Update RadioDeviceSystem.cs removed unneeded code block as requested by notafet * Update Content.Server/Radio/Components/RadioSpeakerComponent.cs Co-authored-by: Partmedia <[email protected]> * Update Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/radio.yml Co-authored-by: Partmedia <[email protected]> * removed nuclear 14 comments * Mic adjustments and FTL string for PBS channel * changed sprite names to reflect states better, attempt at power lights, not working --------- Co-authored-by: Partmedia <[email protected]>
Vault-Overseers#678) * moved draw depth of new sprites to overmob, bumped offset for mic and onair sign * Update beds.yml
* Add files via upload * Add files via upload
* Update overseer.yml * Update vaultdoctor.yml * Update vaultdweller.yml * Update vaultengineer.yml * Update vaultsecurity.yml * Update overseer.yml * Update vaultdoctor.yml * Update vaultdweller.yml * Update vaultsecurity.yml * Update vaultengineer.yml * Update overseer.yml drastic measures. Directly under requirements. * Update vaultdoctor.yml * Update vaultdweller.yml * Update vaultengineer.yml * Update vaultsecurity.yml * Update vaultsecurity.yml * Update vaultdoctor.yml * Update vaultsecurity.yml * Update vaultengineer.yml * Update overseer.yml * Update vaultdweller.yml * Update vaultsecurity.yml * Update overseer.yml * Update vaultengineer.yml
* fix master * update patrons * remove door migrations
* Recipes, cutlets, and reagents updated * WEIRD bugs coming up now. * Feature complete, creating PR for easier review/testing * Kebabs removed * McRib fix. I wish YAML showed multiple errors but that's life * Did you know we just didn't have our own popcorn entity? My bad. * Bun fixed * Human burger out * Weedbutter fix * Missing entity fixed * Now we're making real headway. * Bacon tweak * Pizza problem * Ready to roll - pizza problem deferred * Finished & Migration check is good! * Minor nutrient tweak for fun * Some tweaks have been made * If this doesn't work someone else has to help me fix it. Deal? Deal * Fixed bun error, burgers work again --------- Co-authored-by: Peptide90 <[email protected]>
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.
Апстрим