Upstream sync #704
Merged
Upstream sync #704
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
* Syndicate thief, spy, medic * Fixes description for nukies * update description for uplink * Implement the radial menu * forgot these were necessary to push lol --------- Co-authored-by: plykiya <[email protected]>
* Prevent Dragon Body from Despawning + Make Dragon Unrevivable * Requested changes * Meh, nobody wanted this anyways and it was not really an issue
* fix microwave construction * retry
* goofed up * wip, mostly test sprites * Nearly done, just need to fix storage locks * everything done to my knowledge * Alright, construction tested and working, and updated health spread * remove a single comment I forgot. Pending sprite changes. * Update sprites and add chemistry locked preset * Forgot to remove a comment
vital bugfix
* Update water.yml Water should put out the fire. That's why now the water tiles are extinguishing you. * Update water.yml
Basic implementation.
My lawyer told me to do this Co-authored-by: plykiya <[email protected]>
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
* Added all the parts to implement spicy rock pizza * Added sprites for pizza * Fixed coma formatting in meta.json for pizzas * Fix formatting and rebalance reagent quantities in pizza.yml * Flipped Uranium and Radium values to be the correct ratio * Updated meta.json file to have credit for sprite
split traits into disabilities and quirks
* Get needhand from yml * MovementThreshold modifiable + inheritdoc
replace tiny fans fix #29482
fans external airlocks one escape pod more airlocks in arrivals
replace tiny fans in fridge
replace tiny fans with directional connect missed external airlocks
* Update Box replace missed tiny fans with directional * add two more security hardsuits
* Update Atlas connect missed atmos devices (part of #29025) replace fans in fridge * remove invalid
* perma escape crate fills and spawner * also include maints closets because thats easy. * oopsie daisys * green glowsticks * mindshield * base folder * mob traps. * I skill issued a ctrl+F and wrote garabge into yml * re work syndicate gift crate, remove ability to get syndicate guns randomly. * Do mob traps differently to hopefully appease tests. * mindshield probability decrease. * lower mob chance since I forgor there are crabs in the walls * Suffixes * mob chance was definitely too low. * still too low * still a bit low * that feels right. * too many mk's * increase hatchet chance since you need a cutting impliment to logs. * alphabetize
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit fa580a0 merging into 99a7804 Resources/Textures/Clothing/Shoes/color.rsi
Resources/Textures/Clothing/Head/Hats/cardborg_h.rsi
Resources/Textures/Clothing/Head/Hats/papersack.rsi
Resources/Textures/Clothing/Head/Hats/santahat.rsi
Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi
Resources/Textures/Clothing/Head/Hoods/rad.rsi
Resources/Textures/Clothing/Head/Misc/pumpkin.rsi
Resources/Textures/Clothing/Head/Misc/skubhead.rsi
Resources/Textures/Mobs/Species/Human/displacement.rsi
Resources/Textures/Mobs/Species/Vox/displacement.rsi
Resources/Textures/Objects/Consumable/Food/Baked/pizza.rsi
Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi
Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi
Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi
Resources/Textures/Structures/Storage/Shelfs/glass.rsi
Resources/Textures/Structures/Storage/Shelfs/metal.rsi
Resources/Textures/Structures/Storage/Shelfs/wood.rsi
|
|
Трусы в порядке и отрисовываются нормально |
KayzelW
approved these changes
Jul 25, 2024
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.
No description provided.