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

KnuckleVerse (New) - Bboxing ship #891

Merged
merged 8 commits into from
Mar 16, 2024
Merged

KnuckleVerse (New) - Bboxing ship #891

merged 8 commits into from
Mar 16, 2024

Conversation

Batuh1n
Copy link
Contributor

@Batuh1n Batuh1n commented Jan 21, 2024 •
edited
Loading

About the PR

Adds a new ship, SW KnuckleVerse

Media

image
image

Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]):
-->

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

Changelog

@Batuh1n
Copy link
Contributor Author

Batuh1n commented Jan 21, 2024

I might've accidently used 2 accounts, it is all me though.

@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Jan 25, 2024
@dvir001 dvir001 changed the title Adds the boxing ship, KnuckleVerse. KnuckleVerse (New) - Bboxing ship Jan 25, 2024
@github-actions github-actions bot removed the YML label Jan 28, 2024
@Batuh1n
Copy link
Contributor Author

Batuh1n commented Jan 28, 2024 •
edited
Loading

-Added pilot job
-Added EVA storage closet, defib, fire extinguisher and changed the design a bit
-Adjusted the price again
-Decreased the amount of forward thrusts. It was too fast.
-Changed shuttle file location to _NF/shuttle
image
image

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Feb 8, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 8, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Cheackraze
Copy link
Member

i like the idea, however is this intended for the scrapyard? you seem to be going for more of the 'back alley maints rage cage' vibe with it, and I think you should lean into it a bit more if that is the case. You can also add the boxer job to the prototype if you'd like as well. I can fix up this branch's conflicts if not tonight, then soon this week.

@Batuh1n
Copy link
Contributor Author

Batuh1n commented Feb 17, 2024

It was intended for the normal shipyard. The "SW" branding I put is quite similar to the scrapyard branding tho so, I should probably change that. I can try to lean more into the vibe you say, too. But not really sure how to.

@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Feb 19, 2024
@Cheackraze
Copy link
Member

ok, i fixed up your mistaken file change. Make sure to update your local repository before making more changes. This all looks good to me, and we can put it in the main shipyard, but we may eventually move it to a different one or a 'themed' shipyard in the future. I'll let @MagnusCrowe do a review too

MagnusCrowe
MagnusCrowe requested changes Feb 25, 2024
View reviewed changes
Copy link
Contributor

@MagnusCrowe MagnusCrowe left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
You're missing a wall here.

image
Replace these generators with the ship version. The ship versions are half filled, anchored, and running on purchase.

image
Your atmos here is pretty sus. The red pipe just ends at the wall, you have a scrubber attached to distro, and you have no other scrubbers in this part of the ship. Generators produce CO2 so you need to fix this.

Also your power setup is not standard, please refer to a powering guide and fix your wiring in the generator room.

image
image

You don't need air sensors. Every vent and scrubber has one built in.

image
Last but not least, you need to replace all the internal reinforced walls with normal walls.
The only place a ship like this could argue for reinforced walls is on tiles that border space.

@GreaseMonk GreaseMonk added Status: Awaiting Changes This PR has changes that need to be made before merging and removed Status: Needs Review This PR is awaiting reviews labels Mar 7, 2024
@GreaseMonk
Copy link
Contributor

DM'd on discord as a reminder, would love to see the ship fixed up and ready to go :-)

@Batuh1n
Copy link
Contributor Author

Batuh1n commented Mar 16, 2024

image
-Atmos probably fixed
-Fixed walls
-Boxer role added
-Changed company callsign to SSC so it is more unique
-The wirings in engine is still not standart. When I do it the normal way, power flickerings happen which is quite annoying sometimes. It works just fine this way so I think it should be ok?
image

