From eb9770efb91fab68696938008fedb5ab1a10f15f Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Mon, 8 Jan 2024 20:34:47 -0500 Subject: [PATCH] Reduce vendor thank you message spam and add variety (#23746) * Moved vendor thank you messages into AdvertisementPack, making them vendor-specific. Wrote a few example messages. * Only display thank yous when closing the UI after a purchase. * Tweaked a few messages * More custom messages * Missed one --- Content.Server/Advertise/AdvertiseSystem.cs | 11 +++++++++ .../AdvertisementsPackPrototype.cs | 3 +++ .../VendingMachines/VendingMachineSystem.cs | 23 ++++++++++++++----- .../VendingMachineComponent.cs | 2 ++ .../en-US/advertisements/vending/ammo.ftl | 1 - .../advertisements/vending/boozeomat.ftl | 1 + .../en-US/advertisements/vending/chang.ftl | 2 ++ .../en-US/advertisements/vending/chefvend.ftl | 5 +++- .../en-US/advertisements/vending/cigs.ftl | 2 ++ .../en-US/advertisements/vending/coffee.ftl | 3 +++ .../en-US/advertisements/vending/cola.ftl | 3 +++ .../en-US/advertisements/vending/discount.ftl | 7 ++++++ .../en-US/advertisements/vending/donut.ftl | 3 +++ .../en-US/advertisements/vending/games.ftl | 3 +++ .../advertisements/vending/happyhonk.ftl | 3 +++ .../en-US/advertisements/vending/nutrimax.ftl | 3 ++- .../en-US/advertisements/vending/sectech.ftl | 3 ++- .../en-US/advertisements/vending/snack.ftl | 4 ++++ .../advertisements/vending/sovietsoda.ftl | 2 ++ .../advertisements/vending/syndiedrobe.ftl | 4 +++- .../VendingMachines/Advertisements/ammo.yml | 2 ++ .../Advertisements/atmosdrobe.yml | 2 ++ .../Advertisements/bardrobe.yml | 2 ++ .../Advertisements/boozeomat.yml | 3 +++ .../Advertisements/cargodrobe.yml | 2 ++ .../VendingMachines/Advertisements/chang.yml | 6 ++++- .../Advertisements/chefdrobe.yml | 2 ++ .../Advertisements/chefvend.yml | 7 +++++- .../Advertisements/chemdrobe.yml | 2 ++ .../VendingMachines/Advertisements/cigs.yml | 4 ++++ .../Advertisements/clothesmate.yml | 2 ++ .../VendingMachines/Advertisements/coffee.yml | 5 ++++ .../VendingMachines/Advertisements/cola.yml | 5 ++++ .../Advertisements/condiments.yml | 4 +++- .../Advertisements/curadrobe.yml | 2 ++ .../Advertisements/detdrobe.yml | 2 ++ .../Advertisements/dinnerware.yml | 2 ++ .../Advertisements/discount.yml | 9 ++++++++ .../VendingMachines/Advertisements/donut.yml | 5 ++++ .../Advertisements/engidrobe.yml | 2 ++ .../Advertisements/fatextractor.yml | 2 ++ .../VendingMachines/Advertisements/games.yml | 5 ++++ .../Advertisements/genedrobe.yml | 2 ++ .../Advertisements/happyhonk.yml | 5 ++++ .../Advertisements/hydrobe.yml | 2 ++ .../Advertisements/janidrobe.yml | 2 ++ .../Advertisements/lawdrobe.yml | 2 ++ .../Advertisements/magivend.yml | 3 ++- .../Advertisements/medidrobe.yml | 2 ++ .../Advertisements/megaseed.yml | 2 ++ .../Advertisements/nanomed.yml | 2 ++ .../Advertisements/nutrimax.yml | 3 +++ .../Advertisements/robodrobe.yml | 2 ++ .../Advertisements/scidrobe.yml | 2 ++ .../Advertisements/secdrobe.yml | 2 ++ .../Advertisements/sectech.yml | 4 ++++ .../Advertisements/smartfridge.yml | 2 ++ .../VendingMachines/Advertisements/snack.yml | 6 +++++ .../Advertisements/sovietsoda.yml | 4 ++++ .../Advertisements/syndiedrobe.yml | 5 ++++ .../Advertisements/theater.yml | 2 ++ .../Advertisements/vendomat.yml | 2 ++ .../Advertisements/virodrobe.yml | 2 ++ 63 files changed, 208 insertions(+), 15 deletions(-) diff --git a/Content.Server/Advertise/AdvertiseSystem.cs b/Content.Server/Advertise/AdvertiseSystem.cs index 517d1779ec..ab538f3c77 100644 --- a/Content.Server/Advertise/AdvertiseSystem.cs +++ b/Content.Server/Advertise/AdvertiseSystem.cs @@ -74,6 +74,17 @@ namespace Content.Server.Advertise _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.Advertisements)), InGameICChatType.Speak, true); } + public void SayThankYou(EntityUid uid, AdvertiseComponent? advertise = null) + { + if (!Resolve(uid, ref advertise)) + return; + + if (_prototypeManager.TryIndex(advertise.PackPrototypeId, out AdvertisementsPackPrototype? advertisements)) + { + _chat.TrySendInGameICMessage(uid, Loc.GetString(_random.Pick(advertisements.ThankYous), ("name", Name(uid))), InGameICChatType.Speak, true); + } + } + public void SetEnabled(EntityUid uid, bool enable, AdvertiseComponent? advertise = null) { if (!Resolve(uid, ref advertise)) diff --git a/Content.Server/Advertisements/AdvertisementsPackPrototype.cs b/Content.Server/Advertisements/AdvertisementsPackPrototype.cs index 56086d39a4..641ab3c56f 100644 --- a/Content.Server/Advertisements/AdvertisementsPackPrototype.cs +++ b/Content.Server/Advertisements/AdvertisementsPackPrototype.cs @@ -11,5 +11,8 @@ namespace Content.Server.Advertisements [DataField("advertisements")] public List Advertisements { get; private set; } = new(); + + [DataField("thankyous")] + public List ThankYous { get; private set; } = new(); } } diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 4d3fc0b941..9125bd8756 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -24,6 +24,7 @@ using Robust.Shared.Audio; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; +using Robust.Shared.Utility; namespace Content.Server.VendingMachines { @@ -37,7 +38,7 @@ namespace Content.Server.VendingMachines [Dependency] private readonly ThrowingSystem _throwingSystem = default!; [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private readonly AdvertiseSystem _advertise = default!; private ISawmill _sawmill = default!; @@ -56,6 +57,7 @@ namespace Content.Server.VendingMachines SubscribeLocalEvent(OnActivatableUIOpenAttempt); SubscribeLocalEvent(OnBoundUIOpened); + SubscribeLocalEvent(OnBoundUIClosed); SubscribeLocalEvent(OnInventoryEjectMessage); SubscribeLocalEvent(OnSelfDispense); @@ -110,6 +112,19 @@ namespace Content.Server.VendingMachines UpdateVendingMachineInterfaceState(uid, component); } + private void OnBoundUIClosed(EntityUid uid, VendingMachineComponent component, BoundUIClosedEvent args) + { + if ((VendingMachineUiKey) args.UiKey != VendingMachineUiKey.Key) + return; + + // Only vendors that advertise will send message after dispensing + if (component.ShouldSayThankYou && TryComp(uid, out var advertise)) + { + _advertise.SayThankYou(uid, advertise); + component.ShouldSayThankYou = false; + } + } + private void UpdateVendingMachineInterfaceState(EntityUid uid, VendingMachineComponent component) { var state = new VendingMachineInterfaceState(GetAllInventory(uid, component)); @@ -387,11 +402,7 @@ namespace Content.Server.VendingMachines _throwingSystem.TryThrow(ent, direction, vendComponent.NonLimitedEjectForce); } - // Only vendors that advertise will send message after dispensing - if (TryComp(uid, out var advertise)) - { - _chat.TrySendInGameICMessage(uid, Loc.GetString("vending-machine-thanks", ("name", Name(uid))), InGameICChatType.Speak, true); - } + vendComponent.ShouldSayThankYou = true; vendComponent.NextItemToEject = null; vendComponent.ThrowNextItem = false; diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index 7d474feca9..a7c8ae299a 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -51,6 +51,8 @@ namespace Content.Shared.VendingMachines public bool Broken; + public bool ShouldSayThankYou; + /// /// When true, will forcefully throw any object it dispenses /// diff --git a/Resources/Locale/en-US/advertisements/vending/ammo.ftl b/Resources/Locale/en-US/advertisements/vending/ammo.ftl index 29e9411be3..bf20a3c3c3 100644 --- a/Resources/Locale/en-US/advertisements/vending/ammo.ftl +++ b/Resources/Locale/en-US/advertisements/vending/ammo.ftl @@ -6,4 +6,3 @@ advertisement-ammo-5 = Float like an astronaut, sting like a bullet! advertisement-ammo-6 = Express your second amendment today! advertisement-ammo-7 = Guns don't kill people, but you can! advertisement-ammo-8 = Who needs responsibilities when you have guns? - diff --git a/Resources/Locale/en-US/advertisements/vending/boozeomat.ftl b/Resources/Locale/en-US/advertisements/vending/boozeomat.ftl index 0d9713e5fd..64fc9c0080 100644 --- a/Resources/Locale/en-US/advertisements/vending/boozeomat.ftl +++ b/Resources/Locale/en-US/advertisements/vending/boozeomat.ftl @@ -17,3 +17,4 @@ advertisement-boozeomat-16 = Award-winning wine! advertisement-boozeomat-17 = Maximum alcohol! advertisement-boozeomat-18 = Man loves beer. advertisement-boozeomat-19 = A toast for progress! +thankyou-boozeomat-1 = Please drink responsibly! diff --git a/Resources/Locale/en-US/advertisements/vending/chang.ftl b/Resources/Locale/en-US/advertisements/vending/chang.ftl index 34b6ece3ff..843b8dcb66 100644 --- a/Resources/Locale/en-US/advertisements/vending/chang.ftl +++ b/Resources/Locale/en-US/advertisements/vending/chang.ftl @@ -2,3 +2,5 @@ advertisement-chang-2 = Mr. Chang, approved for safe consumption in over 10 sectors! advertisement-chang-3 = Chinese food is great for a date night, or a lonely night! advertisement-chang-4 = You can't go wrong with Mr. Chang's authentic Chinese food! +thankyou-chang-1 = Mr. Chang says thank you! +thankyou-chang-2 = Enjoy your authentic meal! diff --git a/Resources/Locale/en-US/advertisements/vending/chefvend.ftl b/Resources/Locale/en-US/advertisements/vending/chefvend.ftl index ddc68c8489..2ea82b0d62 100644 --- a/Resources/Locale/en-US/advertisements/vending/chefvend.ftl +++ b/Resources/Locale/en-US/advertisements/vending/chefvend.ftl @@ -4,4 +4,7 @@ advertisement-chefvend-3 = Slap some butter on it! advertisement-chefvend-4 = Are you worth your salt? We are. advertisement-chefvend-5 = Mmm, meat. advertisement-chefvend-6 = Harness the power of flour. -advertisement-chefvend-7 = Show your customers who's the best chef around with our galaxy famous, award winning BBQ sauce. \ No newline at end of file +advertisement-chefvend-7 = Show your customers who's the best chef around with our galaxy famous, award winning BBQ sauce. +thankyou-chefvend-1 = Time to get cooking! +thankyou-chefvend-2 = Thanks for trusting our quality ingredients! +thankyou-chefvend-3 = That should give them what they're craving! diff --git a/Resources/Locale/en-US/advertisements/vending/cigs.ftl b/Resources/Locale/en-US/advertisements/vending/cigs.ftl index d7db3990a6..f8b3ce1e5c 100644 --- a/Resources/Locale/en-US/advertisements/vending/cigs.ftl +++ b/Resources/Locale/en-US/advertisements/vending/cigs.ftl @@ -9,3 +9,5 @@ advertisement-cigs-8 = Don't quit, buy more! advertisement-cigs-9 = Nicotine heaven. advertisement-cigs-10 = Best cigarettes since 2150. advertisement-cigs-11 = Award-winning cigs. +thankyou-cigs-1 = You've got 'em, now smoke 'em! +thankyou-cigs-2 = You probably won't regret it! diff --git a/Resources/Locale/en-US/advertisements/vending/coffee.ftl b/Resources/Locale/en-US/advertisements/vending/coffee.ftl index 18ec5be2dd..d4e22cb2f9 100644 --- a/Resources/Locale/en-US/advertisements/vending/coffee.ftl +++ b/Resources/Locale/en-US/advertisements/vending/coffee.ftl @@ -11,3 +11,6 @@ advertisement-coffee-10 = Coffee helps you work! advertisement-coffee-11 = Try some tea. advertisement-coffee-12 = We hope you like the best! advertisement-coffee-13 = Try our new chocolate! +thankyou-coffee-1 = Enjoy your beverage! +thankyou-coffee-2 = Get it while it's hot! +thankyou-coffee-3 = Beverage completed. diff --git a/Resources/Locale/en-US/advertisements/vending/cola.ftl b/Resources/Locale/en-US/advertisements/vending/cola.ftl index 68326d51d3..6806235525 100644 --- a/Resources/Locale/en-US/advertisements/vending/cola.ftl +++ b/Resources/Locale/en-US/advertisements/vending/cola.ftl @@ -5,3 +5,6 @@ advertisement-cola-4 = Thirsty? Why not cola? advertisement-cola-5 = Please, have a drink! advertisement-cola-6 = Drink up! advertisement-cola-7 = The best drinks in the galaxy! +thankyou-cola-1 = Pop open that can and enjoy! +thankyou-cola-2 = Pow! Take that, thirst! +thankyou-cola-3 = I hope you like flavor! diff --git a/Resources/Locale/en-US/advertisements/vending/discount.ftl b/Resources/Locale/en-US/advertisements/vending/discount.ftl index 4b2e4c62a3..4569968189 100644 --- a/Resources/Locale/en-US/advertisements/vending/discount.ftl +++ b/Resources/Locale/en-US/advertisements/vending/discount.ftl @@ -6,3 +6,10 @@ advertisement-discount-5 = Don't listen to those eggheads at the CDC, buy now! advertisement-discount-6 = Discount Dan's: We're good for you! Nope, couldn't say it with a straight face. advertisement-discount-7 = Discount Dan's: Only the best quality produ-*BZZT advertisement-discount-8 = Discount Dan(tm) is not responsible for any damages caused by misuse of his product. +thankyou-discount-1 = Thanks for usi-*BZZT +thankyou-discount-2 = Remember: no refunds! +thankyou-discount-3 = It's your problem now! +thankyou-discount-4 = We are legally obligated to remind you not to eat that. +thankyou-discount-5 = Please don't sue us! +thankyou-discount-6 = We swear it looked like that when we stocked it! +thankyou-discount-7 = Yeah, good luck with that. diff --git a/Resources/Locale/en-US/advertisements/vending/donut.ftl b/Resources/Locale/en-US/advertisements/vending/donut.ftl index 32a3443e07..e5bb7410e0 100644 --- a/Resources/Locale/en-US/advertisements/vending/donut.ftl +++ b/Resources/Locale/en-US/advertisements/vending/donut.ftl @@ -1,3 +1,6 @@ advertisement-donut-1 = Each of us is a little cop! advertisement-donut-2 = Hope you're hunger! advertisement-donut-3 = Over 1 million donuts sold! +thankyou-donut-1 = Enjoy your donut! +thankyou-donut-2 = Another donut sold! +thankyou-donut-3 = Have a nice day, officer! diff --git a/Resources/Locale/en-US/advertisements/vending/games.ftl b/Resources/Locale/en-US/advertisements/vending/games.ftl index f6beabec6f..bcc52a6190 100644 --- a/Resources/Locale/en-US/advertisements/vending/games.ftl +++ b/Resources/Locale/en-US/advertisements/vending/games.ftl @@ -6,3 +6,6 @@ advertisement-goodcleanfun-5 = Elves and dwarves! advertisement-goodcleanfun-6 = Paranoid computers! advertisement-goodcleanfun-7 = Totally not satanic! advertisement-goodcleanfun-8 = Fun times forever! +thankyou-goodcleanfun-1 = Have fun! +thankyou-goodcleanfun-2 = Now you're playing with power! +thankyou-goodcleanfun-3 = Go get your game on! diff --git a/Resources/Locale/en-US/advertisements/vending/happyhonk.ftl b/Resources/Locale/en-US/advertisements/vending/happyhonk.ftl index fd674ab283..c3f025f613 100644 --- a/Resources/Locale/en-US/advertisements/vending/happyhonk.ftl +++ b/Resources/Locale/en-US/advertisements/vending/happyhonk.ftl @@ -7,3 +7,6 @@ advertisement-happyhonk-6 = How many security officers does it take to arrest yo advertisement-happyhonk-7 = Happy Honk is not responsible for the quality of the food placed within our Happy Honk meal boxes. advertisement-happyhonk-8 = Why not ask for our limited edition Mime Happy Honk Meal? advertisement-happyhonk-9 = Happy Honk is a trademark of Honk! co. and is far superior to Robust Nukie Food corp. +thankyou-happyhonk-1 = Honk! +thankyou-happyhonk-2 = Honk honk! +thankyou-happyhonk-3 = Go share the fun! Honk! diff --git a/Resources/Locale/en-US/advertisements/vending/nutrimax.ftl b/Resources/Locale/en-US/advertisements/vending/nutrimax.ftl index 75655df370..6bbebd5d5a 100644 --- a/Resources/Locale/en-US/advertisements/vending/nutrimax.ftl +++ b/Resources/Locale/en-US/advertisements/vending/nutrimax.ftl @@ -3,4 +3,5 @@ advertisement-nutrimax-2 = Don't you want some? advertisement-nutrimax-3 = The greenest thumbs ever. advertisement-nutrimax-4 = We like big plants. advertisement-nutrimax-5 = Soft soil... -advertisement-nutrimax-6 = Buckets now included! \ No newline at end of file +advertisement-nutrimax-6 = Buckets now included! +thankyou-nutrimax-1 = Get planting! diff --git a/Resources/Locale/en-US/advertisements/vending/sectech.ftl b/Resources/Locale/en-US/advertisements/vending/sectech.ftl index e81528750d..3dd2ca2eb0 100644 --- a/Resources/Locale/en-US/advertisements/vending/sectech.ftl +++ b/Resources/Locale/en-US/advertisements/vending/sectech.ftl @@ -2,4 +2,5 @@ advertisement-sectech-2 = Beat some heads in! advertisement-sectech-3 = Don't forget - harm is good! advertisement-sectech-4 = Your weapons are right here. - +thankyou-sectech-1 = Give 'em hell out there! +thankyou-sectech-2 = Go enforce the law! diff --git a/Resources/Locale/en-US/advertisements/vending/snack.ftl b/Resources/Locale/en-US/advertisements/vending/snack.ftl index c5aa1b1c4e..92317b6072 100644 --- a/Resources/Locale/en-US/advertisements/vending/snack.ftl +++ b/Resources/Locale/en-US/advertisements/vending/snack.ftl @@ -10,3 +10,7 @@ advertisement-snack-9 = Have some more Getmore! advertisement-snack-10 = Best quality snacks straight from mars. advertisement-snack-11 = We love chocolate! advertisement-snack-12 = Try our new jerky! +thankyou-snack-1 = Eat up! +thankyou-snack-2 = Enjoy your product! +thankyou-snack-3 = Have a nice snack. +thankyou-snack-4 = Yummy! diff --git a/Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl b/Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl index 8d9988d357..5efe250354 100644 --- a/Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl +++ b/Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl @@ -3,3 +3,5 @@ advertisement-sovietsoda-2 = Have you fulfilled your nutrition quota today? advertisement-sovietsoda-3 = Very nice! advertisement-sovietsoda-4 = We are simple people, for this is all we eat. advertisement-sovietsoda-5 = If there is a person, there is a problem. If there is no person, then there is no problem. +thankyou-sovietsoda-1 = Enjoy, comrade! +thankyou-sovietsoda-2 = Now get back to work. diff --git a/Resources/Locale/en-US/advertisements/vending/syndiedrobe.ftl b/Resources/Locale/en-US/advertisements/vending/syndiedrobe.ftl index b7f06f53f1..8841ce6b92 100644 --- a/Resources/Locale/en-US/advertisements/vending/syndiedrobe.ftl +++ b/Resources/Locale/en-US/advertisements/vending/syndiedrobe.ftl @@ -29,4 +29,6 @@ advertisement-syndiedrobe-28 = Our suits are moisture-resistant, which means you advertisement-syndiedrobe-29 = The best in the galaxy! advertisement-syndiedrobe-30 = What could be better than the smell of our uniform in the morning? advertisement-syndiedrobe-31 = You can leave feedback about the convenience of the form by sending a request to our Taipan hotline, the main thing is not to the wrong number! - +thankyou-syndiedrobe-1 = Put it to good use! +thankyou-syndiedrobe-2 = Death to NT! +thankyou-syndiedrobe-3 = Show them the power of style. diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml index adea9a0879..8db0871c75 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml @@ -9,3 +9,5 @@ - advertisement-ammo-6 - advertisement-ammo-7 - advertisement-ammo-8 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml index 66f4382f98..49155b8414 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml @@ -2,3 +2,5 @@ id: AtmosDrobeAds advertisements: - advertisement-atmosdrobe-1 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml index 43d6810440..719d596dc9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml @@ -2,3 +2,5 @@ id: BarDrobeAds advertisements: - advertisement-bardrobe-1 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml index 92cf60e2b4..48275fba8a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml @@ -20,3 +20,6 @@ - advertisement-boozeomat-17 - advertisement-boozeomat-18 - advertisement-boozeomat-19 + thankyous: + - vending-machine-thanks + - thankyou-boozeomat-1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml index c15ec0a552..60b9af5301 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml @@ -3,3 +3,5 @@ advertisements: - advertisement-cargodrobe-1 - advertisement-cargodrobe-2 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml index 59e16a011d..165d5716be 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml @@ -4,4 +4,8 @@ - advertisement-chang-1 - advertisement-chang-2 - advertisement-chang-3 - - advertisement-chang-4 \ No newline at end of file + - advertisement-chang-4 + thankyous: + - vending-machine-thanks + - thankyou-chang-1 + - thankyou-chang-2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml index 7b7da445ce..2c65a8532b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml @@ -2,3 +2,5 @@ id: ChefDrobeAds advertisements: - advertisement-chefdrobe-1 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml index 7ae7ee024e..e6cc76a694 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml @@ -7,4 +7,9 @@ - advertisement-chefvend-4 - advertisement-chefvend-5 - advertisement-chefvend-6 - - advertisement-chefvend-7 \ No newline at end of file + - advertisement-chefvend-7 + thankyous: + - vending-machine-thanks + - thankyou-chefvend-1 + - thankyou-chefvend-2 + - thankyou-chefvend-3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml index 03feab4d0a..994a4abc33 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml @@ -2,4 +2,6 @@ id: ChemDrobeAds advertisements: - advertisement-chemdrobe-1 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml index d9c032cc3d..393dcb5348 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml @@ -12,3 +12,7 @@ - advertisement-cigs-9 - advertisement-cigs-10 - advertisement-cigs-11 + thankyous: + - vending-machine-thanks + - thankyou-cigs-1 + - thankyou-cigs-2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml index 0eba7001dc..a32ba98a10 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml @@ -6,3 +6,5 @@ - advertisement-clothes-3 - advertisement-clothes-4 - advertisement-clothes-5 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml index f096a5c879..0e6941a002 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml @@ -14,3 +14,8 @@ - advertisement-coffee-11 - advertisement-coffee-12 - advertisement-coffee-13 + thankyous: + - vending-machine-thanks + - thankyou-coffee-1 + - thankyou-coffee-2 + - thankyou-coffee-3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml index dc94f153fc..533d2768b3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml @@ -8,3 +8,8 @@ - advertisement-cola-5 - advertisement-cola-6 - advertisement-cola-7 + thankyous: + - vending-machine-thanks + - thankyou-cola-1 + - thankyou-cola-2 + - thankyou-cola-3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml index 9ee06de4a1..2b06293801 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml @@ -5,4 +5,6 @@ - advertisement-condiment-2 - advertisement-condiment-3 - advertisement-condiment-4 - - advertisement-condiment-5 \ No newline at end of file + - advertisement-condiment-5 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml index 71cc1230b2..0d7c4e6442 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml @@ -3,3 +3,5 @@ advertisements: - advertisement-curadrobe-1 - advertisement-curadrobe-2 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml index 77cc6e8fc1..12cb6aa4a4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml @@ -2,3 +2,5 @@ id: DetDrobeAds advertisements: - advertisement-detdrobe-1 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml index 7763970329..f7fc777543 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml @@ -8,3 +8,5 @@ - advertisement-dinnerware-5 - advertisement-dinnerware-6 - advertisement-dinnerware-7 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml index dada2512af..c065af6e21 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml @@ -9,3 +9,12 @@ - advertisement-discount-6 - advertisement-discount-7 - advertisement-discount-8 + thankyous: + - vending-machine-thanks + - thankyou-discount-1 + - thankyou-discount-2 + - thankyou-discount-3 + - thankyou-discount-4 + - thankyou-discount-5 + - thankyou-discount-6 + - thankyou-discount-7 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml index 1bc44793e4..e868e2a3b4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml @@ -4,3 +4,8 @@ - advertisement-donut-1 - advertisement-donut-2 - advertisement-donut-3 + thankyous: + - vending-machine-thanks + - thankyou-donut-1 + - thankyou-donut-2 + - thankyou-donut-3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml index f076b41d66..9a1772a0bf 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml @@ -3,3 +3,5 @@ advertisements: - advertisement-engidrobe-1 - advertisement-engidrobe-2 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml index 4e8b3eb88e..ad100c4626 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml @@ -7,3 +7,5 @@ - fat-extractor-fact-4 - fat-extractor-fact-5 - fat-extractor-fact-6 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml index d3a320b371..a3a9f2924e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml @@ -9,3 +9,8 @@ - advertisement-goodcleanfun-6 - advertisement-goodcleanfun-7 - advertisement-goodcleanfun-8 + thankyous: + - vending-machine-thanks + - thankyou-goodcleanfun-1 + - thankyou-goodcleanfun-2 + - thankyou-goodcleanfun-3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml index f66ad49f30..3a16ab3104 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml @@ -2,3 +2,5 @@ id: GeneDrobeAds advertisements: - advertisement-genedrobe-1 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml index 7866747be0..f0ec1bce51 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml @@ -10,3 +10,8 @@ - advertisement-happyhonk-7 - advertisement-happyhonk-8 - advertisement-happyhonk-9 + thankyous: + - vending-machine-thanks + - thankyou-happyhonk-1 + - thankyou-happyhonk-2 + - thankyou-happyhonk-3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml index f20d658f80..3dbe08f310 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml @@ -3,3 +3,5 @@ advertisements: - advertisement-hydrobe-1 - advertisement-hydrobe-2 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml index 83b9f28b30..2e7036e284 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml @@ -2,3 +2,5 @@ id: JaniDrobeAds advertisements: - advertisement-janidrobe-1 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml index 26ff0108e2..0884bb2612 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml @@ -2,3 +2,5 @@ id: LawDrobeAds advertisements: - advertisement-lawdrobe-1 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml index 80844d11bd..b6945d1dec 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml @@ -10,4 +10,5 @@ - advertisement-magivend-7 - advertisement-magivend-8 - advertisement-magivend-9 - + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml index 2f5165f51b..e65e1792f9 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml @@ -2,3 +2,5 @@ id: MediDrobeAds advertisements: - advertisement-medidrobe-1 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml index 0afbb546c3..a297d3f675 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml @@ -5,3 +5,5 @@ - advertisement-megaseed-2 - advertisement-megaseed-3 - advertisement-megaseed-4 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml index 0f6901a419..88f2e0f006 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml @@ -8,3 +8,5 @@ - advertisement-nanomed-5 - advertisement-nanomed-6 - advertisement-nanomed-7 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml index 5376282251..3f173ec719 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml @@ -7,3 +7,6 @@ - advertisement-nutrimax-4 - advertisement-nutrimax-5 - advertisement-nutrimax-6 + thankyous: + - vending-machine-thanks + - thankyou-nutrimax-1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml index 84677cd5c5..67d190a8ea 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml @@ -3,3 +3,5 @@ advertisements: - advertisement-robodrobe-1 - advertisement-robodrobe-2 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml index 4afd3abf91..8e52f655d3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml @@ -3,3 +3,5 @@ advertisements: - advertisement-scidrobe-1 - advertisement-scidrobe-2 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml index 54002a8d2b..ac0ec007eb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml @@ -5,3 +5,5 @@ - advertisement-secdrobe-2 - advertisement-secdrobe-3 - advertisement-secdrobe-4 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml index 5e89c9a8e3..300260cc6c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml @@ -5,3 +5,7 @@ - advertisement-sectech-2 - advertisement-sectech-3 - advertisement-sectech-4 + thankyous: + - vending-machine-thanks + - thankyou-sectech-1 + - thankyou-sectech-2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml index 24a83a7c02..5e33902122 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml @@ -7,3 +7,5 @@ - advertisement-smartfridge-4 - advertisement-smartfridge-5 - advertisement-smartfridge-6 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml index 2147050516..0698c16a2a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml @@ -13,3 +13,9 @@ - advertisement-snack-10 - advertisement-snack-11 - advertisement-snack-12 + thankyous: + - vending-machine-thanks + - thankyou-snack-1 + - thankyou-snack-2 + - thankyou-snack-3 + - thankyou-snack-4 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml index c97e10804c..79f00acb1e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml @@ -6,3 +6,7 @@ - advertisement-sovietsoda-3 - advertisement-sovietsoda-4 - advertisement-sovietsoda-5 + thankyous: + - vending-machine-thanks + - thankyou-sovietsoda-1 + - thankyou-sovietsoda-2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml index 4cd0108cba..2f9a93f119 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml @@ -32,3 +32,8 @@ - advertisement-syndiedrobe-29 - advertisement-syndiedrobe-30 - advertisement-syndiedrobe-31 + thankyous: + - vending-machine-thanks + - thankyou-syndiedrobe-1 + - thankyou-syndiedrobe-2 + - thankyou-syndiedrobe-3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml index e6443400ea..a8b48c4074 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml @@ -5,3 +5,5 @@ - advertisement-theater-2 - advertisement-theater-3 - advertisement-theater-4 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml index 082f7eee12..5b5b8f16b4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml @@ -5,3 +5,5 @@ - advertisement-vendomat-2 - advertisement-vendomat-3 - advertisement-vendomat-4 + thankyous: + - vending-machine-thanks diff --git a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml index 0de9976174..8588f0567e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml @@ -2,3 +2,5 @@ id: ViroDrobeAds advertisements: - advertisement-virodrobe-1 + thankyous: + - vending-machine-thanks