Upstream sync #2047
Merged
Upstream sync #2047
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
github-actions
bot
added
Status: Needs Review
|
Судя по многому, лучше не мержить, пока оффы многие баги лоадаутов не пофиксят |
|
основные баги пофикшены, можно мёржить |
|
Чёта update locale как-то слабо прошёл. ФТЛок мало |
* Hide some map related logs from clients * #if !DEBUG * Fix typo
fixed-ops Im sure there is a more elegant way of fixing this, but this way requires no code changes. So I guess it works.
* fixes it * Snout fix * Partway commit * Partway commit * Update masks and helmets to use the new system
* add dirty calls to mask system * among --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
stunprod
* YAML Linter now validates invalid fields in server-only and client-only components * Update to change in engine PR * Use reflection manager to get the lists of client/server assemblies. Also made it use a hashset on type instead of the previous code. * I'm dumb my bad. * Fix 2 errors that snuck through, showing why we need this. --------- Co-authored-by: Pieter-Jan Briers <[email protected]>
* add fuel costs back to welding * ack * meh * eek!
…list (#26878) Reduced Pneumatic Cannon inventory space by 75%, removed cannon whitelist.
add song to jukebox for funsies!
deleted bartender's incend
# made the waistband position consistent when rotating
* Cane + Cane Blade * Add - type: ContainerContainer * Add another - type: ContainerContainer * Fix and add proper ContainerContainer component * Add UserInterface component * Remove Space * Stat Changes * review --------- Co-authored-by: metalgearsloth <[email protected]>
…eam-sync # Conflicts: # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Entities/Clothing/Hands/specific.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
Add tooltips to indicate why "Extract" button is disabled. Co-authored-by: Eoin Mcloughlin <[email protected]>
* vox oxygen toxicity and related stuff * Review --------- Co-authored-by: metalgearsloth <[email protected]>
* Update miscellaneous.yml * Update mobspawn.yml * Update miscellaneous.yml * Update miscellaneous.yml
… (#26178) * Printable Empty Magazines * Adjust values of ammo boxes, adjust material costs, add empty lethal/non-lethal mags, swap secfab shotgun shells with shotgun ammo boxes, add recipe for shotgun ammo boxes * Adds fully loaded pistol mags at secfab, removes printing respective cartridges at secfab * Adds fully loaded rifle mags at secfab, removes respective cartridges * Adds fully loaded light rifle mags at secfab, removes respective cartridges from secfab * Adds fully loaded speedloader to secfab, removes respective cartridges from secfab * small id mismatch fix * another wrong ID fix * capitalize Ls in speedloader * Add missing SpeedLoader recipe * Adds fully loaded shotgun drums to secfab, removes respective shells from secfab * add rifle ammo unlocks back in, forgot ammo unlocks affect other fabs as well * Moves tranquilizer shells to the non-lethal ammunition research * Account for the removal of rubbers, adds in craftable disablers * rubber rounds don't exist, remove empty non-lethal mags to just have empty mags * Add in WT550 mags * Convert latheRecipes to use LayeredTextureRect instead of TextureRect * Fix for issue, texture layering now works * Add in missing shell uranium box art * add shelluranium to meta.json * Fix yml issue * Get rid of unused single ammo printing unlocks --------- Co-authored-by: Plykiya <[email protected]>
* Update cane UI key * none of the pr passed ci yippee * weh
* Add a handy security radio I've always wanted to have a handy security radio in game and I thought it would be cool to have one in game. Demonstation can be found in here: https://youtu.be/VQOLiTQAmKc * Merged radio files and changed sprite location * Fixed RSI not having license and copyright * Added a chance to spawn in security closets All security closets will have 50% chance to spawn a handy security radio in it * Update radio id Co-authored-by: lzk <[email protected]> * Change id in locker spawn * Change id in locker spawn * Changed id to RadioHandheldSecurity as suggested * Add radio to vending machine instead of locker Removed radio from lockers and added it to security vending machine * Fixed radio not having a sprite --------- Co-authored-by: lzk <[email protected]>
Morb0
pushed a commit
that referenced
this pull request
Apr 30, 2024
Co-authored-by: lzk <[email protected]>
4 tasks
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
Медиа
Проверки
Изменения