Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Repo] Merge Upstream #210

Merged
merged 12 commits into from
Oct 1, 2023
Merged

[Repo] Merge Upstream #210

merged 12 commits into from
Oct 1, 2023

Commits on Aug 19, 2023

  1. Address StartingGearPrototype issues

    @Vordenburg
    Vordenburg committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    08b5d4c View commit details
    Browse the repository at this point in the history

  2. fixe (#18591) 

    Co-authored-by: moonheart08 <[email protected]>
(cherry picked from commit e9890a8331504fa4883609f94598bd15cfdb7897)
    @moonheart08 @Vordenburg
    moonheart08 authored and Vordenburg committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    0bbf807 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1784 from Vordenburg/bugfix-2023-08-19 

    Bugfix 2023-08-19
    @Vordenburg
    Vordenburg committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    e96f91d View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2023

  1. Map Tweaks (#1785) 

    * Map Tweaks

* Add additional warp points

---------

Co-authored-by: Jeff <[email protected]>
    @IamVelcroboy @BurningRash
    IamVelcroboy and BurningRash committed Aug 21, 2023
    Configuration menu
    Copy the full SHA
    0794eac View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. Map Hotfix (#1786) 

    Co-authored-by: Jeff <[email protected]>
    @IamVelcroboy @BurningRash
    IamVelcroboy and BurningRash committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    45b6a1b View commit details
    Browse the repository at this point in the history

  2. Update Angle and Shoukou (#1788) 

    Adds the "PreventPilot" component to both stations, and replaces chemical dispensers at medical outposts (not chemistry) with ChemVends.
    @Colin-Tel
    Colin-Tel committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    5d7a779 View commit details
    Browse the repository at this point in the history

  3. Added accesses to Cargo jobs and Assistant (#1782) 

    Gave cargo jobs (QM & mail carrier) service access, and gave assistants maintenance access.
    @Colin-Tel
    Colin-Tel committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    58c560f View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. Mk32 Glowup (#1779) 

    * 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]>
    @TadJohnson00 @Elijahrane
    TadJohnson00 and Elijahrane committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    71294c3 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. Update glacier.yml (#1793) 

    * Update glacier.yml

- added cryo
- moved docking port office
- added land mine field
- added mining chunk

* Update glacier.yml
    @ps3moira
    ps3moira committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    88684c0 View commit details
    Browse the repository at this point in the history

  2. Update angle.yml (#1791) 

    * 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
    @Colin-Tel
    Colin-Tel committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    995880d View commit details
    Browse the repository at this point in the history

  3. Map Edits (#1797) 

    * Map Edits

* remove potential serialization

* Fix upsidedown mirror

---------

Co-authored-by: Jeff <[email protected]>
    @IamVelcroboy @BurningRash
    IamVelcroboy and BurningRash committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    3fd6fff View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2023

  1. Merge branch 'master' of https://github.com/Nyanotrasen/Nyanotrasen 

    I also added CSS as the boss of the MailCarrier
    @Pspritechologist
    Pspritechologist committed Sep 19, 2023
    Configuration menu
    Copy the full SHA
    9b76582 View commit details
    Browse the repository at this point in the history