upstream merge #1598
Merged
upstream merge #1598
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
Wanted to package a server for the funny on my macbook and noticed it was not working cause of this... now it will workie :3
* Buckling an entity requires a do-after * Works but feels like bad code? * Cleanup --------- Co-authored-by: plykiya <[email protected]>
* add * comma * sprites * yaml-ify * add s * lathe and engi belt * yes * fix maybe * progress * nearly there * fix * fix yaml linter having a stroke
* Crowbars fix * oops
Revert "Make hotplate and grill anchorable on table part 2 (#29454)" This reverts commit 268cab9.
* Entity table code * entity table examples * fix dat shit * access * tests tests tests * sloth review
8 pipe throw damage
…eviathan-use channel (#30851) cant test this because the documentation sucks ass but fuck it we ball
Update regalrat.yml
* Added jumpskirt * added locale * Added spaces in code * Updated the meta
Chaplain fixy
Infer type for EntSelector.cs
* add * reduce contrast
* Cursed Mask * extra expressions * block ingestion * mind returning * okay fix the removal shit
* Fix some locales * forgor
kneecaps links while we're at it
Update figurines.ftl
Reordered MeleeCombatCompound to improve unpulling
…#29133) make the sentient plant mutation not propagate by clipping, using the seed extractor or cryoxadone
…aviors. (#30362) * I should be studying for school but that is sofucking boring, I will pass my class no matter, however getting an A might be a challenge. My gpa is important but is the tourture for 1 point of GPA worth it? The american government says yes but they are responsible for the majority of all genocides that have ever been conducted since the dawn of man * ugh * ugh
* adds a throngler plushie, and adds it to the grand lotto * this was supposed to be in the initial commit but I apparently forgot to save so anyway here it is * make throngler plushie more rare how about I split the difference: original throngler: 0.0001 other plushies: 0.01 thongler plushie: 0.0005 * removed inheritied soundhit
github-actions
bot
added
S: Needs Review
Changes: YML
|
RSI Diff Bot; head commit aecc1f1 merging into ab3c0f3 Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
Resources/Textures/Clothing/Head/Bandanas/botany.rsi
Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi
Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi
Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi
Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi
Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi
Resources/Textures/Clothing/Head/Hardsuits/cybersun.rsi
Resources/Textures/Clothing/Head/Bandanas/black.rsi
Resources/Textures/Clothing/Head/Bandanas/blue.rsi
Resources/Textures/Clothing/Head/Bandanas/brown.rsi
Resources/Textures/Clothing/Head/Bandanas/gold.rsi
Resources/Textures/Clothing/Head/Bandanas/green.rsi
Resources/Textures/Clothing/Head/Bandanas/grey.rsi
Resources/Textures/Clothing/Head/Bandanas/merc.rsi
Resources/Textures/Clothing/Head/Bandanas/red.rsi
Resources/Textures/Clothing/Head/Bandanas/skull.rsi
Resources/Textures/Clothing/Head/Hardsuits/clown.rsi
|
* non-displacement-mappable vox sprites part 2 * fixes * more fixes * a * more para sprites + ntrsa voidhelm * no more clown...
* adds a bunch of vox clothing sprites * bird up * bee mask * fix test fails. i hope. this better be the only damn one * fix "eqipped" * A. * outerclohting * ??? --------- Co-authored-by: metalgearsloth <[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.
About the PR
mostly for burger ops
fake test fails hopefully fixed by now
Technical details
Media
🇺🇸
Changelog
🆑