Code

Floran wants to stab#456

Code

Merged

dwasint merged 28 commits intoMonkestation:masterMonkestation/Monkestation2.0:masterfrom Glyphee:floran-wants-to-stabGlyphee/Monkestation2.0:floran-wants-to-stabCopy head branch name to clipboardNov 7, 2023

+304-5

Commits

Commits on Oct 11, 2023

• adds florans!

  Glyphee

  committed
  ff79ad8

  Copy full SHA for ff79ad8

• all is lost!!!!!!!!

  Glyphee

  committed
  64b6aa5

  Copy full SHA for 64b6aa5

Commits on Oct 12, 2023

• Update floran_accessories.dm

  Glyphee

  committed
  dda4302

  Copy full SHA for dda4302

• Merge branch 'Monkestation:master' into floran-wants-to-stab

  Glyphee

  authored
  0233af0

  Copy full SHA for 0233af0

Commits on Oct 14, 2023

• Merge branch 'Monkestation:master' into floran-wants-to-stab

  Glyphee

  authored
  3931d6f

  Copy full SHA for 3931d6f

• some alterations

  Glyphee

  committed
  d6b3891

  Copy full SHA for d6b3891

• minor changes to try and fix issues

  Glyphee

  committed
  bdfe6b4

  Copy full SHA for bdfe6b4

• mroe fixes

  Glyphee

  committed
  2edd742

  Copy full SHA for 2edd742

• more fixes

  Glyphee

  committed
  b736e24

  Copy full SHA for b736e24

• uncommented a line

  Glyphee

  committed
  47573c6

  Copy full SHA for 47573c6

• it WORKS

  Glyphee

  committed
  d8f354b

  Copy full SHA for d8f354b

Commits on Oct 15, 2023

• Merge branch 'Monkestation:master' into floran-wants-to-stab

  Glyphee

  authored
  a30b416

  Copy full SHA for a30b416

• linter should be good now

  Glyphee

  committed
  cbcea7d

  Copy full SHA for cbcea7d

• added gore to food types

  Glyphee

  committed
  11dba54

  Copy full SHA for 11dba54

• bug fix

  Glyphee

  committed
  630791c

  Copy full SHA for 630791c

• Merge branch 'Monkestation:master' into floran-wants-to-stab

  Glyphee

  authored
  9de4ec7

  Copy full SHA for 9de4ec7

• screenshot test fix, and some commented out code for explosions

  Glyphee

  committed
  fb47ed5

  Copy full SHA for fb47ed5

Commits on Oct 23, 2023

• Merge branch 'master' into floran-wants-to-stab

  Glyphee

  committed
  bca368e

  Copy full SHA for bca368e

• Merge branch 'master' into floran-wants-to-stab

  Glyphee

  committed
  5b74e15

  Copy full SHA for 5b74e15

• Merge branch 'Monkestation:master' into floran-wants-to-stab

  Glyphee

  authored
  62b0f14

  Copy full SHA for 62b0f14

Commits on Oct 25, 2023

• Merge branch 'Monkestation:master' into floran-wants-to-stab

  Glyphee

  authored
  2de2418

  Copy full SHA for 2de2418

• floran pocketses

  Glyphee

  committed
  86c1e8f

  Copy full SHA for 86c1e8f

• Merge branch 'Monkestation:master' into floran-wants-to-stab

  Glyphee

  authored
  f3a685a

  Copy full SHA for f3a685a

• Merge branch 'floran-wants-to-stab' of https://github.com/Glyphee/Monkestation2.0 into floran-wants-to-stab

  Glyphee

  committed
  688eaa8

  Copy full SHA for 688eaa8

• changed their diet

  Glyphee

  committed
  5617183

  Copy full SHA for 5617183

• removed mutcolors_secondary from traits until i can get it working

  Glyphee

  committed
  7abc643

  Copy full SHA for 7abc643

• added in (still not working) mutcolors code

  Glyphee

  committed
  2c28cd5

  Copy full SHA for 2c28cd5

Commits on Oct 28, 2023

• modifies burn factor, light healing, and potassium metabolism

  Glyphee

  committed
  0a00db3

  Copy full SHA for 0a00db3