Code

EE Merge + Early Merge Fixes#89

Code

Merged

sleepyyapril merged 28 commits intomasterTheDenSS14/TheDen:masterfrom early-merge-my-fixesTheDenSS14/TheDen:early-merge-my-fixesCopy head branch name to clipboardDec 4, 2024

+53-35

Commits

Commits on Nov 30, 2024

• Religious Headgear For Character Customization (#1297)

  Show description for e46a863
  VMSolidus

  authored
  e46a863

  Copy full SHA for e46a863

• Automatic Changelog Update (#1297)

  SimpleStation14

  committed
  56be690

  Copy full SHA for 56be690

• Don't Require Running in Release to Test Mood (#1257)

  DEATHB4DEFEAT

  authored
  f287188

  Copy full SHA for f287188

• Start of Lore Documents

  VMSolidus

  committed
  dfb12e5

  Copy full SHA for dfb12e5

Commits on Dec 1, 2024

• Finally Done

  VMSolidus

  committed
  2a8bf58

  Copy full SHA for 2a8bf58

• Update Credits (#1300)

  Show description for 9ef8252
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  9ef8252

  Copy full SHA for 9ef8252

• Merge branch 'master' into Lore-Documentation

  sleepyyapril

  authored
  386fd77

  Copy full SHA for 386fd77

• Loadouts Lore Documentation (#1298)

  Show description for a535d98
  sleepyyapril

  authored
  a535d98

  Copy full SHA for a535d98

• Automatic Changelog Update (#1298)

  SimpleStation14

  committed
  8a368bb

  Copy full SHA for 8a368bb

• Fashion Update: Earrings & Makeup (#1299)

  Show description for 932f9e3
  angelofallars

  authored
  932f9e3

  Copy full SHA for 932f9e3

• Automatic Changelog Update (#1299)

  SimpleStation14

  committed
  b05ab8e

  Copy full SHA for b05ab8e

• ♂️ Add Male Arachne (#1301)

  Show description for 1bab6b8
  angelofallars

  authored
  1bab6b8

  Copy full SHA for 1bab6b8

• Automatic Changelog Update (#1301)

  SimpleStation14

  committed
  5476ee0

  Copy full SHA for 5476ee0

• Add Localization for Senior Physician and Senior Engineer (#1302)

  Show description for 4bf7624
  zelezniciar1

  authored
  4bf7624

  Copy full SHA for 4bf7624

• Automatic Changelog Update (#1302)

  SimpleStation14

  committed
  9169818

  Copy full SHA for 9169818

Commits on Dec 2, 2024

• Make Cultist Constructs Speak Eldritch (#1303)

  Show description for 8573914
  

  angelofallars

  and

  sleepyyapril

  authored
  8573914

  Copy full SHA for 8573914

• Automatic Changelog Update (#1303)

  SimpleStation14

  committed
  114ecde

  Copy full SHA for 114ecde

Commits on Dec 3, 2024

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

  sleepyyapril

  committed
  f0de977

  Copy full SHA for f0de977

Commits on Dec 4, 2024

• Merge branch 'master' of https://github.com/TheDenSS14/TheDen into early-merge-my-fixes

  sleepyyapril

  committed
  9d75659

  Copy full SHA for 9d75659

• Unrelated

  sleepyyapril

  committed
  8f4f317

  Copy full SHA for 8f4f317

• Made ChemMaster Sorted (#2498)

  Show description for 4588d02
  

  2 peopleauthored and

  sleepyyapril

  committed
  4588d02

  Copy full SHA for 4588d02

• One

  

  fenndragon

  authored and

  sleepyyapril

  committed
  46d8814

  Copy full SHA for 46d8814

• Update uplink_catalog.yml

  

  fenndragon

  authored and

  sleepyyapril

  committed
  d857a23

  Copy full SHA for d857a23

• Remove deception, put items into utility.

  

  fenndragon

  authored and

  sleepyyapril

  committed
  3850de7

  Copy full SHA for 3850de7

• Add ComplexInteractions check for power toggles.

  sleepyyapril

  committed
  0de5ce3

  Copy full SHA for 0de5ce3

• Cleanup

  sleepyyapril

  committed
  664b423

  Copy full SHA for 664b423

• A revenant will never have hands, silly self.

  sleepyyapril

  committed
  a515ebf

  Copy full SHA for a515ebf

• Enable revenants

  sleepyyapril

  committed
  0d982d2

  Copy full SHA for 0d982d2