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

Resprites most cigarette boxes & Adds two new imported cigarettes. #6638

Merged
merged 34 commits into from
Aug 2, 2024

Conversation

AlphaM01
Copy link
Contributor

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:
respritebanner_large

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:
Banner_EEcigs_large

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:

leaves eridani mention to fluff desc, just a bit neater
@github-actions github-actions bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 31, 2024
@ktoma36
Copy link
Collaborator

ktoma36 commented Jul 31, 2024

Yooooo these look awesome!

should hopefully not break anything but I'll test later
silicons pushed a commit that referenced this pull request Jul 31, 2024
@silicons silicons merged commit 234e627 into Citadel-Station-13:master Aug 2, 2024
7 checks passed
silicons pushed a commit that referenced this pull request Aug 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants