mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-29 16:10:02 +01:00
Koko Reed Cigarettes + Ha'zana Chewing Koko Spritefix (#21295)
Adds new cigarettes to the loadout & vending machines that contain Koko Reed. Adds sprites for the new cigarette packets <img width="879" height="100" alt="image" src="https://github.com/user-attachments/assets/10edcbb7-81c2-405d-8e56-f09f10d24ee3" /> Fixes the existing sprite for Ha'zana chewing koko so that it no longer has the colour scheme of the k'ois bar. <img width="261" height="114" alt="image" src="https://github.com/user-attachments/assets/14d853e7-53ee-42df-84e2-4ff6ed366499" /> To Do: ~~- Get approval from Unathi Lore~~ ~~- Figure out a cool name for the cigarettes~~ --------- Co-authored-by: Crozarius <cowsgomooand@gmail.com>
This commit is contained in:
@@ -25,6 +25,7 @@
|
||||
/obj/item/storage/box/fancy/cigarettes/federation = 3,
|
||||
/obj/item/storage/box/fancy/cigarettes/dyn = 3,
|
||||
/obj/item/storage/box/fancy/cigarettes/oracle = 3,
|
||||
/obj/item/storage/box/fancy/cigarettes/koko = 3,
|
||||
/obj/item/storage/chewables/rollable = 8,
|
||||
/obj/item/storage/chewables/rollable/unathi = 6,
|
||||
/obj/item/storage/chewables/rollable/fine = 5,
|
||||
@@ -73,6 +74,7 @@
|
||||
/obj/item/storage/box/fancy/cigarettes/federation = 11.50,
|
||||
/obj/item/storage/box/fancy/cigarettes/dyn = 10.25,
|
||||
/obj/item/storage/box/fancy/cigarettes/oracle = 10.25,
|
||||
/obj/item/storage/box/fancy/cigarettes/koko = 11.50,
|
||||
/obj/item/storage/chewables/rollable = 7.50,
|
||||
/obj/item/storage/chewables/rollable/unathi = 7.75,
|
||||
/obj/item/storage/chewables/rollable/fine = 8.00,
|
||||
@@ -109,6 +111,7 @@
|
||||
/obj/item/storage/box/fancy/cigarettes = 2,
|
||||
/obj/item/storage/box/fancy/cigarettes/dpra = 2,
|
||||
/obj/item/storage/box/fancy/cigarettes/federation = 1,
|
||||
/obj/item/storage/box/fancy/cigarettes/koko = 1,
|
||||
/obj/item/storage/chewables/rollable = 2,
|
||||
/obj/item/storage/chewables/rollable/unathi = 1,
|
||||
/obj/item/storage/chewables/tobacco/bad = 2,
|
||||
|
||||
@@ -453,6 +453,11 @@ ABSTRACT_TYPE(/obj/item/clothing/mask/smokable)
|
||||
/singleton/reagent/mental/caromeg = 5
|
||||
)
|
||||
|
||||
/obj/item/clothing/mask/smokable/cigarette/koko
|
||||
name = "unathi cigarette"
|
||||
desc = "An Unathi cigarette made with koko reed."
|
||||
reagents_to_add = list(/singleton/reagent/mental/kokoreed = 15)
|
||||
|
||||
////////////
|
||||
// CIGARS //
|
||||
////////////
|
||||
|
||||
@@ -439,6 +439,13 @@
|
||||
item_state = "Fpacket"
|
||||
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/oracle
|
||||
|
||||
/obj/item/storage/box/fancy/cigarettes/koko
|
||||
name = "\improper Ha'zana Corsair Afterburners cigarette packet"
|
||||
desc = "Made exclusively on the Compact ruled world of Ha'zana, these cigarettes are made using koko reed instead of tobacco; a good pick-me-up for Unathi, but has no effect on other species."
|
||||
icon_state = "kokopacket"
|
||||
item_state = "kokopacket"
|
||||
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/koko
|
||||
|
||||
/obj/item/storage/box/fancy/cigarettes/case
|
||||
name = "cigarette case"
|
||||
desc = "A simple cigarette case for the aspiring chain-smoker."
|
||||
|
||||
@@ -61,6 +61,7 @@
|
||||
cigarettes["Eriuyushi Sunset cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/federation
|
||||
cigarettes["Xaqixal Dyn Fields cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/dyn
|
||||
cigarettes["Natural Vysokan Soothsayer oracle cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/oracle
|
||||
cigarettes["Koko-Reed cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/koko
|
||||
gear_tweaks += new /datum/gear_tweak/path(cigarettes)
|
||||
|
||||
/datum/gear/drugs_meds/chew
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
author: Crozarius
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- rscadd: "Added Sinta'Unathi cigarettes containing Koko reed, an Unathi-specific drug."
|
||||
- imageadd: "Adds sprites for Koko reed cigarettes."
|
||||
- qol: "Corrected the Ha'zana chewing koko sprite to no longer have the K'ois bar colour scheme."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 41 KiB After Width: | Height: | Size: 42 KiB |
Reference in New Issue
Block a user