Code

Upstream Merge 02-12-25#85

Code

Merged

Aidenkrz merged 86 commits intoGoob-Station:masterGoob-Station/Goob-Station-MRP:masterfrom angelofallars:upstream-merge-02-12-25angelofallars/Goob-Station-MRP:upstream-merge-02-12-25Copy head branch name to clipboardFeb 14, 2025

+500,197-42,515

Commits

Commits on Feb 7, 2025

• Holopads, New AI Core, BSO and NTR Offices for Glacier (#1704)

  Show description for 8cbdc93
  dootythefrooty

  authored
  8cbdc93

  Copy full SHA for 8cbdc93

• Automatic Changelog Update (#1704)

  SimpleStation14

  committed
  5f654fc

  Copy full SHA for 5f654fc

• BagelStation (#1700)

  Show description for 17cb737
  Ichaie

  authored
  17cb737

  Copy full SHA for 17cb737

• Automatic Changelog Update (#1700)

  SimpleStation14

  committed
  bba2ba7

  Copy full SHA for bba2ba7

• New Law Sets And Minor Fixes on AI (#1686)

  Show description for b1ff7b3
  Ichaie

  authored
  b1ff7b3

  Copy full SHA for b1ff7b3

• Automatic Changelog Update (#1686)

  SimpleStation14

  committed
  ed0ca4f

  Copy full SHA for ed0ca4f

• Fix Shop Vendor Buying on Non-Click (#2906) (#1735)

  Show description for 7c6582a
  

  sleepyyapril

  and

  deltanedas

  authored
  7c6582a

  Copy full SHA for 7c6582a

• Automatic Changelog Update (#1735)

  SimpleStation14

  committed
  f84e6dd

  Copy full SHA for f84e6dd

• Exorcism of the Spirit of the Dwarf Species (#1734)

  Show description for 5de118d
  trashalice

  authored
  5de118d

  Copy full SHA for 5de118d

• Automatic Changelog Update (#1734)

  SimpleStation14

  committed
  0cb32c0

  Copy full SHA for 0cb32c0

• Fix Sprites Getting Stuck Red when Quickly Damaged (#1738)

  Show description for 2f88303
  RedFoxIV

  authored
  2f88303

  Copy full SHA for 2f88303

• Automatic Changelog Update (#1738)

  SimpleStation14

  committed
  e7a32e9

  Copy full SHA for e7a32e9

• "Proper" "Softcrit" "Support" (#1545)

  Show description for 9a357c1
  

  RedFoxIV

  and

  VMSolidus

  authored
  9a357c1

  Copy full SHA for 9a357c1

• Automatic Changelog Update (#1545)

  SimpleStation14

  committed
  2c2243a

  Copy full SHA for 2c2243a

• Oni Guidebook and Lore (#1733)

  Show description for 988227e
  trashalice

  authored
  988227e

  Copy full SHA for 988227e

• Automatic Changelog Update (#1733)

  SimpleStation14

  committed
  194ec5c

  Copy full SHA for 194ec5c

• Artifact Analyzer and Anomaly Vessel Part Upgrading (#1729)

  Show description for cf6707b
  

  dootythefrooty

  and

  VMSolidus

  authored
  cf6707b

  Copy full SHA for cf6707b

• Automatic Changelog Update (#1729)

  SimpleStation14

  committed
  c4a81a8

  Copy full SHA for c4a81a8

• Fix Industrial Ore Processor Inheritance (#1737)

  Show description for ed1e124
  VMSolidus

  authored
  ed1e124

  Copy full SHA for ed1e124

• Automatic Changelog Update (#1737)

  SimpleStation14

  committed
  6c133b1

  Copy full SHA for 6c133b1

• Revert ""Proper" "Softcrit" "Support" (#1545)" (#1741)

  Show description for d62392b
  sleepyyapril

  authored
  d62392b

  Copy full SHA for d62392b

Commits on Feb 8, 2025

• Northway Ship For EE (MVP) (#1743)

  Show description for 451b89e
  Mike32oz

  authored
  451b89e

  Copy full SHA for 451b89e

• Automatic Changelog Update (#1743)

  SimpleStation14

  committed
  b7d9614

  Copy full SHA for b7d9614

• Lambda Station (#1715)

  Show description for c8182e9
  

  3 peopleauthored
  c8182e9

  Copy full SHA for c8182e9

• Automatic Changelog Update (#1715)

  SimpleStation14

  committed
  03b3707

  Copy full SHA for 03b3707

• Adds New Law Boards for AI (#1742)

  Show description for 1743098
  Ichaie

  authored
  1743098

  Copy full SHA for 1743098

• Automatic Changelog Update (#1742)

  SimpleStation14

  committed
  06ac422

  Copy full SHA for 06ac422

• Update SeparatedChatGameScreen.xaml.cs (#1745)

  Show description for 0bf6989
  DEATHB4DEFEAT

  authored
  0bf6989

  Copy full SHA for 0bf6989

• Automatic Changelog Update (#1745)

  SimpleStation14

  committed
  09aa049

  Copy full SHA for 09aa049

• Micro-RTG (#1744)

  Show description for 4c20374
  Timfa2112

  authored
  4c20374

  Copy full SHA for 4c20374

• Automatic Changelog Update (#1744)

  SimpleStation14

  committed
  e1f47d0

  Copy full SHA for e1f47d0

Commits on Feb 9, 2025

• Lyre Birb Trait (#1747)

  Show description for cc91eeb
  VMSolidus

  authored
  cc91eeb

  Copy full SHA for cc91eeb

• Automatic Changelog Update (#1747)

  SimpleStation14

  committed
  0b6d891

  Copy full SHA for 0b6d891

• Add Mood Visual Effects Toggle (#1748)

  Show description for cf3cdc9
  sleepyyapril

  authored
  cf3cdc9

  Copy full SHA for cf3cdc9

• Automatic Changelog Update (#1748)

  SimpleStation14

  committed
  e9365ae

  Copy full SHA for e9365ae

• AI Shall No Longer Be An All-Hearing God (#1749)

  Show description for 4c20f75
  dootythefrooty

  authored
  4c20f75

  Copy full SHA for 4c20f75

• Automatic Changelog Update (#1749)

  SimpleStation14

  committed
  7cf344e

  Copy full SHA for 7cf344e

• Update Credits (#1746)

  Show description for ea7bb46
  

  3 peopleauthored
  ea7bb46

  Copy full SHA for ea7bb46

• Noslip arachne.yml (#1739)

  Show description for 859ba6e
  

  EctoplasmIsGood

  and

  sleepyyapril

  authored
  859ba6e

  Copy full SHA for 859ba6e

• Automatic Changelog Update (#1739)

  SimpleStation14

  committed
  dd0bc24

  Copy full SHA for dd0bc24

Commits on Feb 10, 2025

• Make SMES Not SUCK (#1752)

  Show description for 43ed29b
  VMSolidus

  authored
  43ed29b

  Copy full SHA for 43ed29b

• Automatic Changelog Update (#1752)

  SimpleStation14

  committed
  00e5fc6

  Copy full SHA for 00e5fc6

• Update speech_emotes.yml (#1751)

  Show description for 3e05289
  VMSolidus

  authored
  3e05289

  Copy full SHA for 3e05289

• Automatic Changelog Update (#1751)

  SimpleStation14

  committed
  9e73a3a

  Copy full SHA for 9e73a3a

• Flying Objects Ignore Laying Down (#1754)

  Show description for 057ab17
  VMSolidus

  authored
  057ab17

  Copy full SHA for 057ab17

• Automatic Changelog Update (#1754)

  SimpleStation14

  committed
  1d3538f

  Copy full SHA for 1d3538f

• A Few More Glowy Hardsuits (#1750)

  Show description for ec87cd1
  VMSolidus

  authored
  ec87cd1

  Copy full SHA for ec87cd1

• Shuttle Price Hikes (#1755)

  Show description for 70e42d4
  Rosycup

  authored
  70e42d4

  Copy full SHA for 70e42d4

• More AI QOL Stuff (#1761)

  Show description for 6869f6f
  VMSolidus

  authored
  6869f6f

  Copy full SHA for 6869f6f

• Optional Permanent AI Laws (#1762)

  Show description for 83e42c5
  VMSolidus

  authored
  83e42c5

  Copy full SHA for 83e42c5

• Automatic Changelog Update (#1761)

  SimpleStation14

  committed
  7298a34

  Copy full SHA for 7298a34

• Automatic Changelog Update (#1762)

  SimpleStation14

  committed
  d7cdb79

  Copy full SHA for d7cdb79

• Fix Autodoc Surgery UI (#1756)

  Show description for 6c27976
  deltanedas

  authored
  6c27976

  Copy full SHA for 6c27976

• BSO Chester Loadout Change.yml (#1764)

  Show description for db2deba
  EctoplasmIsGood

  authored
  db2deba

  Copy full SHA for db2deba

• Automatic Changelog Update (#1764)

  SimpleStation14

  committed
  f56a220

  Copy full SHA for f56a220

Commits on Feb 11, 2025

• Move Access Configurators (#1758)

  VMSolidus

  authored
  1716ba4

  Copy full SHA for 1716ba4

• Automatic Changelog Update (#1758)

  SimpleStation14

  committed
  a0dd132

  Copy full SHA for a0dd132

• StationAI Affected by Ion Storm (for Real Now) (#1766)

  Show description for 713eaa7
  Ichaie

  authored
  713eaa7

  Copy full SHA for 713eaa7

• Tweak Lava Ore Rates (#1759)

  Show description for 6ecf789
  VMSolidus

  authored
  6ecf789

  Copy full SHA for 6ecf789

• Lambda Fixes (#1753)

  Show description for bce7401
  VMSolidus

  authored
  bce7401

  Copy full SHA for bce7401

• Automatic Changelog Update (#1766)

  SimpleStation14

  committed
  97af282

  Copy full SHA for 97af282

• Automatic Changelog Update (#1753)

  SimpleStation14

  committed
  87f1906

  Copy full SHA for 87f1906

• Merge remote-tracking branch 'ee/master' into upstream-merge-02-12-25

  angelofallars

  committed
  33315fb

  Copy full SHA for 33315fb

• Fixed Arachne Noslip (#1767)

  Show description for f32499d
  EctoplasmIsGood

  authored
  f32499d

  Copy full SHA for f32499d

• Automatic Changelog Update (#1767)

  SimpleStation14

  committed
  6e0683e

  Copy full SHA for 6e0683e

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

  angelofallars

  committed
  37f2841

  Copy full SHA for 37f2841

Commits on Feb 12, 2025

• Box Update: Rework on Bridge (#1763)

  Show description for ee12ccf
  Ichaie

  authored
  ee12ccf

  Copy full SHA for ee12ccf

• Automatic Changelog Update (#1763)

  SimpleStation14

  committed
  ccf7867

  Copy full SHA for ccf7867

• Merge remote-tracking branch 'ee/master' into upstream-merge-02-12-25

  angelofallars

  committed
  55ba498

  Copy full SHA for 55ba498

• Tiny Saltern Fix (#1771)

  Show description for b51d2f9
  VMSolidus

  authored
  b51d2f9

  Copy full SHA for b51d2f9

• Automatic Changelog Update (#1771)

  SimpleStation14

  committed
  a526faf

  Copy full SHA for a526faf

• Derotate Unmaintained Maps. (#1772)

  Show description for 4c56076
  VMSolidus

  authored
  4c56076

  Copy full SHA for 4c56076

• Automatic Changelog Update (#1772)

  SimpleStation14

  committed
  e0b1159

  Copy full SHA for e0b1159

• Revert Rouny Sprite (#1770)

  angelofallars

  authored
  f8696b5

  Copy full SHA for f8696b5

• Automatic Changelog Update (#1770)

  SimpleStation14

  committed
  ea428d3

  Copy full SHA for ea428d3

Commits on Feb 13, 2025

• Planet Maps Prep For Glacier Rework (#1774)

  Show description for fb4ca1a
  

  VMSolidus

  and

  DEATHB4DEFEAT

  authored
  fb4ca1a

  Copy full SHA for fb4ca1a

• Automatic Changelog Update (#1774)

  SimpleStation14

  committed
  5dce297

  Copy full SHA for 5dce297

• Plasmaman Damage Resist and Density Changes (#1769)

  Show description for f6289bf
  angelofallars

  authored
  f6289bf

  Copy full SHA for f6289bf

• Automatic Changelog Update (#1769)

  SimpleStation14

  committed
  972a936

  Copy full SHA for 972a936

• Den Downstream Merge 02-13-25 (#1773)

  Show description for 19ea863
  

  6 peopleauthored
  19ea863

  Copy full SHA for 19ea863

• Automatic Changelog Update (#1773)

  SimpleStation14

  committed
  493a53a

  Copy full SHA for 493a53a

• Add Argenti Ammo, Gun Age Requirements to Bartender Loadout (#1768)

  Show description for a2d2a3e
  GNUtopia

  authored
  a2d2a3e

  Copy full SHA for a2d2a3e

• Automatic Changelog Update (#1768)

  SimpleStation14

  committed
  accd8d7

  Copy full SHA for accd8d7

• Merge remote-tracking branch 'ee/master' into upstream-merge-02-12-25

  angelofallars

  committed
  17a436f

  Copy full SHA for 17a436f

Commits on Feb 14, 2025

• WAR OPS ARE BACK!!! (#1776)

  Show description for c515cc5
  EctoplasmIsGood

  authored
  c515cc5

  Copy full SHA for c515cc5

• Merge remote-tracking branch 'ee/master' into upstream-merge-02-12-25

  angelofallars

  committed
  f3ac53b

  Copy full SHA for f3ac53b