Code

Merge Upstream#41

Code

Closed

sleepyyapril wants to merge 108 commits intoGoob-Station:masterGoob-Station/Goob-Station-MRP:masterfrom sleepyyapril:merge-upstreamsleepyyapril/Goob-Station-MRP:merge-upstreamCopy head branch name to clipboard

+61,683-59,480

Commits

Commits on Jan 4, 2025

• Station AI (#30944)

  Show description for d8ae58e
  

  metalgearsloth

  authored and

  sleepyyapril

  committed
  d8ae58e

  Copy full SHA for d8ae58e

• Verb tweaks (#31309)

  Show description for c866ffb
  

  metalgearsloth

  authored and

  sleepyyapril

  committed
  c866ffb

  Copy full SHA for c866ffb

• ItemToggle + slots stuff (#31312)

  Show description for d6b0b99
  

  metalgearsloth

  authored and

  sleepyyapril

  committed
  d6b0b99

  Copy full SHA for d6b0b99

• Station AI (#30944)

  Show description for 56451fa
  

  ElectroJr

  authored and

  sleepyyapril

  committed
  56451fa

  Copy full SHA for 56451fa

• Move SleepingSystem to Shared & cleanup (#28672)

  Show description for bdafdeb
  

  Tayrtahn

  authored and

  sleepyyapril

  committed
  bdafdeb

  Copy full SHA for bdafdeb

• Potentially re-add EE changes?

  sleepyyapril

  committed
  ede16f0

  Copy full SHA for ede16f0

• Fix build errors

  sleepyyapril

  committed
  661bdba

  Copy full SHA for 661bdba

• Add ContainerComp (#31311)

  Show description for 006acf3
  

  metalgearsloth

  authored and

  sleepyyapril

  committed
  006acf3

  Copy full SHA for 006acf3

• Localize ai dataset names (#33608)

  Show description for b7e34aa
  

  2 peopleauthored and

  sleepyyapril

  committed
  b7e34aa

  Copy full SHA for b7e34aa

• Add LocalizedDatasetPrototype (#28310)

  

  Tayrtahn

  authored and

  sleepyyapril

  committed
  b8e2844

  Copy full SHA for b8e2844

• SetStationAiName for testing

  sleepyyapril

  committed
  c9e0e5d

  Copy full SHA for c9e0e5d

• Use EntityManager.System<>

  sleepyyapril

  committed
  0334cc6

  Copy full SHA for 0334cc6

• Re-add improved random sentience event (#29123)

  Show description for 00adaa3
  

  Psychpsyo

  authored and

  sleepyyapril

  committed
  00adaa3

  Copy full SHA for 00adaa3

• no name!

  

  Psychpsyo

  authored and

  sleepyyapril

  committed
  b262e8f

  Copy full SHA for b262e8f

• fix shitcode

  sleepyyapril

  committed
  385b667

  Copy full SHA for 385b667

• HideSpawnMenu

  sleepyyapril

  committed
  f5e6583

  Copy full SHA for f5e6583

• Merge branch 'master' into station-ai

  sleepyyapril

  authored
  1b7d820

  Copy full SHA for 1b7d820

• Yippee

  sleepyyapril

  committed
  1ad367b

  Copy full SHA for 1ad367b

• Merge branch 'station-ai' of https://github.com/sleepyyapril/Einstein-Engines into station-ai

  sleepyyapril

  committed
  1f416da

  Copy full SHA for 1f416da

Commits on Jan 5, 2025

• The Den Mass Cherry-Pick 01/06/25 (#1443)

  Show description for ca0b40a
  

  angelofallars

  and

  sleepyyapril

  authored
  ca0b40a

  Copy full SHA for ca0b40a

• Automatic Changelog Update (#1443)

  SimpleStation14

  committed
  975c905

  Copy full SHA for 975c905

• Merge branch 'master' into station-ai

  VMSolidus

  authored
  632cf60

  Copy full SHA for 632cf60

Commits on Jan 7, 2025

• Fix Humanoid Color (#1454)

  Show description for 760596d
  Spatison

  authored
  760596d

  Copy full SHA for 760596d

• Automatic Changelog Update (#1454)

  SimpleStation14

  committed
  f6dec10

  Copy full SHA for f6dec10

• Make Non-Verbal Langs Not Play Speech (#1448)

  Show description for 990a57c
  

  4 peopleauthored
  990a57c

  Copy full SHA for 990a57c

• Automatic Changelog Update (#1448)

  SimpleStation14

  committed
  5353363

  Copy full SHA for 5353363

• [Port] Add Time Transfer Panel From Goobstation (#1429)

  Show description for a05bbce
  

  4 peopleauthored
  a05bbce

  Copy full SHA for a05bbce

• Automatic Changelog Update (#1429)

  SimpleStation14

  committed
  bac302c

  Copy full SHA for bac302c

• Fix Toolshed Crash (#1415)

  Show description for f026528
  

  sleepyyapril

  and

  ElectroJr

  authored
  f026528

  Copy full SHA for f026528

Commits on Jan 8, 2025

• NanoChat QoL And Bug Fixes (#1460)

  Show description for f11d2e7
  angelofallars

  authored
  f11d2e7

  Copy full SHA for f11d2e7

• Automatic Changelog Update (#1460)

  SimpleStation14

  committed
  747cb50

  Copy full SHA for 747cb50

• Increase Title/Content Text Limits For News Articles (#1447)

  Show description for f80f954
  angelofallars

  authored
  f80f954

  Copy full SHA for f80f954

• Automatic Changelog Update (#1447)

  SimpleStation14

  committed
  4a806c8

  Copy full SHA for 4a806c8

• Chem Colors (#1461)

  Show description for e733fa0
  

  aspiringLich

  and

  sleepyyapril

  authored
  e733fa0

  Copy full SHA for e733fa0

• Automatic Changelog Update (#1461)

  SimpleStation14

  committed
  64d4323

  Copy full SHA for 64d4323

• Fix Cybersun Pen Damage (#1459)

  Show description for 089a45e
  angelofallars

  authored
  089a45e

  Copy full SHA for 089a45e

• Automatic Changelog Update (#1459)

  SimpleStation14

  committed
  bea6ca7

  Copy full SHA for bea6ca7

• Fixed Shadow Shackles Not Activating for Blood Cultists (#1456)

  Show description for 70f7298
  Lumminal

  authored
  70f7298

  Copy full SHA for 70f7298

• Automatic Changelog Update (#1456)

  SimpleStation14

  committed
  442e25b

  Copy full SHA for 442e25b

• Fix Face Markings Rendering Above Clothing (#1467)

  Show description for 8b5eec7
  angelofallars

  authored
  8b5eec7

  Copy full SHA for 8b5eec7

• Automatic Changelog Update (#1467)

  SimpleStation14

  committed
  998e0ea

  Copy full SHA for 998e0ea

Commits on Jan 9, 2025

• Prisoner Headset Box in Warden's Locker (#1470)

  Show description for b39e126
  Lumminal

  authored
  b39e126

  Copy full SHA for b39e126

• Automatic Changelog Update (#1470)

  SimpleStation14

  committed
  4907639

  Copy full SHA for 4907639

Commits on Jan 10, 2025

• Adds Missing Lathe Recipes (#1472)

  Show description for 86296da
  BlueHNT

  authored
  86296da

  Copy full SHA for 86296da

• Some Surgery Fixs (#1471)

  Show description for b89412a
  Spatison

  authored
  b89412a

  Copy full SHA for b89412a

• Automatic Changelog Update (#1472)

  SimpleStation14

  committed
  77a7295

  Copy full SHA for 77a7295

• Automatic Changelog Update (#1471)

  SimpleStation14

  committed
  ba616f0

  Copy full SHA for ba616f0

• Night And Thermal Vision (#1462)

  Show description for 0f48142
  

  Spatison

  and

  PuroSlavKing

  authored
  0f48142

  Copy full SHA for 0f48142

• Automatic Changelog Update (#1462)

  SimpleStation14

  committed
  83fa923

  Copy full SHA for 83fa923

• Merge branch 'master' into station-ai

  Show description for 9c65527
  VMSolidus

  authored
  9c65527

  Copy full SHA for 9c65527

• CyberEyes Night Vision And Thermal Vision Modules (#1477)

  Show description for b38b7f9
  VMSolidus

  authored
  b38b7f9

  Copy full SHA for b38b7f9

• Automatic Changelog Update (#1477)

  SimpleStation14

  committed
  7f32e00

  Copy full SHA for 7f32e00

Commits on Jan 11, 2025

• Assay Psionic Power (#1450)

  Show description for df8ffb0
  

  4 peopleauthored
  df8ffb0

  Copy full SHA for df8ffb0

• Automatic Changelog Update (#1450)

  SimpleStation14

  committed
  f0a9bbd

  Copy full SHA for f0a9bbd

• Update dev_map.yml

  VMSolidus

  committed
  6941a01

  Copy full SHA for 6941a01

• How the fuck did AI not have these?

  VMSolidus

  committed
  5a13b27

  Copy full SHA for 5a13b27

• I managed to get both AI Latejoin and Prisoner Latejoin working at the same time

  

  metalgearsloth

  authored and

  VMSolidus

  committed
  0b0e9a8

  Copy full SHA for 0b0e9a8

• Make AI Not Spawn With Clothes

  VMSolidus

  committed
  5242ceb

  Copy full SHA for 5242ceb

• Station AI (#1423)

  Show description for 6903924
  VMSolidus

  authored
  6903924

  Copy full SHA for 6903924

• Automatic Changelog Update (#1423)

  SimpleStation14

  committed
  14f738d

  Copy full SHA for 14f738d

• Hiding and clearing department prototype code (#28114)

  Show description for d662644
  Peptide90

  committed
  d662644

  Copy full SHA for d662644

• Meta with AI

  Mike32oz

  committed
  a89b6cb

  Copy full SHA for a89b6cb

• Fixup playerspawn stuff (#31546)

  Show description for 1a6bd6f
  

  Fildrance

  authored and

  VMSolidus

  committed
  1a6bd6f

  Copy full SHA for 1a6bd6f

• feat: now when research is unlocked in console, approver of reasearch is radio-ed too (#31170)

  Show description for a906ed7
  

  2 peopleauthored and

  VMSolidus

  committed
  a906ed7

  Copy full SHA for a906ed7

• Update SharedStationAiSystem.Held.cs

  VMSolidus

  committed
  c4d14da

  Copy full SHA for c4d14da

• Update SharedStationAiSystem.Held.cs

  VMSolidus

  committed
  d7317a7

  Copy full SHA for d7317a7

• add access reader log wire (#29094)

  Show description for f293d7e
  

  deltanedas

  authored and

  VMSolidus

  committed
  f293d7e

  Copy full SHA for f293d7e

• Update AccessReaderSystem.cs

  VMSolidus

  committed
  1709427

  Copy full SHA for 1709427

• wheeee

  VMSolidus

  committed
  0f7a662

  Copy full SHA for 0f7a662

• Meta with AI (#1484)

  Show description for e2526ec
  VMSolidus

  authored
  e2526ec

  Copy full SHA for e2526ec

• Automatic Changelog Update (#1484)

  SimpleStation14

  committed
  12bf563

  Copy full SHA for 12bf563

• Update silicon.yml

  VMSolidus

  committed
  0ce4d63

  Copy full SHA for 0ce4d63

• Hiding and Clearing Department Prototype Code (#28114) (#1483)

  Show description for fa35a3a
  VMSolidus

  authored
  fa35a3a

  Copy full SHA for fa35a3a

• Fix Ai Accessible Consoles (#1485)

  Show description for 81bab8a
  VMSolidus

  authored
  81bab8a

  Copy full SHA for 81bab8a

• Add Station AI To Gax (#1486)

  Show description for 19f894d
  VMSolidus

  authored
  19f894d

  Copy full SHA for 19f894d

• Automatic Changelog Update (#1486)

  SimpleStation14

  committed
  afa2085

  Copy full SHA for afa2085

• Senior Physician CPR (#1476)

  Show description for 7485e8d
  VMSolidus

  authored
  7485e8d

  Copy full SHA for 7485e8d

• Fix AbsorbentTest & Shadowkin Test Fail (#1458)

  Show description for 2f6f7be
  sleepyyapril

  authored
  2f6f7be

  Copy full SHA for 2f6f7be

• Radstation AI (#1487)

  Show description for 02dfa2e
  VMSolidus

  authored
  02dfa2e

  Copy full SHA for 02dfa2e

• Automatic Changelog Update (#1487)

  SimpleStation14

  committed
  3ebe76e

  Copy full SHA for 3ebe76e

• Porting over My Cruise Control Code From Frontier (#1482)

  Show description for e389dff
  

  neuPanda

  and

  neuPanda

  authored
  e389dff

  Copy full SHA for e389dff

• Automatic Changelog Update (#1482)

  SimpleStation14

  committed
  07401aa

  Copy full SHA for 07401aa

• Port Frontier Guns And The Den PRs For Them (#1490)

  Show description for e2d4a32
  

  3 peopleauthored
  e2d4a32

  Copy full SHA for e2d4a32

• Automatic Changelog Update (#1490)

  SimpleStation14

  committed
  634ace4

  Copy full SHA for 634ace4

• Fix Announcement Spam (#1491)

  Show description for c2c18f5
  sleepyyapril

  authored
  c2c18f5

  Copy full SHA for c2c18f5

• Automatic Changelog Update (#1491)

  SimpleStation14

  committed
  a050d4e

  Copy full SHA for a050d4e

• Material Silo (#1488)

  Show description for 9897094
  

  Spatison

  and

  VMSolidus

  authored
  9897094

  Copy full SHA for 9897094

• Automatic Changelog Update (#1488)

  SimpleStation14

  committed
  289a2a7

  Copy full SHA for 289a2a7

• Add Exclusivity Between Visual Traits and Cyber-Eyes Functionality (#1492)

  Show description for afec1f9
  Tirochora

  authored
  afec1f9

  Copy full SHA for afec1f9

• Automatic Changelog Update (#1492)

  SimpleStation14

  committed
  1547782

  Copy full SHA for 1547782

• Update SharedStationAiSystem.cs (#1494)

  Show description for bcb1ccf
  VMSolidus

  authored
  bcb1ccf

  Copy full SHA for bcb1ccf

• Shadow Shackles Do After (#1466)

  Show description for 7e13e06
  Spatison

  authored
  7e13e06

  Copy full SHA for 7e13e06

• Automatic Changelog Update (#1466)

  SimpleStation14

  committed
  60d7733

  Copy full SHA for 60d7733

• [Fix] Fixed Shadowking Throwing Errors when Spawning as a Random Humanoid Spawner (#1497)

  Show description for 7adee59
  Remuchi

  authored
  7adee59

  Copy full SHA for 7adee59

• Add Station AI And Ore Silo To (Almost) All Maps (#1499)

  Show description for d2ef7e2
  VMSolidus

  authored
  d2ef7e2

  Copy full SHA for d2ef7e2

• Automatic Changelog Update (#1499)

  SimpleStation14

  committed
  3b5303c

  Copy full SHA for 3b5303c

• Remove NPC Stormtrooper Mode (#1500)

  Show description for 1f6e1cb
  VMSolidus

  authored
  1f6e1cb

  Copy full SHA for 1f6e1cb

• Fixes Weather Soundspam(And Crash) (#1501)

  Show description for 28415f1
  VMSolidus

  authored
  28415f1

  Copy full SHA for 28415f1

• Automatic Changelog Update (#1500)

  SimpleStation14

  committed
  2a6107b

  Copy full SHA for 2a6107b

• Automatic Changelog Update (#1501)

  SimpleStation14

  committed
  d7955f5

  Copy full SHA for d7955f5

• PlayTime Unlock Command (#1464)

  Show description for 5ebee12
  sleepyyapril

  authored
  5ebee12

  Copy full SHA for 5ebee12

• Automatic Changelog Update (#1464)

  SimpleStation14

  committed
  5943790

  Copy full SHA for 5943790

• v239.0.0 + .NET 9 (#1475)

  Show description for 64a389a
  

  3 peopleauthored
  64a389a

  Copy full SHA for 64a389a

• Merge branch 'master' of https://github.com/Simple-Station/Einstein-Engines into merge-upstream

  sleepyyapril

  committed
  2966b19

  Copy full SHA for 2966b19

Commits on Jan 12, 2025

• partial

  sleepyyapril

  committed
  3e87f1a

  Copy full SHA for 3e87f1a

• fix

  sleepyyapril

  committed
  745c252

  Copy full SHA for 745c252

• Update AbsorbentComponent

  sleepyyapril

  committed
  0f6e39a

  Copy full SHA for 0f6e39a

• what

  sleepyyapril

  committed
  313123b

  Copy full SHA for 313123b