Upstream sync #512
Merged
Upstream sync #512
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
* add * invalid
* Add logs to things * Make the message log be saved as msg because I forgor before. * Log fails when getting an entity that doesn't exist --------- Co-authored-by: ShadowCommander <[email protected]>
* More solution edit windows * Fix error when closing euis after round restart --------- Co-authored-by: ShadowCommander <[email protected]>
Fix arrivals not working on spinning stations Increases the tolerance to .15 instead of .1
* me * change
* Infection chance * Infection Damage
added crew cut 2 wew
The exact time when the Nuke Music starts is now derived from the music's duration
* Fix rounds restarting in the next round Doesn't fix them restarting in lobby I think but should fix most of it. * delta india sierra charlie oscar romeo delta
* Changed Projectile Sprite to Shard * Removed Notes on Recipe * Made Recipe * Added a space * Update improvised.yml * Update shotgun.yml * Removed Note * Reduced needed matches from 8->6 * Update improvised_shotgun_shell.yml * Matchbox fix didn't work * Reduced glass needed from 5-4 * Added backspace * Update Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml --------- Co-authored-by: metalgearsloth <[email protected]>
Removes the Trash tag
* created and added CarpetSBlue tag * reverting unnecessary de-indentation * Update carpets.yml
added target!=user check
* Add fancy table spawner * fix icon --------- Co-authored-by: Jeff <[email protected]>
* Attempt at a more noticably whispered bubble * Better implementation
* fix bomb activation when eaten * no swap / no eject * activate when sliced
Adds Senior role drip to the Uniform Printer.
* More fax logging * Update Content.Server/Fax/FaxSystem.cs Also logging if no author for some reason Co-authored-by: Chief-Engineer <[email protected]> * Update Content.Server/Fax/FaxSystem.cs * Update Content.Server/Fax/FaxSystem.cs * Update Content.Server/Fax/FaxSystem.cs * Update Content.Server/Fax/FaxSystem.cs --------- Co-authored-by: Chief-Engineer <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
* Added Grey Matter * Update diona.yml * Update human.yml * Update slime.yml * Update flavors.yml * Update biological.yml * Update physical-desc.ftl * Update biological.ftl * Make Slime Brain Grindable * Slime Organs Grind into Slime * Update flavor-profiles.ftl * Added Brain to Blacklist
Syringe delay based on amount in syringe Co-authored-by: Plykiya <[email protected]>
* Changed names of uplink categories and swapped around items * sloth feedback
* Add toggle verb for injector transfer amount * Fix injector verb priority scalability --------- Co-authored-by: veprolet <>
* inital * b * Update MeleeWeaponComponent.cs * Update Content.Shared/Zombies/ZombieComponent.cs --------- Co-authored-by: metalgearsloth <[email protected]>
* Fix butcherable handling * ItemSlots for clown shoes * Return if handled * Handle if popup * Whitespace, spoons are metal * Zero damage plastic utensils, blacklist by metal+melee * Hmmm truthy * Plastic knives are knives too, just use that * Delete unused tag * Always true if doAfter * Raw rat meat should be sliceable too
* Contraband Storage Crate * Better description * Better Communication of Purpose * Update Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml --------- Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: Jeff <[email protected]>
foxes became neutral
lawyer stamp
fix vox specific sprites
* Update fireaxe_cabinet.yml * added min(75) and max (100) dmg threshold 100 dmg destroys the axe as well. * made the cabinet tougher
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.
No description provided.