Skip to content

Commit

Permalink
American Spirit Cigarettes (#7236)
Browse files Browse the repository at this point in the history
For merge after sprite freeze. Adds Crowford's American Spirit
cigarettes. Available in Yellow (Mellow) and Turquoise (Full Bodied,
stronger)


![{CB6FC7B5-8131-4B62-8384-FF2A20051042}](https://github.com/user-attachments/assets/02bfed89-6bd9-44f6-a261-652f829419fe)

![{D6801F71-5103-4E41-85E9-C704A47CEEDB}](https://github.com/user-attachments/assets/ef0b92a6-1058-4dde-a854-fb0691c33dcd)

![{6FAE3AF9-DC9F-4F19-99FF-FD0BBE70B605}](https://github.com/user-attachments/assets/9b72fff7-ccd8-4c28-a366-d019d4525435)

:cl: AmoryBlaine, Crowford
add: American Spirit cigarettes
 /:cl:
  • Loading branch information
AmoryBlaine authored Dec 21, 2024
1 parent 24eee2f commit 522ddac
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 3 deletions.
7 changes: 4 additions & 3 deletions code/game/machinery/vending/vending_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -198,22 +198,24 @@
products = list(
/obj/item/storage/fancy/cigarettes/kpack = 20,
/obj/item/storage/fancy/cigarettes/arcturian_ace = 15,
/obj/item/storage/fancy/cigarettes/spirit = 15,
/obj/item/storage/fancy/cigarettes/spirit/yellow = 15,
/obj/item/storage/fancy/cigarettes/emeraldgreen = 15,
/obj/item/storage/fancy/cigarettes/wypacket = 15,
/obj/item/storage/fancy/cigarettes/trading_card = 15,
/obj/item/storage/fancy/cigarettes/lady_finger = 15,
/obj/item/storage/fancy/cigarettes/blackpack = 10,
/obj/item/storage/fancy/cigar/tarbacks = 5,

/obj/item/storage/box/matches = 10,
/obj/item/tool/lighter/random = 20,
/obj/item/tool/lighter/zippo = 5,

)

prices = list(
/obj/item/storage/fancy/cigarettes/kpack = 40,
/obj/item/storage/fancy/cigarettes/arcturian_ace = 25,
/obj/item/storage/fancy/cigarettes/spirit = 50,
/obj/item/storage/fancy/cigarettes/spirit/yellow = 50,
/obj/item/storage/fancy/cigarettes/emeraldgreen = 35,
/obj/item/storage/fancy/cigarettes/wypacket = 30,
/obj/item/storage/fancy/cigarettes/trading_card = 35,
Expand All @@ -223,7 +225,6 @@
/obj/item/storage/box/matches = 1,
/obj/item/tool/lighter/random = 10,
/obj/item/tool/lighter/zippo = 25,

)

/obj/structure/machinery/vending/security
Expand Down
17 changes: 17 additions & 0 deletions code/game/objects/items/storage/fancy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,23 @@
item_state_slots = list(WEAR_AS_GARB = "cig_lf")
default_cig_type = /obj/item/clothing/mask/cigarette/ucigarette

/obj/item/storage/fancy/cigarettes/spirit
name = "\improper Turquoise American Spirit Packet"
desc = "A pack of turquoise American Spirit cigarettes."
icon_state = "naspacket"
icon = 'icons/obj/items/smoking/packets/spirits_cyan.dmi'
item_state = "naspacket"
item_state_slots = list(WEAR_AS_GARB = "cig_spirit")
default_cig_type = /obj/item/clothing/mask/cigarette

/obj/item/storage/fancy/cigarettes/spirit/yellow
name = "\improper Yellow American Spirit Packet"
desc = "A pack of yellow American Spirit cigarettes."
icon_state = "y_naspacket"
icon = 'icons/obj/items/smoking/packets/spirits_yellow.dmi'
item_state = "y_naspacket"
item_state_slots = list(WEAR_AS_GARB = "cig_spirityellow")

/obj/item/storage/fancy/cigarettes/lucky_strikes_4
name = "\improper Lucky Strikes Mini Packet"
desc = "These four-packs of Luckies come in every MRE. They're not as good as the Habana Reals that come in the LACN MREs, but at least they're free."
Expand Down
2 changes: 2 additions & 0 deletions code/modules/clothing/head/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,8 @@ GLOBAL_LIST_INIT(allowed_hat_items, list(
/obj/item/storage/fancy/cigarettes/lady_finger = PREFIX_HAT_GARB_OVERRIDE,
/obj/item/storage/fancy/cigarettes/blackpack = PREFIX_HAT_GARB_OVERRIDE,
/obj/item/storage/fancy/cigarettes/arcturian_ace = PREFIX_HAT_GARB_OVERRIDE,
/obj/item/storage/fancy/cigarettes/spirit = PREFIX_HAT_GARB_OVERRIDE,
/obj/item/storage/fancy/cigarettes/spirit/yellow = PREFIX_HAT_GARB_OVERRIDE,
/obj/item/tool/pen = PREFIX_HAT_GARB_OVERRIDE,
/obj/item/tool/pen/blue = PREFIX_HAT_GARB_OVERRIDE,
/obj/item/tool/pen/red = PREFIX_HAT_GARB_OVERRIDE,
Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
/obj/item/storage/fancy/cigarettes/blackpack = PREFIX_HELMET_GARB_OVERRIDE, // helmet_
/obj/item/storage/fancy/cigarettes/arcturian_ace = PREFIX_HELMET_GARB_OVERRIDE, // helmet_
/obj/item/storage/fancy/cigarettes/lucky_strikes_4 = PREFIX_HELMET_GARB_OVERRIDE, // helmet_
/obj/item/storage/fancy/cigarettes/spirit = PREFIX_HELMET_GARB_OVERRIDE, // helmet_
/obj/item/storage/fancy/cigarettes/spirit/yellow = PREFIX_HELMET_GARB_OVERRIDE, // helmet_

/obj/item/storage/fancy/cigar/matchbook = NO_GARB_OVERRIDE,
/obj/item/clothing/mask/cigarette/cigar = NO_GARB_OVERRIDE,
/obj/item/clothing/mask/electronic_cigarette = NO_GARB_OVERRIDE,
Expand Down
Binary file modified icons/mob/humans/onmob/clothing/helmet_garb/smoking.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/inhands/items/smoking_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/inhands/items/smoking_righthand.dmi
Binary file not shown.
Binary file added icons/obj/items/smoking/packets/spirits_cyan.dmi
Binary file not shown.
Binary file not shown.

0 comments on commit 522ddac

Please sign in to comment.