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

Python Non-AP Tweak #3093

Merged
merged 12 commits into from
Mar 8, 2025
Merged

Python Non-AP Tweak #3093

merged 12 commits into from
Mar 8, 2025

Conversation

ThataKat
Copy link
Contributor

@ThataKat ThataKat commented Mar 2, 2025

About the PR

Python now comes with regular rounds by default. Regular speedloaders are available for 2tc. AP still available for 3tc.

Why / Balance

Brings in the original changes from space-wizards/space-station-14#33306 to accompany the price reduction in the upcoming upstream merge.

The cost of buying a python with AP will still be 7tc total, but it's now slightly less niche.

Technical details

yaml tweaks to uplink. new ftl. Added an icon for speedloader with AP rounds for use in the uplink

Media

Screenshot 2025-03-02 105058

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

None

Changelog

🆑

  • tweak: The uplink Python now comes with standard rounds, and standard speedloaders can be purchased in the uplink.

@ThataKat ThataKat requested review from a team as code owners March 2, 2025 19:32
@github-actions github-actions bot added S: Needs Review Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi size/S 16-63 lines labels Mar 2, 2025
Copy link
Contributor

github-actions bot commented Mar 2, 2025

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

Resources/Textures/_DV/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi

State Old New Status
piercing-icon Added

Edit: diff updated after 2025d3f

@Lyndomen
Copy link
Contributor

Lyndomen commented Mar 2, 2025

direction approved btw but need yaml tweaks real

@ThataKat ThataKat requested a review from deltanedas March 3, 2025 00:41
@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Mar 4, 2025
Copy link
Contributor

github-actions bot commented Mar 4, 2025

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

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Mar 4, 2025
@ThataKat
Copy link
Contributor Author

ThataKat commented Mar 5, 2025

*cough don't worry about why a one line comment needed 4 commits

Anyways done now I think

@ThataKat ThataKat requested a review from deltanedas March 5, 2025 02:44
@deltanedas deltanedas enabled auto-merge (squash) March 6, 2025 02:15
@deltanedas deltanedas merged commit 84f62fd into DeltaV-Station:master Mar 8, 2025
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/S 16-63 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants