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

CircuitVend, Autotune and cargo orders (the ones with machines) are now flatpacked #1075

Merged
merged 15 commits into from
Mar 8, 2024

Conversation

ErhardSteinhauer
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer commented Mar 3, 2024

About the PR

  • Replaced circuits in CircuitVend with flatpacked machines (except IFF computer board and kept door electronics), added flatpacker and mining gun flatpacks.
  • Replaced machines sold at cargo with flatpacked variants: thrusters, gyros, generators.
  • Replaced stuff in Science Lab Kit sold in cargo with flatpacked machines.
  • Big instruments in Autotune vendomat are now flatpacked and sold freely.

Why / Balance

QoL.
Added icon sprites because vendomat doesn't render icon layers.

Media

image
image

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

Changelog
🆑 erhardsteinhauer

  • tweak: FlatpackVend sells flatpacked machines instead of circuits now (renamed).
  • tweak: JRPAKMAN, PAKMAN, SUPERPAKMAN, thrusters, gyroscopes and some other machines are sold as flatpacks at cargo now.
  • tweak: Particularly big musical instruments are sold as flatpacks from Autotune vendomat.

@github-actions github-actions bot added No C# YML Merge Conflict This PR has conflicts that prevent merging labels Mar 3, 2024
Copy link
Contributor

github-actions bot commented Mar 4, 2024

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

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

github-actions bot commented Mar 6, 2024

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

Resources/Textures/_NF/Objects/Devices/flatpack.rsi

State Old New Status
base Added
command_airlock Added
command_server Added
engineering_gyroscope Added
engineering_lathe Added
engineering_thruster Added
icon-default Added
medical_console Added
medical_lathe Added
overlay Added
power_charger Added
power_console_ame Added
power_generator Added
science_anomaly_vessel Added
science_ape Added
science_artifact_analyzer Added
science_console Added
science_lathe Added
science_server Added
service_lathe Added
service_music Added
service_tray Added
supply_gun Added
supply_lathe Added

Edit: diff updated after 46bec39

@ErhardSteinhauer ErhardSteinhauer marked this pull request as ready for review March 6, 2024 08:45
@dvir001 dvir001 self-requested a review March 8, 2024 10:15
@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Mar 8, 2024
@dvir001
Copy link
Contributor

dvir001 commented Mar 8, 2024

CircuitVend rename to FlatpackVend / ElectronicVend also needed, ill fix it.

@github-actions github-actions bot added Map-POI Map - POI FTL Map-Outpost Map - Outpost and removed YML labels Mar 8, 2024
Copy link
Contributor

@dvir001 dvir001 left a comment

Choose a reason for hiding this comment

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

YML Cleanup fix

@dvir001 dvir001 merged commit 1d0f74c into new-frontiers-14:master Mar 8, 2024
13 checks passed
FrontierATC added a commit that referenced this pull request Mar 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
FTL Map-Outpost Map - Outpost Map-POI Map - POI No C# Sprites Status: Needs Review This PR is awaiting reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants