-
Notifications
You must be signed in to change notification settings - Fork 3.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Soda vending ads and goodbyes v2 #34466
Open
Alpaccalypse
wants to merge
8
commits into
space-wizards:master
Choose a base branch
from
Alpaccalypse:vending-adverts-soda-v2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+171
−68
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
46ed687
Updated advertising YAML references for soda vendors
Alpaccalypse 6972c92
Updated and added advertising en-US localisation files for soda adverts
Alpaccalypse ebe5172
Removed duplicates of some inherited components from already edited s…
Alpaccalypse 480b427
Update Resources/Locale/en-US/advertisements/vending/cola.ftl
Alpaccalypse 11a00af
Minor. Comma in a Space Cola goodbye.
Alpaccalypse a842359
Merge remote-tracking branch 'origin/vending-adverts-soda-v2' into ve…
Alpaccalypse a07ff08
PWR game is not subtle, comma changed to colon, using American Englis…
Alpaccalypse ffc45cc
Made less oblique 1337 reference, which ties in with the other machines.
Alpaccalypse File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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! |
12 changes: 12 additions & 0 deletions
12
Resources/Locale/en-US/advertisements/vending/shambler.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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!~ |
11 changes: 7 additions & 4 deletions
11
Resources/Locale/en-US/advertisements/vending/sovietsoda.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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. | ||
| thankyou-sovietsoda-3 = Enjoy, comrade! | ||
| thankyou-sovietsoda-4 = Trust, but verify. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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! |
12 changes: 12 additions & 0 deletions
12
Resources/Locale/en-US/advertisements/vending/starkist.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh, I missed this part
any reason you are removing these?