Upstream #232
Closed
Upstream #232
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
Added Devicenetwork component to ensure the screens work
* Ensure Arrivals Blacklist in Bluespace Locker rule * While I'm at it, stop the QSI too * fix thing I broke somehow * Every bluespace locker arrivals blacklisted * Add ArrivalsBlacklist to the prototypes too
* Fix popup on handcuffing for person being handcuffed * wrap onto newlines to appease the style gods
…pes. Added default engineering sprites for atmos computer boards. (#34078) * Defined sprites for Atmospheric Alerts and Monitoring computer boards. Added research unlocks and lathe recipes for them. * Defined default engineering sprite for atmospherics computer boards. Removed Power Monitoring Computer board from research and lathe recipes. * Defined engineering sprite for atmos computer boards. Removed Power Monitoring Computer board from research and lathe recipes.
…ame person (#33704) * Deduplicate traitor objectives * Remove redundant check
Removes Unneeded File
* Initial commit * Minor update
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
* Added support so that smile can use hats Changed Prototypes/Entities/Mobs/NPCs/pets.yml Added smile_inventory_template.yml in Resources/Prototypes/inventoryTemplates Added dir smile_displacement.rsi inside Resources/Textures/Mobs/Pets/smile.rsi Added smile_displacement.rsi/meta.json Added smile_displacement.rsi/head.png * Fixed sprite path in ProtoTypes/Entities/Mobs/NPCs/pets.yml mapping to wrong smile_displacement.rsi Fixed smile_inventory_template.yml using uiWindowPos as 1,2 instead of 0,1 Moved Resources/Textures/Mobs/Pets/smile.rsi/ to .../Pets/smile/smile.rsi/ Moved Resources/Textures/Mobs/Pets/smile.rsi/smile_displacement.rsi to .../Pets/smile/smile_displacement.rsi * Minor fixes: removing comments and change naming Renamed Resources/Textures/Mobs/Pets/smile/smile.rsi To .../Mobs/Pets/Smile/smile.rsi * Removed smile_inventory_template.yml and used head_inventory_template.yml instead
* add guaranteed cotton pizza to pizza crates * saner parenting * Use clearer suffix on cotton pizza box
…ds for moffs (#33508) * A looooooooot of new cotton foods for the moffs * address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs) * alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png * update requested sprites * change requested sprites * address part of sloth's review, awaiting response * address second half of review, fix magical food nutriment mitosis bug
* Remove filters from joint crafting * err * hmmm * guhhh * yyyy * whitespace --------- Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Update hand_teleporter.yml
Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
added id for captain Co-authored-by: dylanhunter <dylan2.whittingham@live.uwe.ac.uk>
github-actions
bot
added
size/M
S: Untriaged
S: Needs Review
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
… (#34198) air alarm default settings modified for anaerobic crew
# Conflicts: # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Server/Telephone/TelephoneSystem.cs # LICENSE.TXT # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Guidebook/rules.yml # Resources/Prototypes/Maps/meta.yml # Resources/Prototypes/SoundCollections/NukeMusic.yml # Resources/ServerInfo/Guidebook/Chemicals.xml # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
change return to continue Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
# Conflicts: # Content.Server/Connection/ConnectionManager.cs
Upstream sync
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