[Upstream] Sync #29
Merged
[Upstream] Sync #29
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
* Yes. * maybe allows them to break * Added a new research to create prescription glasses in civ. * Update glasses.ftl * Update glasses.yml * Update glasses.yml * Update civilianservices.yml * Update PermanentBlindnessSystem.cs * Update disabilities.yml * Update glasses.yml * Glasses should now be craftable. * Update glasses.yml * Update glasses.yml * Rounded up to 38 to prevent test-fails * Update glasses.yml * Update glasses.yml --------- Co-authored-by: Aiden <[email protected]> Co-authored-by: BombasterDS2 <[email protected]>
* Gave most abductor equipment unique descriptions. * Reverted a change i made on reflex. * Update duffel.yml * Update belts.yml * Update helmets.yml * Update surgery.yml * Update tools.yml * Update walls.yml * Update Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/surgery.yml Co-authored-by: gluesniffler <[email protected]> * Update Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/surgery.yml Co-authored-by: gluesniffler <[email protected]> * Update Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/tools.yml Co-authored-by: gluesniffler <[email protected]> * Update Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/tools.yml Co-authored-by: gluesniffler <[email protected]> * Update Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/tools.yml Co-authored-by: gluesniffler <[email protected]> * Update Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/tools.yml Co-authored-by: gluesniffler <[email protected]> * Update Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/tools.yml Co-authored-by: gluesniffler <[email protected]> * Update Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/tools.yml Co-authored-by: gluesniffler <[email protected]> * Update Resources/Prototypes/_Shitmed/Entities/Specific/Abductor/surgery.yml Co-authored-by: gluesniffler <[email protected]> * Update walls.yml --------- Co-authored-by: gluesniffler <[email protected]>
Co-authored-by: tiderwithagun <[email protected]>
add anaconda
Fix Nukes Ops Test Co-authored-by: BombasterDS <[email protected]>
* Oasis Atmos Tweaks * Added air alarms to Oasis * Sec EVA reposition and added more doors. * Remove outgoing valves from atmos.
Revert "Added new lobby art (#1587)" This reverts commit 20faa01.
Co-authored-by: GoobBot <[email protected]>
* do * improve
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
Технические детали
Медиа
Чек-лист