Code

Disease Stages But Epic#9043

Code

Merged

metalgearsloth merged 38 commits intospace-wizards:masterspace-wizards/space-station-14:masterfrom EmoGarbage404:stagesEmoGarbage404/space-station-14:stagesCopy head branch name to clipboardJul 8, 2022

+87-3

Commits

Commits on Apr 25, 2022

• Merge branch 'space-wizards-master'

  EmoGarbage404

  committed
  1c46b73

  Copy full SHA for 1c46b73

Commits on Apr 27, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  404cb6d

  Copy full SHA for 404cb6d

Commits on Apr 28, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  bc28856

  Copy full SHA for bc28856

Commits on May 1, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  b78709a

  Copy full SHA for b78709a

Commits on May 5, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  c8f849f

  Copy full SHA for c8f849f

Commits on May 7, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  6ba6110

  Copy full SHA for 6ba6110

Commits on May 9, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  968f756

  Copy full SHA for 968f756

Commits on May 11, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  52cca51

  Copy full SHA for 52cca51

Commits on May 12, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  71d3cb9

  Copy full SHA for 71d3cb9

Commits on May 13, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  0a39235

  Copy full SHA for 0a39235

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  f240894

  Copy full SHA for f240894

Commits on May 27, 2022

• Merge branch 'master' of https://github.com/space-wizards/space-station-14 into space-wizards-master

  EmoGarbage404

  committed
  df20146

  Copy full SHA for df20146

• Merge branch 'space-wizards-master'

  EmoGarbage404

  committed
  1442766

  Copy full SHA for 1442766

Commits on May 29, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  fa7b5dd

  Copy full SHA for fa7b5dd

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  9e8e4f8

  Copy full SHA for 9e8e4f8

Commits on May 30, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  63178a8

  Copy full SHA for 63178a8

Commits on Jun 1, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  0188a18

  Copy full SHA for 0188a18

Commits on Jun 2, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  7afc2d0

  Copy full SHA for 7afc2d0

Commits on Jun 4, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  78ec269

  Copy full SHA for 78ec269

Commits on Jun 5, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  5b6f1b4

  Copy full SHA for 5b6f1b4

Commits on Jun 7, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  4abc44a

  Copy full SHA for 4abc44a

Commits on Jun 9, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  431e114

  Copy full SHA for 431e114

Commits on Jun 12, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  288a562

  Copy full SHA for 288a562

Commits on Jun 15, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  06edbd1

  Copy full SHA for 06edbd1

Commits on Jun 17, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  3b8f2cb

  Copy full SHA for 3b8f2cb

Commits on Jun 19, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  5ba338d

  Copy full SHA for 5ba338d

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  a5d9bcd

  Copy full SHA for a5d9bcd

Commits on Jun 22, 2022

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  b56ac01

  Copy full SHA for b56ac01

• Merge branch 'space-wizards:master' into master

  EmoGarbage404

  authored
  d6592c2

  Copy full SHA for d6592c2

Commits on Jun 23, 2022

• first pass

  EmoGarbage404

  committed
  a028567

  Copy full SHA for a028567

• Update DiseaseSystem.cs

  EmoGarbage404

  authored
  63a7b6a

  Copy full SHA for 63a7b6a

• list now

  EmoGarbage404

  committed
  ed08c63

  Copy full SHA for ed08c63

• Merge remote-tracking branch 'origin/stages' into stages

  EmoGarbage404

  committed
  d5f1dc9

  Copy full SHA for d5f1dc9

• tf

  Show description for 9d051e1
  EmoGarbage404

  committed
  9d051e1

  Copy full SHA for 9d051e1

Commits on Jun 28, 2022

• Update Content.Shared/Disease/DiseasePrototype.cs

  Show description for e30bd55
  

  EmoGarbage404

  and

  metalgearsloth

  authored
  e30bd55

  Copy full SHA for e30bd55

• sloth review

  Show description for 6c70f1b
  EmoGarbage404

  committed
  6c70f1b

  Copy full SHA for 6c70f1b

Commits on Jul 8, 2022

• Merge remote-tracking branch 'upstream/master' into stages

  metalgearsloth

  committed
  40f10f5

  Copy full SHA for 40f10f5

• Adds that test I forgot about

  metalgearsloth

  committed
  3513d80

  Copy full SHA for 3513d80