Code

Glass Cannon Shadowkin#1531

Code

Merged

VMSolidus merged 116 commits intoSimple-Station:masterSimple-Station/Einstein-Engines:masterfrom SixplyDev:erm.-shadowkin-fuckerySixplyDev/erm....-ee-fuckery:erm.-shadowkin-fuckeryCopy head branch name to clipboardJan 26, 2025

+320-293

Commits

Commits on Jan 13, 2025

• Glass Cannon Shadowkin

  Show description for 7925e93
  SixplyDev

  authored
  7925e93

  Copy full SHA for 7925e93

• No more darkswap

  Show description for 4324266
  SixplyDev

  authored
  4324266

  Copy full SHA for 4324266

• Roundstart Shadowkin

  Show description for a577900
  SixplyDev

  authored
  a577900

  Copy full SHA for a577900

Commits on Jan 14, 2025

• Wipes Guidebook Info

  Show description for ef4abfe
  SixplyDev

  authored
  ef4abfe

  Copy full SHA for ef4abfe

• Merge branch 'Simple-Station:master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  1334cce

  Copy full SHA for 1334cce

• Shadowkin Guidebook Lore Primer

  Show description for 59dbff9
  SixplyDev

  authored
  59dbff9

  Copy full SHA for 59dbff9

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  d592fba

  Copy full SHA for d592fba

Commits on Jan 15, 2025

• Shadowkin Guidebook Biology Section

  Show description for 01d2ef8
  SixplyDev

  authored
  01d2ef8

  Copy full SHA for 01d2ef8

• Shadowkin Guidebook Language Section

  Show description for ca43850
  SixplyDev

  authored
  ca43850

  Copy full SHA for ca43850

• Shadowkin Sexes

  Show description for 118630b
  SixplyDev

  authored
  118630b

  Copy full SHA for 118630b

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  d24abc4

  Copy full SHA for d24abc4

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  ec0ea88

  Copy full SHA for ec0ea88

• Species Guidebook - Shadowkin

  Show description for 654088a
  SixplyDev

  authored
  654088a

  Copy full SHA for 654088a

• Species Guidebook - Shadowkin (fixed)

  Show description for c943670
  SixplyDev

  authored
  c943670

  Copy full SHA for c943670

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  7b102bf

  Copy full SHA for 7b102bf

• Shadowkin Guidebook Misc. Notes + Species Traits

  Show description for b75365e
  SixplyDev

  authored
  b75365e

  Copy full SHA for b75365e

• Re-Enable DarkSwap

  Show description for 6350f2a
  SixplyDev

  authored
  6350f2a

  Copy full SHA for 6350f2a

• Shadowkin DarkSwap Removal

  Show description for bf616af
  SixplyDev

  authored
  bf616af

  Copy full SHA for bf616af

• Shadowkin Parent Update

  Show description for 7cc2a8e
  SixplyDev

  authored
  7cc2a8e

  Copy full SHA for 7cc2a8e

Commits on Jan 16, 2025

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  fbe4972

  Copy full SHA for fbe4972

• Shadowkin Lore Wipe

  Show description for 77a9bdf
  SixplyDev

  authored
  77a9bdf

  Copy full SHA for 77a9bdf

Commits on Jan 17, 2025

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  09def42

  Copy full SHA for 09def42

Commits on Jan 18, 2025

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  c828da2

  Copy full SHA for c828da2

Commits on Jan 19, 2025

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  3eb0d8c

  Copy full SHA for 3eb0d8c

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  ef60ae9

  Copy full SHA for ef60ae9

• Shadowkin Lore Update

  Show description for 01b4f83
  SixplyDev

  authored
  01b4f83

  Copy full SHA for 01b4f83

• Marish Language Prototype

  Show description for 38e4b11
  SixplyDev

  authored
  38e4b11

  Copy full SHA for 38e4b11

• Shadowkin Species Traits

  Show description for b3d92c0
  SixplyDev

  authored
  b3d92c0

  Copy full SHA for b3d92c0

• Shadowkin Traits Update

  Show description for 7e4be48
  SixplyDev

  authored
  7e4be48

  Copy full SHA for 7e4be48

• Shadowkin Prisoner Job

  Show description for 667ffa7
  SixplyDev

  authored
  667ffa7

  Copy full SHA for 667ffa7

• Shadowkin Mantis

  Show description for 9a13690
  SixplyDev

  authored
  9a13690

  Copy full SHA for 9a13690

• Shadowkin Mystagogue

  Show description for 277d70f
  SixplyDev

  authored
  277d70f

  Copy full SHA for 277d70f

• Merge branch 'Simple-Station:master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  99b90d2

  Copy full SHA for 99b90d2

• Shadowkin Chaplain

  Show description for 48a35e0
  SixplyDev

  authored
  48a35e0

  Copy full SHA for 48a35e0

• Shadowkin Cataloguer

  Show description for a609537
  SixplyDev

  authored
  a609537

  Copy full SHA for a609537

