]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Reduce vendor thank you message spam and add variety (#23746)
authorTayrtahn <tayrtahn@gmail.com>
Tue, 9 Jan 2024 01:34:47 +0000 (20:34 -0500)
committerGitHub <noreply@github.com>
Tue, 9 Jan 2024 01:34:47 +0000 (18:34 -0700)
* 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

63 files changed:
Content.Server/Advertise/AdvertiseSystem.cs
Content.Server/Advertisements/AdvertisementsPackPrototype.cs
Content.Server/VendingMachines/VendingMachineSystem.cs
Content.Shared/VendingMachines/VendingMachineComponent.cs
Resources/Locale/en-US/advertisements/vending/ammo.ftl
Resources/Locale/en-US/advertisements/vending/boozeomat.ftl
Resources/Locale/en-US/advertisements/vending/chang.ftl
Resources/Locale/en-US/advertisements/vending/chefvend.ftl
Resources/Locale/en-US/advertisements/vending/cigs.ftl
Resources/Locale/en-US/advertisements/vending/coffee.ftl
Resources/Locale/en-US/advertisements/vending/cola.ftl
Resources/Locale/en-US/advertisements/vending/discount.ftl
Resources/Locale/en-US/advertisements/vending/donut.ftl
Resources/Locale/en-US/advertisements/vending/games.ftl
Resources/Locale/en-US/advertisements/vending/happyhonk.ftl
Resources/Locale/en-US/advertisements/vending/nutrimax.ftl
Resources/Locale/en-US/advertisements/vending/sectech.ftl
Resources/Locale/en-US/advertisements/vending/snack.ftl
Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl
Resources/Locale/en-US/advertisements/vending/syndiedrobe.ftl
Resources/Prototypes/Catalog/VendingMachines/Advertisements/ammo.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/atmosdrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/bardrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/boozeomat.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/cargodrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/chang.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefdrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/chefvend.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/chemdrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/cigs.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/clothesmate.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/coffee.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/cola.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/condiments.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/curadrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/detdrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/dinnerware.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/discount.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/donut.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/engidrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/fatextractor.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/games.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/genedrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/happyhonk.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/hydrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/janidrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/lawdrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/magivend.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/medidrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/megaseed.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/nanomed.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/nutrimax.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/robodrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/scidrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/secdrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/sectech.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/smartfridge.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/snack.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/sovietsoda.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/syndiedrobe.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/theater.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/vendomat.yml
Resources/Prototypes/Catalog/VendingMachines/Advertisements/virodrobe.yml

index 517d1779ec22c4b4638436fb0c89f058897ad426..ab538f3c77995b24b02b82c49c7062143e15bbdc 100644 (file)
@@ -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))
index 56086d39a4fdf8f5bccc5e87b348fd3c6ffe6faf..641ab3c56fd46c9d262150096437c3035e777cda 100644 (file)
@@ -11,5 +11,8 @@ namespace Content.Server.Advertisements
 
         [DataField("advertisements")]
         public List<string> Advertisements { get; private set; } = new();
+
+        [DataField("thankyous")]
+        public List<string> ThankYous { get; private set; } = new();
     }
 }
index 4d3fc0b941a040bb32ba0904a994f1411d55ab63..9125bd8756885f2dc5d952e6de34dee6f4d51f12 100644 (file)
@@ -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<VendingMachineComponent, ActivatableUIOpenAttemptEvent>(OnActivatableUIOpenAttempt);
             SubscribeLocalEvent<VendingMachineComponent, BoundUIOpenedEvent>(OnBoundUIOpened);
+            SubscribeLocalEvent<VendingMachineComponent, BoundUIClosedEvent>(OnBoundUIClosed);
             SubscribeLocalEvent<VendingMachineComponent, VendingMachineEjectMessage>(OnInventoryEjectMessage);
 
             SubscribeLocalEvent<VendingMachineComponent, VendingMachineSelfDispenseEvent>(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<AdvertiseComponent>(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<AdvertiseComponent>(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;
index 7d474feca9b7e4cf24117299c7284a8850f3209f..a7c8ae299ad585b61aba07ed179a014d16b29568 100644 (file)
@@ -51,6 +51,8 @@ namespace Content.Shared.VendingMachines
 
         public bool Broken;
 
+        public bool ShouldSayThankYou;
+
         /// <summary>
         /// When true, will forcefully throw any object it dispenses
         /// </summary>
index 29e9411be3cac8a9cdcea622887b7873ac664f11..bf20a3c3c359106d00764272fd72cbe9b6844ed5 100644 (file)
@@ -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?
-
index 0d9713e5fdcaae4a40ee87d291b60fd888366f7f..64fc9c0080b0a18e20ec028da31cd63db29b8182 100644 (file)
@@ -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!
index 34b6ece3ff100e4f46a99ba97a74370f89a1e686..843b8dcb6656b52aeba8ab620c0f884fe4249e33 100644 (file)
@@ -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!
index ddc68c84894caf275b229738ea23ac5b2aa52bac..2ea82b0d62935337086998063f0d6d373b2756f4 100644 (file)
@@ -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!
index d7db3990a64edad0b949fcf578f9414b9706356d..f8b3ce1e5c59f2185446b53105395bbe8f485630 100644 (file)
@@ -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!
index 18ec5be2dd6c8cf0dc9c1bffaa0c289e91e17aba..d4e22cb2f9fabeaa253fcc1267ac93e37372fc11 100644 (file)
@@ -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.
index 68326d51d3b8c0ac1d0099fe9e4e105ec86978f9..6806235525862017c3cf44a5a3711cd0a1da1387 100644 (file)
@@ -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!
index 4b2e4c62a355ae648eb938a822f16016355bf810..456996818954947060f9193a6c3daf93e2c9e0be 100644 (file)
@@ -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.
index 32a3443e074712f84e5a597bd14c5699894e85ed..e5bb7410e007098ff701524cffe21121e911144a 100644 (file)
@@ -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!
index f6beabec6ff73527aee24fce555da62007be3fa1..bcc52a619014ab0169594f8a3bcdefad092831a4 100644 (file)
@@ -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!
index fd674ab28388a814c0484330fedc7d4e3f6ae656..c3f025f61351ccde373a8367b29ebdb1a5c56314 100644 (file)
@@ -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!
index 75655df370eedd295c61a36fb6bb1e98d58128dd..6bbebd5d5a9c5620e2f0de4a3efb4e0521d237cb 100644 (file)
@@ -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!
index e81528750da67ec072137900d89bebc3663986dd..3dd2ca2eb086e2297f5f9aa5c0cb3126c90835b3 100644 (file)
@@ -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!
index c5aa1b1c4e874ea67298bd08a8ac531560ef7bc0..92317b60728b923feb03f949724f926720d73bc8 100644 (file)
@@ -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!
index 8d9988d3571113dfe545dcdfa2b7c58772f25644..5efe250354f19c3395a15f501e3e8bfa1a9fc725 100644 (file)
@@ -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.
index b7f06f53f189da4ef53d9e7fd37973eeb15ae093..8841ce6b92ca07d6023b6044705354b6291e166a 100644 (file)
@@ -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.
index adea9a087944d9a7a9273c8d5f577415dd28bc77..8db0871c754d225871eb952b3947620fe2ab33d5 100644 (file)
@@ -9,3 +9,5 @@
   - advertisement-ammo-6
   - advertisement-ammo-7
   - advertisement-ammo-8
+  thankyous:
+  - vending-machine-thanks
index 66f4382f98e76c274968c30656ef15cb1e500eb2..49155b8414a84be6ddedd9ebf20743ad5ffa3c68 100644 (file)
@@ -2,3 +2,5 @@
   id: AtmosDrobeAds
   advertisements:
     - advertisement-atmosdrobe-1
+  thankyous:
+    - vending-machine-thanks
index 43d681044027f5f692781c586ece1a2c6c0f0b4a..719d596dc9bc2200ef3eecbdae041d582aae39fb 100644 (file)
@@ -2,3 +2,5 @@
   id: BarDrobeAds
   advertisements:
     - advertisement-bardrobe-1
+  thankyous:
+    - vending-machine-thanks
index 92cf60e2b4082d2d9cfef92c7fa46064ed7d8e32..48275fba8aa6a7291f9982ddf99d09452758e57c 100644 (file)
@@ -20,3 +20,6 @@
   - advertisement-boozeomat-17
   - advertisement-boozeomat-18
   - advertisement-boozeomat-19
+  thankyous:
+  - vending-machine-thanks
+  - thankyou-boozeomat-1
index c15ec0a5524cbe5204583199521fcec951c0b177..60b9af5301fcf720d61df3376099d0012a1d2199 100644 (file)
@@ -3,3 +3,5 @@
   advertisements:
     - advertisement-cargodrobe-1
     - advertisement-cargodrobe-2
+  thankyous:
+    - vending-machine-thanks
index 59e16a011d9f58457c2e1701c42b986cbe4a4662..165d5716be03111921ec06e6228599c63250457e 100644 (file)
@@ -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
index 7b7da445ce252ab3f7a0d18f2bdc96f002159c6e..2c65a8532b2bd7f9e267e5cb41b3136c8bee68f4 100644 (file)
@@ -2,3 +2,5 @@
   id: ChefDrobeAds
   advertisements:
     - advertisement-chefdrobe-1
+  thankyous:
+    - vending-machine-thanks
index 7ae7ee024ef28b1b684cf20ba33a349687d8c0ae..e6cc76a694088c7567abe37ba38b00a7d5ff73f4 100644 (file)
@@ -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
index 03feab4d0a07afba64018cefe177c6b5b8e1a9d1..994a4abc33b6df7517b35aa50e3e2b3a210268c0 100644 (file)
@@ -2,4 +2,6 @@
   id: ChemDrobeAds
   advertisements:
     - advertisement-chemdrobe-1
+  thankyous:
+    - vending-machine-thanks
 
index d9c032cc3dbb4cb99ea5d3a98c827bc663e35a4f..393dcb5348867fc3c2f3ccb219233fc1613dbc66 100644 (file)
@@ -12,3 +12,7 @@
   - advertisement-cigs-9
   - advertisement-cigs-10
   - advertisement-cigs-11
+  thankyous:
+  - vending-machine-thanks
+  - thankyou-cigs-1
+  - thankyou-cigs-2
index 0eba7001dc2b8102a7fe7df77ce567bb93b76f90..a32ba98a1047fc84e3dcad7e306337612c7cabae 100644 (file)
@@ -6,3 +6,5 @@
   - advertisement-clothes-3
   - advertisement-clothes-4
   - advertisement-clothes-5
+  thankyous:
+  - vending-machine-thanks
index f096a5c879cd045af26e1fac4cf4835f5b486a4a..0e6941a00262a11687c92a9f07afdfd79577410b 100644 (file)
@@ -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
index dc94f153fcc38bc13f7e7adfe2af1a726768bc5a..533d2768b32535dd714810c008909b857f3cd75c 100644 (file)
@@ -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
index 9ee06de4a1a8f86e8c7fb7b3273c5d66444171c9..2b0629380126ebe574f60ebc4e56339cde80ef2e 100644 (file)
@@ -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
index 71cc1230b2a08221a0a163dad482c68bb80b0ba7..0d7c4e64428bb3b497146e35e50909fbfb459b45 100644 (file)
@@ -3,3 +3,5 @@
   advertisements:
     - advertisement-curadrobe-1
     - advertisement-curadrobe-2
+  thankyous:
+  -  vending-machine-thanks
index 77cc6e8fc1292b36b9d2372d4228e1b4ed65fd28..12cb6aa4a4360c2550563434ea0b32a6de818588 100644 (file)
@@ -2,3 +2,5 @@
   id: DetDrobeAds
   advertisements:
     - advertisement-detdrobe-1
+  thankyous:
+    - vending-machine-thanks
index 776397032911ccedd92b6ec1a51970718bfacd39..f7fc77754328480e036848f2f6dbfcab2361a46f 100644 (file)
@@ -8,3 +8,5 @@
     - advertisement-dinnerware-5
     - advertisement-dinnerware-6
     - advertisement-dinnerware-7
+  thankyous:
+    - vending-machine-thanks
index dada2512afc4a0fd97d95fc7fb022a4c2da4e492..c065af6e21ed006bb04663ac1c7ec67758135675 100644 (file)
@@ -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
index 1bc44793e4b96f50de08968d20abcb1d59c5908b..e868e2a3b4fee1112e1d66596a53838b61029148 100644 (file)
@@ -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
index f076b41d66cd4f526371d1113ad084216246e991..9a1772a0bffe06f2ed3c532e90abe436d8d9ce23 100644 (file)
@@ -3,3 +3,5 @@
   advertisements:
     - advertisement-engidrobe-1
     - advertisement-engidrobe-2
+  thankyous:
+    - vending-machine-thanks
index 4e8b3eb88e9f8373e3bc5f7c7b1140c5e4ecc65a..ad100c462639fe64adfe68a19d15b53c3f81d7f5 100644 (file)
@@ -7,3 +7,5 @@
   - fat-extractor-fact-4
   - fat-extractor-fact-5
   - fat-extractor-fact-6
+  thankyous:
+  - vending-machine-thanks
index d3a320b37184d70fc885ae60c03dede1d5565485..a3a9f2924e08a43527c0357f8b340a58110f1592 100644 (file)
@@ -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
index f66ad49f30c1a8f7f7baa06d0df0e97c25649466..3a16ab3104b5433f90f647ae11ad56e5ac3ba61a 100644 (file)
@@ -2,3 +2,5 @@
   id: GeneDrobeAds
   advertisements:
     - advertisement-genedrobe-1
+  thankyous:
+    - vending-machine-thanks
index 7866747be026605e75df1c10b716c542e053070d..f0ec1bce5172db48436f8d107d339b4789129d0a 100644 (file)
@@ -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
index f20d658f800ff11f5062ae4025b0649dd665cca4..3dbe08f3106484433a2e148ad3d78ea9a3d63f6f 100644 (file)
@@ -3,3 +3,5 @@
   advertisements:
     - advertisement-hydrobe-1
     - advertisement-hydrobe-2
+  thankyous:
+    - vending-machine-thanks
index 83b9f28b30069a9b1a44c939d16de4522818bb96..2e7036e284faf11f4c39fba9cc7651123eeb152b 100644 (file)
@@ -2,3 +2,5 @@
   id: JaniDrobeAds
   advertisements:
     - advertisement-janidrobe-1
+  thankyous:
+    - vending-machine-thanks
index 26ff0108e2f433c04f6c640cbb47cadfaa0cc218..0884bb26124f8200f78ef0f419477d0ed684613c 100644 (file)
@@ -2,3 +2,5 @@
   id: LawDrobeAds
   advertisements:
     - advertisement-lawdrobe-1
+  thankyous:
+    - vending-machine-thanks
index 80844d11bdb20812a9ea6bc2199be76dc281c25a..b6945d1decadfed91f0325f2501eac5c0db7eb6e 100644 (file)
@@ -10,4 +10,5 @@
   - advertisement-magivend-7
   - advertisement-magivend-8
   - advertisement-magivend-9
-
+  thankyous:
+  - vending-machine-thanks
index 2f5165f51b8a75b3e42af7e09f3f8a6ae0889392..e65e1792f95b2b7300e468f9dd244afff2e1c01b 100644 (file)
@@ -2,3 +2,5 @@
   id: MediDrobeAds
   advertisements:
     - advertisement-medidrobe-1
+  thankyous:
+    - vending-machine-thanks
index 0afbb546c359f33b86b5ef0ac1fcf9c5a61f40cb..a297d3f675d23a3160304a5cba9c075f8bc28d15 100644 (file)
@@ -5,3 +5,5 @@
     - advertisement-megaseed-2
     - advertisement-megaseed-3
     - advertisement-megaseed-4
+  thankyous:
+    - vending-machine-thanks
index 0f6901a4199a10f4cf0dcd4c4a2e9f1a6adeb931..88f2e0f00633cfff87b4c88f80caf737f5e01f57 100644 (file)
@@ -8,3 +8,5 @@
     - advertisement-nanomed-5
     - advertisement-nanomed-6
     - advertisement-nanomed-7
+  thankyous:
+    - vending-machine-thanks
index 53762822513baf25cc8810fa34fc2e5581fb716e..3f173ec719ce0105a5992fd2e779253c7fe40ee7 100644 (file)
@@ -7,3 +7,6 @@
     - advertisement-nutrimax-4
     - advertisement-nutrimax-5
     - advertisement-nutrimax-6
+  thankyous:
+    - vending-machine-thanks
+    - thankyou-nutrimax-1
index 84677cd5c58cc7edef1daf6a3771004c57cd84ef..67d190a8eaffdccb68c5baa7683eb2c3bdba3693 100644 (file)
@@ -3,3 +3,5 @@
   advertisements:
     - advertisement-robodrobe-1
     - advertisement-robodrobe-2
+  thankyous:
+    - vending-machine-thanks
index 4afd3abf914cd79da11f7d186ae41ec1b731a6a8..8e52f655d3ba76490a7cf73801eb55db7e911da9 100644 (file)
@@ -3,3 +3,5 @@
   advertisements:
     - advertisement-scidrobe-1
     - advertisement-scidrobe-2
+  thankyous:
+    - vending-machine-thanks
index 54002a8d2b85fc13347de87300eb780e555260ef..ac0ec007eb8cd33c67abe41fcfa8f14ddc752984 100644 (file)
@@ -5,3 +5,5 @@
     - advertisement-secdrobe-2
     - advertisement-secdrobe-3
     - advertisement-secdrobe-4
+  thankyous:
+    - vending-machine-thanks
index 5e89c9a8e31d04486451945c16f98e357e63dd2b..300260cc6c080354201f74bda4b2890531a1a687 100644 (file)
@@ -5,3 +5,7 @@
     - advertisement-sectech-2
     - advertisement-sectech-3
     - advertisement-sectech-4
+  thankyous:
+    - vending-machine-thanks
+    - thankyou-sectech-1
+    - thankyou-sectech-2
index 24a83a7c02114d1b2ff332c7245de4b3b0025860..5e339021221003e27e5c05cc647594c652ca8e23 100644 (file)
@@ -7,3 +7,5 @@
   - advertisement-smartfridge-4
   - advertisement-smartfridge-5
   - advertisement-smartfridge-6
+  thankyous:
+  - vending-machine-thanks
index 2147050516746b5cc7115931929bbdbf68141e84..0698c16a2a81869f69ba40d88e42d3580b120fd4 100644 (file)
@@ -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
index c97e10804cd1af01880e1f330554b4b8bdc5c19c..79f00acb1e74ce9ad591861caa06324348a4008b 100644 (file)
@@ -6,3 +6,7 @@
   - advertisement-sovietsoda-3
   - advertisement-sovietsoda-4
   - advertisement-sovietsoda-5
+  thankyous:
+  - vending-machine-thanks
+  - thankyou-sovietsoda-1
+  - thankyou-sovietsoda-2
index 4cd0108cba5ee5fbbfa5309f4f82f07f476f1e47..2f9a93f119e979b299d43b2081c785aef4ba0447 100644 (file)
@@ -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
index e6443400eae45fce2166d8f9167bccc4e7b89c06..a8b48c4074e0030c6b2269fc7606b9aa73e12ec6 100644 (file)
@@ -5,3 +5,5 @@
   - advertisement-theater-2
   - advertisement-theater-3
   - advertisement-theater-4
+  thankyous:
+  - vending-machine-thanks
index 082f7eee12d4b41ac2a8da67310929cb2b4c5838..5b5b8f16b46537e39b5b26b49d99ca9239957e67 100644 (file)
@@ -5,3 +5,5 @@
   - advertisement-vendomat-2
   - advertisement-vendomat-3
   - advertisement-vendomat-4
+  thankyous:
+  - vending-machine-thanks
index 0de99761747c1dcc4d190f8156f69a1346dcfddc..8588f0567ed0e4ff8f0e16f7d9b3d597e194a568 100644 (file)
@@ -2,3 +2,5 @@
   id: ViroDrobeAds
   advertisements:
     - advertisement-virodrobe-1
+  thankyous:
+  - vending-machine-thanks