Code

Merge surgery#105

Code

Merged

VMSolidus merged 28 commits intomasterSS14-Classic/deep-station-14:masterfrom Merge-SurgerySS14-Classic/deep-station-14:Merge-SurgeryCopy head branch name to clipboardNov 17, 2024

+68,156-52,347

Commits

Commits on Nov 10, 2024

• 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

• Merge remote-tracking branch 'EE-Master/master' into Merge-Surgery

  VMSolidus

  committed
  abca273

  Copy full SHA for abca273