Code

Soda vending ads and goodbyes#34215

Code

Closed

Alpaccalypse wants to merge 66 commits intospace-wizards:masterspace-wizards/space-station-14:masterfrom Alpaccalypse:vending-adverts-sodaAlpaccalypse/space-station-14:vending-adverts-sodaCopy head branch name to clipboard

+24,529-225,326

Commits

Commits on Jan 2, 2025

• Added distinct ad and bye chatter to Dr. Gibb vending

  Alpaccalypse

  committed
  feb502b

  Copy full SHA for feb502b

• Correcting revert mistake

  Alpaccalypse

  committed
  90f6651

  Copy full SHA for 90f6651

• Merge remote-tracking branch 'origin/vending-adverts-gibb' into vending-adverts-gibb

  Alpaccalypse

  committed
  1a18688

  Copy full SHA for 1a18688

Commits on Jan 4, 2025

• PWR Game and Space Cola ads

  Alpaccalypse

  committed
  4add08f

  Copy full SHA for 4add08f

• Fixed moved ad line

  Alpaccalypse

  committed
  3385645

  Copy full SHA for 3385645

• Minor, title case

  Alpaccalypse

  committed
  9962e99

  Copy full SHA for 9962e99

• Minor title case and punct

  Alpaccalypse

  committed
  6974706

  Copy full SHA for 6974706

Commits on Jan 5, 2025

• Added Vlad's Salads reference

  Alpaccalypse

  committed
  a9b4002

  Copy full SHA for a9b4002

• And a Vlad's purchase suggestion

  Alpaccalypse

  committed
  f635aff

  Copy full SHA for f635aff

• Made Vlad reference even more atonal

  Alpaccalypse

  committed
  2896be2

  Copy full SHA for 2896be2

• Added remaining adds for current soda vends

  Alpaccalypse

  committed
  4dfa469

  Copy full SHA for 4dfa469

• Updated localisation and vendor references

  Alpaccalypse

  committed
  1b8ec87

  Copy full SHA for 1b8ec87

• There's something fishy about starkist

  Alpaccalypse

  committed
  80c092e

  Copy full SHA for 80c092e

• Added TF2 Heavy quotes and russian proverbs to BODA

  Alpaccalypse

  committed
  21cd842

  Copy full SHA for 21cd842

• updated boda file references

  Alpaccalypse

  committed
  1e06d96

  Copy full SHA for 1e06d96

• Decided to swap out and add back in a buy line.

  Alpaccalypse

  committed
  943c0ae

  Copy full SHA for 943c0ae

• Swapped out one exceptional long line for an odd proverb

  Alpaccalypse

  committed
  87231e2

  Copy full SHA for 87231e2

Commits on Jan 6, 2025

• Minor, boda line, eat to drink. Don't think it spoils reference.

  Alpaccalypse

  committed
  e61f7d2

  Copy full SHA for e61f7d2

Commits on Jan 7, 2025

• Added newline to end of sovietsoda

  Alpaccalypse

  committed
  fabacd7

  Copy full SHA for fabacd7

• Weird commit to try and keep git happy.

  Alpaccalypse

  committed
  0973f5e

  Copy full SHA for 0973f5e

• Reordered vending adds sets.

  Alpaccalypse

  committed
  0e13172

  Copy full SHA for 0e13172

• Another stupid commit to try and keep git happy.

  Alpaccalypse

  committed
  4edb468

  Copy full SHA for 4edb468

• Git tricked, mostly, putting ad pack back in order.

  Alpaccalypse

  committed
  9432c1a

  Copy full SHA for 9432c1a

• Minor, removed whitespace. Ignoring git merge nonsense for now.

  Alpaccalypse

  committed
  75bf092

  Copy full SHA for 75bf092

• One last attempt to get git to chill out.

  Alpaccalypse

  committed
  323b9ad

  Copy full SHA for 323b9ad

• Merge branch 'master' into vending-adverts-soda

  Show description for 6165606
  Alpaccalypse

  committed
  6165606

  Copy full SHA for 6165606

• Back to exactly where it was before git complained

  Alpaccalypse

  committed
  80879c9

  Copy full SHA for 80879c9

