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

Return RCD to frontier #1109

Closed
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
8474f73
adds RCD to Cargo
Mar 11, 2024
9c52591
adds
Mar 11, 2024
50f2b55
Added Air tank to fill (#1105)
ThatOneGoblin25 Mar 11, 2024
e68011b
added localization message
Mar 11, 2024
9f27054
Crew monitor general tweaks and QoL changes (#1053)
Qulibly Mar 11, 2024
ad2e93f
Automatic Changelog (#1053)
FrontierATC Mar 11, 2024
93b9c40
Fix carrying (#1098)
Mnemotechnician Mar 11, 2024
2e26e40
Automatic Changelog (#1098)
FrontierATC Mar 11, 2024
6d09157
Refinement process for Artifexium (#1096)
Wolfking6116 Mar 11, 2024
b5a9528
Automatic Changelog (#1096)
FrontierATC Mar 11, 2024
31e3931
refactor(research): Improve initial research client registration (#1086)
exincore Mar 11, 2024
0d978ca
Fix tabletop computers (#1113)
GreaseMonk Mar 14, 2024
7021040
Update server rules (#1091)
Leander-0 Mar 14, 2024
1aa4f28
Automatic Changelog (#1091)
FrontierATC Mar 14, 2024
edd866f
Whiskey (New) (#763)
cite2000 Mar 16, 2024
fdff25a
Automatic Changelog (#763)
FrontierATC Mar 16, 2024
c20376a
KnuckleVerse (New) - Bboxing ship (#891)
Batuh1n Mar 16, 2024
a52ab8f
Updates disciple/fixes a few things (#1093)
nyozzl Mar 16, 2024
34e2069
Update mcdelivery.yml (#1124)
dvir001 Mar 17, 2024
650d525
Condor (#1123)
dvir001 Mar 17, 2024
91b1777
Canister (New) - Tiny scrap vessel (#1104)
Cu1r Mar 17, 2024
9299828
Automatic Changelog (#1104)
FrontierATC Mar 17, 2024
a622d9a
Adjusts the price of the NC Hauler to cost what it should (#1121)
Letholldus Mar 17, 2024
714d1c1
Automatic Changelog (#1121)
FrontierATC Mar 17, 2024
e1f6ec6
removes opportunity from shipyard (#1129)
MagnusCrowe Mar 18, 2024
0054ba1
Automatic Changelog (#1129)
FrontierATC Mar 18, 2024
065c84d
Rules formatting (#1127)
Leander-0 Mar 18, 2024
ce18929
Automatic Changelog (#1127)
FrontierATC Mar 18, 2024
7701f4f
UnEmagged (#1128)
dvir001 Mar 18, 2024
41ff359
Fix Pen Sign (#1126)
dvir001 Mar 18, 2024
b57358c
Automatic Changelog (#1126)
FrontierATC Mar 18, 2024
719be3b
Hardsuits Fabrication, Salvage TechFab (#1088)
ErhardSteinhauer Mar 18, 2024
f5fcd41
Automatic Changelog (#1088)
FrontierATC Mar 18, 2024
41b04a5
Increase soup maxVol to prevent spillage (#1122)
arimah Mar 18, 2024
87939de
Automatic Changelog (#1122)
FrontierATC Mar 18, 2024
2457bc9
Update opportunity.yml (#1131)
dvir001 Mar 18, 2024
223e3f9
Adds BoxShotgunSlug to ammo.yml (#1119)
ThatOneGoblin25 Mar 18, 2024
8dcb88a
Automatic Changelog (#1119)
FrontierATC Mar 18, 2024
028de8b
removes RCD from cargo
Mar 19, 2024
56c535f
returns RCD to science + Shipyard RCD to NF directory
Mar 19, 2024
c05c1b8
Squashed commit of the following:
Mar 19, 2024
41f784a
merged master with branch
Mar 19, 2024
84894d8
Squashed commit of the following:
Mar 19, 2024
8104eba
removed RCD from cargo
Mar 19, 2024
c677eb7
returned RCD to research + adjusted Shipyard RCD to NF directory
Mar 19, 2024
97e1542
Merge branch 'Return-RCD-to-Frontier' of https://github.com/Wolfking6…
Mar 19, 2024
613ff73
did I fix it?
Mar 19, 2024
ec967ba
Merge branch 'Return-RCD-to-Frontier' of https://github.com/Wolfking6…
Mar 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Cargo/cargo_engineering.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- type: cargoProduct
id: EngineeringRCDAmmo
icon:
sprite: Objects/Tools/rcd.rsi
state: ammo
product: CrateRCDAmmo
cost: 10000
category: Engineering
group: market

- type: cargoProduct
id: EngineeringRCD
icon:
sprite: Objects/Tools/rcd.rsi
state: icon
product: CrateRCD
cost: 15000
category: Engineering
group: market
Copy link
Contributor

@dvir001 dvir001 Mar 11, 2024

Choose a reason for hiding this comment

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

No, this should never ever be in cargo, not to mention the crate was uncommented from the upstream file.

This gives people a fast way to destroy ships / poi and to mess with people.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I can definitely understand that.

I did a quick set up for it to be purchasable through Cargo due to some conversations in discord and since it was permitted to spawn loose on a ship recently with little-to-no issue to hopefully serve as a little cash sink.

If the consensus overall is it's not desirable I can nix it certainly.

Copy link
Contributor

@dvir001 dvir001 Mar 11, 2024

Choose a reason for hiding this comment

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

It was removed from that ship.
#1106

33 changes: 33 additions & 0 deletions Resources/Prototypes/_NF/Research/industrial.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Tier 1

# Tier 2

- type: technology
id: RapidConstruction
name: research-technology-rapid-construction
icon:
sprite: Objects/Tools/rcd.rsi
state: icon
discipline: Industrial
tier: 2
cost: 10000
recipeUnlocks:
- RCD
- RCDAmmo
- BorgModuleRCD
Copy link
Contributor

@dvir001 dvir001 Mar 11, 2024

Choose a reason for hiding this comment

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

Put it as tier 3, and 15k points.
Might as well be worth it.

Copy link

Choose a reason for hiding this comment

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

A bit much, don't you think? I think it'll be better as default RCD in advanced tools research in T2 and rechargeable RCD in T3 under this one.

Not to mention you can buy one of atmos ships, it comes with RCD on it and you can get both RCD and one cartridge for it for 20k-ish, if you just buy-sell ship.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Definitely can do.

Though why exactly increase it to tier 3? It was pretty heavily under utilized before even as a tier 2 with less price.

Copy link
Contributor

Choose a reason for hiding this comment

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

"rechargeable RCD" you mean the admin tool that is infinite, hell no.

Also if you can name the ship we will go and remove it as no ship should have RCD mapped on it

Ill leave the increase it to tier 3 open a bit for talks if other maintainers want to comment about what they think about it @MagnusCrowe @GreaseMonk @Cheackraze

Copy link
Contributor Author

@Wolfking6116 Wolfking6116 Mar 11, 2024

Choose a reason for hiding this comment

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

Also if you can name the ship we will go and remove it as no ship should have RCD mapped on it

#1106

It's already been removed, but at the Ship Maker's discretion not out of any current known limitation

"rechargeable RCD" you mean the admin tool that is infinite, hell no.

I think they mean the other one that recharges slower, with a max charge limit.
tools.yml#L375

Copy link

@Dysh3s Dysh3s Mar 11, 2024

Choose a reason for hiding this comment

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

As if cartridge printing would be difficult at tier 3, not to mention you get bluespace bags there so hauling bunch of them won't be problematic. Currently RCD only needed for asteroid steam traps (basically one and only tool that can solve it). Not a big deal, no?

Condor. Atmos\SCI vessel. It comes with RCD, one cartridge & axe on it. you can buy it for ~70k and sell ship for ~50k. @dvir001

If only wizden kept axe tile prying as is it was...

Copy link
Contributor

Choose a reason for hiding this comment

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

Condor will be getting a fix,
Bluespace bags will get some kind of a fix soon I hope to make them more rare / harder to make but thats another PR issue.

RCD Is used for all floor removal as per axe tile changes, we cannot just revert the axe thing without fucking with another system.

Copy link

Choose a reason for hiding this comment

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

I mean a borg RCD. 3 max charge capacity, 30 second recharge rate.

Asteroids need a tweak then. Even with RCD you can't deal with them as fast, as you been able to with axe. And they are time limited. If you don't have RCD - no point to head in there. Maybe a ninja one - yeah, but definetly not a syndie one. Because there's so much steam in there that you probably won't even vent it all before asteroid disappears.

Copy link
Contributor

Choose a reason for hiding this comment

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

Asteroids do need a tweak, but thats need to be on another PR


# Tier 3

# - type: technology # frontier - threw this in here since I noticed it was missing, incase anyone wanted it back in. not the point of this pr so can remove it if needed.
# id: CompactPower
# name: research-technology-compact-power
# icon:
# sprite: Structures/Power/Generation/wallmount_generator.rsi
# state: panel
# discipline: Industrial
# tier: 3
# cost: 15000
# recipeUnlocks:
# - WallmountSubstationElectronics
# - WallmountGeneratorElectronics
# - WallmountGeneratorAPUElectronics
Copy link
Contributor

Choose a reason for hiding this comment

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

If this was uncommented on upstream file and missing, put it in upstream file, if not, remove this uncommented from here as it has no use to be here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was removed entirely from upstream, but still exists as a recipe to be unlocked by the Circuit printer via research

Copy link
Contributor

@dvir001 dvir001 Mar 11, 2024

Choose a reason for hiding this comment

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

This should be fully removed here tbh it makes power more free then its already is.
Power is so cheap right now that anyone building it is making the issue worst lamo

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah I do definitely agree that power is cheap right now.

I'm just sad to see usable content being cut is all. Maybe it can see a return someday as like a tier 3 Civilian tech or something. I'll get it nixed after work

Loading