Code

Upstream Merge 7/5/2024#42

Code

Merged

VMSolidus merged 62 commits intoSS14-Classic:masterSS14-Classic/deep-station-14:masterfrom VMSolidus:Upstream-Merge-7/5/2024VMSolidus/deep-station-14:Upstream-Merge-7/5/2024Copy head branch name to clipboardJul 6, 2024

+3,627-661

Commits

Commits on Jun 29, 2024

• Mirror: Throwing Knives: Syndicate Kit (#310)

  Show description for 0269efc
  

  SimpleStation14

  and

  VMSolidus

  authored
  0269efc

Commits on Jun 30, 2024

• Update Credits (#495)

  Show description for 6f54ed1
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  6f54ed1

• Add Equip Delays to Clothing (#499)

  Show description for f439eb7
  Mnemotechnician

  authored
  f439eb7

• Automatic Changelog Update (#499)

  SimpleStation14

  committed
  7c83c8b

Commits on Jul 1, 2024

• Mirror: StrippableSystem doafter overhaul (#205)

  Show description for 89a6bb3
  

  SimpleStation14

  and

  VMSolidus

  authored
  89a6bb3

• Fixes handcuff bug

  VMSolidus

  committed
  5f4df32

• Make Spent Casing Ejection Not Suck (#478)

  Show description for ba2d538
  

  VMSolidus

  and

  DangerRevolution

  authored
  ba2d538

• Automatic Changelog Update (#478)

  SimpleStation14

  committed
  2e712c0

• New glimmer functions

  VMSolidus

  committed
  8bbcafa

• simplify GlimmerEquilibrium constant

  VMSolidus

  committed
  c8e0572

• Some more small optimizations

  VMSolidus

  committed
  35eb6f6

Commits on Jul 2, 2024

• Removing the single power requirement

  Show description for 631a4bf
  VMSolidus

  committed
  631a4bf

• Ye

  VMSolidus

  committed
  2f2f658

• Update PsionicAbilitiesSystem.cs

  VMSolidus

  committed
  7c7ab3f

• 1984 a while loop and make this actually work without needing one.

  VMSolidus

  committed
  10ea788

• Update PsionicAbilitiesSystem.cs

  VMSolidus

  committed
  8e9afa0

• Zap now unlocks the next power roll.

  VMSolidus

  committed
  44e29dd

• Revenant moved to new crit threshold

  VMSolidus

  committed
  864ba53

• Update AtmosphereSystem.HighPressureDelta.cs

  VMSolidus

  committed
  c5946ee

• Don't look at this please.

  VMSolidus

  committed
  d461f4f

• First attempt at the error

  VMSolidus

  committed
  4752115

• Trying this

  VMSolidus

  committed
  10803e1

• Cherrypick "Fix StrippableSystem Blunders" (#504)

  VMSolidus

  authored
  7b89ce1

• Fix Loadouts Breaking when You Spend All Your Points (#506)

  Show description for 606a28d
  WarMechanic

  authored
  606a28d

• Automatic Changelog Update (#506)

  SimpleStation14

  committed
  0d0dd4c

• Revert "Trying this"

  Show description for eaacdea
  VMSolidus

  committed
  eaacdea

• Revert "First attempt at the error"

  Show description for 5fc1ce8
  VMSolidus

  committed
  5fc1ce8

• Unflip Hands for Felinid, Vulpkanin, Harpy (#503)

  Show description for ffb9ec9
  

  Mnemotechnician

  and

  angelofallars

  authored
  ffb9ec9

• Cherry-Pick the Secwatch Pda App (#502)

  Show description for 7a12461
  

  3 peopleauthored
  7a12461

• Automatic Changelog Update (#502)

  SimpleStation14

  committed
  2dcab4d

Commits on Jul 3, 2024

• Fix Clothing Quick-Equip (#507)

  Show description for 2e8e56f
  Mnemotechnician

  authored
  2e8e56f

• Automatic Changelog Update (#507)

  SimpleStation14

  committed
  6aaf466

Commits on Jul 4, 2024

• Revert "Don't look at this please."

  Show description for 8897a4b
  VMSolidus

  committed
  8897a4b

• Merge branch 'Simple-Station:master' into Psionic-Power-Refactor

  VMSolidus

  authored
  8a0ee56

Commits on Jul 5, 2024

• Frictionfull Space (#514)

  Show description for e092203
  Mnemotechnician

  authored
  e092203

• Automatic Changelog Update (#514)

  SimpleStation14

  committed
  81dd782

• Port All Carrying/PseudoItem/EscapeInventory Tweaks From DeltaV (#484)

  Show description for 58be850
  Mnemotechnician

  authored
  58be850

• Automatic Changelog Update (#484)

  SimpleStation14

  committed
  00d786a

• Port Paper Signatures (#456)

  Show description for 476e6de
  

  Mnemotechnician

  and

  DEATHB4DEFEAT

  authored
  476e6de

• Automatic Changelog Update (#456)

  SimpleStation14

  committed
  692ceff

• Felinid Soft Thieving + Trait (#500)

  Show description for e06045c
  

  WarMechanic

  and

  DEATHB4DEFEAT

  authored
  e06045c

• Cherry-Pick Carrypets From Delta-V (#501)

  Show description for 4609f9e
  

  Mnemotechnician

  and

  Froffy025

  authored
  4609f9e

• Automatic Changelog Update (#500)

  SimpleStation14

  committed
  4ebb3cc

• Automatic Changelog Update (#501)

  SimpleStation14

  committed
  d971e7c

• Fix Them Pesky Job Requirements (#511)

  Show description for d5f73ad
  Mnemotechnician

  authored
  d5f73ad

• Automatic Changelog Update (#511)

  SimpleStation14

  committed
  c4f7700

• Restore Old Event Rates (#509)

  Show description for aaee45a
  Mnemotechnician

  authored
  aaee45a

• Automatic Changelog Update (#509)

  SimpleStation14

  committed
  50092e9

• Reapply "Don't look at this please."

  Show description for 0a7acbf
  VMSolidus

  committed
  0a7acbf

• More Loadout Items Wave 1 (#425)

  Show description for 8de45e7
  

  7 peopleauthored
  8de45e7

• Automatic Changelog Update (#425)

  SimpleStation14

  committed
  529c5a4

• Trichromat Modification Trait (#505)

  Show description for 5d36483
  VMSolidus

  authored
  5d36483

• Refactor the Language System (#459)

  Show description for 9d5f3b6
  Mnemotechnician

  authored
  9d5f3b6

• Automatic Changelog Update (#459)

  SimpleStation14

  committed
  726fd0f

Commits on Jul 6, 2024

• Add Item Transfer System (#476)

  Show description for c8a9002
  

  Spatison

  and

  DangerRevolution

  authored
  c8a9002

• Automatic Changelog Update (#476)

  SimpleStation14

  committed
  a6073ef

• Merge remote-tracking branch 'EE-Personal/master' into Upstream-Merge-7/5/2024

  VMSolidus

  committed
  f34a261

• Update base.yml

  VMSolidus

  committed
  ad6a3df

• Merge branch 'master' into Psionic-Power-Refactor

  Show description for a96e9e1
  VMSolidus

  authored
  a96e9e1

• Merge remote-tracking branch 'EE-Personal/Psionic-Power-Refactor' into Upstream-Merge-7/5/2024

  VMSolidus

  committed
  fc08724

• Merge remote-tracking branch 'EE-Personal/MassContests-Remake' into Upstream-Merge-7/5/2024

  VMSolidus

  committed
  98ddaa3

• Merge remote-tracking branch 'EE-Personal/Atmos-optimization-test' into Upstream-Merge-7/5/2024

  VMSolidus

  committed
  ca3f3ca