• Added distinct ad and bye chatter to Dr. Gibb vending (space-wizards#34182)

  Show description for e732c94
  Alpaccalypse

  committed
  e732c94

  Copy full SHA for e732c94

• Cerrypicked rever. Please work

  Alpaccalypse

  committed
  21c27d0

  Copy full SHA for 21c27d0

• Merge remote-tracking branch 'origin/vending-adverts-soda' into vending-adverts-soda

  Alpaccalypse

  committed
  5b6b3f1

  Copy full SHA for 5b6b3f1

• Dupilicate removed, fingers crossed.

  Alpaccalypse

  committed
  39fa449

  Copy full SHA for 39fa449

Commits on Jan 16, 2025

• Merge with Dr. Gibb adds

  Alpaccalypse

  committed
  d218aff

  Copy full SHA for d218aff

• Cherrypicked smite vending_machines.yml

  Alpaccalypse

  committed
  b831a7b

  Copy full SHA for b831a7b

• Cherrypicked adverts with Smite PR

  Alpaccalypse

  committed
  f841d80

  Copy full SHA for f841d80

• Merged upstream

  Alpaccalypse

  committed
  e46319d

  Copy full SHA for e46319d

• BorgChassis transfer their mind to a dropped BorgBrain fix (space-wizards#34464)

  Show description for cec5816
  ScarKy0

  authored
  cec5816

  Copy full SHA for cec5816

• Removed missed speech component

  Alpaccalypse

  committed
  5423eb1

  Copy full SHA for 5423eb1

• PWR Game and Space Cola ads

  Alpaccalypse

  committed
  51b96bb

  Copy full SHA for 51b96bb

• Fixed moved ad line

  Alpaccalypse

  committed
  89fa11d

  Copy full SHA for 89fa11d

• Minor, title case

  Alpaccalypse

  committed
  f5a4e09

  Copy full SHA for f5a4e09

• Minor title case and punct

  Alpaccalypse

  committed
  02e948c

  Copy full SHA for 02e948c

• Added Vlad's Salads reference

  Alpaccalypse

  committed
  589617e

  Copy full SHA for 589617e

• And a Vlad's purchase suggestion

  Alpaccalypse

  committed
  b995d1c

  Copy full SHA for b995d1c

• Made Vlad reference even more atonal

  Alpaccalypse

  committed
  c0c7210

  Copy full SHA for c0c7210

• Added remaining adds for current soda vends

  Alpaccalypse

  committed
  52da79e

  Copy full SHA for 52da79e

• Updated localisation and vendor references

  Alpaccalypse

  committed
  1c78251

  Copy full SHA for 1c78251

• There's something fishy about starkist

  Alpaccalypse

  committed
  903b792

  Copy full SHA for 903b792

• Added TF2 Heavy quotes and russian proverbs to BODA

  Alpaccalypse

  committed
  461be32

  Copy full SHA for 461be32

• updated boda file references

  Alpaccalypse

  committed
  8afc84f

  Copy full SHA for 8afc84f

• Decided to swap out and add back in a buy line.

  Alpaccalypse

  committed
  c31939c

  Copy full SHA for c31939c

• Swapped out one exceptional long line for an odd proverb

  Alpaccalypse

  committed
  2ef69ea

  Copy full SHA for 2ef69ea

• Minor, boda line, eat to drink. Don't think it spoils reference.

  Alpaccalypse

  committed
  1ff37af

  Copy full SHA for 1ff37af

• Added newline to end of sovietsoda

  Alpaccalypse

  committed
  8113633

  Copy full SHA for 8113633

• Weird commit to try and keep git happy.

  Alpaccalypse

  committed
  0a83167

  Copy full SHA for 0a83167

• Reordered vending adds sets.

  Alpaccalypse

  committed
  a19b327

  Copy full SHA for a19b327

• Another stupid commit to try and keep git happy.

  Alpaccalypse

  committed
  edd3e34

  Copy full SHA for edd3e34

• Git tricked, mostly, putting ad pack back in order.

  Alpaccalypse

  committed
  f7a4bc2

  Copy full SHA for f7a4bc2

• Minor, removed whitespace. Ignoring git merge nonsense for now.

  Alpaccalypse

  committed
  8bbaacb

  Copy full SHA for 8bbaacb

• One last attempt to get git to chill out.

  Alpaccalypse

  committed
  176d40f

  Copy full SHA for 176d40f

• Added distinct ad and bye chatter to Dr. Gibb vending (space-wizards#34182)

  Show description for d50d44f
  Alpaccalypse

  committed
  d50d44f

  Copy full SHA for d50d44f

• Cerrypicked rever. Please work

  Alpaccalypse

  committed
  f7565df

  Copy full SHA for f7565df

• Merge with Dr. Gibb adds

  Alpaccalypse

  committed
  e63b022

  Copy full SHA for e63b022

• Cherrypicked smite vending_machines.yml

  Alpaccalypse

  committed
  4a81df9

  Copy full SHA for 4a81df9

• Cherrypicked adverts with Smite PR

  Alpaccalypse

  committed
  a3140a4

  Copy full SHA for a3140a4

• Removed missed speech component

  Alpaccalypse

  committed
  ff1c0be

  Copy full SHA for ff1c0be

• Merge remote-tracking branch 'origin/vending-adverts-soda' into vending-adverts-soda

  Show description for 2755886
  Alpaccalypse

  committed
  2755886

  Copy full SHA for 2755886