Code

Merge upstream 5 29 2024#10

Code

Merged

Peptide90 merged 122 commits intoSS14-Classic:masterSS14-Classic/deep-station-14:masterfrom VMSolidus:Merge-upstream-5-29-2024Copy head branch name to clipboardMay 29, 2024

+6,840-5,051

Commits

Commits on Apr 25, 2024

• Initial Port

  VMSolidus

  committed
  4043f1b

  Copy full SHA for 4043f1b

• Should fix test fail

  VMSolidus

  committed
  158b8d9

  Copy full SHA for 158b8d9

Commits on Apr 26, 2024

• Edge with Experimental Supermatter Engine

  VMSolidus

  committed
  7527bdd

  Copy full SHA for 7527bdd

• Update edge.yml

  VMSolidus

  committed
  4089288

  Copy full SHA for 4089288

• New edge by Colintel

  VMSolidus

  committed
  a9d8b6b

  Copy full SHA for a9d8b6b

• Update edge.yml

  VMSolidus

  committed
  bf337fe

  Copy full SHA for bf337fe

• Update edge.yml

  VMSolidus

  committed
  07d94cb

  Copy full SHA for 07d94cb

Commits on Apr 29, 2024

• Physics based air throws

  VMSolidus

  committed
  4212fbb

  Copy full SHA for 4212fbb

• Update base_structureclosets.yml

  VMSolidus

  committed
  bddb87b

  Copy full SHA for bddb87b

• Updates for review

  VMSolidus

  committed
  162c284

  Copy full SHA for 162c284

• Hello, this is an asymptote. Divide by zero must be an exit condition.

  VMSolidus

  committed
  3374757

  Copy full SHA for 3374757

• Adding the clamp back in

  VMSolidus

  committed
  3dc71fb

  Copy full SHA for 3dc71fb

Commits on Apr 30, 2024

• better sound looping

  VMSolidus

  committed
  0b428dc

  Copy full SHA for 0b428dc

Commits on May 1, 2024

• I found another small optimization

  VMSolidus

  committed
  b3c503c

  Copy full SHA for b3c503c

• Another one

  VMSolidus

  committed
  68e0510

  Copy full SHA for 68e0510

Commits on May 3, 2024

• guh

  VMSolidus

  committed
  6099c11

  Copy full SHA for 6099c11

• Psionic Refactor pt 1

  VMSolidus

  committed
  89d58ed

  Copy full SHA for 89d58ed

• Last bit

  VMSolidus

  committed
  afaedd2

  Copy full SHA for afaedd2

• Last one missed

  VMSolidus

  committed
  1566ee5

  Copy full SHA for 1566ee5

• I accidentally sent the DeltaV legacy version of these

  VMSolidus

  committed
  c832f5f

  Copy full SHA for c832f5f

Commits on May 4, 2024

• Update edge.yml

  VMSolidus

  committed
  185a63b

  Copy full SHA for 185a63b

• New Cvar

  VMSolidus

  committed
  9e7aa5d

  Copy full SHA for 9e7aa5d

• Update comments for documentation

  VMSolidus

  committed
  3d03262

  Copy full SHA for 3d03262

Commits on May 6, 2024

• Apply suggestions from code review

  Show description for 67fdaff
  

  VMSolidus

  and

  DEATHB4DEFEAT

  authored
  67fdaff

  Copy full SHA for 67fdaff

Commits on May 10, 2024

• Update supermatter

  VMSolidus

  committed
  79e9664

  Copy full SHA for 79e9664

Commits on May 14, 2024

• Finishing Mind Swap rework

  VMSolidus

  committed
  827bdb2

  Copy full SHA for 827bdb2

• Noospheric Zap updating

  VMSolidus

  committed
  22f405b

  Copy full SHA for 22f405b

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

  VMSolidus

  authored
  54e7521

  Copy full SHA for 54e7521

Commits on May 15, 2024

• Almost done

  VMSolidus

  committed
  f50f9df

  Copy full SHA for f50f9df

• guh

  VMSolidus

  committed
  834e0eb

  Copy full SHA for 834e0eb

• More migrations

  VMSolidus

  committed
  372671e

  Copy full SHA for 372671e

• Final migrations

  VMSolidus

  committed
  f3bc3d8

  Copy full SHA for f3bc3d8

• Last set of migrations

  VMSolidus

  committed
  303d1b3

  Copy full SHA for 303d1b3

• Update PsionicsSystem.cs

  VMSolidus

  committed
  62163f0

  Copy full SHA for 62163f0

• Almost got it, one last bug to squash

  VMSolidus

  committed
  83ea6ac

  Copy full SHA for 83ea6ac