@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Mar 16, 2024
@github-actions github-actions bot removed the Status: Awaiting Changes This PR has changes that need to be made before merging label Mar 16, 2024
@MagnusCrowe MagnusCrowe merged commit c20376a into new-frontiers-14:master Mar 16, 2024
11 checks passed
Wolfking6116 pushed a commit to Wolfking6116/frontier-station-14 that referenced this pull request Mar 19, 2024
Squashed commit of the following:
c05c1b8 
commit 8dcb88a
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 18:39:31 2024 +0000

    Automatic Changelog (new-frontiers-14#1119)

commit 223e3f9
Author: ThatOneGoblin25 <[email protected]>
Date:   Tue Mar 19 05:39:07 2024 +1100

    Adds BoxShotgunSlug to ammo.yml (new-frontiers-14#1119)

commit 2457bc9
Author: Dvir <[email protected]>
Date:   Mon Mar 18 20:29:04 2024 +0200

    Update opportunity.yml (new-frontiers-14#1131)

commit 87939de
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:46:35 2024 +0000

    Automatic Changelog (new-frontiers-14#1122)

commit 41b04a5
Author: Alice "Arimah" Heurlin <[email protected]>
Date:   Mon Mar 18 17:46:12 2024 +0100

    Increase soup maxVol to prevent spillage (new-frontiers-14#1122)

commit f5fcd41
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:45:25 2024 +0000

    Automatic Changelog (new-frontiers-14#1088)

commit 719be3b
Author: ErhardSteinhauer <[email protected]>
Date:   Mon Mar 18 19:45:02 2024 +0300

    Hardsuits Fabrication, Salvage TechFab (new-frontiers-14#1088)

    * Hardsuits Fabrication

    * fixes

    * botany EVA, sundicate hard suit for EMAG enjoyers

    * moved pirate eva to arsenal

    * fix

    * i changed something earlier today but i don't remember what. i recon i can do no wrong by merging this.

    * merge conflict fix, salvtechfab flatpack

    * circuitvend.yml

    purge

    * fix

    * mailcarrier eva

    * renamed mailman eva to mailcarrier eva

    * no spawn set to true for added toggleable helmets

commit b57358c
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:35:59 2024 +0000

    Automatic Changelog (new-frontiers-14#1126)

commit 41ff359
Author: Dvir <[email protected]>
Date:   Mon Mar 18 18:35:36 2024 +0200

    Fix Pen Sign (new-frontiers-14#1126)

    * My name, not the card name

    * FTL

commit 7701f4f
Author: Dvir <[email protected]>
Date:   Mon Mar 18 18:33:45 2024 +0200

    UnEmagged (new-frontiers-14#1128)

commit ce18929
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:31:19 2024 +0000

    Automatic Changelog (new-frontiers-14#1127)

commit 065c84d
Author: AndresE55 <[email protected]>
Date:   Mon Mar 18 12:30:56 2024 -0400

    Rules formatting  (new-frontiers-14#1127)

    * rule typos

    * formatting

commit 0054ba1
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 13:42:33 2024 +0000

    Automatic Changelog (new-frontiers-14#1129)

commit e1f6ec6
Author: Maxtone <[email protected]>
Date:   Mon Mar 18 08:42:10 2024 -0500

    removes opportunity from shipyard (new-frontiers-14#1129)

commit 714d1c1
Author: FrontierATC <[email protected]>
Date:   Sun Mar 17 10:21:57 2024 +0000

    Automatic Changelog (new-frontiers-14#1121)

commit a622d9a
Author: Leth <[email protected]>
Date:   Sun Mar 17 06:21:37 2024 -0400

    Adjusts the price of the NC Hauler to cost what it should (new-frontiers-14#1121)

commit 9299828
Author: FrontierATC <[email protected]>
Date:   Sun Mar 17 08:29:54 2024 +0000

    Automatic Changelog (new-frontiers-14#1104)

commit 91b1777
Author: Cuir <[email protected]>
Date:   Sun Mar 17 04:29:25 2024 -0400

    Canister (New) - Tiny scrap vessel (new-frontiers-14#1104)

    * Added UAC Canister to the scrapyard for purchase.

    * Fixed headlights not being mounted.
    Fixed diagonally adjacent walls.
    Fixed ship price (6600 --> 8000 spesos).
    Added two small items to make the ship a bit less empty and more lived in.

    * Fixed a few minor issues.

    * Fixed another minor issue.

    * Removed Passenger spawn point.
    Replaced Passenger job with Pilot.

commit 650d525
Author: Dvir <[email protected]>
Date:   Sun Mar 17 09:38:23 2024 +0200

    Condor (new-frontiers-14#1123)

commit 34e2069
Author: Dvir <[email protected]>
Date:   Sun Mar 17 09:37:56 2024 +0200

    Update mcdelivery.yml (new-frontiers-14#1124)

commit a52ab8f
Author: nyozzl <[email protected]>
Date:   Sat Mar 16 23:14:48 2024 +0000

    Updates disciple/fixes a few things (new-frontiers-14#1093)

    Co-authored-by: Nyazz <Nyazz@DESKTOP-Q577H4Q>

commit c20376a
Author: Batuh1n <[email protected]>
Date:   Sun Mar 17 01:36:58 2024 +0300

    KnuckleVerse (New) - Bboxing ship (new-frontiers-14#891)

    * Adds the boxing ship, KnuckleVerse.

    * Make it more expensive and remove "SW" from map name knuckleverse.yml

    * Update the shuttle, shuttle's folder location to _NF and shuttle's price and also add pilot job

    * Atmos, and power change, a few other changes to design

    * removed many emergency lights, fixed power

    ---------

    Co-authored-by: aknyyn <[email protected]>
    Co-authored-by: checkraze <[email protected]>
    Co-authored-by: Maxtone <[email protected]>

commit fdff25a
Author: FrontierATC <[email protected]>
Date:   Sat Mar 16 21:54:00 2024 +0000

    Automatic Changelog (new-frontiers-14#763)

commit edd866f
Author: cite2000 <[email protected]>
Date:   Sat Mar 16 17:53:36 2024 -0400

    Whiskey (New) (new-frontiers-14#763)

    * adds the whiskey ship

    * added the NFSD whiskey.

    * Revert "added the NFSD whiskey."

    This reverts commit 2d56259.

    * fixed the NFSD whiskey ship.

    * added latejoin spawn, changed air outlet, changed files slightly.

    * replaced power monitoring with air tank dispensor, replaced engineering locker with utility belt, moved table to prevent clipping, moved brigmedic headset into locker, added table into storage closet. ((FIXED SHIP SPAWNING))

    * changed lattices back to glass, removed brig-med headset, removed holding cells.

    * changed the tile under the thrusters to be lattice, while the corners were left as glass.

    * changed price from 47k to 55k to more accurately account for markup.

    * Fixed pathing error

    * Revamped main (waiting) room, changed generator out for 2 downgraded versions, changed out cloning setup for a cryogenics setup, changed atmost from air canister to proper atmos setup.

    * Merge remote-tracking branch 'origin/master' into pr/763

    * YML fix

    * added vacuum tiles, removed cigarettes, moved late join one tile down, added trystan plushie

    * Ship Generators, moved cryo pump, moved file to sec folder

    ---------

    Co-authored-by: Dvir <[email protected]>
    Co-authored-by: Maxtone <[email protected]>

commit 1aa4f28
Author: FrontierATC <[email protected]>
Date:   Thu Mar 14 22:47:56 2024 +0000

    Automatic Changelog (new-frontiers-14#1091)

commit 7021040
Author: AndresE55 <[email protected]>
Date:   Thu Mar 14 18:47:32 2024 -0400

    Update server rules (new-frontiers-14#1091)

commit 0d978ca
Author: GreaseMonk <[email protected]>
Date:   Thu Mar 14 14:55:25 2024 +0100

    Fix tabletop computers (new-frontiers-14#1113)

    * Update computers_tabletop.yml

    * Revert "Revert "Tabletop computer deconstruct fix (new-frontiers-14#1090)" (new-frontiers-14#1092)"

    This reverts commit 54d1714.

    * Fix draw depth

    ---------

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

commit 31e3931
Author: exincore <[email protected]>
Date:   Mon Mar 11 18:43:05 2024 -0500

    refactor(research): Improve initial research client registration (new-frontiers-14#1086)

    * refactor(research): Improve initial research client registration

    * refactor(research): Move EntityLookupSystem dependency to main class file

    * Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions. (#25743)

    * fix(research): Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions.

    Fixes a paradox where selecting a research server requires a research server to already be selected.
    This would softlock the research client until it is reconstructed.

    * style: Discards the discard operator

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

    ---------

    Co-authored-by: Nemanja <[email protected]>
    (cherry picked from commit aaf5d0d)

commit b5a9528
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:32:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1096)

commit 6d09157
Author: Wolfking6116 <[email protected]>
Date:   Mon Mar 11 19:31:50 2024 -0400

    Refinement process for Artifexium (new-frontiers-14#1096)

    * swapped artifexium with raw version

    * raw artifexium description

    * raw artifexium reagent

    * Refined artifexium recipes

    * added dashes

    Forgot the dash

    ---------

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

commit 2e26e40
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:21:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1098)

commit 93b9c40
Author: Mnemotechnican <[email protected]>
Date:   Tue Mar 12 02:20:49 2024 +0300

    Fix carrying (new-frontiers-14#1098)

    * Revert "Remove contests (#25425)"

    This reverts commit 012e6e6

    * Re-add contests to carrying

    * Fix various bugs

    * Add clarifying comments

    * Remove the contest from shoving; remove unused contests

    * Un-restore contests

    * This was unintended

    * Revert another minor change

commit ad2e93f
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:04:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1053)

commit 9f27054
Author: Qulibly <[email protected]>
Date:   Tue Mar 12 00:03:50 2024 +0100

    Crew monitor general tweaks and QoL changes (new-frontiers-14#1053)

    * Crew monitor global coordinates tweak

    * Crew Monitor changes to make monitor work with coordinates

    * Crew Monitor WIP space detection tweak

    * Crew Monitor Space detection and expedition tweak

    * Crew Monitor Location and Vessel detection

    * Crew Monitor NET_LOCATION_NAME value fixup

    ---------

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

commit 50f2b55
Author: ThatOneGoblin25 <[email protected]>
Date:   Tue Mar 12 01:31:26 2024 +1100

    Added Air tank to fill (new-frontiers-14#1105)

    Removed nitrogen and oxygen tank from fill

commit 3eeebdd
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 05:47:43 2024 +0000

    Automatic Changelog (new-frontiers-14#1106)

commit 791cd86
Author: ThatOneGoblin25 <[email protected]>
Date:   Mon Mar 11 16:47:20 2024 +1100

    Remove RCD (new-frontiers-14#1106)

    Removes RCD and Ammo

commit d66236b
Author: Dvir <[email protected]>
Date:   Sun Mar 10 01:59:44 2024 +0200

    McCargo (Update) (new-frontiers-14#1102)

    * Update mccargo.yml

    * Removed one light
Wolfking6116 pushed a commit to Wolfking6116/frontier-station-14 that referenced this pull request Mar 19, 2024
Squashed commit of the following:
84894d8 
commit 8dcb88a
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 18:39:31 2024 +0000

    Automatic Changelog (new-frontiers-14#1119)

commit 223e3f9
Author: ThatOneGoblin25 <[email protected]>
Date:   Tue Mar 19 05:39:07 2024 +1100

    Adds BoxShotgunSlug to ammo.yml (new-frontiers-14#1119)

commit 2457bc9
Author: Dvir <[email protected]>
Date:   Mon Mar 18 20:29:04 2024 +0200

    Update opportunity.yml (new-frontiers-14#1131)

commit 87939de
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:46:35 2024 +0000

    Automatic Changelog (new-frontiers-14#1122)

commit 41b04a5
Author: Alice "Arimah" Heurlin <[email protected]>
Date:   Mon Mar 18 17:46:12 2024 +0100

    Increase soup maxVol to prevent spillage (new-frontiers-14#1122)

commit f5fcd41
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:45:25 2024 +0000

    Automatic Changelog (new-frontiers-14#1088)

commit 719be3b
Author: ErhardSteinhauer <[email protected]>
Date:   Mon Mar 18 19:45:02 2024 +0300

    Hardsuits Fabrication, Salvage TechFab (new-frontiers-14#1088)

    * Hardsuits Fabrication

    * fixes

    * botany EVA, sundicate hard suit for EMAG enjoyers

    * moved pirate eva to arsenal

    * fix

    * i changed something earlier today but i don't remember what. i recon i can do no wrong by merging this.

    * merge conflict fix, salvtechfab flatpack

    * circuitvend.yml

    purge

    * fix

    * mailcarrier eva

    * renamed mailman eva to mailcarrier eva

    * no spawn set to true for added toggleable helmets

commit b57358c
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:35:59 2024 +0000

    Automatic Changelog (new-frontiers-14#1126)

commit 41ff359
Author: Dvir <[email protected]>
Date:   Mon Mar 18 18:35:36 2024 +0200

    Fix Pen Sign (new-frontiers-14#1126)

    * My name, not the card name

    * FTL

commit 7701f4f
Author: Dvir <[email protected]>
Date:   Mon Mar 18 18:33:45 2024 +0200

    UnEmagged (new-frontiers-14#1128)

commit ce18929
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 16:31:19 2024 +0000

    Automatic Changelog (new-frontiers-14#1127)

commit 065c84d
Author: AndresE55 <[email protected]>
Date:   Mon Mar 18 12:30:56 2024 -0400

    Rules formatting  (new-frontiers-14#1127)

    * rule typos

    * formatting

commit 0054ba1
Author: FrontierATC <[email protected]>
Date:   Mon Mar 18 13:42:33 2024 +0000

    Automatic Changelog (new-frontiers-14#1129)

commit e1f6ec6
Author: Maxtone <[email protected]>
Date:   Mon Mar 18 08:42:10 2024 -0500

    removes opportunity from shipyard (new-frontiers-14#1129)

commit 714d1c1
Author: FrontierATC <[email protected]>
Date:   Sun Mar 17 10:21:57 2024 +0000

    Automatic Changelog (new-frontiers-14#1121)

commit a622d9a
Author: Leth <[email protected]>
Date:   Sun Mar 17 06:21:37 2024 -0400

    Adjusts the price of the NC Hauler to cost what it should (new-frontiers-14#1121)

commit 9299828
Author: FrontierATC <[email protected]>
Date:   Sun Mar 17 08:29:54 2024 +0000

    Automatic Changelog (new-frontiers-14#1104)

commit 91b1777
Author: Cuir <[email protected]>
Date:   Sun Mar 17 04:29:25 2024 -0400

    Canister (New) - Tiny scrap vessel (new-frontiers-14#1104)

    * Added UAC Canister to the scrapyard for purchase.

    * Fixed headlights not being mounted.
    Fixed diagonally adjacent walls.
    Fixed ship price (6600 --> 8000 spesos).
    Added two small items to make the ship a bit less empty and more lived in.

    * Fixed a few minor issues.

    * Fixed another minor issue.

    * Removed Passenger spawn point.
    Replaced Passenger job with Pilot.

commit 650d525
Author: Dvir <[email protected]>
Date:   Sun Mar 17 09:38:23 2024 +0200

    Condor (new-frontiers-14#1123)

commit 34e2069
Author: Dvir <[email protected]>
Date:   Sun Mar 17 09:37:56 2024 +0200

    Update mcdelivery.yml (new-frontiers-14#1124)

commit a52ab8f
Author: nyozzl <[email protected]>
Date:   Sat Mar 16 23:14:48 2024 +0000

    Updates disciple/fixes a few things (new-frontiers-14#1093)

    Co-authored-by: Nyazz <Nyazz@DESKTOP-Q577H4Q>

commit c20376a
Author: Batuh1n <[email protected]>
Date:   Sun Mar 17 01:36:58 2024 +0300

    KnuckleVerse (New) - Bboxing ship (new-frontiers-14#891)

    * Adds the boxing ship, KnuckleVerse.

    * Make it more expensive and remove "SW" from map name knuckleverse.yml

    * Update the shuttle, shuttle's folder location to _NF and shuttle's price and also add pilot job

    * Atmos, and power change, a few other changes to design

    * removed many emergency lights, fixed power

    ---------

    Co-authored-by: aknyyn <[email protected]>
    Co-authored-by: checkraze <[email protected]>
    Co-authored-by: Maxtone <[email protected]>

commit fdff25a
Author: FrontierATC <[email protected]>
Date:   Sat Mar 16 21:54:00 2024 +0000

    Automatic Changelog (new-frontiers-14#763)

commit edd866f
Author: cite2000 <[email protected]>
Date:   Sat Mar 16 17:53:36 2024 -0400

    Whiskey (New) (new-frontiers-14#763)

    * adds the whiskey ship

    * added the NFSD whiskey.

    * Revert "added the NFSD whiskey."

    This reverts commit 2d56259.

    * fixed the NFSD whiskey ship.

    * added latejoin spawn, changed air outlet, changed files slightly.

    * replaced power monitoring with air tank dispensor, replaced engineering locker with utility belt, moved table to prevent clipping, moved brigmedic headset into locker, added table into storage closet. ((FIXED SHIP SPAWNING))

    * changed lattices back to glass, removed brig-med headset, removed holding cells.

    * changed the tile under the thrusters to be lattice, while the corners were left as glass.

    * changed price from 47k to 55k to more accurately account for markup.

    * Fixed pathing error

    * Revamped main (waiting) room, changed generator out for 2 downgraded versions, changed out cloning setup for a cryogenics setup, changed atmost from air canister to proper atmos setup.

    * Merge remote-tracking branch 'origin/master' into pr/763

    * YML fix

    * added vacuum tiles, removed cigarettes, moved late join one tile down, added trystan plushie

    * Ship Generators, moved cryo pump, moved file to sec folder

    ---------

    Co-authored-by: Dvir <[email protected]>
    Co-authored-by: Maxtone <[email protected]>

commit 1aa4f28
Author: FrontierATC <[email protected]>
Date:   Thu Mar 14 22:47:56 2024 +0000

    Automatic Changelog (new-frontiers-14#1091)

commit 7021040
Author: AndresE55 <[email protected]>
Date:   Thu Mar 14 18:47:32 2024 -0400

    Update server rules (new-frontiers-14#1091)

commit 0d978ca
Author: GreaseMonk <[email protected]>
Date:   Thu Mar 14 14:55:25 2024 +0100

    Fix tabletop computers (new-frontiers-14#1113)

    * Update computers_tabletop.yml

    * Revert "Revert "Tabletop computer deconstruct fix (new-frontiers-14#1090)" (new-frontiers-14#1092)"

    This reverts commit 54d1714.

    * Fix draw depth

    ---------

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

commit 31e3931
Author: exincore <[email protected]>
Date:   Mon Mar 11 18:43:05 2024 -0500

    refactor(research): Improve initial research client registration (new-frontiers-14#1086)

    * refactor(research): Improve initial research client registration

    * refactor(research): Move EntityLookupSystem dependency to main class file

    * Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions. (#25743)

    * fix(research): Fix `ResearchSystem.Client` `UpdateClientInterface` preconditions.

    Fixes a paradox where selecting a research server requires a research server to already be selected.
    This would softlock the research client until it is reconstructed.

    * style: Discards the discard operator

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

    ---------

    Co-authored-by: Nemanja <[email protected]>
    (cherry picked from commit aaf5d0d)

commit b5a9528
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:32:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1096)

commit 6d09157
Author: Wolfking6116 <[email protected]>
Date:   Mon Mar 11 19:31:50 2024 -0400

    Refinement process for Artifexium (new-frontiers-14#1096)

    * swapped artifexium with raw version

    * raw artifexium description

    * raw artifexium reagent

    * Refined artifexium recipes

    * added dashes

    Forgot the dash

    ---------

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

commit 2e26e40
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:21:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1098)

commit 93b9c40
Author: Mnemotechnican <[email protected]>
Date:   Tue Mar 12 02:20:49 2024 +0300

    Fix carrying (new-frontiers-14#1098)

    * Revert "Remove contests (#25425)"

    This reverts commit 012e6e6

    * Re-add contests to carrying

    * Fix various bugs

    * Add clarifying comments

    * Remove the contest from shoving; remove unused contests

    * Un-restore contests

    * This was unintended

    * Revert another minor change

commit ad2e93f
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 23:04:13 2024 +0000

    Automatic Changelog (new-frontiers-14#1053)

commit 9f27054
Author: Qulibly <[email protected]>
Date:   Tue Mar 12 00:03:50 2024 +0100

    Crew monitor general tweaks and QoL changes (new-frontiers-14#1053)

    * Crew monitor global coordinates tweak

    * Crew Monitor changes to make monitor work with coordinates

    * Crew Monitor WIP space detection tweak

    * Crew Monitor Space detection and expedition tweak

    * Crew Monitor Location and Vessel detection

    * Crew Monitor NET_LOCATION_NAME value fixup

    ---------

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

commit 50f2b55
Author: ThatOneGoblin25 <[email protected]>
Date:   Tue Mar 12 01:31:26 2024 +1100

    Added Air tank to fill (new-frontiers-14#1105)

    Removed nitrogen and oxygen tank from fill

commit 3eeebdd
Author: FrontierATC <[email protected]>
Date:   Mon Mar 11 05:47:43 2024 +0000

    Automatic Changelog (new-frontiers-14#1106)

commit 791cd86
Author: ThatOneGoblin25 <[email protected]>
Date:   Mon Mar 11 16:47:20 2024 +1100

    Remove RCD (new-frontiers-14#1106)

    Removes RCD and Ammo

commit d66236b
Author: Dvir <[email protected]>
Date:   Sun Mar 10 01:59:44 2024 +0200

    McCargo (Update) (new-frontiers-14#1102)

    * Update mccargo.yml

    * Removed one light
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MagnusCrowe MagnusCrowe MagnusCrowe approved these changes

Assignees
No one assigned
Labels
Map-Shuttle Map - Shuttle No C# Status: Needs Review This PR is awaiting reviews
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Batuh1n @Cheackraze @GreaseMonk @MagnusCrowe @aknyyn