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

Ashtray is real, and smoking is still bad for you #916

Merged
merged 3 commits into from
Jan 24, 2024
Merged

Ashtray is real, and smoking is still bad for you #916

merged 3 commits into from
Jan 24, 2024

Conversation

dvir001
Copy link
Contributor

@dvir001 dvir001 commented Jan 24, 2024

About the PR

Added the ashtray

Why / Balance

The floor isnt a trashbag

Technical details

.yml

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame,

image

Breaking changes

Changelog
🆑 dvir01

  • add: Added ashtray to the shadycig vender.

@github-actions GitHub Actions
Copy link
Contributor

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

Resources/Textures/_NF/Objects/Misc/ashtray.rsi

State Old New Status
icon-0 Added
icon-1 Added
icon-2 Added
icon-3 Added

@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Jan 24, 2024
@dvir001 dvir001 changed the title Ashtray is real smoking is still bad for you Ashtray is real, and smoking is still bad for you Jan 24, 2024
@Cheackraze Cheackraze merged commit 2132716 into new-frontiers-14:master Jan 24, 2024
14 of 15 checks passed
FrontierATC added a commit that referenced this pull request Jan 24, 2024
@FrontierATC
Automatic Changelog (#916)
72d6d67
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Cheackraze Cheackraze Cheackraze approved these changes

@MagnusCrowe MagnusCrowe Awaiting requested review from MagnusCrowe

Assignees
No one assigned
Labels
No C# Sprites Status: Needs Review This PR is awaiting reviews YML
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dvir001 @Cheackraze