Upstream sync #2556
Merged
Upstream sync #2556
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
space dragon breath cursor indicator Co-authored-by: YourUsername <[email protected]>
Remove unused IoC dependencies
* partmedia ahh kommit * ahh * everything should be fine now * f * now should be good * Update Resources/Prototypes/Entities/Structures/Storage/filing_cabinets.yml Co-authored-by: slarticodefast <[email protected]> * fix suffix --------- Co-authored-by: slarticodefast <[email protected]>
* Cleanup railings * fix line * real fix
Roundstart grappling hook
added smile the slime in-hand texture Co-authored-by: YourUsername <[email protected]>
magnet rebalancing ish
* salvspawn * removed one cargo tech slot
* add jobs for ghost roles * add job to ToggleableGhostRole * typo --------- Co-authored-by: Mota <[email protected]>
boix updateaw
* meta update * real
* bagel update * fix lights
…damage (#31387) * you can now throw the space law book for 1 blunt damage * made book damage a feature of all books
…inerSystem (#30084) * Replace instances of SolutionContainerSystem with SharedSolutionContainerSystem * guap * More fixes * Wait you can do that? --------- Co-authored-by: Pieter-Jan Briers <[email protected]>
* Add special microwave board to Combat Bakery Kit * use event instead of trycomp * make the board sus * add instructions note * embarrassing typo * Add functionality to Donk Co. microwave instead * update note
* Sprites * Prototype_&_Locale * sorted_in_alphabetical_order
* Added the Commandments, Paladin, LetLive, Station Efficiency, Robocop, Overlord, Dungeon Master, Artist, Antimov and Nutimov lawsets/ * Wording * Anti-Antimov * Fixed fun
bingus
* meta update * camera * ok bro
* add snails * scuffix * migrate * mo-grate * oopsied the ftls * Revert "oopsied the ftls" This reverts commit 0d3c6c17f31ec904679d6a48799cea71e77c1f99. * the curse of staging the wrong file, resolved. * Snoth * fix my dumbs * reviews 1 * anti space technology * salt hurty * spelling * Its a slotherhouse out here * sequencing * cooked snail * volfix * speed reversal
… is radio-ed too (#31170) * feat: now when research is unlocked in console, approver of reasearch is radio-ed too * refactor: now most of events that require actor name to be radio-ed or logged use TryGetIdentityShortInfoEvent which is subscibed by id-card system and borg system (to work for both carbon and synthetic life-forms) * refactor: moved TryGetIdentityShortInfoEvent on id card system to shared, fixed cargo cent-com-originated orders * remove unused check * refactor: decoupled systems from IdCardSystem (those that are not dependent on it anymore) * refactor: removed unuseed usings * feat: emagged cargo/research consoles wont radio messages on buy/research confirm anymore --------- Co-authored-by: pa.pecherskij <[email protected]>
* Initial pH nodes, and description changes to indicate pH * Psychoactive and stimulant nodes, Medical foundation, bioreactive hint * Added medical reagents to medical node. Added norepinephric acid to acidic and made up a pH * Added pyrotechnic chem node, and corresponding hint * spelled psychedelic correctly * Fixed capitalisation skill issue * fixed indentation skill issue * fixed a further indentation skill issue * Removed extraneous whitespace * Replaced bioreactive with theraputic and psychoactive. Also fixed typo skill issue. * removed unnecessary comment * Replaced heartbreaker with THC for psychadelic * removed artifexium from acidic * added tran acid to acidic * added more medical chems * removed pH values * removed all but medical
* Red Neck Gaiter Added to SecDrobe * Removes Gaiter From TheaterDrobe
…eam-sync # Conflicts: # Resources/Prototypes/Entities/Objects/Misc/books.yml
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit a8c6210 merging into 3b788ff Resources/Textures/Objects/Weapons/Guns/Launchers/grappling_gun.rsi
Resources/Textures/Structures/Piping/disposal.rsi
Resources/Textures/Mobs/Animals/snail.rsi
Resources/Textures/Mobs/Customization/human_hair.rsi
Resources/Textures/Mobs/Pets/smile.rsi
Resources/Textures/Objects/Consumable/Food/bowl.rsi
Resources/Textures/Objects/Consumable/Food/meat.rsi
|
lzk228
pushed a commit
that referenced
this pull request
Sep 3, 2024
Co-authored-by: lapatison <[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
Медиа
Проверки
Изменения