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

Conversation

Wolfking6116
Copy link
Contributor

About the PR

Returns the RCD to Frontier via Research and Cargo.

(also threw Compact Power in there and commented it out since I noticed it was missing when looking at the older industrial file. can remove if desired since it's not the point of this pr)

Why / Balance

-Why: Many people are upset that it's not obtainable right now except via expeditions, especially with it being one of the few ways to remove plating.

-Balance: I think I added a slight upcharge to the tech cost of it vs the original version. The crates that were added to Cargo were given fairly high prices and separated between the tool and the ammo itself since it is a very powerful tool to have. It seems like a decent opportunity for a money sink for those who have the means to spend it and not care so much.

Personally I think it should be a little bit higher as I now notice it is just within cost of someone to buy with a brand new character and I'm not really happy about that.

Technical details

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

🆑

  • add: Frontier Sector has had their RCD permits reinstated, but CentCom increased the tariffs on them coming through Cargo.

@Wolfking6116 Wolfking6116 marked this pull request as ready for review March 11, 2024 13:10
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

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

# 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

@dvir001 dvir001 added Status: Awaiting Changes This PR has changes that need to be made before merging Status: DO NOT MERGE labels Mar 11, 2024
@github-actions github-actions bot added the FTL label Mar 11, 2024
Qulibly and others added 17 commits March 11, 2024 19:03
* 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]>
* 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
* 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]>
…-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)
* 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]>
* 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]>
* 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]>
Co-authored-by: Nyazz <Nyazz@DESKTOP-Q577H4Q>
* 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.
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Mar 18, 2024
@GreaseMonk
Copy link
Contributor

I propose to close this PR and instead, merge this one:
#1130

@Wolfking6116
Copy link
Contributor Author

After speaking more with Grease about it in the development channel I have some revisions to the submission to make to coordinate this with submission #1130

Very excited about the shipyard RCD!

Wolfking6116 added 4 commits March 19, 2024 02:11
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
Copy link
Contributor

github-actions bot commented Mar 19, 2024

RSI Diff Bot; head commit ec967ba merging into 3eeebdd
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Clothing/Head/Hardsuits/maxim_prototype.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET Added
on-equipped-HELMET Added

Resources/Textures/_NF/Clothing/Head/Helmets/eva_hydro.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/Head/Helmets/eva_mailman.rsi

State Old New Status
equipped-HELMET Added
icon Added

Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/maxim_prototype.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_hydro.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_NF/Clothing/OuterClothing/Suits/eva_mailman.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after ec967ba

Wolfking6116 added 4 commits March 19, 2024 03:54
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
@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Mar 19, 2024
@GreaseMonk
Copy link
Contributor

GreaseMonk commented Mar 24, 2024

Can make the regular rcd a tad more available, make it as a reward and maybe even put it in the salvage spawn pool.
However, this PR will make it researchable and that does not align with frontier philosophy.

Therefore, i will be closing this.

@GreaseMonk GreaseMonk closed this Mar 24, 2024
@Wolfking6116
Copy link
Contributor Author

Can make the regular rcd a tad more available, make it as a reward and maybe even put it in the salvage spawn pool. However, this PR will make it researchable and that does not align with frontier philosophy.

Therefore, i will be closing this.

You seem to be saying conflicting statements?

https://discord.com/channels/1123826877245694004/1127687656084611214/1219399871337857044

@Wolfking6116
Copy link
Contributor Author

Spoke with Grease to clarify that it is a decision from the Frontier Dev Team overall and not based on GreaseMonk's own views. It's unfortunate, but at least with the inclusion of the Shipyard RCD there's some love to replace it!

Thank you all for the consideration none-the-less.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C# FTL Map-Shuttle Map - Shuttle Sprites Status: Awaiting Changes This PR has changes that need to be made before merging Status: DO NOT MERGE UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.