Code

Melee Executions#30104

Code

Merged

metalgearsloth merged 35 commits intospace-wizards:masterspace-wizards/space-station-14:masterfrom Scribbles0:melee-executionsScribbles0/space-station-14:melee-executionsCopy head branch name to clipboardAug 11, 2024

+1,030-201

Commits

Commits on Jul 16, 2024

• melee executions

  Scribbles0

  committed
  9e000af

  Copy full SHA for 9e000af

• fix damage bug

  Scribbles0

  committed
  e9cc495

  Copy full SHA for e9cc495

• cleanup

  Scribbles0

  committed
  14e48f0

  Copy full SHA for 14e48f0

Commits on Jul 17, 2024

• address reviews hopefully

  Scribbles0

  committed
  5db5c0f

  Copy full SHA for 5db5c0f

• resistance bypass mechanic

  Scribbles0

  committed
  05d3688

  Copy full SHA for 05d3688

• component changes

  Scribbles0

  committed
  12dc6f8

  Copy full SHA for 12dc6f8

Commits on Jul 28, 2024

• self executions (not finished yet)

  Scribbles0

  committed
  ac52248

  Copy full SHA for ac52248

• self execs part two

  Scribbles0

  committed
  cd799ff

  Copy full SHA for cd799ff

Commits on Jul 29, 2024

• ok i fixed things (still not finished)

  Scribbles0

  committed
  75de264

  Copy full SHA for 75de264

Commits on Jul 30, 2024

• finish everything

  Scribbles0

  committed
  529bd4e

  Copy full SHA for 529bd4e

Commits on Jul 31, 2024

• review stuff

  Scribbles0

  committed
  6895d97

  Copy full SHA for 6895d97

• nuke if (kind = special)

  Scribbles0

  committed
  0d15591

  Copy full SHA for 0d15591

Commits on Aug 6, 2024

• more review stuffs

  Scribbles0

  committed
  32b8817

  Copy full SHA for 32b8817

• Make suicide system much less hardcoded and make much more use of events

  Plykiya

  committed
  a29fae1

  Copy full SHA for a29fae1

• Fix a dumb bug I introduced

  Plykiya

  committed
  c1138b6

  Copy full SHA for c1138b6

Commits on Aug 7, 2024

• self execution popups

  Scribbles0

  committed
  2688885

  Copy full SHA for 2688885

• Integration tests

  Plykiya

  committed
  d22297f

  Copy full SHA for d22297f

• Merge remote-tracking branch 'github-desktop-Scribbles0/melee-executions' into pr/30104

  Plykiya

  committed
  c8ab74e

  Copy full SHA for c8ab74e

• Why did they even take 0.5 blunt damage?

  Plykiya

  committed
  f7df312

  Copy full SHA for f7df312

• More consistent integration tests

  Plykiya

  committed
  b530d81

  Copy full SHA for b530d81

• Destructive equals true

  Plykiya

  committed
  00a71a9

  Copy full SHA for 00a71a9

• Allow it to dirty-dispose

  Plykiya

  committed
  4515174

  Copy full SHA for 4515174

• IS THIS WHAT YOU WANT?

  Plykiya

  committed
  4829889

  Copy full SHA for 4829889

• FRESH AND CLEAN

  Plykiya

  committed
  e8fcb61

  Copy full SHA for e8fcb61

• modifier to multiplier

  Scribbles0

  committed
  7542799

  Copy full SHA for 7542799

Commits on Aug 8, 2024

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

  Plykiya

  authored
  4227a0c

  Copy full SHA for 4227a0c

• don't jinx the integration tests

  Plykiya

  committed
  d311a3b

  Copy full SHA for d311a3b

Commits on Aug 9, 2024

• no file-scoped namespace

  Plykiya

  committed
  4311cd4

  Copy full SHA for 4311cd4

• Move the rest of execution to shared, create SuicideGhostEvent

  Plykiya

  committed
  78f217b

  Copy full SHA for 78f217b

• handled

  Plykiya

  committed
  802ac54

  Copy full SHA for 802ac54

• Get rid of unused code and add a comment

  Plykiya

  committed
  fc687d1

  Copy full SHA for fc687d1

• ghost before suicide

  Plykiya

  committed
  b3668ea

  Copy full SHA for b3668ea

• stop cat suicides

  Plykiya

  committed
  458799d

  Copy full SHA for 458799d

• popup fix + small suicide change

  Scribbles0

  committed
  5f5a1c8

  Copy full SHA for 5f5a1c8

• make it a bit better

  Scribbles0

  committed
  3298292

  Copy full SHA for 3298292