• slightly more acccurate but still not quite right

  VMSolidus

  committed
  c569e2e

  Copy full SHA for c569e2e

• Update PyrokinesisPowerSystem.cs

  VMSolidus

  committed
  851beba

  Copy full SHA for 851beba

• removing some errant instances of potentialpsionic

  VMSolidus

  committed
  0597405

  Copy full SHA for 0597405

• Revert "removing some errant instances of potentialpsionic"

  Show description for f96847f
  VMSolidus

  committed
  f96847f

  Copy full SHA for f96847f

• Final power update

  VMSolidus

  committed
  0e11da6

  Copy full SHA for 0e11da6

• Update psionicPowers.yml

  VMSolidus

  authored
  d177e55

  Copy full SHA for d177e55

• Update psionic.ftl

  VMSolidus

  committed
  685fc5f

  Copy full SHA for 685fc5f

• some more small tweaks

  VMSolidus

  committed
  0d37ceb

  Copy full SHA for 0d37ceb

• Update PotentialPsionicComponent.cs

  VMSolidus

  committed
  324082a

  Copy full SHA for 324082a

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

  Show description for 952b7e2
  

  VMSolidus

  and

  DangerRevolution

  authored
  952b7e2

  Copy full SHA for 952b7e2

• Update PsionicAbilitiesSystem.cs

  VMSolidus

  committed
  1a1c62a

  Copy full SHA for 1a1c62a

• Merge branch 'Psionic-Power-Refactor' of https://github.com/VMSolidus/Einstein-Engines into Psionic-Power-Refactor

  VMSolidus

  committed
  d53708c

  Copy full SHA for d53708c

• remove downstream comments

  VMSolidus

  committed
  e4f387d

  Copy full SHA for e4f387d

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

  VMSolidus

  committed
  f5bf4d5

  Copy full SHA for f5bf4d5

• Update familiars.yml

  VMSolidus

  committed
  626f2a5

  Copy full SHA for 626f2a5

Commits on May 16, 2024

• MORE

  VMSolidus

  committed
  6cc4704

  Copy full SHA for 6cc4704

• Update AtmosphereSystem.HighPressureDelta.cs

  VMSolidus

  committed
  54ca8ce

  Copy full SHA for 54ca8ce

• guh, last push

  VMSolidus

  committed
  7500efd

  Copy full SHA for 7500efd

• Merge branch 'Simple-Station:master' into Atmos-optimization-test

  VMSolidus

  authored
  3440636

  Copy full SHA for 3440636

• Fix for objects getting stuck on walls, new CVar for more expensive airflow option.

  VMSolidus

  committed
  7470ba7

  Copy full SHA for 7470ba7

• Update animals.yml

  VMSolidus

  committed
  b328725

  Copy full SHA for b328725

• Fix tiny mobs boiling themselves to death

  VMSolidus

  committed
  f7e2f70

  Copy full SHA for f7e2f70

Commits on May 28, 2024

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

  VMSolidus

  authored
  c591bc3

  Copy full SHA for c591bc3

• 1984'ing GlobalRollforward (#423)

  Show description for d041011
  VMSolidus

  authored
  d041011

  Copy full SHA for d041011

