Code

Selective Merge 2024-11-04#326

Code

Merged

Memeji merged 78 commits intoFansana:masterFansana/floofstation1:masterfrom Mnemotechnician:floof/selective-merge-2024-11-04Mnemotechnician/floofstation:floof/selective-merge-2024-11-04Copy head branch name to clipboardNov 22, 2024

+50,878-39,073

Commits

Commits on Oct 23, 2024

• [Fix] Cybereyes No Longer Reveal Identity. (#1127)

  Show description for db40b86
  Remuchi

  authored
  db40b86

  Copy full SHA for db40b86

• Automatic Changelog Update (#1127)

  SimpleStation14

  committed
  b73d45e

  Copy full SHA for b73d45e

• Feat: Port Delta-V Glimmer Wisps (#1125)

  Show description for dd9cdc1
  

  Mnemotechnician

  and

  deltanedas

  authored
  dd9cdc1

  Copy full SHA for dd9cdc1

• Automatic Changelog Update (#1125)

  SimpleStation14

  committed
  85a770c

  Copy full SHA for 85a770c

Commits on Oct 25, 2024

• Fix High Amplification Trait Being the Wildest Scam in Human History (#1137)

  Show description for 9923192
  Mnemotechnician

  authored
  9923192

  Copy full SHA for 9923192

• Automatic Changelog Update (#1137)

  SimpleStation14

  committed
  2509575

  Copy full SHA for 2509575

• Cherry Pick PR #30576 (#1135)

  Show description for ffcbdce
  

  3 peopleauthored
  ffcbdce

  Copy full SHA for ffcbdce

• [Fix] Added Missing Deflect Alert Locale (#1140)

  Show description for 518812b
  Remuchi

  authored
  518812b

  Copy full SHA for 518812b

• Fix Markup Tags in Station News (#30169) (#1116)

  Show description for 4f4f82f
  

  3 peopleauthored
  4f4f82f

  Copy full SHA for 4f4f82f

• Automatic Changelog Update (#1140)

  SimpleStation14

  committed
  f6312a5

  Copy full SHA for f6312a5

• Pyrokinetic Flare Power (#1138)

  Show description for 4b75f26
  VMSolidus

  authored
  4b75f26

  Copy full SHA for 4b75f26

• Penlight Repair (#1142)

  Show description for 3e1f540
  SleepyScarecrow

  authored
  3e1f540

  Copy full SHA for 3e1f540

• Automatic Changelog Update (#1138)

  SimpleStation14

  committed
  7579004

  Copy full SHA for 7579004

• Automatic Changelog Update (#1142)

  SimpleStation14

  committed
  dce01bc

  Copy full SHA for dce01bc

Commits on Oct 27, 2024

• Updade RadStation (#1129)

  Show description for e46ed86
  Ichaie

  authored
  e46ed86

  Copy full SHA for e46ed86

• Remove LPO Shuttle Recalling (#1143)

  Show description for 582a16e
  VMSolidus

  authored
  582a16e

  Copy full SHA for 582a16e

• Automatic Changelog Update (#1129)

  SimpleStation14

  committed
  04afafd

  Copy full SHA for 04afafd

• Automatic Changelog Update (#1143)

  SimpleStation14

  committed
  838a30f

  Copy full SHA for 838a30f

• [Fix] Fixed Icons In Radial Menus (#1150)

  Show description for 306e479
  Remuchi

  authored
  306e479

  Copy full SHA for 306e479

• Automatic Changelog Update (#1150)

  SimpleStation14

  committed
  67ad09e

  Copy full SHA for 67ad09e

• [Feature] Clicking on Health Alerty Now Displays Health State (#1139)

  Show description for 7c8937a
  Remuchi

  authored
  7c8937a

  Copy full SHA for 7c8937a

• Automatic Changelog Update (#1139)

  SimpleStation14

  committed
  820cecc

  Copy full SHA for 820cecc

• Trait Modify Factions (#955)

  Show description for 8e1a63c
  

  VMSolidus

  and

  DEATHB4DEFEAT

  authored
  8e1a63c

  Copy full SHA for 8e1a63c

• [Feature] Telescopic Baton (#1144)

  Show description for 15e46cf
  

  Remuchi

  and

  VMSolidus

  authored
  15e46cf

  Copy full SHA for 15e46cf

• Automatic Changelog Update (#955)

  SimpleStation14

  committed
  9537278

  Copy full SHA for 9537278

• Automatic Changelog Update (#1144)

  SimpleStation14

  committed
  678875b

  Copy full SHA for 678875b

• Psionic Familiar System (#1146)

  Show description for cfcc4cb
  

  VMSolidus

  and

  Remuchi

  authored
  cfcc4cb

  Copy full SHA for cfcc4cb

• Automatic Changelog Update (#1146)

  SimpleStation14

  committed
  2d9d4d4

  Copy full SHA for 2d9d4d4

• Update Credits (#1149)

  Show description for 18a38e8
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  18a38e8

  Copy full SHA for 18a38e8

Commits on Oct 28, 2024

• Properly Credit Contributors Who Were Truncated by GitHub API (#1153)

  Show description for 9a1661e
  

  DEATHB4DEFEAT

  and

  mirrorcult

  authored
  9a1661e

  Copy full SHA for 9a1661e

Commits on Oct 29, 2024

• Tweak Familiars (#1162)

  Show description for 88344bb
  VMSolidus

  authored
  88344bb

  Copy full SHA for 88344bb

• Update Marish Language Description (#1160)

  Show description for 2b90e2a
  PlasmaRaptor

  authored
  2b90e2a

  Copy full SHA for 2b90e2a

• Automatic Changelog Update (#1162)

  SimpleStation14

  committed
  cfd1737

  Copy full SHA for cfd1737

• Clean Up/Change Default Rules (#1154)

  Show description for 6da7eab
  DEATHB4DEFEAT

  authored
  6da7eab

  Copy full SHA for 6da7eab

Commits on Nov 1, 2024

• Updade Gax (#1163)

  Show description for d2bdbec
  

  Ichaie

  and

  VMSolidus

  authored
  d2bdbec

  Copy full SHA for d2bdbec

• Automatic Changelog Update (#1163)

  SimpleStation14

  committed
  d6bb182

  Copy full SHA for d6bb182

Commits on Nov 2, 2024

• Update Saltern (#1170)

  Show description for 523e17c
  VMSolidus

  authored
  523e17c

  Copy full SHA for 523e17c

• Automatic Changelog Update (#1170)

  SimpleStation14

  committed
  dbaec26

  Copy full SHA for dbaec26

• Add Uranium, Gold, And Silver To Cargo Menu (#1171)

  Show description for 9963e23
  VMSolidus

  authored
  9963e23

  Copy full SHA for 9963e23

• Automatic Changelog Update (#1171)

  SimpleStation14

  committed
  7e565b2

  Copy full SHA for 7e565b2

• Voice Mask Refactor and Fixes (#1147)

  Show description for ed50485
  beck-thompson

  authored
  ed50485

  Copy full SHA for ed50485

• More Sec Loadout Guns (#1158)

  Show description for 9ecae9f
  VMSolidus

  authored
  9ecae9f

  Copy full SHA for 9ecae9f

• Automatic Changelog Update (#1147)

  SimpleStation14

  committed
  377a88c

  Copy full SHA for 377a88c

• Automatic Changelog Update (#1158)

  SimpleStation14

  committed
  97e0403

  Copy full SHA for 97e0403

• Fixes Cocoons (#1169)

  Show description for 3bbcab8
  FoxxoTrystan

  authored
  3bbcab8

  Copy full SHA for 3bbcab8

• Automatic Changelog Update (#1169)

  SimpleStation14

  committed
  c5a40ee

  Copy full SHA for c5a40ee

• Add New Sprites (#1174)

  Show description for b553ce9
  

  Ichaie

  and

  VMSolidus

  authored
  b553ce9

  Copy full SHA for b553ce9

• Automatic Changelog Update (#1174)

  SimpleStation14

  committed
  903452b

  Copy full SHA for 903452b

• Syndicate Faction Comes From IFF Tags (#1176)

  Show description for f1f25d6
  VMSolidus

  authored
  f1f25d6

  Copy full SHA for f1f25d6

• Automatic Changelog Update (#1176)

  SimpleStation14

  committed
  b40918b

  Copy full SHA for b40918b

• Fix This Stupid Behavior (#1177)

  Show description for b7de623
  VMSolidus

  authored
  b7de623

  Copy full SHA for b7de623

• Automatic Changelog Update (#1177)

  SimpleStation14

  committed
  a6910bb

  Copy full SHA for a6910bb

Commits on Nov 4, 2024

• Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into floof/selective-merge-2024-11-04

  Mnemotechnician

  committed
  dc4a147

  Copy full SHA for dc4a147

• Revert "Automatic Changelog Update (#1177)"

  Show description for 916647f
  Mnemotechnician

  committed
  916647f

  Copy full SHA for 916647f

• Revert "Fix This Stupid Behavior (#1177)"

  Show description for 406bda7
  Mnemotechnician

  committed
  406bda7

  Copy full SHA for 406bda7

• Comment out the downfall of salvage

  Mnemotechnician

  committed
  ea2de09

  Copy full SHA for ea2de09

• Revert "Automatic Changelog Update (#1171)"

  Show description for cce93eb
  Mnemotechnician

  committed
  cce93eb

  Copy full SHA for cce93eb

• Merge branch 'master' of https://github.com/fansana/floofstation1 into floof/selective-merge-2024-11-04

  Mnemotechnician

  committed
  ec87dc8

  Copy full SHA for ec87dc8

Commits on Nov 5, 2024

• Remove eeMigrations.yml, Remove deltaMigrations.yml, Remove frontierMigrations.yml -- Combine All Into eeMigration.yml (#1123)

  Show description for c58500a
  DangerRevolution

  authored
  c58500a

  Copy full SHA for c58500a

• Fix CanShuttle Not Preventing Recalls (#1180)

  Show description for b1e2e73
  VMSolidus

  authored
  b1e2e73

  Copy full SHA for b1e2e73

• Automatic Changelog Update (#1180)

  SimpleStation14

  committed
  bbe1f8f

  Copy full SHA for bbe1f8f

• Robust Toolbolbox Version 227.0.0 (#1173)

  Show description for 53d12ac
  

  5 peopleauthored
  53d12ac

  Copy full SHA for 53d12ac

Commits on Nov 6, 2024

• There is no brigmedic on saltern.

  Show description for e94fa53
  Mnemotechnician

  authored
  e94fa53

  Copy full SHA for e94fa53

• Merge branch 'master' of https://github.com/simple-station/einstein-engines into floof/selective-merge-2024-11-04

  Mnemotechnician

  committed
  60c9e3f

  Copy full SHA for 60c9e3f

• Merge remote-tracking branch 'origin-floofstation-fork/floof/selective-merge-2024-11-04' into floof/selective-merge-2024-11-04

  Mnemotechnician

  committed
  c94dcf6

  Copy full SHA for c94dcf6

• Hopefully fix the submodule version

  Mnemotechnician

  committed
  272caa3

  Copy full SHA for 272caa3

• Fix duplicate locale

  Mnemotechnician

  committed
  4a671a5

  Copy full SHA for 4a671a5

Commits on Nov 8, 2024

• God please tell me this is the last

  Mnemotechnician

  committed
  fc15cc6

  Copy full SHA for fc15cc6

• I shouldn't be changing this, WHY

  Mnemotechnician

  committed
  ce464ac

  Copy full SHA for ce464ac

Commits on Nov 10, 2024

• Comment out the new sec loadout guns

  Mnemotechnician

  committed
  f5a36e2

  Copy full SHA for f5a36e2

Commits on Nov 19, 2024

• Fix the silver crate name

  Mnemotechnician

  committed
  778abe1

  Copy full SHA for 778abe1

• Merge branch 'master' into floof/selective-merge-2024-11-04

  Fansana

  authored
  ed674d3

  Copy full SHA for ed674d3

Commits on Nov 20, 2024

• Merge branch 'master' into floof/selective-merge-2024-11-04

  Fansana

  committed
  0a8744e

  Copy full SHA for 0a8744e

• adjusted crates and prices

  Fansana

  committed
  e3bb7b5

  Copy full SHA for e3bb7b5

• adjusted the prices a tad

  Fansana

  committed
  ecc69f3

  Copy full SHA for ecc69f3

• fill Janitor and bartender locker

  Fansana

  committed
  f13905d

  Copy full SHA for f13905d

Commits on Nov 22, 2024

• Update saltern.yml

  Fansana

  authored
  c5253fb

  Copy full SHA for c5253fb

• fix BoundUserInterface

  Fansana

  committed
  bbdfecf

  Copy full SHA for bbdfecf