Code

Merge Upstream #58

Code

Merged

Aidenkrz merged 52 commits intoGoob-Station:masterGoob-Station/Goob-Station-MRP:masterfrom Aidenkrz:mergeupstreamAidenkrz/Doob-Station-MRP:mergeupstreamCopy head branch name to clipboardJan 19, 2025

+6,135-3,331

Commits

Commits on Jan 7, 2025

• adds Cohiba Robusto cigars

  BlueHNT

  committed
  377dfe4

  Copy full SHA for 377dfe4

• Merge branch 'master' into Cuba-Attack

  BlueHNT

  authored
  cd56f10

  Copy full SHA for cd56f10

• yaml unstinked

  BlueHNT

  committed
  1262550

  Copy full SHA for 1262550

• Merge branch 'master' into Cuba-Attack

  sleepyyapril

  authored
  ef55be1

  Copy full SHA for ef55be1

Commits on Jan 9, 2025

• Oh, I am may be are stu-huh? (fixes cigar6-8)

  BlueHNT

  committed
  ef9785d

  Copy full SHA for ef9785d

Commits on Jan 13, 2025

• Merge branch 'master' into Cuba-Attack

  sleepyyapril

  authored
  ca3261a

  Copy full SHA for ca3261a

Commits on Jan 18, 2025

