july_23_upstream_merge #78
Merged
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
* Adds Advanced ointment and bruisepack recipes * Changes the sprites to the ones from /tg * Changed names and sprites, slight tweaks * Formatting * Solve Conflict * Formatting * Fix issues found in check * Fix Oopsie
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Adds Bike Horn Implants * Formatting * Formatting * Revert "Formatting" Did an Oopsie This reverts commit 62d5d87f2de59fbddf1c31db3668b174727eff0a. * Revert last push * Revert "Revert last push again!" This reverts commit f12a0f597cace7fb47454762223468c597796d8d.
Co-authored-by: Jeff <[email protected]>
* Update masks.yml * Update masks.yml
Co-authored-by: deltanedas <@deltanedas:kde.org>
* Update jumpsuits.yml * comit puro loh * Update syndiedrobe.yml
* sprite * author fix * code
Co-authored-by: metalgearsloth <[email protected]>
* Update of Terminal * Terminal Update * Update of Terminal
Co-authored-by: Moony <[email protected]>
* add cap cap * locker'd
* gas tank size tweaks * gas_tanks cleanup * gas_tanks cleanup * gas_tanks cleanup * gas tank supply time comment * gas tank cleanup * gas tank cleanup comments * gas tank cleanup * gas tank cleanup
Co-authored-by: deltanedas <@deltanedas:kde.org>
…merge # Conflicts: # Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml # Content.Client/Configurable/UI/ConfigurationMenu.cs # Content.Client/PDA/PdaNavigationButton.xaml.cs # Content.Client/Shuttles/UI/RadarControl.cs # Content.Client/UserInterface/Systems/Chat/Controls/ChannelFilterButton.cs # Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs # Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs # Content.IntegrationTests/Tests/CargoTest.cs # Content.Server/Cargo/Systems/CargoSystem.Orders.cs # Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs # Content.Server/Cargo/Systems/CargoSystem.Telepad.cs # Content.Server/Fluids/EntitySystems/DrainSystem.cs # Content.Server/Salvage/SalvageSystem.Expeditions.cs # Content.Server/Salvage/SpawnSalvageMissionJob.cs # Content.Server/VendingMachines/VendingMachineSystem.cs # Content.Shared/Cargo/Components/SharedCargoTelepadComponent.cs # Content.Shared/Construction/Conditions/NoWindowsInTile.cs # Content.Shared/Doors/Systems/SharedDoorSystem.cs # Content.Shared/Fluids/Components/DrainComponent.cs # Content.Shared/Nutrition/AnimalHusbandry/InfantComponent.cs # Resources/Changelog/Changelog.yml # Resources/ConfigPresets/Build/development.toml # Resources/Locale/en-US/prototypes/catalog/cargo/cargo-vending.ftl # Resources/Locale/en-US/prototypes/catalog/fills/crates/vending-crates.ftl # Resources/Maps/Dungeon/lava_brig.yml # Resources/Prototypes/Catalog/Cargo/cargo_armory.yml # Resources/Prototypes/Catalog/Cargo/cargo_security.yml # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml # Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml # Resources/Prototypes/Entities/Mobs/NPCs/animals.yml # Resources/Prototypes/Maps/Pools/default.yml # Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml # Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml # Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml # Resources/Prototypes/Roles/Jobs/Medical/chemist.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml # Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml # Resources/Prototypes/Roles/Jobs/Science/scientist.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/XenoArch/Effects/normal_effects.yml # Resources/Prototypes/tags.yml # Resources/ServerInfo/Rules.txt
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.
About the PR
matches us to upstream july 23 2023