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

Music + Smokes #251

Merged
merged 6 commits into from
Feb 12, 2025
Merged

Music + Smokes #251

merged 6 commits into from
Feb 12, 2025

Conversation

sleepyyapril
Copy link
Contributor

@sleepyyapril sleepyyapril commented Feb 12, 2025 •
edited
Loading

🆑

  • add: Lobby tracks "The Station," "Get It Done," and "Unknown Theory," by A-Guy have been added.
  • add: Nanotrasen has partnered with a couple extra brands to provide you with more cigarette varieties! Happy smoking! (by KittenColony)

@TheDen-Bot TheDen-Bot changed the title it would be SO FUNNY It Would Be SO FUNNY Feb 12, 2025
sleepyyapril and others added 5 commits February 12, 2025 09:14
@sleepyyapril
Revert "it would be SO FUNNY"
e156b71 
This reverts commit 4c02438.
@therealDLondon @sleepyyapril
New Lobby Track: "The Station" (#1761)
b5188ed 
* upload and YML updates

* namefix
@therealDLondon @sleepyyapril
New Lobby Track "Get It Done" (#1766)
33a86af 
Get it done, got it done
@therealDLondon @sleepyyapril
New Lobby Track "Undefined Theory" by A-Guy (#2234)
2aa3762 
* Create Undefined_Theory.ogg

* stuff
@KittenColony @DEATHB4DEFEAT @sleepyyapril
Smoke.mp4 (#931)
954757a 
* added De' Jure and Sugar Rush cigarettes

* making life easier in the future

* candy carton :)

* trying to get this to work

* !!!

* YOU CAN EAT EM NOW >:D

* added to cig machine / loot spawners

* # DeltaV (thank you Death)

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: KittenColony <[email protected]>

* thank also

Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: KittenColony <[email protected]>

---------

Signed-off-by: KittenColony <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
@sleepyyapril sleepyyapril changed the title It Would Be SO FUNNY Music + Smokes Feb 12, 2025
@github-actions GitHub Actions
Copy link
Contributor

RSI Diff Bot; head commit 954757a merging into 1c22040
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

@sleepyyapril sleepyyapril merged commit 7c9138b into TheDenSS14:master Feb 12, 2025
15 of 16 checks passed
TheDen-Bot added a commit that referenced this pull request Feb 12, 2025
@TheDen-Bot
Automated changelog update (#251)
bdb6f3b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Audio Changes: C# Changes: Sprite Changes: YML
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sleepyyapril @therealDLondon @KittenColony