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.

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

shipyard rewrite/port #1171

Merged
merged 19 commits into from
May 15, 2024
Merged

Conversation

deltanedas
Copy link
Member

@deltanedas deltanedas commented May 7, 2024

About the PR

port shipyard from pre rebase, but:

  • a ship can have multiple categories, unused group is now a category
  • console whitelist support added so you can have centcom shipyard, nukie shipyard, emagged normal shipyard console, etc.
  • a good bit of the console code is in shared so access is predicted
  • instead of managing a single shipyard map and doing fucky stuff to make sure spawned ships dont hit eachother, ships get their own temporary map similar to the loneop shuttle.
    once it enters ftl space the temporary map gets deleted
  • RENAMED PROSPECTER TO PROSPECTOR, GRAMMAR!!!!

currently unobtainable i forgor how its meant to be gotten

also someone needs to look over the prices a lot of them seem insanely high, maybe copy frontier

Media

temp map gets created then deleted after it ftls
06:50:21

ship automatically docks, no stations have the funny docks mapped so it will basically be random
06:51:01

ships have name and a random id similar to frontier
07:23:49

07:24:39

Ship changes

all ships:

  • made sure they all scrubbers in every room, adding waste lines if they didnt have
  • for ones with distro, gave them an air pump for the canister
  • ran fixgridatmos
  • named apcs
  • gave the generators fuel to start with, use 1 pacman and not 1-2 super pacmen (15kw uranium gen migration gaming)
  • removed invalid etc from the yml

barge:

  • made booze vendor AA
  • split power into like 3 apcs

helix:

  • replaced cryobeakers with electrolyser since its for healing not making homemade grenades
  • proper chem access on chem, gave chem facing windoors
  • split power into 4 apcs

pulse:

  • made airlock bolt properly with logic gates
  • added power monitor
  • AA booze vendor instead of 2 (two) glasses on the table
  • split power into 4 apcs

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes: UI labels May 7, 2024
@deltanedas deltanedas marked this pull request as ready for review May 7, 2024 06:25
@NullWanderer NullWanderer self-requested a review May 7, 2024 14:13
@NullWanderer
Copy link
Contributor

UI code got changed with the incoming merge, this will have to wait until after that is merged

@deltanedas
Copy link
Member Author

yep has a comment to update when merged

Copy link
Contributor

@NullWanderer NullWanderer left a comment

Choose a reason for hiding this comment

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

I'm gonna request 2 things here.

An arbitrage test, and a test that makes sure shuttles are valid (if there isn't already a test that does this.)

@deltanedas
Copy link
Member Author

a test that makes sure shuttles are valid

as in having != 1 grids? shuttles being loadable is tested already

@NullWanderer
Copy link
Contributor

a test that makes sure shuttles are valid

as in having != 1 grids? shuttles being loadable is tested already

Stuff like that, yes. Along with making sure there's a shuttle console, and at least 1 dock

@Bonktrauma
Copy link
Contributor

Shipyard isn't meant to be obtainable, im pretty sure it's one of the consoles meant to be mapped into bridge, might add it to shuttle creation though

@deltanedas
Copy link
Member Author

yeah mapping being in locker or research whatevers best

Copy link
Contributor

@NullWanderer NullWanderer left a comment

Choose a reason for hiding this comment

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

Fix all arbitrages and I'll approve

@IamVelcroboy
Copy link
Member

yeah mapping being in locker or research whatevers best

Was previously mapped on the bridge

@IamVelcroboy
Copy link
Member

We should add warp points to all the shuttles too. Can be in a follow up PR but should be done eventually.

@NullWanderer
Copy link
Contributor

We should add warp points to all the shuttles too. Can be in a follow up PR but should be done eventually.

When thats done, it should be added to the tests too. Ensure the shuttles always have a warp point

@NullWanderer
Copy link
Contributor

But should probably be a seperate pr lol

@github-actions github-actions bot added the Changes: YML Changes any yml files label May 9, 2024
@deltanedas
Copy link
Member Author

test itself has dirty disposing but theres no arbitrage, can fix test now or later

Copy link
Contributor

@NullWanderer NullWanderer left a comment

Choose a reason for hiding this comment

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

One small nitpick, lgtm otherwise

Content.Shared/CCVar/CCVars.cs Outdated Show resolved Hide resolved
deltanedas and others added 2 commits May 14, 2024 11:18
s
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
@NullWanderer NullWanderer enabled auto-merge (squash) May 15, 2024 12:09
@NullWanderer NullWanderer merged commit 9291c35 into DeltaV-Station:master May 15, 2024
11 checks passed
@deltanedas deltanedas deleted the shipyard-ops branch May 15, 2024 12:33
@deltanedas deltanedas restored the shipyard-ops branch May 15, 2024 12:44
@deltanedas deltanedas deleted the shipyard-ops branch May 15, 2024 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants