Skip to content

shipyard rewrite/port#1171

Merged
Axionyxx merged 19 commits intoDeltaV-Station:masterfrom
deltanedas:shipyard-ops
May 15, 2024
Merged

shipyard rewrite/port#1171
Axionyxx merged 19 commits intoDeltaV-Station:masterfrom
deltanedas:shipyard-ops

Conversation

@deltanedas
Copy link
Copy Markdown
Contributor

@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
@deltanedas deltanedas requested a review from IamVelcroboy as a code owner May 7, 2024 06:25
@github-actions github-actions Bot added the S: Needs Review Awaiting review from a Maintainer label May 7, 2024
@Axionyxx Axionyxx self-requested a review May 7, 2024 14:13
@Axionyxx
Copy link
Copy Markdown
Contributor

Axionyxx commented May 7, 2024

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

@deltanedas
Copy link
Copy Markdown
Contributor Author

yep has a comment to update when merged

Copy link
Copy Markdown
Contributor

@Axionyxx Axionyxx 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
Copy Markdown
Contributor Author

a test that makes sure shuttles are valid

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

@Axionyxx
Copy link
Copy Markdown
Contributor

Axionyxx commented May 7, 2024

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

deltanedas added 2 commits May 7, 2024 22:48
@deltanedas deltanedas requested a review from Axionyxx May 7, 2024 22:09
@Bonktrauma
Copy link
Copy Markdown
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
Copy Markdown
Contributor Author

yeah mapping being in locker or research whatevers best

Copy link
Copy Markdown
Contributor

@Axionyxx Axionyxx 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
Copy Markdown
Member

yeah mapping being in locker or research whatevers best

Was previously mapped on the bridge

@IamVelcroboy
Copy link
Copy Markdown
Member

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

@Axionyxx
Copy link
Copy Markdown
Contributor

Axionyxx commented May 9, 2024

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

@Axionyxx
Copy link
Copy Markdown
Contributor

Axionyxx commented May 9, 2024

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 deltanedas requested a review from Axionyxx May 9, 2024 20:00
@deltanedas
Copy link
Copy Markdown
Contributor Author

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

Copy link
Copy Markdown
Contributor

@Axionyxx Axionyxx 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

Comment thread Content.Shared/CCVar/CCVars.cs
deltanedas and others added 2 commits May 14, 2024 11:18
s
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
@deltanedas deltanedas requested a review from Axionyxx May 14, 2024 11:19
@Axionyxx Axionyxx enabled auto-merge (squash) May 15, 2024 12:09
@Axionyxx Axionyxx merged commit 9291c35 into DeltaV-Station:master May 15, 2024
@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
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
# Description

This is but a small update in the campaign to, "Make people hate Salvage
less". This time, by adding Gold, Silver, and Uranium to the list of raw
materials that can be ordered by Logi. This serves as an extremely
useful failsafe for in the event that Salvage is
Unwilling/Dead/Incompetent/Shitters and failing to provide these raw
materials to the station. Now Logi can throw away station money at
getting these valuable materials.

This is also extremely useful, since by ordering Uranium, it's possible
for Logi to provide spare fuel for Engineering on the newly updated
Saltern map.
Simple-Station/Einstein-Engines#1170
Which no longer has an AME, and instead contains a dedicated Generator
Room to serve as backup power. One crate of Uranium can provide Saltern
with power for up to 30 minutes. Longer if Engineering correctly sets up
the Solar arrays.

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/04d94031-955e-4d8d-b5f7-c677c353c4e9)

</p>
</details>

# Changelog

:cl:
- add: Cargo can now order crates of Uranium, Gold, and Silver. This is
still far more expensive than getting the materials from Salvage, but
serves as an incredibly useful failsafe in the event Salvage is
Unwilling/Dead/Incompetent/Shitters.
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes: UI Changes: YML Changes any yml files S: Needs Review Awaiting review from a Maintainer

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants