diff --git a/Resources/Locale/en-US/advertisements/vending/cola.ftl b/Resources/Locale/en-US/advertisements/vending/cola.ftl index a0c03c2614e6b6..c15664d7387768 100644 --- a/Resources/Locale/en-US/advertisements/vending/cola.ftl +++ b/Resources/Locale/en-US/advertisements/vending/cola.ftl @@ -1,12 +1,12 @@ -advertisement-cola-1 = Refreshing! -advertisement-cola-2 = Hope you're thirsty! +advertisement-cola-1 = Cola, in spaaace! +advertisement-cola-2 = Space your thirst! advertisement-cola-3 = Over 1 million drinks sold! -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! +advertisement-cola-4 = Consistently Space Cola! +advertisement-cola-5 = Space Cola: It's extraterrestrial! +advertisement-cola-6 = Spessy the Space Cadet says "Drink up!" +advertisement-cola-7 = 42% more sugar than competing brands! advertisement-cola-8 = Way better than Dr. Gibb! -thankyou-cola-1 = Pop open that can and enjoy! -thankyou-cola-2 = Pow! Take that, thirst! -thankyou-cola-3 = I hope you like flavor! -thankyou-cola-4 = Enjoy your sugar-filled drink! +thankyou-cola-1 = Enjoy the sugar rush! +thankyou-cola-2 = Welcome to the club, Space Cadet! +thankyou-cola-3 = I hope you like sugar! +thankyou-cola-4 = Thirst spaced! diff --git a/Resources/Locale/en-US/advertisements/vending/pwrgame.ftl b/Resources/Locale/en-US/advertisements/vending/pwrgame.ftl new file mode 100644 index 00000000000000..cdc328857c3e39 --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/pwrgame.ftl @@ -0,0 +1,12 @@ +advertisement-pwr-1 = PWR Game: What true gamers crave! +advertisement-pwr-2 = In partnership with Vlad's Salads. +advertisement-pwr-3 = Over 1337 drinks sold! +advertisement-pwr-4 = Thirsty? PWR through with PWR Game! +advertisement-pwr-5 = PWR Game: It pwns the competition! +advertisement-pwr-6 = With great PWR comes great gaming! +advertisement-pwr-7 = Power up with PWR Game! +advertisement-pwr-8 = Git gud, get PWR! +thankyou-pwr-1 = PWR to the people! +thankyou-pwr-2 = Pow! Take that, thirst! +thankyou-pwr-3 = Pwn them with PWR! +thankyou-pwr-4 = Pairs well with Vlad's Salads. diff --git a/Resources/Locale/en-US/advertisements/vending/robust.ftl b/Resources/Locale/en-US/advertisements/vending/robust.ftl new file mode 100644 index 00000000000000..27f6a3bc22a724 --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/robust.ftl @@ -0,0 +1,12 @@ +advertisement-robust-1 = Refreshing! +advertisement-robust-2 = Hope you're thirsty! +advertisement-robust-3 = Over 10 million drinks sold! +advertisement-robust-4 = Thirsty? Try a Robust soda! +advertisement-robust-5 = Please, have a drink! +advertisement-robust-6 = Quench that thirst! +advertisement-robust-7 = The best drinks in the galaxy! +advertisement-robust-8 = Stay robust, buy a soda today! +thankyou-robust-1 = Pop open that can and enjoy! +thankyou-robust-2 = Show that thirst who's boss! +thankyou-robust-3 = I hope you like flavor! +thankyou-robust-4 = Enjoy your sugar-filled drink! diff --git a/Resources/Locale/en-US/advertisements/vending/shambler.ftl b/Resources/Locale/en-US/advertisements/vending/shambler.ftl new file mode 100644 index 00000000000000..61f100b7e58fc8 --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/shambler.ftl @@ -0,0 +1,12 @@ +advertisement-shambler-1 = I've got what you need! +advertisement-shambler-2 = Mmmmm, metallic! +advertisement-shambler-3 = Over 1 million drinks sold! +advertisement-shambler-4 = Take a look at my selection! +advertisement-shambler-5 = Hey you, have a drink! +advertisement-shambler-6 = Shamble on down to flavor town! +advertisement-shambler-7 = All our ingredients are secret! +advertisement-shambler-8 = Get your shamble on, here! +thankyou-shambler-1 = Keep it on the QT. +thankyou-shambler-2 = The good stuff! +thankyou-shambler-3 = Shh, it's a secret! +thankyou-shambler-4 = ~Shake me up some of that Shambler's Juice!~ diff --git a/Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl b/Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl index f548f32ea2d3ac..1078176c09074b 100644 --- a/Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl +++ b/Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl @@ -1,9 +1,12 @@ advertisement-sovietsoda-1 = For comrade and country. 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. +advertisement-sovietsoda-4 = We are simple people, for this is all we drink. +advertisement-sovietsoda-5 = Even a hedgehog can understand. advertisement-sovietsoda-6 = If its good enough for daily life, it's good enough for us! -thankyou-sovietsoda-1 = Enjoy, comrade! +advertisement-sovietsoda-7 = Patience and hard work can overcome anything. +advertisement-sovietsoda-8 = We make good team! +thankyou-sovietsoda-1 = You did well! thankyou-sovietsoda-2 = Now get back to work. -thankyou-sovietsoda-3 = This is all you're getting. \ No newline at end of file +thankyou-sovietsoda-3 = Enjoy, comrade! +thankyou-sovietsoda-4 = Trust, but verify. diff --git a/Resources/Locale/en-US/advertisements/vending/spaceup.ftl b/Resources/Locale/en-US/advertisements/vending/spaceup.ftl new file mode 100644 index 00000000000000..8127c7b85db2d2 --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/spaceup.ftl @@ -0,0 +1,12 @@ +advertisement-spaceup-1 = Invigorating! +advertisement-spaceup-2 = Fresh and lean, no caffeine! +advertisement-spaceup-3 = Over 1 million drinks sold! +advertisement-spaceup-4 = Like a hull-breach in your mouth! +advertisement-spaceup-5 = Decompress, have a Space-Up! +advertisement-spaceup-6 = Send your taste buds to outer space! +advertisement-spaceup-7 = Way more nicer than cola, it's Space-Up! +advertisement-spaceup-8 = Crisp invigorating Space-Up! +thankyou-spaceup-1 = Breach that can and enjoy! +thankyou-spaceup-2 = Blow that thirst into space! +thankyou-spaceup-3 = You've Space-Upped! +thankyou-spaceup-4 = Enjoy the singular flavor! diff --git a/Resources/Locale/en-US/advertisements/vending/starkist.ftl b/Resources/Locale/en-US/advertisements/vending/starkist.ftl new file mode 100644 index 00000000000000..d82d9b0761b840 --- /dev/null +++ b/Resources/Locale/en-US/advertisements/vending/starkist.ftl @@ -0,0 +1,12 @@ +advertisement-starkist-1 = Good pulsations! +advertisement-starkist-2 = It's orange flavored! +advertisement-starkist-3 = Over 1 million drinks sold! +advertisement-starkist-4 = Head for the stars! +advertisement-starkist-5 = Taste the stars! +advertisement-starkist-6 = Fun, radiation and Starkist! +advertisement-starkist-7 = There's nothing fishy about Starkist! +advertisement-starkist-8 = Kiss the stars, buy Starkist! +thankyou-starkist-1 = Drinkin' the stars! +thankyou-starkist-2 = Kiss your thirst goodbye! +thankyou-starkist-3 = The fish is just in your head. +thankyou-starkist-4 = Bask in the flavor! diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml index 3422f564b01cd1..d20a08a27f6316 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml @@ -79,7 +79,13 @@ - type: localizedDataset id: RobustSoftdrinksAds values: - prefix: advertisement-cola- + prefix: advertisement-robust- + count: 8 + +- type: localizedDataset + id: BodaAds + values: + prefix: advertisement-sovietsoda- count: 8 - type: localizedDataset @@ -88,12 +94,42 @@ prefix: advertisement-gibb- count: 8 +- type: localizedDataset + id: PwrGameAds + values: + prefix: advertisement-pwr- + count: 8 + +- type: localizedDataset + id: ShamblerAds + values: + prefix: advertisement-shambler- + count: 8 + - type: localizedDataset id: SmiteAds values: prefix: advertisement-smite- count: 8 +- type: localizedDataset + id: SpaceColaAds + values: + prefix: advertisement-cola- + count: 8 + +- type: localizedDataset + id: SpaceUpAds + values: + prefix: advertisement-spaceup- + count: 8 + +- type: localizedDataset + id: StarkistAds + values: + prefix: advertisement-starkist- + count: 8 + - type: localizedDataset id: CondimentVendAds values: @@ -250,12 +286,6 @@ prefix: advertisement-snack- count: 15 -- type: localizedDataset - id: BodaAds - values: - prefix: advertisement-sovietsoda- - count: 6 - - type: localizedDataset id: SyndieDrobeAds values: diff --git a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml index b63c22d06f074d..c81b7213b53cf7 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/goodbyes.yml @@ -37,7 +37,13 @@ - type: localizedDataset id: RobustSoftdrinksGoodbyes values: - prefix: thankyou-cola- + prefix: thankyou-robust- + count: 4 + +- type: localizedDataset + id: BodaGoodbyes + values: + prefix: thankyou-sovietsoda- count: 4 - type: localizedDataset @@ -46,12 +52,42 @@ prefix: thankyou-gibb- count: 4 +- type: localizedDataset + id: PwrGameGoodbyes + values: + prefix: thankyou-pwr- + count: 4 + +- type: localizedDataset + id: ShamblerGoodbyes + values: + prefix: thankyou-shambler- + count: 4 + - type: localizedDataset id: SmiteGoodbyes values: prefix: thankyou-smite- count: 4 +- type: localizedDataset + id: SpaceColaGoodbyes + values: + prefix: thankyou-cola- + count: 4 + +- type: localizedDataset + id: SpaceUpGoodbyes + values: + prefix: thankyou-spaceup- + count: 4 + +- type: localizedDataset + id: StarkistGoodbyes + values: + prefix: thankyou-starkist- + count: 4 + - type: localizedDataset id: DiscountDansGoodbyes values: @@ -106,12 +142,6 @@ prefix: thankyou-snack- count: 6 -- type: localizedDataset - id: BodaGoodbyes - values: - prefix: thankyou-sovietsoda- - count: 3 - - type: localizedDataset id: SyndieDrobeGoodbyes values: diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 41d5edf4d4a0f0..996e0754fb8850 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -490,6 +490,10 @@ name: Space Cola Vendor description: It vends cola, in space. components: + - type: Advertise + pack: SpaceColaAds + - type: SpeakOnUIClosed + pack: SpaceColaGoodbyes - type: Sprite sprite: Structures/Machines/VendingMachines/cola-red.rsi layers: @@ -513,6 +517,10 @@ components: - type: VendingMachine pack: SpaceUpInventory + - type: Advertise + pack: SpaceUpAds + - type: SpeakOnUIClosed + pack: SpaceUpGoodbyes - type: Sprite sprite: Structures/Machines/VendingMachines/spaceup.rsi layers: @@ -553,11 +561,15 @@ - type: entity parent: VendingMachineCola id: VendingMachineStarkist - name: Star-kist Vendor + name: Starkist Vendor description: The taste of a star in liquid form. components: - type: VendingMachine pack: StarkistInventory + - type: Advertise + pack: StarkistAds + - type: SpeakOnUIClosed + pack: StarkistGoodbyes - type: Sprite sprite: Structures/Machines/VendingMachines/starkist.rsi layers: @@ -574,24 +586,17 @@ color: "#D3A44D" - type: entity - parent: VendingMachine + parent: VendingMachineCola id: VendingMachineShamblersJuice name: Shambler's Juice Vendor description: ~Shake me up some of that Shambler's Juice!~ components: - type: VendingMachine pack: ShamblersJuiceInventory - dispenseOnHitChance: 0.25 - dispenseOnHitThreshold: 2 - offState: off - brokenState: broken - normalState: normal-unshaded - ejectState: eject-unshaded - denyState: deny-unshaded - ejectDelay: 1.9 - initialStockQuality: 0.33 - type: Advertise - pack: RobustSoftdrinksAds + pack: ShamblerAds + - type: SpeakOnUIClosed + pack: ShamblerGoodbyes - type: Sprite sprite: Structures/Machines/VendingMachines/shamblersjuice.rsi layers: @@ -608,26 +613,19 @@ color: "#66538F" - type: entity - parent: VendingMachine + parent: VendingMachineCola id: VendingMachinePwrGame - name: Pwr Game Vendor + name: PWR Game Vendor description: You want it, we got it. Brought to you in partnership with Vlad's Salads. components: - type: VendingMachine pack: PwrGameInventory - dispenseOnHitChance: 0.25 + dispenseOnHitChance: 0.35 # Power through with PWR Game! dispenseOnHitThreshold: 2 - offState: off - brokenState: broken - normalState: normal-unshaded - ejectState: eject-unshaded - denyState: deny-unshaded - ejectDelay: 1.9 - initialStockQuality: 0.33 - type: Advertise - pack: RobustSoftdrinksAds + pack: PwrGameAds - type: SpeakOnUIClosed - pack: GenericVendGoodbyes + pack: PwrGameGoodbyes - type: Sprite sprite: Structures/Machines/VendingMachines/pwrgame.rsi layers: @@ -644,22 +642,13 @@ color: "#6927C5" - type: entity - parent: VendingMachine + parent: VendingMachineCola id: VendingMachineDrGibb name: Dr. Gibb Vendor description: Canned explosion of different flavors in this very vendor! components: - type: VendingMachine pack: DrGibbInventory - dispenseOnHitChance: 0.25 - dispenseOnHitThreshold: 2 - offState: off - brokenState: broken - normalState: normal-unshaded - ejectState: eject-unshaded - denyState: deny-unshaded - ejectDelay: 1.9 - initialStockQuality: 0.33 - type: Advertise pack: DrGibbAds - type: SpeakOnUIClosed @@ -680,7 +669,7 @@ color: "#D82929" - type: entity - parent: VendingMachine + parent: VendingMachineCola id: VendingMachineSmite name: Smite Vendor description: Popular with the administration. @@ -697,15 +686,6 @@ map: [ "enum.WiresVisualLayers.MaintenancePanel" ] - type: VendingMachine pack: SmiteInventory - dispenseOnHitChance: 0.25 - dispenseOnHitThreshold: 2 - offState: off - brokenState: broken - normalState: normal-unshaded - ejectState: eject-unshaded - denyState: deny-unshaded - ejectDelay: 1.9 - initialStockQuality: 0.33 - type: Advertise pack: SmiteAds - type: SpeakOnUIClosed