-
-
Notifications
You must be signed in to change notification settings - Fork 285
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
Resprites most cigarette boxes & Adds two new imported cigarettes. #6638
Merged
silicons
merged 34 commits into
Citadel-Station-13:master
from
AlphaM01:the-cigarettening
Aug 2, 2024
Merged
Resprites most cigarette boxes & Adds two new imported cigarettes. #6638
silicons
merged 34 commits into
Citadel-Station-13:master
from
AlphaM01:the-cigarettening
Aug 2, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
you're out of touch ...
woe, [menthol brand] upon ye
xbox cigarette is no more, but it still looks like some kind of energy drink juicebox
expensive and in limited supply, but not premium because coin mechanics are lame
leaves eridani mention to fluff desc, just a bit neater
github-actions
bot
added
the
size/M
Denotes a PR that changes 30-99 lines, ignoring generated files.
label
Jul 31, 2024
Yooooo these look awesome! |
should hopefully not break anything but I'll test later
TheLordME
approved these changes
Jul 31, 2024
silicons
pushed a commit
that referenced
this pull request
Jul 31, 2024
silicons
approved these changes
Aug 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
So this was going to be Epsilon Eridani Imports Chapter 1, however, in spriting the new cigarettes I became so annoyed at the fact that most of our cigarette boxes are either a recolor or ugly, so I resprited most of them as well. This also removes nicotine from the Blackstar brand which is, according to Captain (who added them), not supposed to have it. (I'm not sure nicotine even has any effects, but I've set it to zero anyways).
Trans-stellars get to keep the original sprite, since they are the base cig, however I've still given their open states a tiny facelift to be in-line with all the others.
Jerichos only have small improvements, their sprite was already fine.
P100s have more noticeable changes, but largely retained the same appearance.
Here is a visual of all the resprite changes, old on the top, new on the bottom:
As for the new cigarettes, there are two new brands.
One for lights (theoretically half the nicotine content) called Kyningc [sic], and one for less exotic herbal cigarettes (for those who want something less hardcore than Blackstars) called Subrosa.
Both of these are imported from Epsilon Eridani.
I don't feel they deserve to crowd the coin section of the vending machine, however, so I've added them into regular stock with more limited supply (two boxes per vending machine) and increased costs (Kyningc Silvers are the new most expensive box at 27 thaler each) to reflect their imported nature.
These have unique cigarette sprites. White filters with a gray stripe and all-sepia brown respectively.
Here's an exceedingly fancy preview to market these fictional products:
The only other change is some changes in the wording for the descriptions of Carcinoma Angels to be slightly less ridiculous and more cohesive between the desc and desc_fluff without really changing the overall story.
Why It's Good For The Game
Getting rid of boring recolor sprites is good.
Making Blackstars more mechanically accurate to their lore is good.
Tiny bit of worldbuilding with the new brands, hopefully more to follow soon.
Carcinoma Angels were always Classic SS13 weird, but now they're a little more believable.
Changelog
🆑
add: Added two new imported cigarette brands to vending machines.
tweak: Updated Carcinoma Angel descriptions.
tweak: Updated or resprited most cigarette box sprites.
/:cl: