Code

Merge Upstream#14

Code

Merged

Piras314 merged 71 commits intoGoob-Station:mainGoob-Station/Goob-Station-MRP:mainfrom Piras314:merge-upstreamPiras314/Goob-Station-MRP:merge-upstreamCopy head branch name to clipboardNov 17, 2024

+118,351-90,033

Commits

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 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 7, 2024

• Update Credits (#1179)

  Show description for 12e5363
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  12e5363

  Copy full SHA for 12e5363

• Updates Health Analyzer UI (#1183)

  Show description for ffdaa84
  

  4 peopleauthored
  ffdaa84

  Copy full SHA for ffdaa84

• Automatic Changelog Update (#1183)

  SimpleStation14

  committed
  779583d

  Copy full SHA for 779583d

Commits on Nov 8, 2024

• Nerf The Shit Out Of Familiars (#1184)

  Show description for fa87a39
  VMSolidus

  authored
  fa87a39

  Copy full SHA for fa87a39

• Automatic Changelog Update (#1184)

  SimpleStation14

  committed
  9e85b73

  Copy full SHA for 9e85b73

• Show Language Names In Chat (#1165)

  Show description for 3209838
  

  VMSolidus

  and

  Remuchi

  authored
  3209838

  Copy full SHA for 3209838

• Automatic Changelog Update (#1165)

  SimpleStation14

  committed
  ff43313

  Copy full SHA for ff43313

• Minor Fixes on Rad and Gax (#1178)

  Show description for 8116581
  

  Ichaie

  and

  VMSolidus

  authored
  8116581

  Copy full SHA for 8116581

• Port Cool Punpun (#1157)

  Show description for ae204a8
  

  DEATHB4DEFEAT

  and

  VMSolidus

  authored
  ae204a8

  Copy full SHA for ae204a8

• Automatic Changelog Update (#1178)

  SimpleStation14

  committed
  d521d46

  Copy full SHA for d521d46

• Traits V2 (#1182)

  Show description for e7d40d1
  

  3 peopleauthored
  e7d40d1

  Copy full SHA for e7d40d1

• Automatic Changelog Update (#1182)

  SimpleStation14

  committed
  9b8ad31

  Copy full SHA for 9b8ad31

• Disable Shadowkin (#1187)

  Show description for 09ffbd3
  VMSolidus

  authored
  09ffbd3

  Copy full SHA for 09ffbd3

• Automatic Changelog Update (#1187)

  SimpleStation14

  committed
  b72d7c3

  Copy full SHA for b72d7c3

• Cherry Pick WizDen PR #28488 (#1194)

  Show description for 55e2170
  sleepyyapril

  authored
  55e2170

  Copy full SHA for 55e2170

Commits on Nov 9, 2024

• Port Bloodstains And Footprints (#1190)

  Show description for 8faeaa7
  

  VMSolidus

  and

  Spatison

  authored
  8faeaa7

  Copy full SHA for 8faeaa7

• Automatic Changelog Update (#1190)

  SimpleStation14

  committed
  8d5572b

  Copy full SHA for 8d5572b

• Beacons (#1196)

  Show description for a2b86bc
  sleepyyapril

  authored
  a2b86bc

  Copy full SHA for a2b86bc

• Cherry-Pick Wizden PR 28375 (#1191)

  Show description for 4713261
  

  VMSolidus

  and

  metalgearsloth

  authored
  4713261

  Copy full SHA for 4713261

Commits on Nov 10, 2024

• Fix Call Shuttle (#1199)

  Show description for 94157bd
  sleepyyapril

  authored
  94157bd

  Copy full SHA for 94157bd

• Fix AddTrait And ReplaceTrait Functions (#1195)

  Show description for 4de7f50
  VMSolidus

  authored
  4de7f50

  Copy full SHA for 4de7f50

• Automatic Changelog Update (#1195)

  SimpleStation14

  committed
  e469816

  Copy full SHA for e469816

• Update Credits (#1202)

  Show description for 6305e2d
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  6305e2d

  Copy full SHA for 6305e2d

Commits on Nov 11, 2024

• Add Missing DOTNET_ROOT Environment Variable For Nix Devs (#1203)

  Show description for 04cdc14
  DocNITE

  authored
  04cdc14

  Copy full SHA for 04cdc14

Commits on Nov 13, 2024

• Swapped Hands HUD Fix (#1207)

  Show description for 20ac0b3
  Suraru

  authored
  20ac0b3

  Copy full SHA for 20ac0b3

• Fix Butlertron's Hitbox (#1192)

  Show description for c909724
  

  VMSolidus

  and

  Spatison

  authored
  c909724

  Copy full SHA for c909724

• Automatic Changelog Update (#1192)

  SimpleStation14

  committed
  66490ca

  Copy full SHA for 66490ca

• The Hive: Update Engineering (#1201)

  Show description for d1e4d11
  Ichaie

  authored
  d1e4d11

  Copy full SHA for d1e4d11

• Automatic Changelog Update (#1201)

  SimpleStation14

  committed
  4071d41

  Copy full SHA for 4071d41

• Return Old Lobby Music (#1204)

  Show description for 12c0a63
  DocNITE

  authored
  12c0a63

  Copy full SHA for 12c0a63

• Automatic Changelog Update (#1204)

  SimpleStation14

  committed
  74688cf

  Copy full SHA for 74688cf

• Prevent Listening Posts From Spawning On Planets (#1188)

  Show description for a77f581
  VMSolidus

  authored
  a77f581

  Copy full SHA for a77f581

• Automatic Changelog Update (#1188)

  SimpleStation14

  committed
  7063c79

  Copy full SHA for 7063c79

Commits on Nov 14, 2024

• Fix Silver Crate Name (#1218)

  Show description for ccb26b2
  sleepyyapril

  authored
  ccb26b2

  Copy full SHA for ccb26b2

• Auto Voting System (#1213)

  Show description for 6b2ec00
  

  4 peopleauthored
  6b2ec00

  Copy full SHA for 6b2ec00

• Automatic Changelog Update (#1213)

  SimpleStation14

  committed
  8385fb1

  Copy full SHA for 8385fb1

• Fix Trait Component Removal (#1221)

  Show description for 3c31771
  DEATHB4DEFEAT

  authored
  3c31771

  Copy full SHA for 3c31771

• Some Language Fixes (#1223)

  Show description for 387a362
  Mnemotechnician

  authored
  387a362

  Copy full SHA for 387a362

• Automatic Changelog Update (#1223)

  SimpleStation14

  committed
  8739096

  Copy full SHA for 8739096

Commits on Nov 15, 2024

• The Return of Spray Paint (#1222)

  Show description for 3423e93
  

  3 peopleauthored
  3423e93

  Copy full SHA for 3423e93

• Bounties Localization Fix (#1219)

  Show description for cfdc273
  

  3 peopleauthored
  cfdc273

  Copy full SHA for cfdc273

• Automatic Changelog Update (#1222)

  SimpleStation14

  committed
  45fdd0c

  Copy full SHA for 45fdd0c

Commits on Nov 16, 2024

• Change some Code Style Settings (#1226)

  DEATHB4DEFEAT

  authored
  a505ed7

  Copy full SHA for a505ed7

• Give Penguins Cold Resistance (#1229)

  Show description for 71185a7
  zelezniciar1

  authored
  71185a7

  Copy full SHA for 71185a7

• Automatic Changelog Update (#1229)

  SimpleStation14

  committed
  1c20299

  Copy full SHA for 1c20299

Commits on Nov 17, 2024

• Shitmed: Implementing Existing Newmed Code Into SS14 (#1159)

  Show description for 029b763
  

  4 peopleauthored
  029b763

  Copy full SHA for 029b763

• Automatic Changelog Update (#1159)

  SimpleStation14

  committed
  ea9a076

  Copy full SHA for ea9a076

• Update Credits (#1235)

  Show description for bdbc394
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  bdbc394

  Copy full SHA for bdbc394

• Merge remote-tracking branch 'einstein/master' into merge-upstream

  Piras314

  committed
  9f0d129

  Copy full SHA for 9f0d129