Upstream sync #2446
Merged
Upstream sync #2446
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
In loving memory of Harambe May 27, 1999 – May 28, 2016
Co-authored-by: plykiya <[email protected]>
Stops walls from connecting to foam Co-authored-by: 3nderall <[email protected]>
* Improve PR template * fix typo
…y syringe buff/fix (#29825) * Make delay incurred by transfer amount modifiable * No unintentional negative delay please * Use more fixedpoint, hope I didn't break anything * merge review suggestion Co-authored-by: ShadowCommander <[email protected]> --------- Co-authored-by: ShadowCommander <[email protected]>
* Update word_replacements.yml * Update speech-chatsan.ftl
Fix replayghost spawn
* Added fixedpoint 4, which is basically just fixedpoint2 but with 4 points of precision and using a long instead of an int to store values.
* Adds the Volume of a Gas Tank to its Examine Text * Put Volume in description * Put Volume in description * work please? * Hit space bar
* Fix Freezing on throwing jetpack * bweep(requested stuff)
* vox sprites minor updates * the tax * kid named paper sack
Co-authored-by: plykiya <[email protected]>
* telescreen and television require vision * Move Content.Server.Eye to Shared * fix popups * Filthy
* wrong magazine * a single typo * removed GunSystem solution * magazine misfit warnings
* Syndie borg can now wield DEsword * Made child of EnergySwordDouble for borgs * Made ESword borg module use this new borg DESword * Removed name property of CyborgDESword so that it now inherits from DESword and added a suffix to differentiate the two in spawn menu
* Lowercase some prototypes names * huh * return altar * apply * meta map
* split logic into own system * add support for different size displacement maps * some clothes may not use displacement maps * displacement maps spport hand sprites * Update DisplacementMapSystem.cs * rename things * fuck stencilmask * fix bugs * no masks * Update jumpsuits.yml * fix species specific sprites * Update ClothingSystem.cs * shoes + ears displacement, some bugfix * Update DisplacementMapSystem.cs
…s (#30299) borg law 2 state laws all day
* add flash bounty * escape --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
modified: Resources/Locale/en-US/speech/speech-chatsan.ftl modified: Resources/Prototypes/Accents/word_replacements.yml
* Add PR guidelines checkbox to PR template * Update PULL_REQUEST_TEMPLATE.md
…504) * Adjusts the Bingus steal target to include any of the named cats * Change name of target group --------- Co-authored-by: Velcroboy <[email protected]>
* Add percentage reading to chargers * using args.pushgroup * change message * Update Content.Server/Power/EntitySystems/ChargerSystem.cs --------- Co-authored-by: plykiya <[email protected]> Co-authored-by: metalgearsloth <[email protected]>
remove duplicate cartridge rsi
* commit used for the recording, mostly copypaste * Remove recording artifacts, now contains content * use switch expression instead of switch statement Also `ExpectedDoAfter` to fail when doafter isn't raised
* Deploy foldable * Add NetworkedComponent and access to the component * Add handled to afterinteract * Use drop target location instead of setcoordinates * Put back in hand after failed deploy This prevents dropping the bed when clicking while inside a locker. * Created BaseDeployFoldable for folding chairs, body bags, and rollerbeds
* allow ai to understand if its handcuffed. * rerun tests they worky on local * Contained here in, a string of expletives about flaky tests. * on retrospect, default true is probably smorter. * do reviews * I forgor xml * more xml
Update AdminVerbSystem.cs
* Add fill level sprite support for equipped items * Add fill sprites for held/equipped spears
* apc touchup * darker borders ofjdsa fjoias
* Remove obsolete code from Food, Drink and Respirator systems * remove obsolete comment
…eam-sync # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # .github/labeler.yml # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml # Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Recipes/Lathes/medical.yml # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json # Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png # Resources/Textures/Structures/Power/apc.rsi/base.png # Resources/Textures/Structures/Power/apc.rsi/broken.png # Resources/Textures/Structures/Power/apc.rsi/display-charging.png # Resources/Textures/Structures/Power/apc.rsi/display-full.png # Resources/Textures/Structures/Power/apc.rsi/display-lack.png # Resources/Textures/Structures/Power/apc.rsi/display-remote.png # Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png # Resources/Textures/Structures/Power/apc.rsi/frame.png # Resources/Textures/Structures/Power/apc.rsi/static.png
github-actions
bot
added
Status: Needs Review
lzk228
added a commit
that referenced
this pull request
Aug 3, 2024
Co-authored-by: NotSoDamn <[email protected]> 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
Медиа
Проверки
Изменения