[Repo] Merge Upstream #210
Merged
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: moonheart08 <[email protected]> (cherry picked from commit e9890a8331504fa4883609f94598bd15cfdb7897)
Bugfix 2023-08-19
* Map Tweaks * Add additional warp points --------- Co-authored-by: Jeff <[email protected]>
Co-authored-by: Jeff <[email protected]>
Adds the "PreventPilot" component to both stations, and replaces chemical dispensers at medical outposts (not chemistry) with ChemVends.
Gave cargo jobs (QM & mail carrier) service access, and gave assistants maintenance access.
* Mk32 Glowup Improved the Mk32 sprite, fixed erroneous pixels on the katana sheath sprite, added a new pistol gunshot for the Universal. * Second fix There's always something, ain't there? --------- Co-authored-by: Rane <[email protected]>
* Update glacier.yml - added cryo - moved docking port office - added land mine field - added mining chunk * Update glacier.yml
* Update angle.yml Completely overhauled Angle's medical department. * Update angle.yml Added medical techfab * Update angle.yml Fixed missing disposal pipes * Update angle.yml fixes unpowered APC * Update angle.yml Added missing biomass reclaimer * Update angle.yml Added missing vents and camera router
* Map Edits * remove potential serialization * Fix upsidedown mirror --------- Co-authored-by: Jeff <[email protected]>
I also added CSS as the boss of the MailCarrier
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit 9b76582 merging into f179799 Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi
Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi
|
|
Only a handful of conflicts, but some odd changes. |
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.
Description
Merges Upstream