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

Upstream Sync #43

Merged
merged 26 commits into from
Jan 22, 2024
Merged

Upstream Sync #43

merged 26 commits into from
Jan 22, 2024

Commits on Jan 17, 2024

  1. Hammurabi Rebase (#686) 

    Co-authored-by: IamVelcroboy<>
    @IamVelcroboy
    IamVelcroboy authored Jan 17, 2024
    Configuration menu
    Copy the full SHA
    81a4890 View commit details
    Browse the repository at this point in the history

  2. Automatic Changelog Update (#686)

    DeltaV-Bot committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    f0b2d59 View commit details
    Browse the repository at this point in the history

  3. Map Hotfixes (#687) 

    Co-authored-by: IamVelcroboy<>
    @IamVelcroboy
    IamVelcroboy authored Jan 17, 2024
    Configuration menu
    Copy the full SHA
    3b1abac View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Map Edits: Hammurabi (#689) 

    * Map Edits: Hammurabi

* add psionic mantis

---------

Co-authored-by: Velcroboy <>
    @IamVelcroboy
    IamVelcroboy authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    fe40f33 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. Map Edits: Hammurabi (#694) 

    Co-authored-by: Velcroboy <>
    @IamVelcroboy
    IamVelcroboy authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    3b842b6 View commit details
    Browse the repository at this point in the history

  2. Update Rules.txt (#690) 

    * Update Rules.txt

* Update Rules.txt
    @Colin-Tel
    Colin-Tel authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    e33e3ac View commit details
    Browse the repository at this point in the history

  3. Automatic Changelog Update (#690)

    DeltaV-Bot committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    f0d3e58 View commit details
    Browse the repository at this point in the history

  4. Fixes snake spawner spawning spiders (#688) 

    Co-authored-by: Jeff <>
    @IamVelcroboy
    IamVelcroboy authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    1f20714 View commit details
    Browse the repository at this point in the history

  5. Prevent zombies from becoming psionic (#679) 

    * Prevent zombies from becoming psionic, and remove existing powers.

* Minor spelling mistake
    @DebugOk
    DebugOk authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    1a5469f View commit details
    Browse the repository at this point in the history

  6. Automatic Changelog Update (#679)

    DeltaV-Bot committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    59773dc View commit details
    Browse the repository at this point in the history

  7. Fix psionic invisiblity to others (#650) 

    Set vis flags to cyborgs, silicon, ghost
    @OCOtheOmega
    OCOtheOmega authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    13b0a78 View commit details
    Browse the repository at this point in the history

  8. Fixes mantis not spawnin with their respective bag. (#643) 

    * Fixes mantis not spawnin with their respective bag.

A small thing but somethin to note nontheless.

* Fixes it as I didnt notice that there was already yml for the other ones, eeh

* Update backpack.yml
    @Adrian16199
    Adrian16199 authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    fa044a0 View commit details
    Browse the repository at this point in the history

  9. Automatic Changelog Update (#643)

    DeltaV-Bot committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    c791a6a View commit details
    Browse the repository at this point in the history

  10. Laika change. (#678)

    @Adrian16199
    Adrian16199 authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    022ca05 View commit details
    Browse the repository at this point in the history

  11. Automatic Changelog Update (#678)

    DeltaV-Bot committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    f2ad4eb View commit details
    Browse the repository at this point in the history

  12. Remove remaining spare ID card (#696) 

    Update heads.yml

I forgor

Signed-off-by: Debug <[email protected]>
    @DebugOk
    DebugOk authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    f06d4ac View commit details
    Browse the repository at this point in the history

  13. Salvage cloak (#631) 

    * CLAOK TO BRRR

* Correct cloak placement

* more corrections

* removed unwanted code

* Update Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: lleftTheDragon <[email protected]>

* Update Resources/Prototypes/Catalog/Fills/Crates/salvage.yml

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: lleftTheDragon <[email protected]>

* Update Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: lleftTheDragon <[email protected]>

---------

Signed-off-by: lleftTheDragon <[email protected]>
Co-authored-by: Colin-Tel <[email protected]>
    @lleftTheDragon @Colin-Tel
    lleftTheDragon and Colin-Tel authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    16e0774 View commit details
    Browse the repository at this point in the history

  14. Automatic Changelog Update (#631)

    DeltaV-Bot committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    ae8f3fa View commit details
    Browse the repository at this point in the history

  15. Fix SpareIdCabinet prototypes (#697)

    @DebugOk
    DebugOk authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    7af5703 View commit details
    Browse the repository at this point in the history

  16. Gamemode votes (#698) 

    * Allow voting for the extended and survival gamemode

These votes shouldn't be called ever anyways, so might aswell use them for the adminless server

* Update periapsis.toml
    @DebugOk
    DebugOk authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    0eef1fe View commit details
    Browse the repository at this point in the history

  17. Automatic Changelog Update (#698)

    DeltaV-Bot committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    396973d View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2024

  1. Map Hotfix: Hammurabi (#699) 

    * Map Hotfix: Hammurabi

* fix corpsman's airlock

---------

Co-authored-by: Velcroboy <>
    @IamVelcroboy
    IamVelcroboy authored Jan 20, 2024
    Configuration menu
    Copy the full SHA
    5727e27 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2024

  1. Implement gridinv, proper (#703) 

    * Implement gridinv, 1500 squashed commits :elp:

* Me when

* Linter errors

* Fix katana belts
    @DebugOk
    DebugOk authored Jan 21, 2024
    Configuration menu
    Copy the full SHA
    18f0af1 View commit details
    Browse the repository at this point in the history

  2. Automatic Changelog Update (#703)

    DeltaV-Bot committed Jan 21, 2024
    Configuration menu
    Copy the full SHA
    89d107b View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. Merge branch 'master' of https://github.com/DeltaV-Station/Delta-v in… 

    …to upstream-sync-2
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    c5b30f0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/Simple-Station/Parkstatio… 

    …n-Friendly-Chainsaw into upstream-sync-2
    @DEATHB4DEFEAT
    DEATHB4DEFEAT committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    74cd28a View commit details
    Browse the repository at this point in the history