Upstream #32
Merged
Upstream #32
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
* Spider poison * No more double damage * add toxin regeneration --------- Co-authored-by: Slava0135 <[email protected]>
* Ensure actions are predicted * Fix test fail
* Implementation * Reviews
* Kettle map upload * Kettle map proto upload
…at ignores all armor. (#20836)
* seperates the anchored and unachored versions of the gyro and thruster with a suffix. * add station suffix for station pinpointer * more suffixes for briefcases
Co-authored-by: gus <[email protected]>
* Initial commit * Balancing and tweaks
* add sprites * fix copyright * update sprites
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
# Conflicts: # Content.Client/Administration/UI/AdminMenuWindow.xaml # Content.Client/Administration/UI/AdminMenuWindow.xaml.cs # Content.Client/Changelog/ChangelogManager.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/Communications/CommunicationsConsoleSystem.cs # README.md # Resources/Credits/Patrons.yml # Resources/Locale/en-US/administration/ui/admin-menu-window.ftl # Resources/Prototypes/Body/Parts/diona.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/tankdispenser.yml # Resources/Prototypes/Entities/Mobs/NPCs/animals.yml # Resources/Prototypes/Entities/Mobs/Species/diona.yml # Resources/Prototypes/Entities/Mobs/Species/reptilian.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Entities/Structures/Power/chargers.yml # Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml # Resources/Prototypes/Voice/disease_emotes.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-left.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/inhand-right.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/librarian.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json
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.
Обновление