• Listening Post Earlier Start (#409)

  Show description for 7876728
  VMSolidus

  authored
  7876728

  Copy full SHA for 7876728

• Automatic Changelog Update (#409)

  SimpleStation14

  committed
  68c8a5e

  Copy full SHA for 68c8a5e

• Mirror: Add Prometheus stats for admin count (#323)

  Show description for 4123236
  SimpleStation14

  authored
  4123236

  Copy full SHA for 4123236

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

  VMSolidus

  authored
  4567016

  Copy full SHA for 4567016

• Walls/Windows Resprites! (#402)

  Show description for 16fa1ca
  FoxxoTrystan

  authored
  16fa1ca

  Copy full SHA for 16fa1ca

Commits on May 29, 2024

• Radio Resprites! (#404)

  Show description for 84163c9
  FoxxoTrystan

  authored
  84163c9

  Copy full SHA for 84163c9

• Merge branch 'master' into Atmos-optimization-test

  Show description for 53d221f
  VMSolidus

  authored
  53d221f

  Copy full SHA for 53d221f

• Automatic Changelog Update (#402)

  SimpleStation14

  committed
  068ee52

  Copy full SHA for 068ee52

• Automatic Changelog Update (#404)

  SimpleStation14

  committed
  08c8a73

  Copy full SHA for 08c8a73

• Mirror: Change Syndie Monkey Price 8-6 TC (#243)

  Show description for 67df38e
  SimpleStation14

  authored
  67df38e

  Copy full SHA for 67df38e

• Mirror: Updated the TEG page (#260)

  Show description for 8629041
  

  SimpleStation14

  and

  VMSolidus

  authored
  8629041

  Copy full SHA for 8629041

• Mirror: Red Neck Gaiter (#214)

  Show description for b7583b3
  

  SimpleStation14

  and

  VMSolidus

  authored
  b7583b3

  Copy full SHA for b7583b3

• Mirror: Add PVS command permissions (#207)

  Show description for 6657aea
  

  SimpleStation14

  and

  VMSolidus

  authored
  6657aea

  Copy full SHA for 6657aea

• Mirror: fix admin verb to set unspawned ballisic ammo count (#375)

  Show description for 159ebe4
  SimpleStation14

  authored
  159ebe4

  Copy full SHA for 159ebe4

• Glorious Tools! (#407)

  Show description for af3d935
  FoxxoTrystan

  authored
  af3d935

  Copy full SHA for af3d935

• Mirror: new book - Tales of a Tired Janitor (#278)

  Show description for 470c75b
  

  SimpleStation14

  and

  VMSolidus

  authored
  470c75b

  Copy full SHA for 470c75b

• Automatic Changelog Update (#407)

  SimpleStation14

  committed
  c21bdce

  Copy full SHA for c21bdce

• Add More Suggested VSCode Extensions (#414)

  Show description for 4fdfd6f
  

  DEATHB4DEFEAT

  and

  DangerRevolution

  authored
  4fdfd6f

  Copy full SHA for 4fdfd6f

• Mirror: Obsolete Logger cleanup for EntitySystems part 2 (#237)

  Show description for a22601c
  

  SimpleStation14

  and

  VMSolidus

  authored
  a22601c

  Copy full SHA for a22601c

• Mirror: CargoConsoleMenu localization (#127)

  Show description for a8242a3
  

  3 peopleauthored
  a8242a3

  Copy full SHA for a8242a3

• Updates spawners with new content (#86)

  Show description for 9c08775
  

  4 peopleauthored
  9c08775

  Copy full SHA for 9c08775

• Update PsionicRegenerationPowerSystem.cs

  VMSolidus

  committed
  3584a4e

  Copy full SHA for 3584a4e

• Merge branch 'VMSolidus-Psionic-Power-Refactor'

  VMSolidus

  committed
  15fc457

  Copy full SHA for 15fc457

• Revert "Merge branch 'VMSolidus-Psionic-Power-Refactor'"

  Show description for d439c5a
  VMSolidus

  committed
  d439c5a

  Copy full SHA for d439c5a

• Update PsionicRegenerationPowerSystem.cs

  VMSolidus

  committed
  3f44f9d

  Copy full SHA for 3f44f9d

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

  Show description for 0984fde
  VMSolidus

  authored
  0984fde

  Copy full SHA for 0984fde

• aaaaaaaaa

  VMSolidus

  committed
  462e91c

  Copy full SHA for 462e91c

• Merge branch 'Psionic-Power-Refactor' of https://github.com/VMSolidus/Einstein-Engines into Psionic-Power-Refactor

  VMSolidus

  committed
  6fafc34

  Copy full SHA for 6fafc34

• Update PsionicRegenerationPowerSystem.cs

  VMSolidus

  committed
  c4db831

  Copy full SHA for c4db831

• fun pvs fixes

  VMSolidus

  committed
  cefe228

  Copy full SHA for cefe228

• Mirror: Fixes store purchase events and adds support to raise a directed event (#364)

  Show description for 8223dca
  SimpleStation14

  authored
  8223dca

  Copy full SHA for 8223dca

• Mirror: Adds logging for refunds (#275)

  Show description for 2affb3e
  

  SimpleStation14

  and

  VMSolidus

  authored
  2affb3e

  Copy full SHA for 2affb3e

• Mirror: Fix artifact report guidebook info (#268)

  Show description for 28a7f19
  

  SimpleStation14

  and

  VMSolidus

  authored
  28a7f19

  Copy full SHA for 28a7f19

• Mirror: More good looking inventory part 2.2 (instruments version) (#189)

  Show description for 2ca6be7
  

  SimpleStation14

  and

  VMSolidus

  authored
  2ca6be7

  Copy full SHA for 2ca6be7

• Mirror: Syringes that spawn with content start in inject mode (#129)

  Show description for 2bbf7ad
  

  3 peopleauthored
  2bbf7ad

  Copy full SHA for 2bbf7ad

• Mirror: Fix vox custom sprites (#186)

  Show description for 4e8c3ca
  SimpleStation14

  authored
  4e8c3ca

  Copy full SHA for 4e8c3ca

• Mirror: Code cleanup: Purge calls to obsolete EntityCoordinates methods (#289)

  Show description for 3b2a19d
  

  SimpleStation14

  and

  VMSolidus

  authored
  3b2a19d

  Copy full SHA for 3b2a19d

• Merge branch 'master' into Atmos-optimization-test

  Show description for eba2d1d
  VMSolidus

  authored
  eba2d1d

  Copy full SHA for eba2d1d

• Mirror: Snore is a trait now (#299)

  Show description for a58b815
  SimpleStation14

  authored
  a58b815

  Copy full SHA for a58b815

• Mirror: Sanitize "ig" (#298)

  Show description for 3bf69bf
  SimpleStation14

  authored
  3bf69bf

  Copy full SHA for 3bf69bf

• Mirror: Fix placement mode on chairs (#183)

  Show description for ef7f58f
  

  SimpleStation14

  and

  VMSolidus

  authored
  ef7f58f

  Copy full SHA for ef7f58f

• Mirror: Fix mice steering (#134)

  Show description for 6ca11bd
  

  3 peopleauthored
  6ca11bd

  Copy full SHA for 6ca11bd

• Mirror: Create DeviceNetworkJammerComponent & System as a general way for entities to act as jammers (#382)

  Show description for 2fb4c5e
  

  SimpleStation14

  and

  VMSolidus

  authored
  2fb4c5e

  Copy full SHA for 2fb4c5e

• Mirror: Irish Coffee Recipe Tweak (#302)

  Show description for 3898d09
  

  SimpleStation14

  and

  VMSolidus

  authored
  3898d09

  Copy full SHA for 3898d09

• Mirror: Adds craftable ducky slippers (#261)

  Show description for 75106b3
  

  SimpleStation14

  and

  VMSolidus

  authored
  75106b3

  Copy full SHA for 75106b3

• Mirror: Fix anomaly decay logs (#227)

  Show description for ec3986b
  

  SimpleStation14

  and

  VMSolidus

  authored
  ec3986b

  Copy full SHA for ec3986b

• Mirror: Use entity queries in ambient sound & power receiver systems (#376)

  Show description for 4e8365c
  

  SimpleStation14

  and

  VMSolidus

  authored
  4e8365c

  Copy full SHA for 4e8365c

• Mirror: Fix wire layout inheritance. (#284)

  Show description for 5c2cff0
  

  SimpleStation14

  and

  DangerRevolution

  authored
  5c2cff0

  Copy full SHA for 5c2cff0

• Mirror: Per-department wire layouts (#285)

  Show description for b61bdca
  

  SimpleStation14

  and

  VMSolidus

  authored
  b61bdca

  Copy full SHA for b61bdca

• Mirror: Run fixgridatmos for cargo & emergency shuttle (#361)

  Show description for 23c0e98
  

  SimpleStation14

  and

  VMSolidus

  authored
  23c0e98

  Copy full SHA for 23c0e98

• Merge upstream from EE

  VMSolidus

  committed
  1b0a746

  Copy full SHA for 1b0a746

• Merge branch 'master' into Merge-upstream-5-29-2024

  VMSolidus

  authored
  c3657a9

  Copy full SHA for c3657a9

• Update Submodule

  VMSolidus

  committed
  bcc8e33

  Copy full SHA for bcc8e33

• Merge branch 'Merge-upstream-5-29-2024' of https://github.com/VMSolidus/deep-station-14 into Merge-upstream-5-29-2024

  VMSolidus

  committed
  bd35b92

  Copy full SHA for bd35b92

• changing IDs is bad but eh

  VMSolidus

  committed
  c2f4c1c

  Copy full SHA for c2f4c1c

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

  VMSolidus

  authored
  84e4d10

  Copy full SHA for 84e4d10

• Psychic refactor

  VMSolidus

  committed
  e6fcde6

  Copy full SHA for e6fcde6

• Psychic refactor

  VMSolidus

  committed
  858fac4

  Copy full SHA for 858fac4

• update supermatter

  VMSolidus

  committed
  eebe035

  Copy full SHA for eebe035

• update space wind

  VMSolidus

  committed
  208656f

  Copy full SHA for 208656f

• Update research_director.yml

  VMSolidus

  committed
  369bf0a

  Copy full SHA for 369bf0a

• Update DispelPowerSystem.cs

  VMSolidus

  committed
  441c5db

  Copy full SHA for 441c5db

• Update familiars.yml

  VMSolidus

  committed
  1da4c07

  Copy full SHA for 1da4c07