diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index ad6f201d8662..154dd7a372f9 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -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, @@ -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 diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index d39d2497901c..297e7f227394 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -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." diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 7da7354b1f04..2c0adff5b989 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -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, diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 11529a3fbbc7..704d978f9a4d 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -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, diff --git a/icons/mob/humans/onmob/clothing/helmet_garb/smoking.dmi b/icons/mob/humans/onmob/clothing/helmet_garb/smoking.dmi index 03147c3521b5..a015dcfd79c9 100644 Binary files a/icons/mob/humans/onmob/clothing/helmet_garb/smoking.dmi and b/icons/mob/humans/onmob/clothing/helmet_garb/smoking.dmi differ diff --git a/icons/mob/humans/onmob/inhands/items/smoking_lefthand.dmi b/icons/mob/humans/onmob/inhands/items/smoking_lefthand.dmi index 34327d62f06c..d79ba6ed77c7 100644 Binary files a/icons/mob/humans/onmob/inhands/items/smoking_lefthand.dmi and b/icons/mob/humans/onmob/inhands/items/smoking_lefthand.dmi differ diff --git a/icons/mob/humans/onmob/inhands/items/smoking_righthand.dmi b/icons/mob/humans/onmob/inhands/items/smoking_righthand.dmi index 53726b6baaff..e349d16e3e18 100644 Binary files a/icons/mob/humans/onmob/inhands/items/smoking_righthand.dmi and b/icons/mob/humans/onmob/inhands/items/smoking_righthand.dmi differ diff --git a/icons/obj/items/smoking/packets/spirits_cyan.dmi b/icons/obj/items/smoking/packets/spirits_cyan.dmi new file mode 100644 index 000000000000..4fe06d4cd530 Binary files /dev/null and b/icons/obj/items/smoking/packets/spirits_cyan.dmi differ diff --git a/icons/obj/items/smoking/packets/spirits_yellow.dmi b/icons/obj/items/smoking/packets/spirits_yellow.dmi new file mode 100644 index 000000000000..2fd4169d54fd Binary files /dev/null and b/icons/obj/items/smoking/packets/spirits_yellow.dmi differ