Code

Upstream Merge 6 22 2024#26

Code

Merged

VMSolidus merged 98 commits intoSS14-Classic:masterSS14-Classic/deep-station-14:masterfrom VMSolidus:upstream-merge-6-22-2024VMSolidus/deep-station-14:upstream-merge-6-22-2024Copy head branch name to clipboardJun 22, 2024

+2,280-1,413

Commits

Commits on Jun 19, 2024

• Two new CVars and height slider now shows actual height in CM

  VMSolidus

  committed
  0673211

  Copy full SHA for 0673211

• Merge branch 'master' into port-of-height-sliders

  Show description for fabcdfa
  VMSolidus

  authored
  fabcdfa

  Copy full SHA for fabcdfa

• Height sliders now include weight

  VMSolidus

  committed
  639a17e

  Copy full SHA for 639a17e

• UI now automatically resizes the preview

  VMSolidus

  committed
  2545218

  Copy full SHA for 2545218

• More Exciting Shell Casings

  VMSolidus

  committed
  69ec1a8

  Copy full SHA for 69ec1a8

Commits on Jun 20, 2024

• Mass Contests Remake

  VMSolidus

  committed
  eb9d2da

  Copy full SHA for eb9d2da

• Update SharedCuffableSystem.cs

  VMSolidus

  committed
  1701ded

  Copy full SHA for 1701ded

