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

Smoke.mp4 #931

Merged
merged 22 commits into from
Apr 19, 2024
Merged

Conversation

KittenColony
Copy link
Contributor

@KittenColony KittenColony commented Mar 5, 2024

About the PR

Adds several new cigarette brands in an attempt to shatter the monopoly Nomads and Interdyne have on the smokers market.

Why / Balance

Nomads don't cut it anymore. The majority of people prefer Nomads for the fact that there isn't a better alternative.

Technical details

adds a few .rsi files and some .yml files in the dV namespace

Media

image

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

Changelog

🆑

add: Added Several new cigarette brands.

@KittenColony KittenColony requested a review from DebugOk as a code owner March 5, 2024 10:02
@github-actions github-actions bot added S: Needs Review Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Mar 5, 2024
Copy link
Contributor

github-actions bot commented Mar 5, 2024

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

Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/pink.rsi

State Old New Status
closed Added
inhand-left Added
inhand-right Added
open Added

Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Cartons/purple.rsi

State Old New Status
closed Added
inhand-left Added
inhand-right Added
open Added

Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/pink.rsi

State Old New Status
closed Added
equipped-BELT Added
inhand-left Added
inhand-right Added
open Added
trash Added

Resources/Textures/DeltaV/Objects/Consumable/Smokeables/Cigarettes/Packs/purple.rsi

State Old New Status
closed Added
equipped-BELT Added
inhand-left Added
inhand-right Added
open Added
trash Added

Edit: diff updated after 2bd676b

Copy link
Contributor

@DangerRevolution DangerRevolution left a comment

Choose a reason for hiding this comment

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

CandyCigCarton pls

@KittenColony
Copy link
Contributor Author

its far from done, I still have to do beef cigarettes and [redacted], I'm just trying to get my dev-environment to work

@KittenColony KittenColony marked this pull request as draft March 5, 2024 10:16
@KittenColony
Copy link
Contributor Author

fucking dev env wont work so im going to hope this currently works and try the other bits later

@KittenColony KittenColony marked this pull request as ready for review March 8, 2024 07:26
@KittenColony
Copy link
Contributor Author

why the fuck

@KittenColony
Copy link
Contributor Author

I give up

@KittenColony
Copy link
Contributor Author

I NO LONGER GIVE UP!

@KittenColony
Copy link
Contributor Author

I still need to add beef cigarettes and some other misc brands, as well as the vender contents but weh!

@KittenColony
Copy link
Contributor Author

why do I smell burning?

@KittenColony
Copy link
Contributor Author

I should have put that in a long time ago

@deltanedas deltanedas merged commit 3032530 into DeltaV-Station:master Apr 19, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants