Unathi Leaves (#11399)

code/game/machinery/vending_types.dm

@@ -376,8 +376,8 @@
 		/obj/item/storage/box/fancy/cigarettes/dromedaryco = 5,
 		/obj/item/storage/box/fancy/cigarettes/nicotine = 3,
 		/obj/item/storage/box/fancy/cigarettes/pra = 6,
-		/obj/item/storage/chewables/rollable/bad = 6,
 		/obj/item/storage/chewables/rollable = 8,
+		/obj/item/storage/chewables/rollable/unathi = 6,
 		/obj/item/storage/chewables/rollable/fine = 5,
 		/obj/item/storage/chewables/rollable/nico = 3,
 		/obj/item/storage/chewables/tobacco/bad = 6,
@@ -406,8 +406,8 @@
 		/obj/item/storage/box/fancy/cigarettes/dromedaryco = 82,
 		/obj/item/storage/box/fancy/cigarettes/nicotine = 89,
 		/obj/item/storage/box/fancy/cigarettes/pra = 79,
-		/obj/item/storage/chewables/rollable/bad = 56,
 		/obj/item/storage/chewables/rollable = 63,
+		/obj/item/storage/chewables/rollable/unathi = 65,
 		/obj/item/storage/chewables/rollable/fine = 69,
 		/obj/item/storage/chewables/rollable/nico = 86,
 		/obj/item/storage/chewables/tobacco/bad = 55,

code/game/objects/items/weapons/storage/misc.dm

@@ -171,13 +171,6 @@
 
 //loose leaf
 
-/obj/item/storage/chewables/rollable/bad
-	name = "box of S'th Kasavakh tobacco leaves"
-	desc = "A box of coarse gritty tobacco which still manages to grow against the desertification of Moghes."
-	starts_with = list(/obj/item/reagent_containers/food/snacks/grown/dried_tobacco/bad = 8)
-	icon_state = "roll_bad"
-	item_state = "Fpacket"
-
 /obj/item/storage/chewables/rollable
 	name = "box of Agyre Lake tobacco leaves"
 	desc = "Advertised to be grown using fresh water pumped directly from the titular Martian lake."
@@ -193,6 +186,13 @@
 	pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
 	use_sound = 'sound/items/storage/box.ogg'
 
+/obj/item/storage/chewables/rollable/unathi
+	name = "box of S'th Kasavakh tobacco leaves"
+	desc = "A box of coarse gritty tobacco which still manages to grow against the desertification of Moghes."
+	starts_with = list(/obj/item/reagent_containers/food/snacks/grown/dried_tobacco = 8)
+	icon_state = "roll_unathi"
+	item_state = "Fpacket"
+
 /obj/item/storage/chewables/rollable/fine
 	name = "box of Excelsior Epsilon tobacco leaves"
 	desc = "Quality tobacco favored by the Corporates of Eridani - just don't read the label at the bottom."

code/modules/client/preference_setup/loadout/loadout_smoking.dm

@@ -80,7 +80,7 @@
 /datum/gear/smoking/leaves/New()
 	..()
 	var/leaves = list()
-	leaves["S'th Kasavakh tobacco leaves"] = /obj/item/storage/chewables/rollable/bad
+	leaves["S'th Kasavakh tobacco leaves"] = /obj/item/storage/chewables/rollable/unathi
 	leaves["Agyre Lake tobacco leaves"] = /obj/item/storage/chewables/rollable
 	leaves["Excelsior Epsilon tobacco leaves"] = /obj/item/storage/chewables/rollable/fine
 	leaves["Golden Sol tobacco leaves"] = /obj/item/storage/chewables/rollable/nico

html/changelogs/geeves-unathi_leaves.yml

@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - tweak: "The Unathi tobacco leaves are no longer low quality producing acrid smoke."