Upstream sync #1484
Merged
Upstream sync #1484
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
Co-authored-by: Ray <[email protected]> Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
This reverts commit 5aa7b01.
* Origin Station Update 22.09.2023 (remove mines, add smile slime, fix telecoms) * ore boxes in salv, fixed hv power teg * name substations and smes
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: deltanedas <@deltanedas:kde.org>
* add ship * update * update * update again :3
Make Ninja more stable in terms of design
Co-authored-by: coolmankid12345 <[email protected]> Co-authored-by: EmoGarbage404 <[email protected]>
… (#20690) * Removes unnecessary message for defibbing a patient which has ghosted This message is for the defib operator. It could inform them that the patient doesn't have a consciousness since it's ghosted but maybe no message is really the right move here because it may have succeeded and that would be what would happen had the defib attempt succeeded - no message. Also when the patient's ghost return to body there they will be alive as long as the body is still alive, so telling the operator to defib again may be wrong. * Removes corresponding ftl message which doesn't occur now
…d sprites (#20736) * Adds clipboards to the bureaucracy crate * Ports current sprites from TG to fix the credits
…e a session (#20742)
Co-authored-by: Илья Стокалюк <[email protected]>
* fix access for vehicles and mechs * optimize
* Update barratry proto to accomodate senior roles * Add senior role spawnpoints to barratry
Co-authored-by: deltanedas <@deltanedas:kde.org>
# Conflicts: # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml # Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Clothing/OuterClothing/Suits/spaceninja.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/magboots-advanced.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots-syndicate.rsi/on-equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/equipped-FEET.png # Resources/Textures/Clothing/Shoes/Boots/magboots.rsi/on-equipped-FEET.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
This reverts commit 09b2151
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit 3cf94e9 merging into 5ca1a75 Resources/Textures/Objects/Misc/bureaucracy.rsi
Resources/Textures/Interface/Misc/job_icons.rsi
Resources/Textures/Mobs/Customization/human_hair.rsi
Resources/Textures/Objects/Misc/clipboard.rsi
Resources/Textures/Objects/Tools/emag.rsi
Resources/Textures/Objects/Tools/rolling_pin.rsi
|
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
Медиа
Проверки
Изменения