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.

Sign up for GitHub

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

Jump to bottom

Adds Veterancy Weapons to Sec, Removes Ion (Broken), Fixes Cutlass Sp… #1599

Merged
merged 9 commits into from
Jan 23, 2025
Merged

Adds Veterancy Weapons to Sec, Removes Ion (Broken), Fixes Cutlass Sp… #1599

merged 9 commits into from
Jan 23, 2025

Conversation

BlueHNT
Copy link
Contributor

@BlueHNT BlueHNT commented Jan 19, 2025

Description

Adds some more expensive weapons to security which eat up more value.
idea from goob MRP

Changelog

🆑

  • add: Added 2 new security loadout items
  • tweak: Tweaked BSO's ammo
  • fix: Fixed energy cutlass sprite
  • remove: Removed broken Ion component

@github-actions github-actions bot added Changes: Localization Changes any ftl files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Jan 19, 2025
@SimpleStation14 SimpleStation14 changed the title Adds veterancy weapons to sec, removes Ion (broken), fixes cutlass sp… Adds Veterancy Weapons to Sec, Removes Ion (Broken), Fixes Cutlass Sp… Jan 19, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 19, 2025 •
edited
Loading

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

Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi

State Old New Status
e_cutlass_blade Modified

Edit: diff updated after fdd49cf

@angelofallars angelofallars self-requested a review January 19, 2025 14:03
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jan 19, 2025
@bruhmogus
Copy link

i feel like the energy sword should be kept to the hos, since he gets the big boy weapons

angelofallars
angelofallars previously requested changes Jan 19, 2025
View reviewed changes
@bruhmogus
Copy link

wait that was an energy CUTLASS? lmfao

@BlueHNT
Copy link
Contributor Author

BlueHNT commented Jan 20, 2025

Fucking heisentests

@VMSolidus VMSolidus merged commit 1aa7619 into Simple-Station:master Jan 23, 2025
13 checks passed
SimpleStation14 added a commit that referenced this pull request Jan 23, 2025
@SimpleStation14
Automatic Changelog Update (#1599)
9816bd2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VMSolidus VMSolidus VMSolidus approved these changes

@sleepyyapril sleepyyapril Awaiting requested review from sleepyyapril sleepyyapril is a code owner

@Remuchi Remuchi Awaiting requested review from Remuchi Remuchi is a code owner

@angelofallars angelofallars Awaiting requested review from angelofallars angelofallars is a code owner

Assignees
No one assigned
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@BlueHNT @bruhmogus @VMSolidus @angelofallars @sleepyyapril