From 33dfd1f636d301a12a12c4eb4c5c73b0949cdac5 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Thu, 6 Mar 2025 15:41:22 -0500 Subject: [PATCH 1/5] Update cigarettes.dmi --- icons/obj/items/cigarettes.dmi | Bin 28861 -> 30550 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/items/cigarettes.dmi b/icons/obj/items/cigarettes.dmi index 915090cc0c1e7eba45e1a82ac9dbd7bf8e2dfb7c..5992631c0bd94b2fab3ad0faecc4f3fe4c14372a 100644 GIT binary patch literal 30550 zcmce;2{=^m`#(M++C*9?%Ty|538{#f3MqtA*^LsC7_t?!XhF%6Y?W-;*O7glQDn)! zj(zO=ZWw0F%>NnQ_4)k1zyEi+uK)M?Uzc;3Gv_?#dG7N(ulv4V_v?74qou~V>&Pw$ z1j2dqhRPiXWSbdt+rbWwNZ1gYAdu}WZg=&aR4g3LpIO^GStINqkmp|`KG*v9T<3-~ zw&-!Mw(rnPUy`5TN!vH`gTDP$xnRbd7@?!dQX5o(i>t1RW} zp?TqiR=IoLDgAbo?}}B)@^`g+>TLwNbLHl152ud0y$@USf&GB??H!*!PbNPYh)VEuX6fBYq@wKq6GRts6;Ff{D9ABy<8_I$XaieE&jUrJsF?3Nb20s~}y zktGjChB<|y2)@}xm&E+3j{a|oeRHJyD~S&*A1k=bK4RpH#o21=7=4P)le}tc@~S(J zE!SeFk8x=%{>wzKf6Oe;`onuVJy##t?)1!+IMC6dqu-p!LO+#nuj{y6i|5tbF2~)jgQz zawAo+>Y>?9k+H6Aj7wJv%6tB~ zM42a_?a9Gl_igFBe&2d|XZvWzmBd%ijG|lEgm2|EtL(p()1<|WWmq$( zUZqvDpzck%W`*}{VIHZ;5E zWUN!c2hiO$&F+4SrM)+Md6Mqx%_L0v2R|@#_MF39@>@1tE{nj#_1B9qD{BOzPstxVQNiz2_~nm z4t{YdJRx#RQPFy8@uqHo_7^u~OWSZzf>6}?m9@C!D)5!k->-TzqkDNSSx-3>y?S$inh7MdzEJ_<=$`{>HYXvz&QA^ zKyL{69rn2Q5}&>GHwSwJ*qp)U4z`y|(KV^bS*j=_K>Tj^=zSl z`#=Qx2lSU(|Ejz7qQ&QE|HSUy!bzoKuexoHCzT$1)m?imsg(Csw;1@vsrphatep3B zN#8?C7FxR!yo&7tu_lU)qxr-clD(U%Z zHhs%n`+g)C>;p#9z&>cC0_?*^dSjYa3u6OVtLjMeSE4bj+h$=+ ztE{t1O=GOHicKA?vzG@dS?3f6@>u8O2NGE4E)9gT&dCjUvChfr&!W?CNcW6LJnkuj zCF|IMyG4uqh7ib6$W4{2cb|Wq>2pUOSSe*Jx_X@G<@so@v4cnIQN3#Xcb=47�sw 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 From 1b360ce2fe76c78fe2d7b1534baf965f9e428065 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Thu, 6 Mar 2025 19:47:03 -0500 Subject: [PATCH 2/5] yup --- code/game/machinery/vending/vending_types.dm | 336 +++++------------- maps/map_files/BigRed/BigRed.dmm | 8 +- maps/map_files/CORSAT/Corsat.dmm | 26 +- maps/map_files/DesertDam/Desert_Dam.dmm | 16 +- .../FOP_v3_Sciannex/Fiorina_SciAnnex.dmm | 26 +- .../Ice_Colony_v3/Shivas_Snowball.dmm | 16 +- maps/map_files/Kutjevo/Kutjevo.dmm | 8 +- .../LV522_Chances_Claim.dmm | 8 +- .../LV522_Chances_Claim_FORECON.dmm | 9 +- maps/map_files/LV624/LV624.dmm | 4 +- maps/map_files/LV624_Fixed/LV624_repaired.dmm | 4 +- maps/map_files/New_Varadero/New_Varadero.dmm | 10 +- .../New_Varadero_Repaired.dmm | 8 +- .../Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm | 4 +- maps/map_files/generic/Admin_level.dmm | 2 +- maps/map_files/rover/rover.dmm | 2 +- maps/templates/baseone.dmm | 2 +- maps/templates/basetwo.dmm | 2 +- 18 files changed, 160 insertions(+), 331 deletions(-) diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index 52f6ad7c61c..c0bdc1d5fc0 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -196,303 +196,133 @@ /obj/structure/machinery/vending/cigarette name = "cigarette machine" //Template - desc = "If you want to get cancer, might as well do it in style!" - product_slogans = "L.S./M.F.T.! Lucky Strikes Means Fine Tobacco.;For a classic style that lights up every time, there's always Zippo!;The FDA would like to remind you that tobacco products cause cancer and increased fatigue.;Real men smoke Lucky Strikes!;Serving the US Armed Forces for over two-hundred years!;Life's short, smoke a Lucky!;L.S./M.F.T.!;Lucky Strike is first again!;You just can't beat a Lucky Strike!;The preferred cigarette of Carlos Hathcock!;First again with tobacco-men!" - product_ads = "Real men smoke Lucky Strikes!;Serving the US Armed Forces for over two-hundred years!;Life's short, smoke a Lucky!;L.S./M.F.T.!;Lucky Strike is first again!;You just can't beat a Lucky Strike!;The preferred cigarette of Carlos Hathcock!;First again with tobacco-men!" - vend_delay = 1.4 SECONDS + desc = "A vending machine dealing in all sorts of cigarettes, lighters and cigars." + product_slogans = list("Light up and enjoy the rich, comfortably familiar taste of Koorlander Gold.", + "Always by your side, Koorlander Gold!", + "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.", + "Enjoy the delicate touch of Lady Fingers.", + "Lady Fingers, the compliment to any evening.", + "For the cool, filtered feel, Lady Finger vigarettes provide the smoothest draw of any cigarette on the market.", + "Real. Simple. Different. American Spirit.", + "American Spirit, America's best cigarette.", + "Lucky Strike, it's toasted!", + "L.S./M.F.T.! Lucky Strikes Means Fine Tobacco!", + "A taste of the Emerald Isles at the touch of your finger-tips, Emerald Green.", + "Forge new frontiers with Arcturian Ace.", + "For a classic style that lights up every time, there's always Zippo!", + "Zippo, it works or we fix it for free.", + "On a budget? Buy a Bic.", + "Bic, proudly lighting the way since 1973.", + "The Colonial Administration Bureau would like to remind you that smoking kills.", + "The Interstellar Commerce Commission would like to remind you that smoking kills.", + "The Food and Drug Administration would like to remind you that tobacco products cause cancer and increased fatigue.") + product_ads = "The Food and Drug Administration would like to remind you that tobacco products cause cancer and increased fatigue." icon_state = "cigs" - products = list( - /obj/item/storage/fancy/cigarettes/lucky_strikes = 50, - /obj/item/storage/fancy/cigar/tarbacktube = 20, - /obj/item/storage/box/matches = 15, - /obj/item/tool/lighter/random = 25, - /obj/item/tool/lighter/zippo = 10, - ) - - premium = list(/obj/item/storage/fancy/cigar = 25) - prices = list( - /obj/item/storage/fancy/cigarettes/lucky_strikes = 35, - /obj/item/storage/fancy/cigar/tarbacktube = 35, - /obj/item/storage/box/matches = 1, - /obj/item/tool/lighter/random = 10, - /obj/item/tool/lighter/zippo = 25, - ) - product_type = VENDOR_PRODUCT_TYPE_NICOTINE - -/obj/structure/machinery/vending/cigarette/free - product_slogans = "" - product_ads = "" - products = list( - /obj/item/storage/fancy/cigarettes/lucky_strikes = 50, - /obj/item/storage/fancy/cigar/tarbacktube = 20, - /obj/item/storage/box/matches = 15, - /obj/item/tool/lighter/random = 25, - /obj/item/tool/lighter/zippo = 10, - ) - premium = list() - prices = list() - product_type = VENDOR_PRODUCT_TYPE_NICOTINE -/obj/structure/machinery/vending/cigarette/colony - product_slogans = "Koorlander Gold, for the refined palate.;Lady Fingers, for the dainty smoker.;Lady Fingers, treat your palete with pink!;The big blue K means a cool fresh day!;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." - 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, - /obj/item/storage/fancy/cigarettes/trading_card = 15, - /obj/item/storage/fancy/cigarettes/lady_finger = 15, + /obj/item/storage/fancy/cigarettes/lucky_strikes = 10, + /obj/item/storage/fancy/cigarettes/kpack = 10, + /obj/item/storage/fancy/cigarettes/spirit = 10, + /obj/item/storage/fancy/cigarettes/spirit/yellow = 10, + /obj/item/storage/fancy/cigarettes/emeraldgreen = 10, + /obj/item/storage/fancy/cigarettes/wypacket = 10, + /obj/item/storage/fancy/cigarettes/trading_card = 10, + /obj/item/storage/fancy/cigarettes/lady_finger = 10, /obj/item/storage/fancy/cigarettes/blackpack = 10, - /obj/item/storage/fancy/cigar/tarbacks = 5, - + /obj/item/storage/fancy/cigar/tarbacktube = 10, /obj/item/storage/box/matches = 10, - /obj/item/tool/lighter/random = 20, + /obj/item/tool/lighter/random = 10, /obj/item/tool/lighter/zippo = 5, - + /obj/item/tool/lighter/zippo/black = 5, + /obj/item/tool/lighter/zippo/blue = 5, ) + premium = list(/obj/item/clothing/mask/cigarette/cigar = 25) prices = list( + /obj/item/storage/fancy/cigarettes/lucky_strikes = 35, /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, - /obj/item/storage/fancy/cigarettes/trading_card = 35, + /obj/item/storage/fancy/cigarettes/emeraldgreen = 25, + /obj/item/storage/fancy/cigarettes/wypacket = 50, + /obj/item/storage/fancy/cigarettes/trading_card = 50, /obj/item/storage/fancy/cigarettes/lady_finger = 30, /obj/item/storage/fancy/cigarettes/blackpack = 75, - /obj/item/storage/fancy/cigar/tarbacks = 35, - /obj/item/storage/box/matches = 1, - /obj/item/tool/lighter/random = 10, + /obj/item/storage/fancy/cigar/tarbacktube = 35, + /obj/item/storage/box/matches = 2, + /obj/item/tool/lighter/random = 5, /obj/item/tool/lighter/zippo = 25, - + /obj/item/tool/lighter/zippo/black = 27, + /obj/item/tool/lighter/zippo/blue = 27, ) + product_type = VENDOR_PRODUCT_TYPE_NICOTINE /obj/structure/machinery/vending/cigarette/koorlander //koorlander machine, contains luckies since they either bought Lucky Strikes as a company, or are working together to survive. name = "Koorlander brand cigarette machine" - desc = "A Koorlander brand cigarette vending machine. Comes with Lucky Strikes, Lady Fingers, Koorlander Golds of course, and a few smaller brands you've barely heard of." + desc = "A vending machine dealing in Koorlander affiliated cigarette brands, most of whom only exist in the frontier, but is primarily stocked with Koorlander Gold." icon_state = "koorcigs" - product_slogans = list( - "Koorlander Gold, for the refined palate.", - "Lady Fingers, for the dainty smoker.", - "Lady Fingers, treat your palete with pink!", - "The big blue K means a cool fresh day!", - "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.", + product_slogans = list("Light up and enjoy the rich, comfortably familiar taste of Koorlander Gold.", + "Always by your side, Koorlander Gold!", "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.", - "L.S./M.F.T.! Lucky Strikes Means Fine Tobacco.", + "Enjoy the delicate touch of Lady Fingers.", + "Lady Fingers, the compliment to any evening.", + "For the cool, filtered feel, Lady Finger vigarettes provide the smoothest draw of any cigarette on the market.", + "A taste of the Emerald Isles at the touch of your finger-tips, Emerald Green.", + "Forge new frontiers with Arcturian Ace.", "For a classic style that lights up every time, there's always Zippo!", + "Zippo, it works or we fix it for free.", "On a budget? Buy a Bic.", - "Bic, making school supplies since 1945.", - "Real men smoke Lucky Strikes!", - "Serving the US Armed Forces for over two-hundred years!", - "Life's short, smoke a Lucky!", - "Lucky Strike is first again!", - "You just can't beat a Lucky Strike!", - "The preferred cigarette of Carlos Hathcock!", - "First again with tobacco-men!", - "Real. Simple. Different. American Spirit.", - "Tobacco Ingredients: Tobacco & Water. American Spirit.", - "The Interstellar Commerce Commission would like to remind you that smoking kills.", - "The Food and Drug Administration would like to remind you that tobacco products cause cancer and increased fatigue.", - ) - - product_ads = list( - "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.", - "Real men smoke Lucky Strikes!;Serving the US Armed Forces for over two-hundred years!", - "Life's short, smoke a Lucky!", - "L.S./M.F.T.!,", - "Lucky Strike is first again!", - "You just can't beat a Lucky Strike!", - "The preferred cigarette of Carlos Hathcock!", - "First again with tobacco-men!", - "Real. Simple. Different. American Spirit.", - "Tobacco Ingredients: Tobacco & Water. American Spirit.", + "Bic, proudly lighting the way since 1973.", + "The Colonial Administration Bureau would like to remind you that smoking kills.", "The Interstellar Commerce Commission would like to remind you that smoking kills.", - "The Food and Drug Administration would like to remind you that tobacco products cause cancer and increased fatigue.", - ) - + "The Food and Drug Administration would like to remind you that tobacco products cause cancer and increased fatigue.") + product_ads = "The Food and Drug Administration would like to remind you that tobacco products cause cancer and increased fatigue." + icon_state = "cigs" products = list( - /obj/item/storage/fancy/cigarettes/kpack = 20, - /obj/item/storage/fancy/cigarettes/lucky_strikes = 20, - /obj/item/storage/fancy/cigarettes/lady_finger = 20, - /obj/item/storage/fancy/cigarettes/spirit = 10, - /obj/item/storage/fancy/cigarettes/spirit/yellow = 10, + /obj/item/storage/fancy/cigarettes/kpack = 10, + /obj/item/storage/fancy/cigarettes/kpack = 10, + /obj/item/storage/fancy/cigarettes/arcturian_ace = 25, + /obj/item/storage/fancy/cigarettes/emeraldgreen = 10, + /obj/item/storage/fancy/cigarettes/lady_finger = 10, /obj/item/storage/fancy/cigar/tarbacktube = 10, - - /obj/item/storage/box/matches = 5, - /obj/item/storage/fancy/cigar/matchbook/koorlander = 5, - /obj/item/storage/fancy/cigar/matchbook/brown = 10, - /obj/item/tool/lighter/random = 20, - /obj/item/tool/lighter/zippo = 10, - /obj/item/tool/lighter/zippo/blue = 5, - ) - - prices = list( - /obj/item/storage/fancy/cigarettes/kpack = 14, - /obj/item/storage/fancy/cigarettes/lucky_strikes = 8, - /obj/item/storage/fancy/cigarettes/lady_finger = 11, - /obj/item/storage/fancy/cigarettes/spirit/yellow = 12, - /obj/item/storage/fancy/cigarettes/spirit = 12, - /obj/item/storage/fancy/cigar/tarbacktube = 20, - /obj/item/storage/box/matches = 3, - /obj/item/storage/fancy/cigar/matchbook/koorlander = 2, - /obj/item/storage/fancy/cigar/matchbook/brown = 1, - /obj/item/tool/lighter/random = 5, - /obj/item/tool/lighter/zippo = 20, - /obj/item/tool/lighter/zippo/blue = 30, - ) - -/obj/structure/machinery/vending/cigarette/koorlander/free - prices = list( - /obj/item/storage/fancy/cigarettes/kpack = 0, - /obj/item/storage/fancy/cigarettes/lucky_strikes = 0, - /obj/item/storage/fancy/cigarettes/lady_finger = 0, - /obj/item/storage/fancy/cigarettes/spirit/yellow = 0, - /obj/item/storage/fancy/cigarettes/spirit = 0, - /obj/item/storage/fancy/cigar/tarbacktube = 0, - /obj/item/storage/box/matches = 0, - /obj/item/storage/fancy/cigar/matchbook/koorlander = 0, - /obj/item/storage/fancy/cigar/matchbook/brown = 0, - /obj/item/tool/lighter/random = 0, - /obj/item/tool/lighter/zippo = 0, - /obj/item/tool/lighter/zippo/blue = 0, - ) - -/obj/structure/machinery/vending/cigarette/wy //WY machine - name = "Weyland Yutani brand cigarette machine" - desc = "A Weyland Yutani Brand cigarette vending machine, looks like a Wey-Yu Gold pack. Comes with Emerald Greens, Wey-Yu Golds of course, Arcturian Aces, and some Three World Empire brand you've barely heard of. Executive Selects are still out of stock due to shipping issues..." - icon_state = "wycigs" - product_slogans = list( - "Weyland Yutani Gold, for those high up the chain.", - "Arcturian Ace, for those who can't stand bad taste!", - "Arcturian Ace, good for the lungs! On account of exotic Arctura flora.", //it's cocaine - "Tastes how a cigarette should, smoke Wey-Yu Golds!", - "Refined smokers go for Gold!", - "Arcturian Aces, minty fresh.", - "Aces, keeps your breah as fresh as an Arcturian waterfall!", - "Emerald Greens are the number one cigarette this side of New Eden!", - "The tobacco aficionado prefers Executive Selects.", - "For the minty freshness of another world, try Arcturian Aces!", - "For the Executive on top of the world, smoke Exec Selects.", - "Arcturian Aces, good for first timers!", - "For a classic style that lights up every time, there's always Zippo!", - "On a budget? Buy a Bic.", - "Bic, making school supplies since 1945.", - "Emerald Greens, green as the fields of New Eden.", - "Emerald Greens, favored by doctors!", - "You just can't beat the green!", - "The preferred brand of Richard Nixon!", //:smug: - "First again with doctors!", - "Balaji Imperials, for King and Country!", - "Life's short, smoke a 'laji!", - "The Interstellar Commerce Commission would like to remind you that smoking kills.", - "The Food and Drug Administration would like to remind you that tobacco products cause cancer and increased fatigue.", - ) - - product_ads = list( - "Weyland Yutani Gold, for those high up the chain.", - "Arcturian Ace, for those who don't like bad taste.", - "Arcturian Ace, good for the lungs! On account of local Arctura flora.", - "Tastes how a cigarette should, Weyland Yutani Gold!", - "Refined smokers go for Gold!", - "Arcturian Aces, minty fresh.", - "Emerald Greens are the number one cigarette this side of New Eden!", - "The tobacco aficionado prefers Executives.", - "For the minty freshness of another world, try Arcturian Aces!", - "For the Executive on top of the world, smoke Exec Selects.", - "Arcturian Aces, good for first timers!", - "Emerald Greens, favorited by doctors!", - "You just can't beat the green!", - "The preferred cigarette of Richard Nixon!", - "First again with doctors!", - "Balaji Imperials, for King and Country!", - "Life's short, smoke a 'laji!", - "The Interstellar Commerce Commission would like to remind you that smoking kills.", - "The Food and Drug Administration would like to remind you that tobacco products cause cancer and increased fatigue.", - ) - - premium = list(/obj/item/storage/fancy/cigar = 5) - products = list( - /obj/item/storage/fancy/cigarettes/wypacket = 15, - /obj/item/storage/fancy/cigarettes/emeraldgreen = 30, - /obj/item/storage/fancy/cigarettes/arcturian_ace = 10, - /obj/item/storage/fancy/cigarettes/balaji = 10, - /obj/item/storage/fancy/cigarettes/blackpack = 0, - - /obj/item/storage/box/matches = 5, - /obj/item/storage/fancy/cigar/matchbook/exec_select = 10, - /obj/item/storage/fancy/cigar/matchbook/wy_gold = 10, - /obj/item/tool/lighter/random = 20, + /obj/item/storage/box/matches = 10, + /obj/item/tool/lighter/random = 10, + /obj/item/tool/lighter/zippo = 5, /obj/item/tool/lighter/zippo/black = 5, - /obj/item/tool/lighter/zippo/executive = 1, - + /obj/item/tool/lighter/zippo/blue = 5, ) + premium = list(/obj/item/clothing/mask/cigarette/cigar = 25) prices = list( - /obj/item/storage/fancy/cigarettes/wypacket = 15, - /obj/item/storage/fancy/cigarettes/emeraldgreen = 5, - /obj/item/storage/fancy/cigarettes/arcturian_ace = 8, - /obj/item/storage/fancy/cigarettes/balaji = 15, - /obj/item/storage/fancy/cigarettes/blackpack = 40, - + /obj/item/storage/fancy/cigarettes/kpack = 40, + /obj/item/storage/fancy/cigarettes/kpack = 40, + /obj/item/storage/fancy/cigarettes/arcturian_ace = 25, + /obj/item/storage/fancy/cigarettes/emeraldgreen = 25, + /obj/item/storage/fancy/cigarettes/lady_finger = 30, + /obj/item/storage/fancy/cigar/tarbacktube = 35, /obj/item/storage/box/matches = 2, - /obj/item/storage/fancy/cigar/matchbook/exec_select = 7, - /obj/item/storage/fancy/cigar/matchbook/wy_gold = 5, - /obj/item/tool/lighter/random = 3, - /obj/item/tool/lighter/zippo/black = 15, - /obj/item/tool/lighter/zippo/executive = 50, - ) - -/obj/structure/machinery/vending/cigarette/wy/Initialize(mapload, ...) - var/exec_number = rand(0, 2) - products[/obj/item/storage/fancy/cigarettes/blackpack] = exec_number - return ..() - -/obj/structure/machinery/vending/cigarette/wy/free - prices = list( - /obj/item/storage/fancy/cigarettes/wypacket = 0, - /obj/item/storage/fancy/cigarettes/emeraldgreen = 0, - /obj/item/storage/fancy/cigarettes/arcturian_ace = 0, - /obj/item/storage/fancy/cigarettes/balaji = 0, - /obj/item/storage/fancy/cigarettes/blackpack = 0, - - /obj/item/storage/box/matches = 5, - /obj/item/storage/fancy/cigar/matchbook/exec_select = 0, - /obj/item/storage/fancy/cigar/matchbook/wy_gold = 0, - /obj/item/tool/lighter/random = 0, - /obj/item/tool/lighter/zippo/black = 0, - /obj/item/tool/lighter/zippo/executive = 0, + /obj/item/tool/lighter/random = 5, + /obj/item/tool/lighter/zippo = 25, + /obj/item/tool/lighter/zippo/black = 27, + /obj/item/tool/lighter/zippo/blue = 27, ) - + product_type = VENDOR_PRODUCT_TYPE_NICOTINE /obj/structure/machinery/vending/cigarette/upp desc = "A state-owned cigarette vendor. Its drab colour was chosen to discourage purchases, but its existence is an admittance to the necessity for such machines to exist in the first place." product_slogans = "" - product_ads = "" + product_ads = "The Ministry of Health would like to remind you that tobacco products cause cancer and increased fatigue." icon_state = "china_cig_vending" products = list( /obj/item/storage/fancy/cigarettes/laika = 10, - /obj/item/storage/box/matches = 15, + /obj/item/storage/box/matches = 10, /obj/item/tool/lighter/zippo = 10, ) prices = list( - /obj/item/storage/fancy/cigarettes/laika = 45, + /obj/item/storage/fancy/cigarettes/laika = 55, /obj/item/storage/box/matches = 1, - /obj/item/tool/lighter/zippo = 25, + /obj/item/tool/lighter/zippo = 15, ) /obj/structure/machinery/vending/security diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index f6d5129973c..07d3be4dff8 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -11367,7 +11367,7 @@ /turf/open/floor/asteroidwarning/north, /area/bigredv2/outside/eta) "hDD" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkyellow2/north, /area/bigredv2/outside/engineering) "hEq" = ( @@ -19461,7 +19461,7 @@ /area/bigredv2/outside/filtration_plant) "oxa" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor, /area/bigredv2/outside/general_offices) "oxe" = ( @@ -19868,7 +19868,7 @@ /turf/open/floor/freezerfloor, /area/bigredv2/outside/engineering) "oPT" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/dark, /area/bigredv2/outside/space_port) "oQi" = ( @@ -22047,7 +22047,7 @@ /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) "qLP" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/mars_cave/mars_dirt_6, /area/bigredv2/caves/mining) "qLR" = ( diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index cfc4b55d591..e59866e5a21 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -4284,7 +4284,7 @@ /turf/open/floor/corsat/red/northeast, /area/corsat/gamma/airlock/south/id) "bsL" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/wood, /area/corsat/gamma/rnr/bar) "btk" = ( @@ -11858,7 +11858,7 @@ /area/corsat/gamma/biodome/virology) "fFW" = ( /obj/structure/machinery/light, -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/corsat/plate, /area/corsat/sigma/south/engineering) "fGd" = ( @@ -12622,7 +12622,7 @@ /turf/open/floor/corsat/purplewhite/northwest, /area/corsat/gamma/biodome/virology) "gcu" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/corsat/red/northwest, /area/corsat/omega/airlocknorth/id) "gcQ" = ( @@ -16270,7 +16270,7 @@ /turf/open/floor/corsat/retrosquares, /area/corsat/sigma/hangar/monorail) "hUH" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/corsat/tan/north, /area/corsat/sigma/dorms) "hUW" = ( @@ -20794,7 +20794,7 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/corsat/red/north, /area/corsat/sigma/south/security) "ksV" = ( @@ -21742,7 +21742,7 @@ /turf/open/floor/corsat/squares, /area/corsat/gamma/residential) "kTU" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /obj/structure/machinery/light{ dir = 4 }, @@ -28308,7 +28308,7 @@ /turf/open/floor/corsat/squares, /area/corsat/gamma/hallwaysouth) "otv" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/corsat/yellow/southeast, /area/corsat/gamma/engineering) "otA" = ( @@ -30173,7 +30173,7 @@ /turf/open/gm/dirt, /area/corsat/theta/biodome) "prP" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/corsat/brown/west, /area/corsat/sigma/cargo) "prZ" = ( @@ -30838,7 +30838,7 @@ /turf/open/floor/corsat/darkgreen/east, /area/corsat/gamma/residential) "pKI" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/corsat/red/northeast, /area/corsat/omega/security) "pKM" = ( @@ -34841,7 +34841,7 @@ /obj/structure/machinery/light{ dir = 1 }, -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/corsat/bluegrey/north, /area/corsat/gamma/hangar/flightcontrol) "rRC" = ( @@ -36933,7 +36933,7 @@ /turf/open/floor/corsat/plate, /area/corsat/omega/control) "sZR" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/corsat/squareswood/north, /area/corsat/gamma/residential/lounge) "sZX" = ( @@ -39147,7 +39147,7 @@ /turf/open/floor/corsat/yellow/north, /area/corsat/gamma/engineering) "uhD" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/corsat/browncorner/east, /area/corsat/gamma/cargo) "uhH" = ( @@ -42119,7 +42119,7 @@ /turf/open/floor/corsat/red/northeast, /area/corsat/gamma/airlock/control) "vOb" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/corsat/red/southeast, /area/corsat/sigma/hangar/security) "vOg" = ( diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 56d1a6dcf2c..4c6787a1b0b 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -8973,7 +8973,7 @@ /turf/open/floor/interior/wood, /area/desert_dam/building/bar/bar) "ceH" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/interior/wood, /area/desert_dam/building/bar/bar) "ceJ" = ( @@ -18908,7 +18908,7 @@ /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/desert_dam/exterior/valley/valley_civilian) "fyj" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/white, /area/desert_dam/building/administration/meetingrooom) "fyz" = ( @@ -19571,7 +19571,7 @@ /turf/open/desert/dirt/dirt2, /area/desert_dam/interior/caves/central_caves) "fQD" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/sterile_white/west, /area/desert_dam/building/hydroponics/hydroponics_breakroom) "fRa" = ( @@ -27734,7 +27734,7 @@ /turf/open/floor/prison/whitegreen/east, /area/desert_dam/building/medical/west_wing_hallway) "kMb" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/darkyellow2/north, /area/desert_dam/building/warehouse/breakroom) "kMi" = ( @@ -31548,7 +31548,7 @@ /turf/open/floor/cult, /area/desert_dam/building/security/courtroom) "nbu" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/whiteyellow/north, /area/desert_dam/interior/dam_interior/break_room) "nby" = ( @@ -38204,7 +38204,7 @@ /turf/open/desert/dirt/dirt2, /area/desert_dam/exterior/river_mouth/southern) "reW" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/sterile_white, /area/desert_dam/building/cafeteria/loading) "rfm" = ( @@ -40776,7 +40776,7 @@ /turf/open/gm/river/desert/shallow_edge/west, /area/desert_dam/exterior/river/riverside_central_north) "sDC" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/sterile_white, /area/desert_dam/building/cafeteria/cafeteria) "sDJ" = ( @@ -49741,7 +49741,7 @@ /turf/open/floor/prison/southwest, /area/desert_dam/interior/dam_interior/north_tunnel_entrance) "xPX" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/greenfull/northwest, /area/desert_dam/building/dorms/hallway_northwing) "xQc" = ( diff --git a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm index b5d05779470..fc634db3244 100644 --- a/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm +++ b/maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm @@ -124,7 +124,7 @@ /turf/open/floor/prison/floor_plate, /area/fiorina/station/civres_blue) "afx" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/whitegreenfull/southwest, /area/fiorina/tumor/ice_lab) "afG" = ( @@ -2443,7 +2443,7 @@ /turf/open/floor/plating/prison, /area/fiorina/tumor/servers) "bPX" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/darkpurplefull2, /area/fiorina/station/research_cells) "bQh" = ( @@ -4186,7 +4186,7 @@ /turf/open/gm/river/pool, /area/fiorina/station/park) "dhA" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/darkyellow2/east, /area/fiorina/lz/near_lzI) "dhL" = ( @@ -7171,7 +7171,7 @@ /turf/open/floor/prison/yellow/southwest, /area/fiorina/station/central_ring) "fnn" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/plating/prison, /area/fiorina/tumor/ice_lab) "fnB" = ( @@ -7806,7 +7806,7 @@ /turf/open/floor/prison/darkpurplefull2, /area/fiorina/lz/near_lzI) "fMH" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/floor_plate, /area/fiorina/tumor/aux_engi) "fMW" = ( @@ -9207,7 +9207,7 @@ /turf/open/floor/prison/floor_plate, /area/fiorina/station/lowsec) "gQn" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/darkredfull2, /area/fiorina/lz/near_lzI) "gQK" = ( @@ -14552,7 +14552,7 @@ /turf/open/floor/prison/floor_plate, /area/fiorina/station/park) "lgr" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /obj/structure/machinery/light/double/blue{ dir = 1; pixel_y = 21 @@ -14848,7 +14848,7 @@ /turf/open/floor/prison/blue_plate, /area/fiorina/station/botany) "lvf" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/organic/grass/astroturf, /area/fiorina/tumor/fiberbush) "lvg" = ( @@ -15862,7 +15862,7 @@ /turf/open/floor/prison/floor_plate, /area/fiorina/station/telecomm/lz1_cargo) "mle" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/bluefull, /area/fiorina/station/power_ring) "mll" = ( @@ -17371,7 +17371,7 @@ /turf/closed/wall/r_wall/prison, /area/fiorina/station/botany) "nvF" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison, /area/fiorina/station/medbay) "nvG" = ( @@ -21666,7 +21666,7 @@ /turf/open/floor/plating/prison, /area/fiorina/station/park) "qQc" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/floor_plate, /area/fiorina/station/chapel) "qQl" = ( @@ -25483,7 +25483,7 @@ /turf/open/floor/prison, /area/fiorina/lz/near_lzII) "tSw" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/floor_plate, /area/fiorina/station/transit_hub) "tSx" = ( @@ -30385,7 +30385,7 @@ /turf/closed/wall/r_wall/prison, /area/fiorina/station/security) "xNo" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/floor_plate, /area/fiorina/station/civres_blue) "xNq" = ( diff --git a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm index db303434726..8dc7f68a86b 100644 --- a/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm +++ b/maps/map_files/Ice_Colony_v3/Shivas_Snowball.dmm @@ -18,7 +18,7 @@ /turf/open/auto_turf/ice/layer1, /area/shiva/interior/colony/medseceng) "aaf" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/closed/wall/shiva/ice, /area/shiva/exterior/cp_s_research) "aah" = ( @@ -4714,7 +4714,7 @@ /turf/open/auto_turf/snow/layer1, /area/shiva/exterior/telecomm/lz2_northeast) "cnc" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/north, /area/shiva/interior/colony/medseceng) "cng" = ( @@ -5011,7 +5011,7 @@ /turf/open/floor/wood, /area/shiva/interior/bar) "cBL" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva, /area/shiva/interior/bar) "cCr" = ( @@ -7788,7 +7788,7 @@ /turf/closed/wall/shiva/ice, /area/shiva/exterior/cp_s_research) "fUy" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/north, /area/shiva/interior/lz2_habs) "fUG" = ( @@ -8972,7 +8972,7 @@ /turf/open/floor/wood, /area/shiva/interior/colony/central) "hiX" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/floor3, /area/shiva/interior/bar) "hjP" = ( @@ -18344,7 +18344,7 @@ /turf/open/auto_turf/snow/layer2, /area/shiva/exterior/cp_colony_grounds) "rER" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/multi_tiles, /area/shiva/interior/colony/research_hab) "rEV" = ( @@ -18611,7 +18611,7 @@ /turf/open/auto_turf/snow/layer3, /area/shiva/interior/caves/cp_camp) "rUy" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/central) "rUD" = ( @@ -19339,7 +19339,7 @@ /turf/open/floor/shiva/wred, /area/shiva/interior/colony/medseceng) "sOP" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/floor3, /area/shiva/interior/aerodrome) "sPo" = ( diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index 94d0e8106c9..941200f038e 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -3106,7 +3106,7 @@ /turf/open/floor/kutjevo/colors/orange/edge/northwest, /area/kutjevo/interior/foremans_office) "eCB" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /obj/structure/machinery/light{ dir = 1 }, @@ -4124,7 +4124,7 @@ /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/complex_border/med_rec) "glU" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /obj/structure/sign/poster{ pixel_y = 32 }, @@ -5682,7 +5682,7 @@ /turf/open/floor/kutjevo/colors/cyan/edge/west, /area/kutjevo/interior/complex/med/triage) "iRk" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /obj/structure/platform/kutjevo/smooth{ dir = 1 }, @@ -12515,7 +12515,7 @@ /turf/open/floor/kutjevo/tan/grey_edge/west, /area/kutjevo/interior/complex/Northwest_Dorms) "tdG" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/kutjevo/colors/green, /area/kutjevo/interior/complex/botany) "tdT" = ( diff --git a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm index 333df170056..00f545356a6 100644 --- a/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm +++ b/maps/map_files/LV522_Chances_Claim/LV522_Chances_Claim.dmm @@ -6076,7 +6076,7 @@ /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/north_east_street) "ddH" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/corsat/plate, /area/lv522/atmos/cargo_intake) "ddK" = ( @@ -14815,7 +14815,7 @@ /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) "hKv" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) "hKE" = ( @@ -17951,7 +17951,7 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "juq" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/blue1, /area/lv522/outdoors/colony_streets/windbreaker/observation) @@ -44952,7 +44952,7 @@ /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) "wuB" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /obj/structure/machinery/light{ dir = 4 }, diff --git a/maps/map_files/LV522_Chances_Claim_FORECON/LV522_Chances_Claim_FORECON.dmm b/maps/map_files/LV522_Chances_Claim_FORECON/LV522_Chances_Claim_FORECON.dmm index 31c73c3d499..181780a7cad 100644 --- a/maps/map_files/LV522_Chances_Claim_FORECON/LV522_Chances_Claim_FORECON.dmm +++ b/maps/map_files/LV522_Chances_Claim_FORECON/LV522_Chances_Claim_FORECON.dmm @@ -6436,7 +6436,7 @@ /turf/open/asphalt/cement/cement1, /area/lv522/outdoors/colony_streets/north_east_street) "ddH" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/corsat/plate, /area/lv522/atmos/cargo_intake) "ddK" = ( @@ -15800,8 +15800,7 @@ /turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms) "hKv" = ( -/obj/structure/machinery/vending/cigarette/koorlander, -/turf/open/floor/prison/darkpurplefull2, +/obj/structure/machinery/vending/cigarette/turf/open/floor/prison/darkpurplefull2, /area/lv522/indoors/a_block/dorms/glass) "hKE" = ( /obj/structure/prop/ice_colony/ground_wire{ @@ -19119,7 +19118,7 @@ /turf/open/auto_turf/shale/layer1, /area/lv522/outdoors/colony_streets/central_streets) "juq" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /obj/effect/decal/cleanable/dirt, /turf/open/floor/strata/blue1, /area/lv522/outdoors/colony_streets/windbreaker/observation) @@ -47708,7 +47707,7 @@ /turf/open/floor/prison/darkbrownfull2, /area/lv522/indoors/c_block/casino) "wuB" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /obj/structure/machinery/light{ dir = 4 }, diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 0396a4c8288..d7c4b85ef59 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -11809,7 +11809,7 @@ /turf/open/floor/redcorner/east, /area/lv624/lazarus/security) "lAI" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/whiteblue/northwest, /area/lv624/lazarus/main_hall) "lAN" = ( @@ -18238,7 +18238,7 @@ /area/lv624/ground/jungle/east_jungle) "uux" = ( /obj/effect/landmark/crap_item, -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/white, /area/lv624/lazarus/main_hall) "uuE" = ( diff --git a/maps/map_files/LV624_Fixed/LV624_repaired.dmm b/maps/map_files/LV624_Fixed/LV624_repaired.dmm index 4270444a6b9..da060a97361 100644 --- a/maps/map_files/LV624_Fixed/LV624_repaired.dmm +++ b/maps/map_files/LV624_Fixed/LV624_repaired.dmm @@ -2038,7 +2038,7 @@ /area/lv624/ground/jungle/west_jungle) "cEp" = ( /obj/effect/landmark/crap_item, -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/white, /area/lv624/lazarus/main_hall) "cEI" = ( @@ -4154,7 +4154,7 @@ /turf/open/gm/grass/grass1, /area/lv624/ground/jungle/south_east_jungle) "fhn" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/whiteblue/northwest, /area/lv624/lazarus/main_hall) "fhu" = ( diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index ff3aebd4636..a4bba23147e 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -3111,7 +3111,7 @@ /turf/open/gm/river/ocean/deep_ocean, /area/varadero/exterior/comms4) "cBl" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/greenfull/west, /area/varadero/interior/hall_SE) "cBq" = ( @@ -5572,7 +5572,7 @@ /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/digsite) "esZ" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/floor3, /area/varadero/interior/hall_N) "etk" = ( @@ -7346,7 +7346,7 @@ /turf/open/floor/bcircuit, /area/varadero/interior/maintenance/north) "fUJ" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/wood, /area/varadero/interior/hall_SE) "fVk" = ( @@ -7685,7 +7685,7 @@ /turf/open/gm/dirt, /area/varadero/exterior/pontoon_beach) "gfm" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/red/northeast, /area/varadero/interior/security) "gfx" = ( @@ -29241,7 +29241,7 @@ /turf/open/floor/plating/icefloor/asteroidplating, /area/varadero/interior/maintenance/security) "xgj" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/green/east, /area/varadero/interior/hall_SE) "xgq" = ( diff --git a/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm b/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm index b044e249844..e7df676c68b 100644 --- a/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm +++ b/maps/map_files/New_Varadero_Fixed/New_Varadero_Repaired.dmm @@ -963,7 +963,7 @@ /turf/open/gm/dirt, /area/varadero/exterior/eastbeach) "aLa" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/green/east, /area/varadero/interior/hall_SE) "aLe" = ( @@ -4771,7 +4771,7 @@ /turf/open/floor/shiva/snow_mat/east, /area/varadero/interior/security) "dWn" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/greenfull/west, /area/varadero/interior/hall_SE) "dWI" = ( @@ -7180,7 +7180,7 @@ /turf/open/gm/grass/grass1/weedable, /area/varadero/interior/caves/north_research) "fUJ" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/wood, /area/varadero/interior/hall_SE) "fVd" = ( @@ -26024,7 +26024,7 @@ /turf/open/gm/river/shallow_ocean_shallow_ocean, /area/varadero/exterior/pontoon_beach) "vXi" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/red/northeast, /area/varadero/interior/security) "vXI" = ( diff --git a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm index 75896b974bd..65bf09c9dd9 100644 --- a/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm +++ b/maps/map_files/Whiskey_Outpost_v2/Whiskey_Outpost_v2.dmm @@ -246,7 +246,7 @@ /turf/open/jungle/impenetrable, /area/whiskey_outpost/outside/south) "ba" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/floor_plate/southwest, /area/whiskey_outpost/inside/bunker/bunker/front) "bb" = ( @@ -3155,7 +3155,7 @@ /turf/open/jungle, /area/whiskey_outpost/outside/south/far) "nF" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison, /area/whiskey_outpost/inside/living) "nG" = ( diff --git a/maps/map_files/generic/Admin_level.dmm b/maps/map_files/generic/Admin_level.dmm index 86f39d2e9f6..058f8d78a8c 100644 --- a/maps/map_files/generic/Admin_level.dmm +++ b/maps/map_files/generic/Admin_level.dmm @@ -418,7 +418,7 @@ /turf/open/floor/tdome/northeast, /area/tdome/tdomeobserve) "lT" = ( -/obj/structure/machinery/vending/cigarette/free, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/tdome/northeast, /area/tdome/tdomeobserve) "mi" = ( diff --git a/maps/map_files/rover/rover.dmm b/maps/map_files/rover/rover.dmm index 292845722e6..fe81583c256 100644 --- a/maps/map_files/rover/rover.dmm +++ b/maps/map_files/rover/rover.dmm @@ -924,7 +924,7 @@ /turf/closed/wall/almayer/outer, /area/golden_arrow/cryo_cells) "kp" = ( -/obj/structure/machinery/vending/cigarette/koorlander, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer/plate, /area/golden_arrow/hangar) "kw" = ( diff --git a/maps/templates/baseone.dmm b/maps/templates/baseone.dmm index 80962bf165c..40469640906 100644 --- a/maps/templates/baseone.dmm +++ b/maps/templates/baseone.dmm @@ -449,7 +449,7 @@ /turf/open/floor/wood, /area/adminlevel/bunker01/bedroom) "bt" = ( -/obj/structure/machinery/vending/cigarette/free, +/obj/structure/machinery/vending/cigarette, /obj/structure/machinery/light{ dir = 1 }, diff --git a/maps/templates/basetwo.dmm b/maps/templates/basetwo.dmm index 1051f515c96..3186a28b188 100644 --- a/maps/templates/basetwo.dmm +++ b/maps/templates/basetwo.dmm @@ -979,7 +979,7 @@ /turf/open/floor/wood, /area/adminlevel/bunker01/breakroom) "dw" = ( -/obj/structure/machinery/vending/cigarette/free, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/wood, /area/adminlevel/bunker01/breakroom) "dx" = ( From a71ff44d7d3cb3b21f8c44f331b2009651d72d14 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Thu, 6 Mar 2025 20:06:06 -0500 Subject: [PATCH 3/5] yup --- code/game/machinery/vending/vending.dm | 2 +- code/game/machinery/vending/vending_types.dm | 21 +++++++++--------- .../BMG290_Otogi_Egress_Point.dmm | 8 +++---- maps/map_files/BigRed/BigRed.dmm | 2 +- .../BigRed/sprinkles/15.reactor_meltdown.dmm | 2 +- .../BigRed/sprinkles/20.lz1entrance_v2.dmm | 2 +- .../BigRed/sprinkles/40.dorms_party.dmm | 2 +- .../sprinkles/25.researchprestine.dmm | 2 +- .../map_files/Ice_Colony_v1/Ice_Colony_v1.dmm | 8 +++---- .../map_files/Ice_Colony_v2/Ice_Colony_v2.dmm | 20 ++++++++--------- .../standalone/panic_room_hold.dmm | 6 ++--- .../sprinkles/30.nexuscenter_barricaded.dmm | 2 +- maps/map_files/LV624/standalone/clfship.dmm | 2 +- .../Sorokyne_Strata/Sorokyne_Strata.dmm | 22 +++++++++---------- maps/map_files/generic/Admin_level.dmm | 2 +- maps/templates/Chinook.dmm | 10 ++++----- .../lazy_templates/freelancer_ert_station.dmm | 2 +- .../lazy_templates/weyland_ert_station.dmm | 2 +- 18 files changed, 58 insertions(+), 59 deletions(-) diff --git a/code/game/machinery/vending/vending.dm b/code/game/machinery/vending/vending.dm index 5305cf90611..77837019175 100644 --- a/code/game/machinery/vending/vending.dm +++ b/code/game/machinery/vending/vending.dm @@ -71,7 +71,7 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending /// when did we last pitch? var/last_slogan = 0 /// how long until we can pitch again? - var/slogan_delay = 600 + var/slogan_delay = 120 /// icon_state when vending var/icon_vend /// icon_state when failing to vend diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index c0bdc1d5fc0..1acb0c2f9b6 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -195,9 +195,11 @@ product_type = VENDOR_PRODUCT_TYPE_FOOD /obj/structure/machinery/vending/cigarette - name = "cigarette machine" //Template + name = "cigarette machine" + icon_state = "cigs" desc = "A vending machine dealing in all sorts of cigarettes, lighters and cigars." - product_slogans = list("Light up and enjoy the rich, comfortably familiar taste of Koorlander Gold.", + product_slogans = list( + "Light up and enjoy the rich, comfortably familiar taste of Koorlander Gold.", "Always by your side, Koorlander Gold!", "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.", "Enjoy the delicate touch of Lady Fingers.", @@ -217,8 +219,6 @@ "The Interstellar Commerce Commission would like to remind you that smoking kills.", "The Food and Drug Administration would like to remind you that tobacco products cause cancer and increased fatigue.") product_ads = "The Food and Drug Administration would like to remind you that tobacco products cause cancer and increased fatigue." - icon_state = "cigs" - products = list( /obj/item/storage/fancy/cigarettes/lucky_strikes = 10, /obj/item/storage/fancy/cigarettes/kpack = 10, @@ -236,7 +236,6 @@ /obj/item/tool/lighter/zippo/black = 5, /obj/item/tool/lighter/zippo/blue = 5, ) - premium = list(/obj/item/clothing/mask/cigarette/cigar = 25) prices = list( /obj/item/storage/fancy/cigarettes/lucky_strikes = 35, @@ -258,11 +257,12 @@ ) product_type = VENDOR_PRODUCT_TYPE_NICOTINE -/obj/structure/machinery/vending/cigarette/koorlander //koorlander machine, contains luckies since they either bought Lucky Strikes as a company, or are working together to survive. - name = "Koorlander brand cigarette machine" - desc = "A vending machine dealing in Koorlander affiliated cigarette brands, most of whom only exist in the frontier, but is primarily stocked with Koorlander Gold." +/obj/structure/machinery/vending/cigarette/koorlander + name = "Koorlander cigarette machine" icon_state = "koorcigs" - product_slogans = list("Light up and enjoy the rich, comfortably familiar taste of Koorlander Gold.", + desc = "A vending machine dealing in Koorlander affiliated cigarette brands, most of which are relegated to the colonial frontier, but is primarily stocked with the popular Koorlander Gold brand." + product_slogans = list( + "Light up and enjoy the rich, comfortably familiar taste of Koorlander Gold.", "Always by your side, Koorlander Gold!", "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.", "Enjoy the delicate touch of Lady Fingers.", @@ -278,11 +278,10 @@ "The Interstellar Commerce Commission would like to remind you that smoking kills.", "The Food and Drug Administration would like to remind you that tobacco products cause cancer and increased fatigue.") product_ads = "The Food and Drug Administration would like to remind you that tobacco products cause cancer and increased fatigue." - icon_state = "cigs" products = list( /obj/item/storage/fancy/cigarettes/kpack = 10, /obj/item/storage/fancy/cigarettes/kpack = 10, - /obj/item/storage/fancy/cigarettes/arcturian_ace = 25, + /obj/item/storage/fancy/cigarettes/arcturian_ace = 10, /obj/item/storage/fancy/cigarettes/emeraldgreen = 10, /obj/item/storage/fancy/cigarettes/lady_finger = 10, /obj/item/storage/fancy/cigar/tarbacktube = 10, diff --git a/maps/map_files/BMG290_Otogi_Egress_Point/BMG290_Otogi_Egress_Point.dmm b/maps/map_files/BMG290_Otogi_Egress_Point/BMG290_Otogi_Egress_Point.dmm index e9fd2f571c5..ae9d8352daf 100644 --- a/maps/map_files/BMG290_Otogi_Egress_Point/BMG290_Otogi_Egress_Point.dmm +++ b/maps/map_files/BMG290_Otogi_Egress_Point/BMG290_Otogi_Egress_Point.dmm @@ -320,7 +320,7 @@ /turf/open/auto_turf/strata_grass/layer0_mud, /area/bmg290/wilderness/outskirts) "aiM" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison, /area/bmg290/colony/diner) "ajl" = ( @@ -1369,7 +1369,7 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/asphalt/cement, /area/bmg290/wilderness/colony_exterior) "aIj" = ( @@ -26032,7 +26032,7 @@ /area/bmg290/keppitz/acquisitions) "miy" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /obj/structure/machinery/light/small{ dir = 1; pixel_y = 20 @@ -41177,7 +41177,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/asphalt/cement, /area/bmg290/wilderness/colony_exterior) "ttP" = ( diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index 07d3be4dff8..bf64f04797c 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -1782,7 +1782,7 @@ /turf/open/floor, /area/bigredv2/outside/dorms) "azT" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, diff --git a/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm b/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm index 897f76d0f65..22cb90a03af 100644 --- a/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm +++ b/maps/map_files/BigRed/sprinkles/15.reactor_meltdown.dmm @@ -295,7 +295,7 @@ /turf/open/floor/darkyellowcorners2/east, /area/bigredv2/outside/engineering) "bL" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkyellow2/north, /area/bigredv2/outside/engineering) "bM" = ( diff --git a/maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm b/maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm index ad90ee0bc60..8401b7c54df 100644 --- a/maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm +++ b/maps/map_files/BigRed/sprinkles/20.lz1entrance_v2.dmm @@ -72,7 +72,7 @@ /turf/open/floor/darkgreen2/north, /area/bigredv2/outside/space_port) "as" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkgreen2/northeast, /area/bigredv2/outside/space_port) "at" = ( diff --git a/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm b/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm index 4a54b3d5bee..d343e2383c6 100644 --- a/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm +++ b/maps/map_files/BigRed/sprinkles/40.dorms_party.dmm @@ -291,7 +291,7 @@ /turf/open/floor, /area/bigredv2/outside/dorms) "bg" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, diff --git a/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm b/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm index 9a7b604d783..11e5f98cb05 100644 --- a/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm +++ b/maps/map_files/FOP_v3_Sciannex/sprinkles/25.researchprestine.dmm @@ -338,7 +338,7 @@ /turf/open/floor/prison/whitepurple, /area/template_noop) "FZ" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/prison/darkpurplefull2, /area/template_noop) "Gk" = ( diff --git a/maps/map_files/Ice_Colony_v1/Ice_Colony_v1.dmm b/maps/map_files/Ice_Colony_v1/Ice_Colony_v1.dmm index 0acc5358c73..89bfd75cfe3 100644 --- a/maps/map_files/Ice_Colony_v1/Ice_Colony_v1.dmm +++ b/maps/map_files/Ice_Colony_v1/Ice_Colony_v1.dmm @@ -274,7 +274,7 @@ /turf/open/floor/engine, /area/ice_colony/underground/research) "atr" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkgreen2/east, /area/ice_colony/underground/reception) "atP" = ( @@ -348,7 +348,7 @@ /turf/open/floor/darkblue2/east, /area/ice_colony/underground/reception) "aAk" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkpurplecorners2/north, /area/ice_colony/underground/research/work) "aAr" = ( @@ -4922,7 +4922,7 @@ /turf/open/floor/plating/icefloor, /area/ice_colony/surface/dorms) "jci" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkgreencorners2/north, /area/ice_colony/underground/crew/canteen) "jeP" = ( @@ -8999,7 +8999,7 @@ /turf/open/floor/plating/icefloor, /area/ice_colony/surface/excavation/storage) "rng" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkgreen2/north, /area/ice_colony/surface/storage_unit/research) "roE" = ( diff --git a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm index d20d4ef6148..38728ce8102 100644 --- a/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm +++ b/maps/map_files/Ice_Colony_v2/Ice_Colony_v2.dmm @@ -3970,7 +3970,7 @@ /turf/open/floor/wood, /area/ice_colony/surface/command/crisis) "aIx" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/wood, /area/ice_colony/surface/command/crisis) "aIy" = ( @@ -4824,7 +4824,7 @@ /turf/open/floor/wood, /area/ice_colony/surface/bar/bar) "aRx" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /obj/structure/machinery/light, /turf/open/floor/wood, /area/ice_colony/surface/bar/bar) @@ -10636,7 +10636,7 @@ /turf/open/floor/darkyellow2/north, /area/ice_colony/underground/engineering) "dIf" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkblue2/northeast, /area/ice_colony/surface/command/checkpoint) "dIB" = ( @@ -11343,7 +11343,7 @@ /turf/open/floor/white, /area/ice_colony/underground/reception/toilet_women) "ewS" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkgreen2/east, /area/ice_colony/underground/hallway/south_east) "ewY" = ( @@ -13411,7 +13411,7 @@ /turf/open/floor/plating/icefloor/warnplate/north, /area/shuttle/elevator2/underground) "hjy" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkblue2/southeast, /area/ice_colony/underground/command/checkpoint) "hjM" = ( @@ -14551,7 +14551,7 @@ /turf/open/floor/darkyellow2/east, /area/ice_colony/surface/substation/smes) "izK" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkblue2/southeast, /area/ice_colony/surface/command/control) "iAs" = ( @@ -15513,7 +15513,7 @@ /turf/open/floor/white, /area/ice_colony/underground/reception/toilet_men) "jLW" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkred2/northeast, /area/ice_colony/underground/security/hallway) "jMD" = ( @@ -19453,7 +19453,7 @@ /turf/open/floor/darkbrown2, /area/ice_colony/underground/requesition/sec_storage) "oNw" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkgreen2/north, /area/ice_colony/underground/hallway/north_west) "oOd" = ( @@ -20859,7 +20859,7 @@ /turf/open/floor/darkbrown2/southeast, /area/ice_colony/surface/excavation) "qAT" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/dark2, /area/ice_colony/surface/hangar/checkpoint) "qBa" = ( @@ -22366,7 +22366,7 @@ /turf/open/floor/darkyellow2/north, /area/ice_colony/underground/hallway/south_east) "szY" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/darkgreen2/north, /area/ice_colony/underground/hallway/south_east) "szZ" = ( diff --git a/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm b/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm index 17bade13f5e..1f2974d062a 100644 --- a/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm +++ b/maps/map_files/Ice_Colony_v3/standalone/panic_room_hold.dmm @@ -811,7 +811,7 @@ /turf/open/floor/shiva/north, /area/shiva/interior/colony/s_admin) "DW" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/north, /area/shiva/interior/colony/s_admin) "DY" = ( @@ -923,7 +923,7 @@ /turf/open/floor/wood, /area/shiva/interior/colony/s_admin) "IQ" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/floor3, /area/shiva/interior/colony/s_admin) "Jp" = ( @@ -1010,7 +1010,7 @@ /turf/open/floor/shiva/bluefull, /area/shiva/interior/colony/s_admin) "Lu" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/shiva/multi_tiles/west, /area/shiva/interior/colony/s_admin) "LE" = ( diff --git a/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm b/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm index 45172d666eb..8e5b76feb23 100644 --- a/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm +++ b/maps/map_files/LV624/sprinkles/30.nexuscenter_barricaded.dmm @@ -77,7 +77,7 @@ /turf/open/floor/floorscorched1, /area/lv624/lazarus/main_hall) "dQ" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/whiteblue/northwest, /area/lv624/lazarus/main_hall) "ef" = ( diff --git a/maps/map_files/LV624/standalone/clfship.dmm b/maps/map_files/LV624/standalone/clfship.dmm index 9b15bff7b83..ad334ac8567 100644 --- a/maps/map_files/LV624/standalone/clfship.dmm +++ b/maps/map_files/LV624/standalone/clfship.dmm @@ -1268,7 +1268,7 @@ /turf/open/floor/plating/warnplate/northwest, /area/lv624/lazarus/crashed_ship) "OL" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/plating/plating_catwalk, /area/lv624/lazarus/crashed_ship) "OO" = ( diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index 436e7f0248b..4024e86e0c7 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -16898,7 +16898,7 @@ /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/engi) "ibc" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/canteen/lower_cafeteria) "ibh" = ( @@ -17994,7 +17994,7 @@ /turf/open/floor/strata, /area/strata/ag/exterior/research_decks) "iZK" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /obj/structure/machinery/light/small{ dir = 1; pixel_y = 20 @@ -18506,7 +18506,7 @@ /turf/open/gm/river, /area/strata/ag/exterior/nearlz2) "jAD" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /obj/item/clothing/head/soft/ferret{ pixel_y = 9 }, @@ -19025,7 +19025,7 @@ /turf/closed/wall/strata_outpost, /area/strata/ug/interior/outpost/jung/dorms/med2) "kaD" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/strata/red1, /area/strata/ag/interior/landingzone_checkpoint) "kaL" = ( @@ -20754,7 +20754,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh) "lGw" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/strata/white_cyan2/west, /area/strata/ag/interior/dorms) "lHs" = ( @@ -20857,7 +20857,7 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/interior/mountain) "lLB" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/strata/blue1, /area/strata/ag/interior/outpost/admin) "lLC" = ( @@ -22208,7 +22208,7 @@ /turf/open/floor/strata/white_cyan1, /area/strata/ag/interior/dorms) "nes" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/strata/cyan3/east, /area/strata/ag/interior/outpost/med) "neN" = ( @@ -22335,7 +22335,7 @@ /turf/open/floor/strata/floor3, /area/strata/ag/interior/outpost/canteen/lower_cafeteria) "njg" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/strata/white_cyan1/east, /area/strata/ag/interior/outpost/canteen/lower_cafeteria) "njq" = ( @@ -23281,7 +23281,7 @@ /turf/open/floor/strata/multi_tiles/southeast, /area/strata/ag/interior/outpost/canteen/personal_storage) "nYA" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/strata/floor2, /area/strata/ug/interior/jungle/deep/structures/engi) "nZR" = ( @@ -27509,7 +27509,7 @@ /turf/open/floor/strata/multi_tiles, /area/strata/ag/exterior/research_decks) "rVy" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/strata/blue1, /area/strata/ug/interior/jungle/deep/structures/res) "rVK" = ( @@ -28377,7 +28377,7 @@ /turf/closed/wall/strata_outpost, /area/strata/ug/interior/outpost/jung/dorms/sec1) "sIx" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/strata/floor3, /area/strata/ug/interior/jungle/deep/structures/res) "sIX" = ( diff --git a/maps/map_files/generic/Admin_level.dmm b/maps/map_files/generic/Admin_level.dmm index 058f8d78a8c..4e52833565e 100644 --- a/maps/map_files/generic/Admin_level.dmm +++ b/maps/map_files/generic/Admin_level.dmm @@ -1942,7 +1942,7 @@ /turf/open/floor/carpet, /area/adminlevel/ert_station) "WQ" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/wood/ship, /area/adminlevel/ert_station) "Xc" = ( diff --git a/maps/templates/Chinook.dmm b/maps/templates/Chinook.dmm index a983ce18038..03f08c3c5e7 100644 --- a/maps/templates/Chinook.dmm +++ b/maps/templates/Chinook.dmm @@ -2844,7 +2844,7 @@ /turf/open/floor/almayer/blue, /area/adminlevel/chinook/offices) "kN" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer/blue, /area/adminlevel/chinook/offices) "kP" = ( @@ -3708,7 +3708,7 @@ /turf/open/floor/carpet, /area/adminlevel/chinook/event) "on" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook/offices) "op" = ( @@ -4224,7 +4224,7 @@ /turf/open/floor/wood, /area/adminlevel/chinook/offices) "qb" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/almayer/plating/northeast, /area/adminlevel/chinook) "qc" = ( @@ -5844,7 +5844,7 @@ /turf/open/floor/almayer/sterile_green, /area/adminlevel/chinook/medical) "wG" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/kutjevo/plate, /area/adminlevel/chinook/event) "wH" = ( @@ -7306,7 +7306,7 @@ /turf/open/floor/almayer/cargo, /area/adminlevel/chinook/sec) "Dp" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /obj/structure/machinery/light{ dir = 4 }, diff --git a/maps/templates/lazy_templates/freelancer_ert_station.dmm b/maps/templates/lazy_templates/freelancer_ert_station.dmm index 938e2a63952..cb6e1445df4 100644 --- a/maps/templates/lazy_templates/freelancer_ert_station.dmm +++ b/maps/templates/lazy_templates/freelancer_ert_station.dmm @@ -1087,7 +1087,7 @@ /turf/open/floor/almayer/dark_sterile, /area/adminlevel/ert_station) "ZS" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/wood/ship, /area/adminlevel/ert_station) diff --git a/maps/templates/lazy_templates/weyland_ert_station.dmm b/maps/templates/lazy_templates/weyland_ert_station.dmm index b8e15039814..39097fd47ee 100644 --- a/maps/templates/lazy_templates/weyland_ert_station.dmm +++ b/maps/templates/lazy_templates/weyland_ert_station.dmm @@ -2680,7 +2680,7 @@ /turf/open/floor/corsat/squares, /area/adminlevel/ert_station/weyland_station) "SM" = ( -/obj/structure/machinery/vending/cigarette/colony, +/obj/structure/machinery/vending/cigarette, /turf/open/floor/wood/ship, /area/adminlevel/ert_station/weyland_station) "SN" = ( From 778cb9b0d2a5126e71f53c60437c899f9bab469a Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Thu, 6 Mar 2025 20:18:41 -0500 Subject: [PATCH 4/5] yup --- code/game/machinery/vending/vending_types.dm | 65 +++++++++++++++- maps/map_files/golden_arrow/golden_arrow.dmm | 79 ++++++-------------- 2 files changed, 85 insertions(+), 59 deletions(-) diff --git a/code/game/machinery/vending/vending_types.dm b/code/game/machinery/vending/vending_types.dm index 1acb0c2f9b6..854526eb063 100644 --- a/code/game/machinery/vending/vending_types.dm +++ b/code/game/machinery/vending/vending_types.dm @@ -236,7 +236,7 @@ /obj/item/tool/lighter/zippo/black = 5, /obj/item/tool/lighter/zippo/blue = 5, ) - premium = list(/obj/item/clothing/mask/cigarette/cigar = 25) + premium = list(/obj/item/clothing/mask/cigarette/cigar = 5) prices = list( /obj/item/storage/fancy/cigarettes/lucky_strikes = 35, /obj/item/storage/fancy/cigarettes/kpack = 40, @@ -292,7 +292,7 @@ /obj/item/tool/lighter/zippo/blue = 5, ) - premium = list(/obj/item/clothing/mask/cigarette/cigar = 25) + premium = list(/obj/item/clothing/mask/cigarette/cigar = 5) prices = list( /obj/item/storage/fancy/cigarettes/kpack = 40, /obj/item/storage/fancy/cigarettes/kpack = 40, @@ -308,6 +308,67 @@ ) product_type = VENDOR_PRODUCT_TYPE_NICOTINE + +/obj/structure/machinery/vending/cigarette/marine + name = "cigarette machine" + icon_state = "cigs" + desc = "A vending machine dealing in all sorts of cigarettes, lighters and cigars." + product_slogans = list( + "Light up and enjoy the rich, comfortably familiar taste of Koorlander Gold.", + "Always by your side, Koorlander Gold!", + "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.", + "Enjoy the delicate touch of Lady Fingers.", + "Lady Fingers, the compliment to any evening.", + "For the cool, filtered feel, Lady Finger vigarettes provide the smoothest draw of any cigarette on the market.", + "Real. Simple. Different. American Spirit.", + "American Spirit, America's best cigarette.", + "Lucky Strike, it's toasted!", + "L.S./M.F.T.! Lucky Strikes Means Fine Tobacco!", + "A taste of the Emerald Isles at the touch of your finger-tips, Emerald Green.", + "Forge new frontiers with Arcturian Ace.", + "For a classic style that lights up every time, there's always Zippo!", + "Zippo, it works or we fix it for free.", + "On a budget? Buy a Bic.", + "Bic, proudly lighting the way since 1973.", + "The Interstellar Commerce Commission would like to remind you that smoking kills.", + "The Food and Drug Administration would like to remind you that tobacco products cause cancer and increased fatigue.") + product_ads = "The Surgeon General would like to remind you that tobacco products cause cancer and increased fatigue." + products = list( + /obj/item/storage/fancy/cigarettes/lucky_strikes = 5, + /obj/item/storage/fancy/cigarettes/kpack = 5, + /obj/item/storage/fancy/cigarettes/spirit = 5, + /obj/item/storage/fancy/cigarettes/spirit/yellow = 5, + /obj/item/storage/fancy/cigarettes/emeraldgreen = 5, + /obj/item/storage/fancy/cigarettes/wypacket = 5, + /obj/item/storage/fancy/cigarettes/lady_finger = 5, + /obj/item/storage/fancy/cigarettes/blackpack = 5, + /obj/item/storage/fancy/cigar/tarbacktube = 5, + /obj/item/storage/box/matches = 20, + /obj/item/tool/lighter/random = 10, + /obj/item/tool/lighter/zippo = 5, + /obj/item/tool/lighter/zippo/black = 2, + /obj/item/tool/lighter/zippo/blue = 2, + ) + premium = list(/obj/item/clothing/mask/cigarette/cigar = 5) + prices = list( + /obj/item/storage/fancy/cigarettes/lucky_strikes = 70, + /obj/item/storage/fancy/cigarettes/kpack = 80, + /obj/item/storage/fancy/cigarettes/spirit = 80, + /obj/item/storage/fancy/cigarettes/spirit/yellow = 80, + /obj/item/storage/fancy/cigarettes/arcturian_ace = 50, + /obj/item/storage/fancy/cigarettes/emeraldgreen = 50, + /obj/item/storage/fancy/cigarettes/wypacket = 100, + /obj/item/storage/fancy/cigarettes/lady_finger = 60, + /obj/item/storage/fancy/cigarettes/blackpack = 75, + /obj/item/storage/fancy/cigar/tarbacktube = 70, + /obj/item/storage/box/matches = 2, + /obj/item/tool/lighter/random = 5, + /obj/item/tool/lighter/zippo = 50, + /obj/item/tool/lighter/zippo/black = 54, + /obj/item/tool/lighter/zippo/blue = 54, + ) + product_type = VENDOR_PRODUCT_TYPE_NICOTINE + /obj/structure/machinery/vending/cigarette/upp desc = "A state-owned cigarette vendor. Its drab colour was chosen to discourage purchases, but its existence is an admittance to the necessity for such machines to exist in the first place." product_slogans = "" diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 87b65b256c4..34383ab4507 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -58,38 +58,6 @@ }, /turf/open/floor/almayer/test_floor4, /area/golden_arrow/lower_cargo) -"aai" = ( -/obj/structure/machinery/vending/snack/packaged{ - pixel_y = -6; - wrenchable = 0; - pixel_x = 5 - }, -/turf/closed/wall/almayer, -/area/golden_arrow/cryo_cells) -"aaj" = ( -/obj/structure/machinery/vending/coffee{ - pixel_y = -7; - pixel_x = -1; - wrenchable = 0 - }, -/turf/closed/wall/almayer, -/area/golden_arrow/cryo_cells) -"aak" = ( -/obj/structure/machinery/vending/cigarette/koorlander{ - pixel_x = -7; - pixel_y = -7; - wrenchable = 0 - }, -/turf/closed/wall/almayer, -/area/golden_arrow/cryo_cells) -"aal" = ( -/obj/structure/machinery/door/poddoor/almayer/locked{ - dir = 2; - name = "\improper Hangar Lockdown Blast Door" - }, -/obj/structure/machinery/vending/cigarette/wy, -/turf/open/floor/almayer/test_floor4, -/area/golden_arrow/hangar) "aan" = ( /obj/effect/decal/cleanable/dirt{ layer = 2.52 @@ -1482,24 +1450,21 @@ /turf/open/floor/almayer, /area/golden_arrow/platoonarmory) "afl" = ( -/obj/effect/decal/cleanable/dirt{ - layer = 2.52 +/obj/structure/machinery/light/double/blue{ + dir = 1; + light_color = "#dae2ff"; + pixel_y = 20 }, -/obj/structure/closet/crate/trashcart{ - pixel_y = 8 +/obj/structure/closet/crate/miningcar{ + name = "\improper trash cart" }, -/obj/item/trash/candy, /obj/item/trash/burger, -/obj/item/trash/cigbutt, +/obj/item/trash/candy, /obj/item/trash/burger{ pixel_y = 6; pixel_x = 3 }, -/obj/structure/machinery/light/double/blue{ - dir = 1; - light_color = "#dae2ff"; - pixel_y = 20 - }, +/obj/item/trash/cigbutt, /turf/open/floor/almayer/dark_sterile, /area/golden_arrow/cryo_cells) "afm" = ( @@ -7479,10 +7444,13 @@ /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/hangar) "azG" = ( -/obj/structure/machinery/vending/dinnerware, -/obj/structure/sign/banners/usa_flag{ - pixel_x = -15; - pixel_y = 32 +/obj/structure/machinery/vending/cigarette/marine{ + pixel_y = 16; + can_block_movement = 0 + }, +/obj/item/ashtray/bronze{ + pixel_x = -3; + pixel_y = 27 }, /turf/open/floor/almayer/dark_sterile, /area/golden_arrow/cryo_cells) @@ -10006,9 +9974,9 @@ /turf/open/floor/almayer, /area/golden_arrow/hangar) "aHQ" = ( -/obj/item/ashtray/bronze{ - pixel_x = 29; - pixel_y = 37 +/obj/structure/sign/banners/united_americas_flag{ + pixel_y = 31; + pixel_x = -16 }, /turf/open/floor/almayer, /area/golden_arrow/cryo_cells) @@ -14033,9 +14001,6 @@ icon_state = "SW-out"; pixel_x = -1 }, -/obj/structure/sign/banners/united_americas_flag{ - pixel_y = 30 - }, /turf/open/floor/almayer/plate, /area/golden_arrow/cryo_cells) "aWx" = ( @@ -28179,7 +28144,7 @@ aEG aEG aEG aWh -aai +aog alD ave anG @@ -28356,7 +28321,7 @@ aEG aEG aEG aWh -aaj +aog aHQ aBk aBk @@ -28533,7 +28498,7 @@ aEG aEG aEG aWh -aak +aog aBk azd aQd @@ -35059,7 +35024,7 @@ aEG aEG aEG atb -aal +axa aBg alK aUD From 5828d084b18e03cb81cf5ff7917c44126620db08 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Thu, 6 Mar 2025 20:25:04 -0500 Subject: [PATCH 5/5] Update golden_arrow.dmm --- maps/map_files/golden_arrow/golden_arrow.dmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 34383ab4507..735abe5ddfd 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -18493,9 +18493,6 @@ /turf/open/floor/almayer, /area/golden_arrow/engineering) "nsl" = ( -/obj/structure/closet/crate/trashcart{ - pixel_y = 11 - }, /obj/item/prop/colony/usedbandage, /obj/item/prop/colony/usedbandage{ dir = 4 @@ -18518,6 +18515,9 @@ light_power = 0.5; pixel_y = 10 }, +/obj/structure/closet/crate/miningcar/yellow{ + name = "\improper biological hazard container" + }, /turf/open/floor/almayer/dark_sterile, /area/golden_arrow/medical) "nuo" = (