Code

Partial Merge Up to 2024-11-17#402

Code

Merged

Fansana merged 64 commits intoFansana:masterFansana/floofstation1:masterfrom Mnemotechnician:floof/feat/partial-merge-2024-12-04Mnemotechnician/floofstation:floof/feat/partial-merge-2024-12-04Copy head branch name to clipboardDec 15, 2024

+63,468-53,462

Commits

Commits on Nov 7, 2024

• Update Credits (#1179)

  Show description for 12e5363
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  12e5363

• Updates Health Analyzer UI (#1183)

  Show description for ffdaa84
  

  4 peopleauthored
  ffdaa84

• Automatic Changelog Update (#1183)

  SimpleStation14

  committed
  779583d

Commits on Nov 8, 2024

• Nerf The Shit Out Of Familiars (#1184)

  Show description for fa87a39
  VMSolidus

  authored
  fa87a39

• Automatic Changelog Update (#1184)

  SimpleStation14

  committed
  9e85b73

• Show Language Names In Chat (#1165)

  Show description for 3209838
  

  VMSolidus

  and

  Remuchi

  authored
  3209838

• Automatic Changelog Update (#1165)

  SimpleStation14

  committed
  ff43313

• Minor Fixes on Rad and Gax (#1178)

  Show description for 8116581
  

  Ichaie

  and

  VMSolidus

  authored
  8116581

• Port Cool Punpun (#1157)

  Show description for ae204a8
  

  DEATHB4DEFEAT

  and

  VMSolidus

  authored
  ae204a8

• Automatic Changelog Update (#1178)

  SimpleStation14

  committed
  d521d46

• Traits V2 (#1182)

  Show description for e7d40d1
  

  3 peopleauthored
  e7d40d1

• Automatic Changelog Update (#1182)

  SimpleStation14

  committed
  9b8ad31

• Disable Shadowkin (#1187)

  Show description for 09ffbd3
  VMSolidus

  authored
  09ffbd3

• Automatic Changelog Update (#1187)

  SimpleStation14

  committed
  b72d7c3

• Cherry Pick WizDen PR #28488 (#1194)

  Show description for 55e2170
  sleepyyapril

  authored
  55e2170

Commits on Nov 9, 2024

• Port Bloodstains And Footprints (#1190)

  Show description for 8faeaa7
  

  VMSolidus

  and

  Spatison

  authored
  8faeaa7

• Automatic Changelog Update (#1190)

  SimpleStation14

  committed
  8d5572b

• Beacons (#1196)

  Show description for a2b86bc
  sleepyyapril

  authored
  a2b86bc

• Cherry-Pick Wizden PR 28375 (#1191)

  Show description for 4713261
  

  VMSolidus

  and

  metalgearsloth

  authored
  4713261

Commits on Nov 10, 2024

• Fix Call Shuttle (#1199)

  Show description for 94157bd
  sleepyyapril

  authored
  94157bd

• Fix AddTrait And ReplaceTrait Functions (#1195)

  Show description for 4de7f50
  VMSolidus

  authored
  4de7f50

• Automatic Changelog Update (#1195)

  SimpleStation14

  committed
  e469816

• Update Credits (#1202)

  Show description for 6305e2d
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  6305e2d

Commits on Nov 11, 2024

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

  Show description for 04cdc14
  DocNITE

  authored
  04cdc14

Commits on Nov 13, 2024

• Swapped Hands HUD Fix (#1207)

  Show description for 20ac0b3
  Suraru

  authored
  20ac0b3

• Fix Butlertron's Hitbox (#1192)

  Show description for c909724
  

  VMSolidus

  and

  Spatison

  authored
  c909724

• Automatic Changelog Update (#1192)

  SimpleStation14

  committed
  66490ca

• The Hive: Update Engineering (#1201)

  Show description for d1e4d11
  Ichaie

  authored
  d1e4d11

• Automatic Changelog Update (#1201)

  SimpleStation14

  committed
  4071d41

• Return Old Lobby Music (#1204)

  Show description for 12c0a63
  DocNITE

  authored
  12c0a63

• Automatic Changelog Update (#1204)

  SimpleStation14

  committed
  74688cf

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

  Show description for a77f581
  VMSolidus

  authored
  a77f581

• Automatic Changelog Update (#1188)

  SimpleStation14

  committed
  7063c79

Commits on Nov 14, 2024

• Fix Silver Crate Name (#1218)

  Show description for ccb26b2
  sleepyyapril

  authored
  ccb26b2

• Auto Voting System (#1213)

  Show description for 6b2ec00
  

  4 peopleauthored
  6b2ec00

• Automatic Changelog Update (#1213)

  SimpleStation14

  committed
  8385fb1

• Fix Trait Component Removal (#1221)

  Show description for 3c31771
  DEATHB4DEFEAT

  authored
  3c31771

• Some Language Fixes (#1223)

  Show description for 387a362
  Mnemotechnician

  authored
  387a362

• Automatic Changelog Update (#1223)

  SimpleStation14

  committed
  8739096

Commits on Nov 15, 2024

• The Return of Spray Paint (#1222)

  Show description for 3423e93
  

  3 peopleauthored
  3423e93

• Bounties Localization Fix (#1219)

  Show description for cfdc273
  

  3 peopleauthored
  cfdc273

• Automatic Changelog Update (#1222)

  SimpleStation14

  committed
  45fdd0c

Commits on Nov 16, 2024

• Change some Code Style Settings (#1226)

  DEATHB4DEFEAT

  authored
  a505ed7

• Give Penguins Cold Resistance (#1229)

  Show description for 71185a7
  zelezniciar1

  authored
  71185a7

• Automatic Changelog Update (#1229)

  SimpleStation14

  committed
  1c20299

Commits on Dec 4, 2024

• Merge commit '1c202993ed0986f72205c31a14176f4fbb8e1420' into floof/feat/partial-merge-2024-12-04

  Mnemotechnician

  committed
  7573650

• Tonight's the night, we discover entity parenting

  Mnemotechnician

  committed
  2342a3b

Commits on Dec 5, 2024

• some fixes or something?

  Mnemotechnician

  committed
  14d52ed

Commits on Dec 9, 2024

• yaml fixes

  Mnemotechnician

  committed
  3bde61d

• Merge remote-tracking branch 'floofstation/master' into floof/feat/partial-merge-2024-12-04

  Show description for 7feee73
  Mnemotechnician

  committed
  7feee73

• Exclude rodentia and resomi from lightweight

  Mnemotechnician

  committed
  cada5ea

• Nevermind - trystan was right

  Show description for 971fe73
  Mnemotechnician

  authored
  971fe73

Commits on Dec 12, 2024

• Fix disposal trunk ejection

  Mnemotechnician

  committed
  9283d62

• Merge remote-tracking branch 'origin-floofstation-fork/floof/feat/partial-merge-2024-12-04' into floof/feat/partial-merge-2024-12-04

  Mnemotechnician

  committed
  a0e6fcb

Commits on Dec 14, 2024

• Remove useless ccvar

  Fansana

  authored
  626231a

• Update BatteryRampPegSolver.cs

  Fansana

  authored
  56293da

• Update PowerNetSystem.cs

  Fansana

  authored
  44b9192

• Update CCVars.cs

  Fansana

  authored
  e6d88cd

• update summary

  Fansana

  committed
  dfbbd99

• enable roundstart shadowkin

  Fansana

  authored
  a38504e

• scales slider fixes (Thanks april)

  Fansana

  committed
  8c096b7

Commits on Dec 15, 2024

• Revert "scales slider fixes (Thanks april)"

  Show description for 903e3e9
  Fansana

  committed
  903e3e9

• skibedi

  Fansana

  committed
  f7ff7dd

• rizzler

  Fansana

  committed
  33f8509