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

…6638)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## 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](https://github.com/user-attachments/assets/7375d821-a5f1-49af-a406-4e510f0f6f15)

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](https://github.com/user-attachments/assets/570a0f3a-7bc8-4bf1-87a7-7420cd2f6623)

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.


<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## 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.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Added two new imported cigarette brands to vending machines.
tweak: Updated Carcinoma Angel descriptions.
tweak: Updated or resprited most cigarette box sprites.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

code/game/machinery/vending/misc.dm

@@ -46,6 +46,8 @@
 		/obj/item/storage/fancy/cigarettes/luckystars = 5,
 		/obj/item/storage/fancy/cigarettes/jerichos = 5,
 		/obj/item/storage/fancy/cigarettes/menthols = 5,
+		/obj/item/storage/fancy/cigarettes/kingsilvers = 2,
+		/obj/item/storage/fancy/cigarettes/subrosas = 2,
 		/obj/item/storage/rollingpapers = 5,
 		/obj/item/storage/rollingblunts = 5,
 		/obj/item/storage/box/matches = 10,
@@ -67,6 +69,8 @@
 		/obj/item/storage/fancy/cigarettes/luckystars = 17,
 		/obj/item/storage/fancy/cigarettes/jerichos = 22,
 		/obj/item/storage/fancy/cigarettes/menthols = 18,
+		/obj/item/storage/fancy/cigarettes/kingsilvers = 27,
+		/obj/item/storage/fancy/cigarettes/subrosas = 22,
 		/obj/item/storage/rollingpapers = 15,
 		/obj/item/storage/rollingblunts = 25,
 		/obj/item/storage/box/matches = 3,

code/game/objects/items/storage/misc_legacy/fancy.dm

@@ -323,7 +323,7 @@
 
 /obj/item/storage/fancy/cigarettes/carcinomas
 	name = "\improper pack of Carcinoma Angels"
-	desc = "This unknown brand was slated for the chopping block, until they were publicly endorsed by an old Earthling gonzo journalist. The rest is history. They sell a variety for cats, too."
+	desc = "This neptunian brand was slated for the chopping block, until they were publicly endorsed by an old Earthling gonzo journalist. The rest is history."
 	icon_state = "CApacket"
 	brand = "\improper Carcinoma Angel"
 
@@ -340,6 +340,20 @@
 	starts_with = list(/obj/item/clothing/mask/smokable/cigarette/import = 6)
 	brand = "\improper Black Star"
 
+/obj/item/storage/fancy/cigarettes/kingsilvers
+	name = "\improper pack of Kyningc Silvers"
+	desc = "A brand of imported cigarettes. A homegrown favourite to many a pretentious Eridanian businessman."
+	icon_state = "KSpacket"
+	starts_with = list(/obj/item/clothing/mask/smokable/cigarette/light = 6)
+	brand = "\improper Kyningc Silver"
+
+/obj/item/storage/fancy/cigarettes/subrosas
+	name = "\improper pack of Subrosas"
+	desc = "A brand of imported cigarettes. These ones contain a proprietary herbal blend, 100% nicotine free."
+	icon_state = "SRpacket"
+	starts_with = list(/obj/item/clothing/mask/smokable/cigarette/herbal = 6)
+	brand = "\improper Subrosa"
+
 /obj/item/storage/fancy/cigar
 	name = "cigar case"
 	desc = "A case for holding your cigars when you are not smoking them."

code/game/objects/items/weapons/cigs_lighters.dm

@@ -321,19 +321,25 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			quench()
 
 /obj/item/clothing/mask/smokable/cigarette/import
-	name = "cigarette"
-	desc = "A roll of tobacco and blended herbs."
+	desc = "A roll of exotic blended herbs."
 	icon_state = "cigimp"
 	item_state = "cigimp"
-	throw_speed = 0.5
-	w_class = WEIGHT_CLASS_TINY
-	slot_flags = SLOT_EARS | SLOT_MASK
-	attack_verb = list("burnt", "singed")
 	type_butt = /obj/item/cigbutt/imp
-	chem_volume = 15
-	max_smoketime = 300
-	smoketime = 300
-	nicotine_amt = 2
+	nicotine_amt = 0
+
+/obj/item/clothing/mask/smokable/cigarette/light
+	icon_state = "ciglite"
+	item_state = "ciglite"
+	type_butt = /obj/item/cigbutt/light
+	nicotine_amt = 1
+
+
+/obj/item/clothing/mask/smokable/cigarette/herbal
+	desc = "A roll of aromatic blended herbs."
+	icon_state = "cigherbal"
+	item_state = "cigherbal"
+	type_butt = /obj/item/cigbutt/herbal
+	nicotine_amt = 0
 
 ////////////
 // CIGARS //
@@ -419,10 +425,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	user.update_inv_r_hand(1)
 
 /obj/item/cigbutt/imp
-	name = "cigarette butt"
-	desc = "A manky old cigarette butt."
 	icon_state = "cigimpbutt"
 
+/obj/item/cigbutt/light
+	icon_state = "ciglitebutt"
+
+/obj/item/cigbutt/herbal
+	icon_state = "cigherbalbutt"
+
 /////////////////
 //SMOKING PIPES//
 /////////////////

code/modules/examine/descriptions/smokeables.dm

@@ -19,13 +19,19 @@
 	This is a pack of Temperamento Menthols, the main product of the company.  They taste like menthol, surprisingly enough."
 
 /obj/item/storage/fancy/cigarettes/carcinomas
-	description_fluff = "The CarcinoCo was originally destined to fail, as the company blatantly advertized themselves as creating the 'most cancerous cigarette'. The cigarettes became a hit among those rich enough to afford regular lung replacements."
+	description_fluff = "The precursor company of CarcinoCo was originally destined to fail, as the company's cigarettes were found to be the 'most carcinogenic cigarette ever made'. Yet, the cigarettes became a hit among those rich enough to afford the exorbitant treatment costs after it's endorsement by a well-known journalist. Soon enough the company underwent a complete rebranding, embracing the new motto."
 
 /obj/item/storage/fancy/cigarettes/professionals
 	description_fluff = "Decades ago, probably before you were born, Gilthari Exports created the Professional 120s.  They wanted to make a fancy cigarette that would be considered a luxury.  Nowadays, they are generally concidered an emblem of the nouveau riche and the elderly.  They are, however, very high-quality and made from the very best Solar tobacco."
 
 /obj/item/storage/fancy/cigarettes/blackstars
-	description_fluff = "Originally developed as an upscale alternative to tobacco-based cigarettes, Black Stars use a proprietary blend of chemically treated herbs. Although these cigarettes still contain nicotine, they produce a thicker, more richly scented smoke than those using tobacco. Their iconic black filters and papering distinguish them almost as much as the exotic way their cherries glow green."
+	description_fluff = "Originally developed as an upscale alternative to tobacco-based cigarettes, Black Stars use a proprietary blend of chemically treated herbs. They produce a thicker, more richly scented smoke than those using tobacco. Their iconic black filters and papering distinguish them almost as much as the exotic way their cherries glow green."
+
+/obj/item/storage/fancy/cigarettes/kingsilvers
+	description_fluff = "Kyningc Tobacco Co. is among the oldest and most popular cigarette brands of Epsilon Eridani. Grown from domestic, gene-tailored strains. Silvers are considered a 'light' variant with reduced nicotine content, making them more easily exported to foreign markets."
+
+/obj/item/storage/fancy/cigarettes/subrosas
+	description_fluff = "The flagship product of it's namesake Eridanian company, Subrosa cigarettes contain no tobacco or nicotine and are instead made with a selection of dried aromatic herbs and extracts including, presumably, roses. Each sepia-colored roll smells faintly of cloves and cinnamon."
 
 /obj/item/clothing/mask/smokable/cigarette/cigar
 	description_fluff = "While the label does say that this is a 'premium cigar', it really cannot match other types of cigars on the market.  Is it a quality cigarette?  Perhaps.  Was it hand-made with care?  No.  This is what differentiates between quality products that Gilthari puts out and Nanotrasen 'premium' cigars like this one."