Upstream sync #1743
Merged
Upstream sync #1743
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
Remove reference to tritium creation + fix typo
Added recipe OilBreakdown
* Use default panic bunker message on Lizard * use default panic bunker message on Leviathan
Revert "Electric anomaly rework (#23173)" This reverts commit 05ee6eb.
* add * yes --------- Co-authored-by: metalgearsloth <[email protected]>
Revert "Revert "Electric anomaly rework" (#23546)" This reverts commit 9acbe38.
* add tesla dissapear mechanic add field holobarrier * add PD * add crafting * spacing * added to cargo * Fix * resprite + damageable * oopsie * Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml Co-authored-by: Kara <[email protected]> * Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml Co-authored-by: Kara <[email protected]> * Update Resources/Locale/en-US/research/technologies.ftl Co-authored-by: Kara <[email protected]> --------- Co-authored-by: Kara <[email protected]>
ports the derelict sign decal
hamlet after you won't let them eat a stack of uranium ore
* beacon text * command beacon color * pa * weh
…23298) * Allows a possibility for a new reagant to work on dead if applied. To use it, go to Resources\Prototypes\Reagents\medicine.yml and add worksOnTheDead: true to any reagent. * Update Content.Shared/Chemistry/Reagent/ReagentPrototype.cs Co-authored-by: Nemanja <[email protected]> * Update Content.Server/Body/Systems/MetabolizerSystem.cs Co-authored-by: Nemanja <[email protected]> --------- Co-authored-by: Nemanja <[email protected]>
NetSyncEnabled fixes
* flatpacker nerf * stuff
…es (#21333) added reparent bool for this kinds of unequips Co-authored-by: Yurii Kis <[email protected]>
* Fix atmos UI inconsistent culture usage * Remove the need to pass localization manager
* Update spacetick.yml * Update carp.yml
* omega beacons * beacon layout omega * border beacons * weh
* add * delete old image
your PR will be my beginning of a maintainer journey
Diagnostic Hud can see health silicon
…(#23577) * initial commit * rewrote code to early return to reduce nesting * added VV to Capacity field of MicrowaveComponent
…intlock resprite and rebalance) (#23408) * tally ho * yarg * forgot some shit * Update projectiles.yml * fucl * glass ball * Update snipers.yml --------- Co-authored-by: Ed <[email protected]>
* set stamina damage to 25, attack speed to 1.4, remove jank "jank" is me artificially setting the stamina damage lower so it accounts for blunt damage, now the gloves are pure stamina damage with no blunt conversion * bump the price to 6 for passengers and 4 for boxers
* fix mice eating * actually just ignore utensils
* locale * tweaks
# Conflicts: # .github/workflows/publish.yml # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Maps/barratry.yml # Resources/ServerInfo/Gameplay.txt # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml # Resources/Textures/Clothing/Mask/bat.rsi/meta.json # Resources/Textures/Clothing/Mask/bear.rsi/meta.json # Resources/Textures/Clothing/Mask/bee.rsi/meta.json # Resources/Textures/Clothing/Mask/breath.rsi/meta.json # Resources/Textures/Clothing/Mask/clown.rsi/meta.json # Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json # Resources/Textures/Clothing/Mask/ert.rsi/meta.json # Resources/Textures/Clothing/Mask/fox.rsi/meta.json # Resources/Textures/Clothing/Mask/gas.rsi/meta.json # Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json # Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json # Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json # Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json # Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json # Resources/Textures/Clothing/Mask/jackal.rsi/meta.json # Resources/Textures/Clothing/Mask/joy.rsi/meta.json # Resources/Textures/Clothing/Mask/medical.rsi/meta.json # Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json # Resources/Textures/Clothing/Mask/merc.rsi/meta.json # Resources/Textures/Clothing/Mask/mime.rsi/meta.json # Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json # Resources/Textures/Clothing/Mask/rat.rsi/meta.json # Resources/Textures/Clothing/Mask/raven.rsi/meta.json # Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json # Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json # Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json # Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json # Resources/Textures/Clothing/Mask/squadron.rsi/meta.json # Resources/Textures/Clothing/Mask/sterile.rsi/meta.json # Resources/Textures/Clothing/Mask/swat.rsi/meta.json
github-actions
bot
added
Status: Needs Review
Morb0
pushed a commit
that referenced
this pull request
Jan 14, 2024
Co-authored-by: faint <[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.
Описание PR
Медиа
Проверки
Изменения