Code

Soda vending ads and goodbyes v2#34466

Code

Open

Alpaccalypse wants to merge 8 commits intospace-wizards:masterspace-wizards/space-station-14:masterfrom Alpaccalypse:vending-adverts-soda-v2Alpaccalypse/space-station-14:vending-adverts-soda-v2Copy head branch name to clipboard

+171-68

Commits

Commits on Jan 16, 2025

• Updated advertising YAML references for soda vendors

  Alpaccalypse

  committed
  46ed687

  Copy full SHA for 46ed687

• Updated and added advertising en-US localisation files for soda adverts

  Alpaccalypse

  committed
  6972c92

  Copy full SHA for 6972c92

• Removed duplicates of some inherited components from already edited soda machines.

  Alpaccalypse

  committed
  ebe5172

  Copy full SHA for ebe5172

• Update Resources/Locale/en-US/advertisements/vending/cola.ftl

  Show description for 480b427
  

  Alpaccalypse

  and

  Aeshus

  authored
  480b427

  Copy full SHA for 480b427

• Minor. Comma in a Space Cola goodbye.

  Alpaccalypse

  committed
  11a00af

  Copy full SHA for 11a00af

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

  Alpaccalypse

  committed
  a842359

  Copy full SHA for a842359

• PWR game is not subtle, comma changed to colon, using American English capitalisation.

  Alpaccalypse

  committed
  a07ff08

  Copy full SHA for a07ff08

• Made less oblique 1337 reference, which ties in with the other machines.

  Alpaccalypse

  committed
  ffc45cc

  Copy full SHA for ffc45cc