• Fixed Species YML Prototype

  Show description for 531b7e4
  SixplyDev

  authored
  531b7e4

  Copy full SHA for 531b7e4

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  8377c97

  Copy full SHA for 8377c97

• Shadowkin Blackeye Bug

  Show description for 231155c
  SixplyDev

  authored
  231155c

  Copy full SHA for 231155c

• Shadowkin Organs

  Show description for a5585a5
  SixplyDev

  authored
  a5585a5

  Copy full SHA for a5585a5

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  90cdaac

  Copy full SHA for 90cdaac

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  35cabd3

  Copy full SHA for 35cabd3

• Shadowkin Naming Conventions

  Show description for 3dabc29
  SixplyDev

  authored
  3dabc29

  Copy full SHA for 3dabc29

Commits on Jan 20, 2025

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  f1e8a9e

  Copy full SHA for f1e8a9e

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  a6831d7

  Copy full SHA for a6831d7

• Shadowkin Empathy

  Show description for eac7f5f
  SixplyDev

  authored
  eac7f5f

  Copy full SHA for eac7f5f

• Shadowkin Empathy Fix

  Show description for 7bcbfaa
  SixplyDev

  authored
  7bcbfaa

  Copy full SHA for 7bcbfaa

• Marish Language Fix

  Show description for b9e9fc6
  SixplyDev

  authored
  b9e9fc6

  Copy full SHA for b9e9fc6

• Empathy Languages FTL

  Show description for 8abe4c8
  SixplyDev

  authored
  8abe4c8

  Copy full SHA for 8abe4c8

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  c57e8e8

  Copy full SHA for c57e8e8

• Shadowkin Empathy Speaking

  Show description for a84886b
  SixplyDev

  authored
  a84886b

  Copy full SHA for a84886b

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  5fbc7c1

  Copy full SHA for 5fbc7c1

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  48774ba

  Copy full SHA for 48774ba

• Shadowkin Languages Grammar Fix

  Show description for 3cd3924
  

  SixplyDev

  and

  DEATHB4DEFEAT

  authored
  3cd3924

  Copy full SHA for 3cd3924

• Shadowkin Guidebook Grammar Fix

  Show description for 1406cf6
  

  SixplyDev

  and

  DEATHB4DEFEAT

  authored
  1406cf6

  Copy full SHA for 1406cf6

• Shadowkin Traits Grammar Fix

  Show description for 66aadfe
  

  SixplyDev

  and

  DEATHB4DEFEAT

  authored
  66aadfe

  Copy full SHA for 66aadfe

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  7f707c2

  Copy full SHA for 7f707c2

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  2c5a60b

  Copy full SHA for 2c5a60b

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  a835fd5

  Copy full SHA for a835fd5

Commits on Jan 21, 2025

• trying to fix conflicts

  Show description for 426af89
  SixplyDev

  authored
  426af89

  Copy full SHA for 426af89

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  7a8e919

  Copy full SHA for 7a8e919

• conflicts fixed

  Show description for 9c23c71
  SixplyDev

  authored
  9c23c71

  Copy full SHA for 9c23c71

• Shadowkin Eye Color

  Show description for 7b89e4e
  SixplyDev

  authored
  7b89e4e

  Copy full SHA for 7b89e4e

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  252f8dc

  Copy full SHA for 252f8dc

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  207e368

  Copy full SHA for 207e368

• Shadowkin Organs Fix

  Show description for 7dcac4a
  SixplyDev

  authored
  7dcac4a

  Copy full SHA for 7dcac4a

• Shadowkin Damage Modifiers Update 2

  Show description for c32d826
  SixplyDev

  authored
  c32d826

  Copy full SHA for c32d826

• Shadowkin Damage Modifiers Update 3

  Show description for 1f94a94
  SixplyDev

  authored
  1f94a94

  Copy full SHA for 1f94a94

• Shadowkin Examine Text

  Show description for 6ce852d
  SixplyDev

  authored
  6ce852d

  Copy full SHA for 6ce852d

• Shadowkin Traits Fixing

  Show description for b347e78
  SixplyDev

  authored
  b347e78

  Copy full SHA for b347e78

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  0a61904

  Copy full SHA for 0a61904

Commits on Jan 22, 2025

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  4ade90a

  Copy full SHA for 4ade90a

• Shadowkin Potentia Multiplyer

  Show description for a961d0e
  SixplyDev

  authored
  a961d0e

  Copy full SHA for a961d0e

• Shadowkin Traits Update 2

  Show description for d82568c
  SixplyDev

  authored
  d82568c

  Copy full SHA for d82568c

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  7ddfca6

  Copy full SHA for 7ddfca6

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  59f6f05

  Copy full SHA for 59f6f05

Commits on Jan 23, 2025

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  e6df549

  Copy full SHA for e6df549

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  a984ad9

  Copy full SHA for a984ad9

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  a8be82e

  Copy full SHA for a8be82e

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  30e5cc9

  Copy full SHA for 30e5cc9

