Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Upstream030524 #111

Merged
merged 11 commits into from
May 3, 2024
Merged

Upstream030524 #111

merged 11 commits into from
May 3, 2024

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented May 3, 2024

About the PR

Why / Balance

How to test

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

ErhardSteinhauer and others added 9 commits May 3, 2024 03:27
…ew-frontiers-14#1324)

* Blacklist felinids/goblins/vulps from hoverbike built-in storage

* different blacklist comp

* Update vehicles.yml

---------

Co-authored-by: Dvir <[email protected]>
Removed the Whiskey, as the Brigmed has more than enough Medbay space on every NFSD capital ship.

Updated Shipyard files from Security to Nfsd.
* Update labeler.yml

* Apply suggestions from code review

Co-authored-by: whatston3 <[email protected]>

---------

Co-authored-by: whatston3 <[email protected]>
* added new science books to R&D lockers for hints

* silly meal

* removed funny food, too much distraction

* customised icons from merge

* Book Pool

* Update bookshelf.yml

---------

Co-authored-by: Wolfking6116 <[email protected]>
Co-authored-by: Dvir <[email protected]>
@Vonsant Vonsant merged commit 647f428 into master May 3, 2024
13 checks passed
@Vonsant Vonsant deleted the upstream030524 branch May 11, 2024 23:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants