From c4957ad2bdee322ba254c4cd4853fc8c28f5535a Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Sat, 28 Sep 2024 20:22:00 -0400 Subject: [PATCH] vendor and loadout --- code/game/machinery/vending/vending_types.dm | 4 ++++ code/modules/client/preferences_gear.dm | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index b73e5b5cf0..d72556aeb7 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -200,6 +200,8 @@ product_ads = "For the taste that cools your mood, look for the big blue K!;Refined smokers go for Gold!;Lady Fingers are preferred by women who appreciate a cool smoke.;Lady Fingers are the number one cigarette this side of Gateway!;The tobacco connoisseur prefers Koorlander Gold.;For the cool, filtered feel, Lady Finger Cigarettes provide the smoothest draw of any cigarette on the market.;For the man who knows his place is at the top, Koorlander Gold shows the world that you're the best and no-one can say otherwise.;The Colonial Administration Bureau would like to remind you that smoking kills." products = list( /obj/item/storage/fancy/cigarettes/kpack = 20, + /obj/item/storage/fancy/cigarettes/spirit = 20, + /obj/item/storage/fancy/cigarettes/spirit/yellow = 20, /obj/item/storage/fancy/cigarettes/arcturian_ace = 15, /obj/item/storage/fancy/cigarettes/emeraldgreen = 15, /obj/item/storage/fancy/cigarettes/wypacket = 15, @@ -216,6 +218,8 @@ prices = list( /obj/item/storage/fancy/cigarettes/kpack = 40, + /obj/item/storage/fancy/cigarettes/spirit = 40, + /obj/item/storage/fancy/cigarettes/spirit/yellow = 40, /obj/item/storage/fancy/cigarettes/arcturian_ace = 25, /obj/item/storage/fancy/cigarettes/emeraldgreen = 35, /obj/item/storage/fancy/cigarettes/wypacket = 30, diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index f7cbb752e5..c446c0eaeb 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -1024,6 +1024,7 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name) /datum/gear/smoking/pack_lucky_strikes display_name = "Pack Of Lucky Strikes" path = /obj/item/storage/fancy/cigarettes/lucky_strikes + cost = 0 /datum/gear/smoking/pack_emeraldgreen display_name = "Pack Of Emerald Greens" @@ -1055,6 +1056,16 @@ GLOBAL_LIST_EMPTY(gear_datums_by_name) path = /obj/item/storage/fancy/cigarettes/blackpack cost = 4 +/datum/gear/smoking/spirit + display_name = "Pack Of American Spirit, Turquoise" + path = /obj/item/storage/fancy/cigarettes/spirit + cost = 4 + +/datum/gear/smoking/spirit_yellow + display_name = "Pack Of American Spirit, Yellow" + path = /obj/item/storage/fancy/cigarettes/spirit/yellow + cost = 4 + /datum/gear/smoking/weed_joint display_name = "Joint of space weed" path = /obj/item/clothing/mask/cigarette/weed