Upstream sync #1824
Merged
Upstream sync #1824
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
- poison chemicals (HealthChange effect) - being on fire - guardians transferring damage to owner
People are using these as unhackable and hard-to-tailgate airlocks into sec. They should not be trivial for security officers to move through. Made LockComponent have configurable lock times to implement this.
- Fix datafield spelling - Fix some code oddities
Co-authored-by: PJBot <[email protected]>
* Add cowboy hats and boots * oops * audio fix and attribution
* fixed syndicite bombs being unpurchasable * removed previous attempt * added restock condition to listing's equal method * reverted id change
* Update game_presets.yml * Create preset-allatonce.ftl * Update game_presets.yml * Update game_presets.yml the game rule has been removed: - pirates * Update game_presets.yml Pascal case/Camel case fix * Update preset-allatonce.ftl Camel case fix
Co-authored-by: Gwen <>
Co-authored-by: deltanedas <@deltanedas:kde.org>
* add clothing equip/unequip doafters * boowomp
* Lower speech noise sounds & refactor system christ fuck * MORE
* Fix eris style hand slot sprites * rename meta to meta.json
nomoresentientmeat
…ad (#24077) * Add a modifier event for GunComponent values * Add docs * Add VV readwrite to modified values * Add more docs * More docs * Add Gun parameter to GunRefreshModifiersEvent * Add another event for handling cartridge spread * Fix pneumatic speed
* BatteryWeaponFireModes refactor Made the code a bit better but still needs integrating into attachments. * murder * Fix serialization * weh * weh
…… (#24679) * Revert "Make flare gun explode, damage and stun the player when used with the wrong ammo (#22349)" This reverts commit e301378. # Conflicts: # Content.Shared/Weapons/Ranged/Components/GunComponent.cs # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml * Fix revert conflicts * Update Content.Shared/Weapons/Ranged/Components/GunComponent.cs
- Remove unnecessary mapcoordinates get. - Remove mapping markers as everything should be ingame entities and this is functioning as an area.
* content * d * fix artifact
Health analyzers and cryopods also show temperature in kelvin
Stop bandaiding problems
* Delete Resources/Maps/gemini.yml * Delete Resources/Prototypes/Maps/gemini.yml * Update default.yml * Update PostMapInitTest.cs * Update MapLoadBenchmark.cs
* add every * remove 2 crusher spawns
follow tag + norot
* Split changelog entries for discord Not sure where best to split it, by entry in group or by author. * Formatting
* Implement text splitting for discord CL Should bandaid it enough for now. * More docs * Minor fix * Also this field * you
Until publish runs work.
Revert "Comment out discord CL (#24734)" This reverts commit 117399d.
* new sounds * fix * fix sound * some tweak
Fix improper prediction on unpryable doors. Entities that had CanPry to false on their components would get improperly predicted as pryable on the client because the check was only preformed on the server. Same problem existed for welded doors. Moved the check from server to shared.
# Conflicts: # Resources/Audio/Weapons/Guns/Gunshots/attributions.yml # Resources/Prototypes/Maps/aspid.yml # Resources/Prototypes/Maps/gemini.yml # Resources/Prototypes/Roles/Jobs/Civilian/detective.yml # Tools/actions_changelogs_since_last_run.py
github-actions
bot
added
Changes: Localization
|
RSI Diff Bot; head commit 5ca19e1 merging into f456aaf Resources/Textures/Objects/Specific/Chemistry/jug.rsi
Resources/Textures/Objects/Specific/Chemistry/syringe.rsi
Resources/Textures/Clothing/Head/Hats/cowboyhatblack.rsi
Resources/Textures/Clothing/Head/Hats/cowboyhatbountyhunter.rsi
Resources/Textures/Clothing/Head/Hats/cowboyhatbrown.rsi
Resources/Textures/Clothing/Head/Hats/cowboyhatgrey.rsi
Resources/Textures/Clothing/Head/Hats/cowboyhatred.rsi
Resources/Textures/Clothing/Head/Hats/cowboyhatwhite.rsi
Resources/Textures/Clothing/Head/Misc/waterdroplet.rsi
Resources/Textures/Clothing/Shoes/Boots/cowboybootsblack.rsi
Resources/Textures/Clothing/Shoes/Boots/cowboybootsbrown.rsi
Resources/Textures/Clothing/Shoes/Boots/cowboybootsfancy.rsi
Resources/Textures/Clothing/Shoes/Boots/cowboybootswhite.rsi
Resources/Textures/Objects/Consumable/Drinks/waterbottle.rsi
Resources/Textures/Objects/Specific/Chemistry/beaker.rsi
Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi
Resources/Textures/Objects/Specific/Chemistry/dropper.rsi
Resources/Textures/Objects/Specific/Chemistry/vial.rsi
|
Morb0
pushed a commit
that referenced
this pull request
Feb 1, 2024
Co-authored-by: lzk <[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
Медиа
Проверки
Изменения