• Shadowkin Organs Reversion

  Show description for a7a8bf1
  SixplyDev

  authored
  a7a8bf1

  Copy full SHA for a7a8bf1

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  426c4a0

  Copy full SHA for 426c4a0

• Shadowkin Organs Fix 2

  Show description for 146179a
  SixplyDev

  authored
  146179a

  Copy full SHA for 146179a

• Shadowkin Blackeye Trait Fix

  Show description for 75bd507
  SixplyDev

  authored
  75bd507

  Copy full SHA for 75bd507

• Shadowkin Organs Fix 3

  Show description for e3b16cd
  SixplyDev

  authored
  e3b16cd

  Copy full SHA for e3b16cd

• Shadowkin Unarmed Damage

  Show description for 7dbf536
  SixplyDev

  authored
  7dbf536

  Copy full SHA for 7dbf536

• Shadowkin Empathy Manager Fix

  Show description for b93be80
  SixplyDev

  authored
  b93be80

  Copy full SHA for b93be80

• Uhhh robust toolbox fix

  

  ShirouAjisai

  committed
  227e52f

  Copy full SHA for 227e52f

• Uhhh added their lungs to their core and stuff

  

  ShirouAjisai

  committed
  fd275ed

  Copy full SHA for fd275ed

Commits on Jan 24, 2025

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  82d0bec

  Copy full SHA for 82d0bec

• Shadowkin Minor Retexturing

  

  ShirouAjisai

  committed
  af24956

  Copy full SHA for af24956

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  846634a

  Copy full SHA for 846634a

Commits on Jan 25, 2025

• Shadowkin Guidebook Fix

  

  ShirouAjisai

  committed
  b8e55ea

  Copy full SHA for b8e55ea

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  8d3c5f5

  Copy full SHA for 8d3c5f5

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  1a7bb71

  Copy full SHA for 1a7bb71

• Pretty sure I fixed my Robust Toolbox error

  

  ShirouAjisai

  committed
  755e181

  Copy full SHA for 755e181

• Shadowkin Blackeye Trait Fix

  Show description for 810c6b8
  

  SixplyDev

  and

  VMSolidus

  authored
  810c6b8

  Copy full SHA for 810c6b8

• Shadowkin Guidebook Lore Update

  Show description for 2b689d1
  

  SixplyDev

  and

  VMSolidus

  authored
  2b689d1

  Copy full SHA for 2b689d1

• Shadowkin Claws Damage

  Show description for 1c6e425
  

  SixplyDev

  and

  VMSolidus

  authored
  1c6e425

  Copy full SHA for 1c6e425

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  af010b2

  Copy full SHA for af010b2

• Shadowkin Review Fixes

  

  ShirouAjisai

  committed
  831d63d

  Copy full SHA for 831d63d

• Merge branch 'erm.-shadowkin-fuckery' of https://github.com/SixplyDev/erm....-ee-fuckery into erm.-shadowkin-fuckery

  

  ShirouAjisai

  committed
  0fbd6cb

  Copy full SHA for 0fbd6cb

• Shadowkin Guidebook Traits Update

  

  ShirouAjisai

  committed
  440b9a1

  Copy full SHA for 440b9a1

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  b4610aa

  Copy full SHA for b4610aa

• Shadowkin Hair Update

  

  ShirouAjisai

  committed
  4fd0446

  Copy full SHA for 4fd0446

• YAML Linter Fix

  

  ShirouAjisai

  committed
  0df83ad

  Copy full SHA for 0df83ad

• Fixed merge conflicts, removed Shadowkin hair

  

  ShirouAjisai

  committed
  328c3e0

  Copy full SHA for 328c3e0

• Fixing merge conflicts (again)

  

  ShirouAjisai

  committed
  cb2ee99

  Copy full SHA for cb2ee99

• Fix merge conflicts (hopefully for the last time)

  

  ShirouAjisai

  committed
  1912bd5

  Copy full SHA for 1912bd5

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  db93852

  Copy full SHA for db93852

• Readded Shadowkin to the guidebook (removed due to merge conflict)

  

  ShirouAjisai

  committed
  f863cb1

  Copy full SHA for f863cb1

• Merge branch 'erm.-shadowkin-fuckery' of https://github.com/SixplyDev/erm....-ee-fuckery into erm.-shadowkin-fuckery

  

  ShirouAjisai

  committed
  c0790e4

  Copy full SHA for c0790e4

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  f3d3a22

  Copy full SHA for f3d3a22

• Removed Empathy File

  

  ShirouAjisai

  committed
  b20887b

  Copy full SHA for b20887b

• Merge branch 'erm.-shadowkin-fuckery' of https://github.com/SixplyDev/erm....-ee-fuckery into erm.-shadowkin-fuckery

  

  ShirouAjisai

  committed
  4e4f105

  Copy full SHA for 4e4f105

• Merge branch 'master' into erm.-shadowkin-fuckery

  SixplyDev

  authored
  2c415c7

  Copy full SHA for 2c415c7

• Merge branch 'master' into erm.-shadowkin-fuckery

  VMSolidus

  authored
  3e21139

  Copy full SHA for 3e21139