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

Bbgun #580

Merged
merged 6 commits into from
Jan 2, 2024
Merged

Bbgun #580

merged 6 commits into from
Jan 2, 2024

Conversation

IamVelcroboy
Copy link
Member

About the PR

Adds a BB gun and cargo order crate

Why / Balance

  • Mainly for the public shooting range on Tortuga but also for more fun items.

Technical details

n/a

Media

2023-12-20.12-13-30.mp4
  • I have added screenshots/videos to this PR showcasing its changes in-game, or this PR does not require an in-game showcase

Breaking changes

n/a

Changelog

Make sure to take this Changelog template out of the comment block in order for it to show up.
🆑 Velcroboy

  • add: Added BB guns! Don't shoot your eye out.

@github-actions github-actions bot added S: Needs Review Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Dec 20, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 20, 2023 •
edited
Loading

RSI Diff Bot; head commit 29dfedc merging into 490e6c6
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi

State Old New Status
bbbox Added
bbbullet Added

Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi

State Old New Status
base Added
equipped-BACKPACK Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 29dfedc

Colin-Tel
Colin-Tel approved these changes Jan 2, 2024
View reviewed changes
Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

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

Looks like a lil Daisy Red Ryder, don't it?

@Colin-Tel Colin-Tel merged commit c7c09e3 into DeltaV-Station:master Jan 2, 2024
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Jan 2, 2024
Automatic Changelog Update (#580)
f66a755
@IamVelcroboy
Copy link
Member Author

Looks like a lil Daisy Red Ryder, don't it?

That's what we were going for!

DebugOk pushed a commit to DebugOk/Delta-v that referenced this pull request Jan 20, 2024
@IamVelcroboy @DebugOk
Bbgun (DeltaV-Station#580)
2d51c9d 
* Add BB gun

* Clean up back sprite

* Replace old code

* Case?

* Guess I didn't need that

* Proper attribution

---------

Co-authored-by: Jeff <>
(cherry picked from commit c7c09e3)
DebugOk pushed a commit to DebugOk/Delta-v that referenced this pull request Jan 20, 2024
@DebugOk
Automatic Changelog Update (DeltaV-Station#580)
a3ffbf6 
(cherry picked from commit f66a755)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Colin-Tel Colin-Tel Colin-Tel approved these changes

@DebugOk DebugOk DebugOk approved these changes

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 S: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@IamVelcroboy @DebugOk @Colin-Tel