• Fix Sophia Sending a Massive Float to Chat (#1581)

  Show description for 3a6de6c
  sleepyyapril

  authored
  3a6de6c

  Copy full SHA for 3a6de6c

• Automatic Changelog Update (#1581)

  SimpleStation14

  committed
  2ca3ef0

  Copy full SHA for 2ca3ef0

• Make Room for Longer Chem Names. (#1582)

  Show description for 2ce71b4
  sleepyyapril

  authored
  2ce71b4

  Copy full SHA for 2ce71b4

• Automatic Changelog Update (#1582)

  SimpleStation14

  committed
  2bf0c00

  Copy full SHA for 2bf0c00

• IPCs Can Cryo Again (#1583)

  Show description for d326d4c
  sleepyyapril

  authored
  d326d4c

  Copy full SHA for d326d4c

• Automatic Changelog Update (#1583)

  SimpleStation14

  committed
  18dfce3

  Copy full SHA for 18dfce3

• Split All CVars Into Separate Files (#1587)

  Show description for 357f837
  

  VMSolidus

  and

  Simyon264

  authored
  357f837

  Copy full SHA for 357f837

• Add Classic Asimov Laws (#1588)

  Show description for c1c61e9
  

  VMSolidus

  and

  Plykiya

  authored
  c1c61e9

  Copy full SHA for c1c61e9

• Automatic Changelog Update (#1588)

  SimpleStation14

  committed
  f484195

  Copy full SHA for f484195

• ChemMaster+ (#1585)

  Show description for 9baa214
  

  sleepyyapril

  and

  VMSolidus

  authored
  9baa214

  Copy full SHA for 9baa214

• Automatic Changelog Update (#1585)

  SimpleStation14

  committed
  b1490d8

  Copy full SHA for b1490d8

• Remove Default Scream Action (#1589)

  Show description for 48a3233
  VMSolidus

  authored
  48a3233

  Copy full SHA for 48a3233

• Automatic Changelog Update (#1589)

  SimpleStation14

  committed
  595ad86

  Copy full SHA for 595ad86

• Update build-test-debug.yml

  VMSolidus

  committed
  6818344

  Copy full SHA for 6818344

• Update CCVars.Misc.cs (#1590)

  Show description for 12bec92
  VMSolidus

  authored
  12bec92

  Copy full SHA for 12bec92

• Automatic Changelog Update (#1590)

  SimpleStation14

  committed
  568293a

  Copy full SHA for 568293a

• Merge branch 'master' into Ignore-Warnings-In-Tests

  sleepyyapril

  authored
  d9adf3f

  Copy full SHA for d9adf3f

• fix whitelist.enabled test fail

  VMSolidus

  committed
  4866f0f

  Copy full SHA for 4866f0f

• Merge branch 'Ignore-Warnings-In-Tests' of https://github.com/VMSolidus/Einstein-Engines into Ignore-Warnings-In-Tests

  VMSolidus

  committed
  85df476

  Copy full SHA for 85df476

• Update PoolTestLogHandler.cs

  VMSolidus

  committed
  9ab44b0

  Copy full SHA for 9ab44b0

• Fix Cargo Shuttle

  VMSolidus

  committed
  ea182fc

  Copy full SHA for ea182fc

• Fix Lathe Issue

  VMSolidus

  committed
  3856eee

  Copy full SHA for 3856eee

• More various fixes

  VMSolidus

  committed
  166d3f7

  Copy full SHA for 166d3f7

• More Fixes

  VMSolidus

  committed
  13bf44b

  Copy full SHA for 13bf44b

• Network Configurator Fixes (#1592)

  Show description for d7c5e48
  

  3 peopleauthored
  d7c5e48

  Copy full SHA for d7c5e48

• Automatic Changelog Update (#1592)

  SimpleStation14

  committed
  fbf0bf7

  Copy full SHA for fbf0bf7

• aaaaa

  VMSolidus

  committed
  fbc9cc7

  Copy full SHA for fbc9cc7

• Disable Blood Traits For Lamia (#1586)

  Show description for 9d611b5
  VMSolidus

  authored
  9d611b5

  Copy full SHA for 9d611b5

• Automatic Changelog Update (#1586)

  SimpleStation14

  committed
  4ed887f

  Copy full SHA for 4ed887f

• Add mapping editor (#23427)

  Show description for cb6a090
  

  3 peopleauthored and

  VMSolidus

  committed
  cb6a090

  Copy full SHA for cb6a090

• Fix coords monitor in replays (#29512)

  Show description for 3697509
  

  PJB3005

  authored and

  VMSolidus

  committed
  3697509

  Copy full SHA for 3697509

• Fix Airlock Error (#1593)

  Show description for d1fefc0
  

  sleepyyapril

  and

  slarticodefast

  authored
  d1fefc0

  Copy full SHA for d1fefc0

• Merge branch 'master' into Ignore-Warnings-In-Tests

  VMSolidus

  authored
  a8a8395

  Copy full SHA for a8a8395

• Fix verbs in mapping state (#30631)

  

  metalgearsloth

  authored and

  VMSolidus

  committed
  42181ed

  Copy full SHA for 42181ed

Commits on Jan 19, 2025

• MORE FIXES

  VMSolidus

  committed
  3757996

  Copy full SHA for 3757996

• Merge branch 'Ignore-Warnings-In-Tests' of https://github.com/VMSolidus/Einstein-Engines into Ignore-Warnings-In-Tests

  VMSolidus

  committed
  3f29e24

  Copy full SHA for 3f29e24

• Update CCVars.Whitelist.cs

  VMSolidus

  committed
  d84ad07

  Copy full SHA for d84ad07

• IPCs dont have blood

  VMSolidus

  committed
  ee481dc

  Copy full SHA for ee481dc

• Update CCVars.Admin.Logs.cs

  VMSolidus

  committed
  82b31d4

  Copy full SHA for 82b31d4

• SHUT

  VMSolidus

  committed
  42b98be

  Copy full SHA for 42b98be

• aaaaaaaaaaaa

  VMSolidus

  committed
  1865386

  Copy full SHA for 1865386

• Resurrect The Build And Test Debug (#1591)

  Show description for 61511ec
  VMSolidus

  authored
  61511ec

  Copy full SHA for 61511ec

• Merge branch 'master' into Cuba-Attack

  BlueHNT

  authored
  8fe7608

  Copy full SHA for 8fe7608

• Adds Cohiba Robusto Cigars (#1455)

  Show description for 8fb5dcb
  VMSolidus

  authored
  8fb5dcb

  Copy full SHA for 8fb5dcb

• Automatic Changelog Update (#1455)

  SimpleStation14

  committed
  c187070

  Copy full SHA for c187070

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

  Aidenkrz

  committed
  c80fe5c

  Copy full SHA for c80fe5c