• Harpy Peacock Tail (#428)

  Show description for f149d46
  

  VMSolidus

  and

  DangerRevolution

  authored
  f149d46

  Copy full SHA for f149d46

• Automatic Changelog Update (#428)

  SimpleStation14

  committed
  896627d

  Copy full SHA for 896627d

• Merge branch 'master' into The-Great-Massening-Guns

  DangerRevolution

  authored
  5bc2f59

  Copy full SHA for 5bc2f59

• Port Randomly Fire Dropped Weapons (#471)

  Show description for b353d95
  VMSolidus

  authored
  b353d95

  Copy full SHA for b353d95

• Automatic Changelog Update (#471)

  SimpleStation14

  committed
  ff6e9b7

  Copy full SHA for ff6e9b7

• Update HandcuffComponent.cs

  VMSolidus

  authored
  1a1263f

  Copy full SHA for 1a1263f

• Port Random Bark System (#466)

  Show description for bc0e2e6
  

  VMSolidus

  and

  DEATHB4DEFEAT

  authored
  bc0e2e6

  Copy full SHA for bc0e2e6

• Automatic Changelog Update (#466)

  SimpleStation14

  committed
  d42cd67

  Copy full SHA for d42cd67

• Mirror 26250: Make all implants unable to be implanted more than once (#445)

  Show description for 4b8036c
  SimpleStation14

  authored
  4b8036c

  Copy full SHA for 4b8036c

• Mirror: Bumps LoneOps minimum required players to 20 (#263)

  Show description for 2961bf4
  SimpleStation14

  authored
  2961bf4

  Copy full SHA for 2961bf4

• Merge branch 'master' into The-Great-Massening-Guns

  DangerRevolution

  authored
  cc4f19f

  Copy full SHA for cc4f19f

• Apply suggestions from code review

  Show description for 282b207
  

  VMSolidus

  and

  DangerRevolution

  authored
  282b207

  Copy full SHA for 282b207

• Trait Points (#434)

  Show description for d3ed34f
  

  DEATHB4DEFEAT

  and

  VMSolidus

  authored
  d3ed34f

  Copy full SHA for d3ed34f

• Automatic Changelog Update (#434)

  SimpleStation14

  committed
  287f33c

  Copy full SHA for 287f33c

• Merge branch 'master' into port-of-height-sliders

  Show description for 4b4dbea
  VMSolidus

  authored
  4b4dbea

  Copy full SHA for 4b4dbea

Commits on Jun 21, 2024

• Merge branch 'master' into MassContests-Remake

  VMSolidus

  authored
  ff8f568

  Copy full SHA for ff8f568

• guh

  VMSolidus

  committed
  c3b54db

  Copy full SHA for c3b54db

• Psionic Refactor pt 1

  VMSolidus

  committed
  839eac1

  Copy full SHA for 839eac1

• Last bit

  VMSolidus

  committed
  ac83004

  Copy full SHA for ac83004

• I accidentally sent the DeltaV legacy version of these

  VMSolidus

  committed
  4ad73d4

  Copy full SHA for 4ad73d4

• Finishing Mind Swap rework

  VMSolidus

  committed
  8c0fc8d

  Copy full SHA for 8c0fc8d

• Noospheric Zap updating

  VMSolidus

  committed
  fa213b7

  Copy full SHA for fa213b7

• Almost done

  VMSolidus

  committed
  2ef711c

  Copy full SHA for 2ef711c

• guh

  VMSolidus

  committed
  4e919ee

  Copy full SHA for 4e919ee

• More migrations

  VMSolidus

  committed
  ca07c5c

  Copy full SHA for ca07c5c

• Final migrations

  VMSolidus

  committed
  2cbcfb9

  Copy full SHA for 2cbcfb9

• Last set of migrations

  VMSolidus

  committed
  6bb7093

  Copy full SHA for 6bb7093

• Update PsionicsSystem.cs

  VMSolidus

  committed
  51d4c1b

  Copy full SHA for 51d4c1b

• Almost got it, one last bug to squash

  VMSolidus

  committed
  90ebdb5

  Copy full SHA for 90ebdb5

• slightly more acccurate but still not quite right

  VMSolidus

  committed
  52ea837

  Copy full SHA for 52ea837

• Update PyrokinesisPowerSystem.cs

  VMSolidus

  committed
  4f8a6b8

  Copy full SHA for 4f8a6b8

• removing some errant instances of potentialpsionic

  VMSolidus

  committed
  577e51a

  Copy full SHA for 577e51a

• Revert "removing some errant instances of potentialpsionic"

  Show description for a6f8d40
  VMSolidus

  committed
  a6f8d40

  Copy full SHA for a6f8d40

• Final power update

  VMSolidus

  committed
  f677d5a

  Copy full SHA for f677d5a

• Update psionicPowers.yml

  VMSolidus

  committed
  5ac883e

  Copy full SHA for 5ac883e

• Update psionic.ftl

  VMSolidus

  committed
  e9f1ae0

  Copy full SHA for e9f1ae0

• some more small tweaks

  VMSolidus

  committed
  f951e22

  Copy full SHA for f951e22

• Update PotentialPsionicComponent.cs

  VMSolidus

  committed
  2fc2351

  Copy full SHA for 2fc2351

• Update PsionicAbilitiesSystem.cs

  VMSolidus

  committed
  2e706d1

  Copy full SHA for 2e706d1

• Update Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs

  Show description for 96174af
  

  VMSolidus

  and

  DangerRevolution

  committed
  96174af

  Copy full SHA for 96174af

• remove downstream comments

  VMSolidus

  committed
  60f76ea

  Copy full SHA for 60f76ea

• Giving pyrokinesis back to ifrit, and setting up base caster stat bonuses to roundstart casters

  VMSolidus

  committed
  a5c6210

  Copy full SHA for a5c6210

• Update familiars.yml

  VMSolidus

  committed
  c703766

  Copy full SHA for c703766

• Update PsionicRegenerationPowerSystem.cs

  VMSolidus

  committed
  e4163c6

  Copy full SHA for e4163c6

• Revert "Merge branch 'master' of https://github.com/VMSolidus/Einstein-Engines"

  Show description for 6539713
  VMSolidus

  committed
  6539713

  Copy full SHA for 6539713

• Revert "what"

  Show description for f59b62e
  VMSolidus

  committed
  f59b62e

  Copy full SHA for f59b62e

• Mirror: Trading Outpost now has half buy-only and half sell-only pallets (#191)

  Show description for 409f5fa
  

  SimpleStation14

  authored and

  VMSolidus

  committed
  409f5fa

  Copy full SHA for 409f5fa

• Update Credits (#437)

  Show description for 7240412
  

  3 peopleauthored and

  VMSolidus

  committed
  7240412

  Copy full SHA for 7240412

• Corpo Jacket Fixes (#462)

  Show description for 32328cb
  

  Pspritechologist

  authored and

  VMSolidus

  committed
  32328cb

  Copy full SHA for 32328cb

• Default to Separated UI Layout (#433)

  Show description for 3bae97d
  

  DEATHB4DEFEAT

  authored and

  VMSolidus

  committed
  3bae97d

  Copy full SHA for 3bae97d

• Build doc cleanup (#470)

  Show description for 34e5669
  

  stellar-novas

  authored and

  VMSolidus

  committed
  34e5669

  Copy full SHA for 34e5669

• Move Changelog Bot to Changelogs Directory (#469)

  

  DEATHB4DEFEAT

  authored and

  VMSolidus

  committed
  5b69766

  Copy full SHA for 5b69766

• Port Frictionless Space (#464)

  Show description for d34f64b
  

  VMSolidus

  and

  DEATHB4DEFEAT

  committed
  d34f64b

  Copy full SHA for d34f64b

• Mirror: Landmine stepoff (#358)

  Show description for cef74f3
  

  SimpleStation14

  and

  VMSolidus

  committed
  cef74f3

  Copy full SHA for cef74f3

• Workflow to Automatically Title Case PRs (#468)

  Show description for c03835e
  

  DEATHB4DEFEAT

  authored and

  VMSolidus

  committed
  c03835e

  Copy full SHA for c03835e

• Revert "Merge branch 'master' of https://github.com/VMSolidus/Einstein-Engines"

  Show description for 17cf334
  VMSolidus

  committed
  17cf334

  Copy full SHA for 17cf334

• Reapply "Merge branch 'master' of https://github.com/VMSolidus/Einstein-Engines"

  Show description for df88298
  VMSolidus

  committed
  df88298

  Copy full SHA for df88298

• Fix PRTitleCase Workflow (#472)

  Show description for 8d72195
  

  DEATHB4DEFEAT

  authored and

  VMSolidus

  committed
  8d72195

  Copy full SHA for 8d72195

• Port Station Goals (#465)

  Show description for bc93199
  

  3 peoplecommitted
  bc93199

  Copy full SHA for bc93199

• Automatic Changelog Update (#465)

  

  SimpleStation14

  authored and

  VMSolidus

  committed
  70badaa

  Copy full SHA for 70badaa

• Harpy Peacock Tail (#428)

  Show description for d1cae9a
  

  VMSolidus

  and

  DangerRevolution

  committed
  d1cae9a

  Copy full SHA for d1cae9a

• Automatic Changelog Update (#428)

  

  SimpleStation14

  authored and

  VMSolidus

  committed
  90bca5a

  Copy full SHA for 90bca5a

• Port Randomly Fire Dropped Weapons (#471)

  Show description for af3a963
  VMSolidus

  committed
  af3a963

  Copy full SHA for af3a963

• Automatic Changelog Update (#471)

  

  SimpleStation14

  authored and

  VMSolidus

  committed
  97f1960

  Copy full SHA for 97f1960

• Port Random Bark System (#466)

  Show description for 2177160
  

  VMSolidus

  and

  DEATHB4DEFEAT

  committed
  2177160

  Copy full SHA for 2177160

• Automatic Changelog Update (#466)

  

  SimpleStation14

  authored and

  VMSolidus

  committed
  a17fb08

  Copy full SHA for a17fb08

• Mirror 26250: Make all implants unable to be implanted more than once (#445)

  Show description for 80217d6
  

  SimpleStation14

  authored and

  VMSolidus

  committed
  80217d6

  Copy full SHA for 80217d6

• Mirror: Bumps LoneOps minimum required players to 20 (#263)

  Show description for 87084f8
  

  SimpleStation14

  authored and

  VMSolidus

  committed
  87084f8

  Copy full SHA for 87084f8

• Trait Points (#434)

  Show description for ff9fe08
  

  DEATHB4DEFEAT

  and

  VMSolidus

  committed
  ff9fe08

  Copy full SHA for ff9fe08

• Automatic Changelog Update (#434)

  

  SimpleStation14

  authored and

  VMSolidus

  committed
  d0bf466

  Copy full SHA for d0bf466

• Revert "Merge remote-tracking branch 'upstream/master' into Additional-Loadout-Items"

  Show description for 02427b4
  VMSolidus

  committed
  02427b4

  Copy full SHA for 02427b4

• Revert "Merge branch 'master' into Additional-Loadout-Items"

  Show description for e6e1e46
  VMSolidus

  committed
  e6e1e46

  Copy full SHA for e6e1e46

• Merge remote-tracking branch 'upstream/master' into Additional-Loadout-Items

  VMSolidus

  committed
  4c2129f

  Copy full SHA for 4c2129f

• Merging with species listing

  VMSolidus

  committed
  a76045e

  Copy full SHA for a76045e

• Character instead of Loadout now

  VMSolidus

  committed
  e467fdf

  Copy full SHA for e467fdf

• Update categories.yml

  VMSolidus

  committed
  4bd700c

  Copy full SHA for 4bd700c

• Traits plural and species singular

  VMSolidus

  committed
  c43866b

  Copy full SHA for c43866b

• Update security.yml

  VMSolidus

  committed
  8d55d8c

  Copy full SHA for 8d55d8c

• Mistake in death code that wasn't caught by the tests until an item failed it

  VMSolidus

  committed
  f4289f9

  Copy full SHA for f4289f9

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

  VMSolidus

  authored
  02d528e

  Copy full SHA for 02d528e

• Now featuring trait points

  VMSolidus

  committed
  e6e69c0

  Copy full SHA for e6e69c0

• Update loadouts per feedback

  VMSolidus

  committed
  a1d2081

  Copy full SHA for a1d2081

Commits on Jun 22, 2024

• Upstream Merge

  VMSolidus

  committed
  c5301df

  Copy full SHA for c5301df

• Merge remote-tracking branch 'EE-Personal/Additional-Loadout-Items' into upstream-merge-6-22-2024

  VMSolidus

  committed
  fd2e167

  Copy full SHA for fd2e167

• Merge remote-tracking branch 'EE-Personal/Psionic-Power-Refactor' into upstream-merge-6-22-2024

  VMSolidus

  committed
  375e502

  Copy full SHA for 375e502

• Merge remote-tracking branch 'EE-Personal/The-Great-Massening-Guns' into upstream-merge-6-22-2024

  VMSolidus

  committed
  2026495

  Copy full SHA for 2026495

• Merge remote-tracking branch 'EE-Personal/MassContests-Remake' into upstream-merge-6-22-2024

  VMSolidus

  committed
  3030ea1

  Copy full SHA for 3030ea1

• Merge remote-tracking branch 'EE-Personal/port-of-height-sliders' into upstream-merge-6-22-2024

  VMSolidus

  committed
  abc0dad

  Copy full SHA for abc0dad

• Mass Contests

  VMSolidus

  committed
  586aaa4

  Copy full SHA for 586aaa4

• Merge branch 'master' into upstream-merge-6-22-2024

  VMSolidus

  authored
  9f46ddc

  Copy full SHA for 9f46ddc

• Update trash_drinks.yml

  VMSolidus

  committed
  7255f1d

  Copy full SHA for 7255f1d