From 12f321b8f019cdbbacce424ecc2443d516bf8222 Mon Sep 17 00:00:00 2001 From: Geeves Date: Mon, 15 Mar 2021 22:34:06 +0200 Subject: [PATCH] Unathi Leaves (#11399) --- code/game/machinery/vending_types.dm | 4 ++-- .../objects/items/weapons/storage/misc.dm | 14 +++++++------- .../loadout/loadout_smoking.dm | 2 +- html/changelogs/geeves-unathi_leaves.yml | 6 ++++++ icons/obj/cigs_lighters.dmi | Bin 26544 -> 26545 bytes 5 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 html/changelogs/geeves-unathi_leaves.yml diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index ffbc64a38e6..8e948db54bd 100644 --- a/code/game/machinery/vending_types.dm +++ b/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, diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm index b8184c3ed32..c8efe6c2f37 100644 --- a/code/game/objects/items/weapons/storage/misc.dm +++ b/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." diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index d466f9b9ce9..bbc5280c853 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/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 diff --git a/html/changelogs/geeves-unathi_leaves.yml b/html/changelogs/geeves-unathi_leaves.yml new file mode 100644 index 00000000000..15c202aace3 --- /dev/null +++ b/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." \ No newline at end of file diff --git a/icons/obj/cigs_lighters.dmi b/icons/obj/cigs_lighters.dmi index 5fcfd1034700e665616bbfcb2a95824abc103d9c..ec60a24233256b5d26eb1b98508a9820f6716266 100644 GIT binary patch delta 234 zcmVlirS5~Gm8uz+{Uj4uVtYBXJmCCEBiQ!*z0lN2JFe+t8fY-9o#wpv! z^w3Ze-XY7uJFO?f|Kajzc%peUJkdNFo@gEoPc)B)Cz?mY6V0RHi6-$akX8|5WrSH7 zp;kt?l@W4fgk2e-x80(4JsFnk(Xd;OhShpBY}TV;u^tV3^=Me@bU4OuHiAs$DEy*2 k;jcd3lc9D#?4taZ6>mAqUtf~HJB>M611XghvrhwIWRqHOmjD0& delta 233 zcmV$C`a zCVF9chfx)^8*OJ689KF%UkzT%K>yFk>OfZZaT2kI^|AtV@4sMF%8&rBWuuK#wvXwd zp(MORmV*~sPlo@!<