Code

Upstream Merge 08/16/2024#114

Code

Merged

FoxxoTrystan merged 142 commits intoFansana:masterFansana/floofstation1:masterfrom FoxxoTrystan:Upstream-Merge-08/16/2024FoxxoTrystan/floofstation1:Upstream-Merge-08/16/2024Copy head branch name to clipboardAug 20, 2024

+16,555-4,897

Commits

Commits on Aug 6, 2024

• Adds PKA & Jetpack Module for Salvage Cyborgs (#550)

  Show description for 1141f26
  gluesniffler

  authored
  1141f26

  Copy full SHA for 1141f26

• Automatic Changelog Update (#550)

  SimpleStation14

  committed
  e352057

  Copy full SHA for e352057

• Rebase Blood Drinker System, Arachne, Oneirophage (Fansana#438)

  Show description for 981b7dd
  VMSolidus

  authored
  981b7dd

  Copy full SHA for 981b7dd

• Automatic Changelog Update (Fansana#438)

  SimpleStation14

  committed
  c2d83e4

  Copy full SHA for c2d83e4

• CPR Remake (Fansana#487)

  Show description for aed3bab
  VMSolidus

  authored
  aed3bab

  Copy full SHA for aed3bab

• Automatic Changelog Update (Fansana#487)

  SimpleStation14

  committed
  b1674d1

  Copy full SHA for b1674d1

• New Trait: Self-Aware (#680)

  Show description for 22ff27c
  

  angelofallars

  and

  VMSolidus

  authored
  22ff27c

  Copy full SHA for 22ff27c

• Automatic Changelog Update (#680)

  SimpleStation14

  committed
  5fcec47

  Copy full SHA for 5fcec47

• Remove Overlay Restrict From Vulps (#683)

  Show description for 498d070
  TadJohnson00

  authored
  498d070

  Copy full SHA for 498d070

• Automatic Changelog Update (#683)

  SimpleStation14

  committed
  cb3ddd4

  Copy full SHA for cb3ddd4

• Stamina Damage Resistance Real (#679)

  Show description for 55aa822
  whateverusername0

  authored
  55aa822

  Copy full SHA for 55aa822

• Automatic Changelog Update (#679)

  SimpleStation14

  committed
  b7d3080

  Copy full SHA for b7d3080

• New Trait: Blood Deficiency (#686)

  Show description for 6ab1797
  angelofallars

  authored
  6ab1797

  Copy full SHA for 6ab1797

• Automatic Changelog Update (#686)

  SimpleStation14

  committed
  bc3ffaf

  Copy full SHA for bc3ffaf

• New Trait: Oni Damage Bonuses (#676)

  Show description for 6574893
  

  angelofallars

  and

  DangerRevolution

  authored
  6574893

  Copy full SHA for 6574893

• Automatic Changelog Update (#676)

  SimpleStation14

  committed
  0e29373

  Copy full SHA for 0e29373

• Port Justice Department From DeltaV (#675)

  Show description for 32b08b0
  VMSolidus

  authored
  32b08b0

  Copy full SHA for 32b08b0

• New Trait: Parkour Training (#670)

  Show description for da3956b
  angelofallars

  authored
  da3956b

  Copy full SHA for da3956b

• Automatic Changelog Update (#670)

  SimpleStation14

  committed
  8400f6c

  Copy full SHA for 8400f6c

• Cherry-Pick "EMP Grenade Actually Sabotages Power" From Wizden (Fansana#516)

  Show description for 93ece39
  

  WarMechanic

  and

  VMSolidus

  authored
  93ece39

  Copy full SHA for 93ece39

• Automatic Changelog Update (Fansana#516)

  SimpleStation14

  committed
  b6b21da

  Copy full SHA for b6b21da

• Admeme Language Commands (Attempt 2) (#565)

  Show description for 81ad859
  

  Mnemotechnician

  and

  DEATHB4DEFEAT

  authored
  81ad859

  Copy full SHA for 81ad859

• Automatic Changelog Update (#565)

  SimpleStation14

  committed
  48c0770

  Copy full SHA for 48c0770

• Added Penlights (#567)

  Show description for 04d01f6
  

  SleepyScarecrow

  and

  VMSolidus

  authored
  04d01f6

  Copy full SHA for 04d01f6

• Automatic Changelog Update (#567)

  SimpleStation14

  committed
  5779039

  Copy full SHA for 5779039

• Unique Glove Fibers (#642)

  Show description for 8768df7
  

  5 peopleauthored
  8768df7

  Copy full SHA for 8768df7

• Automatic Changelog Update (#642)

  SimpleStation14

  committed
  24a5f92

  Copy full SHA for 24a5f92

• Alphabetized physical-desc.ftl (Fr This Time) (#648)

  Show description for bd11307
  SleepyScarecrow

  authored
  bd11307

  Copy full SHA for bd11307

Commits on Aug 7, 2024

• Fix No Blood Regeneration (#689)

  Show description for ab2947b
  angelofallars

  authored
  ab2947b

  Copy full SHA for ab2947b

• Automatic Changelog Update (#689)

  SimpleStation14

  committed
  cf310f3

  Copy full SHA for cf310f3

• Fix BarotraumaSystem (#694)

  Show description for 69946f8
  Fansana

  authored
  69946f8

  Copy full SHA for 69946f8

• Automatic Changelog Update (#694)

  SimpleStation14

  committed
  1b2c946

  Copy full SHA for 1b2c946

• Butlergone (Cherry-Pick From Delta-V) (#678)

  Show description for a0f3f31
  

  3 peopleauthored
  a0f3f31

  Copy full SHA for a0f3f31

• Automatic Changelog Update (#678)

  SimpleStation14

  committed
  732b8e8

  Copy full SHA for 732b8e8

• White Dream Harpy Markings (#696)

  Show description for 2a6790b
  VMSolidus

  authored
  2a6790b

  Copy full SHA for 2a6790b

• Automatic Changelog Update (#696)

  SimpleStation14

  committed
  07325fc

  Copy full SHA for 07325fc

• Add Le Psionic Orb From Nyanotrasen (#685)

  Show description for 020e90a
  DangerRevolution

  authored
  020e90a

  Copy full SHA for 020e90a

• Automatic Changelog Update (#685)

  SimpleStation14

  committed
  9e83f66

  Copy full SHA for 9e83f66

• Psionic Refactor Part 1: Respacing To Keep Files Changed Down (#698)

  Show description for dfe5c2c
  VMSolidus

  authored
  dfe5c2c

  Copy full SHA for dfe5c2c

• New Trait: Sluggish / Snail-Paced (#692)

  Show description for f79c6db
  

  angelofallars

  and

  VMSolidus

  authored
  f79c6db

  Copy full SHA for f79c6db

• Automatic Changelog Update (#692)

  SimpleStation14

  committed
  04330a4

  Copy full SHA for 04330a4

• New Trait: Hemophilia (#690)

  Show description for 54e5982
  angelofallars

  authored
  54e5982

  Copy full SHA for 54e5982

• Automatic Changelog Update (#690)

  SimpleStation14

  committed
  0fc4051

  Copy full SHA for 0fc4051

• Aloe Cream Recipe Fix, Now 15 Seconds (#688)

  Show description for c469961
  SleepyScarecrow

  authored
  c469961

  Copy full SHA for c469961

• Automatic Changelog Update (#688)

  SimpleStation14

  committed
  7ef43ac

  Copy full SHA for 7ef43ac

• New Plant Trait : Bluespace Slips (#674)

  Show description for f2e6d1a
  dootythefrooty

  authored
  f2e6d1a

  Copy full SHA for f2e6d1a

• Automatic Changelog Update (#674)

  SimpleStation14

  committed
  a243fca

  Copy full SHA for a243fca

Commits on Aug 8, 2024

• 1984 Dresser Arbitrage 2, Electric Boogaloo (#682)

  Show description for 4c4b37a
  VMSolidus

  authored
  4c4b37a

  Copy full SHA for 4c4b37a

• Respace Psionics Audio & Localization Files (#700)

  Show description for 9b11260
  VMSolidus

  authored
  9b11260

  Copy full SHA for 9b11260

• Updates WelderRefinable Component (#687)

  Show description for e9e10f2
  BlueHNT

  authored
  e9e10f2

  Copy full SHA for e9e10f2

• Automatic Changelog Update (#687)

  SimpleStation14

  committed
  844218c

  Copy full SHA for 844218c

• 1984 Shit Colored Moths (#681)

  Show description for 75d2ea8
  VMSolidus

  authored
  75d2ea8

  Copy full SHA for 75d2ea8

• Automatic Changelog Update (#681)

  SimpleStation14

  committed
  ba9a937

  Copy full SHA for ba9a937

Commits on Aug 9, 2024

• Tweak Skeleton Description (#707)

  Show description for d1c8bf1
  

  Mnemotechnician

  and

  ShatteredSwords

  authored
  d1c8bf1

  Copy full SHA for d1c8bf1

• Automatic Changelog Update (#707)

  SimpleStation14

  committed
  892f1e0

  Copy full SHA for 892f1e0

• Soft-Refactor Geiger Counters (#615)

  Show description for 7d92c3e
  VMSolidus

  authored
  7d92c3e

  Copy full SHA for 7d92c3e

• Automatic Changelog Update (#615)

  SimpleStation14

  committed
  f034031

  Copy full SHA for f034031

• Make Dionas Slow And Steady (#704)

  Show description for f4d2e35
  angelofallars

  authored
  f4d2e35

  Copy full SHA for f4d2e35

• Automatic Changelog Update (#704)

  SimpleStation14

  committed
  3657ad4

  Copy full SHA for 3657ad4

• Psionic System Cleanup (#703)

  Show description for 31e3c02
  VMSolidus

  authored
  31e3c02

  Copy full SHA for 31e3c02

• Minor Glimmer System Cleanup (#702)

  Show description for 05364c5
  VMSolidus

  authored
  05364c5

  Copy full SHA for 05364c5

Commits on Aug 10, 2024

• Melee Pt2 (#693)

  Show description for c8c859a
  

  3 peopleauthored
  c8c859a

  Copy full SHA for c8c859a

• Automatic Changelog Update (#693)

  SimpleStation14

  committed
  c5fb202

  Copy full SHA for c5fb202

• Rename Mantis (#709)

  Show description for cb6e6ae
  Elijahrane

  authored
  cb6e6ae

  Copy full SHA for cb6e6ae

• Automatic Changelog Update (#709)

  SimpleStation14

  committed
  07c8eba

  Copy full SHA for 07c8eba

• New Trait: Liquor Lifeline 🍺🩹 (#706)

  Show description for 6a12eab
  angelofallars

  authored
  6a12eab

  Copy full SHA for 6a12eab

• Automatic Changelog Update (#706)

  SimpleStation14

  committed
  643df55

  Copy full SHA for 643df55

• NyanoCombat 2, Part 1: Simple Melee Refactor (#605)

  Show description for b9bf6e6
  

  VMSolidus

  and

  DangerRevolution

  authored
  b9bf6e6

  Copy full SHA for b9bf6e6

• Automatic Changelog Update (#605)

  SimpleStation14

  committed
  e617342

  Copy full SHA for e617342

• Remove Hugging Interaction Popup From Humanoids (#710)

  Show description for 80c3d63
  Elijahrane

  authored
  80c3d63

  Copy full SHA for 80c3d63

• Automatic Changelog Update (#710)

  SimpleStation14

  committed
  c006ec8

  Copy full SHA for c006ec8

• NyanoCombat 2, Part 3: Physical Traits (#607)

  Show description for 79b3190
  

  3 peopleauthored
  79b3190

  Copy full SHA for 79b3190

• Automatic Changelog Update (#607)

  SimpleStation14

  committed
  9869330

  Copy full SHA for 9869330

• Adds BeardTag (#608)

  Show description for e4b925b
  BlueHNT

  authored
  e4b925b

  Copy full SHA for e4b925b

• Automatic Changelog Update (#608)

  SimpleStation14

  committed
  9c74822

  Copy full SHA for 9c74822

Commits on Aug 11, 2024

• Update Credits (#719)

  github-actions[bot]

  authored
  eb64404

  Copy full SHA for eb64404

• Increase Trait Limit From 5 To 10 (#720)

  Show description for 09a8b91
  angelofallars

  authored
  09a8b91

  Copy full SHA for 09a8b91

• Automatic Changelog Update (#720)

  SimpleStation14

  committed
  3931167

  Copy full SHA for 3931167

• Make Security Dripped Out Again (#660)

  Show description for 8b0c754
  

  3 peopleauthored
  8b0c754

  Copy full SHA for 8b0c754

Commits on Aug 12, 2024

• Ports 78 From Floofstation - Fix Crew Monitor (#717)

  Show description for 84c338a
  DangerRevolution

  authored
  84c338a

  Copy full SHA for 84c338a

• Automatic Changelog Update (#717)

  SimpleStation14

  committed
  572123e

  Copy full SHA for 572123e

• Various Floofstation Ports. (#716)

  Show description for feb5529
  DangerRevolution

  authored
  feb5529

  Copy full SHA for feb5529

• Automatic Changelog Update (#716)

  SimpleStation14

  committed
  a425aeb

  Copy full SHA for a425aeb

• Add Home Run Bat (Traitor Item) (#722)

  Show description for e0f18e8
  

  angelofallars

  and

  deltanedas

  authored
  e0f18e8

  Copy full SHA for e0f18e8

• Automatic Changelog Update (#722)

  SimpleStation14

  committed
  f57327e

  Copy full SHA for f57327e

• Added Showers (#661)

  Show description for 376b8f1
  SleepyScarecrow

  authored
  376b8f1

  Copy full SHA for 376b8f1

• Automatic Changelog Update (#661)

  SimpleStation14

  committed
  e14bea6

  Copy full SHA for e14bea6

• Hardsuit MRP Descriptions (#725)

  Show description for 6df564a
  

  gluesniffler

  and

  VMSolidus

  authored
  6df564a

  Copy full SHA for 6df564a

• Automatic Changelog Update (#725)

  SimpleStation14

  committed
  e23114c

  Copy full SHA for e23114c

• Nix Version Bump (#721)

  Show description for 2ae464e
  stellar-novas

  authored
  2ae464e

  Copy full SHA for 2ae464e

Commits on Aug 13, 2024

• Fix Whitelist Requirements (#729)

  Show description for eb98bc8
  DEATHB4DEFEAT

  authored
  eb98bc8

  Copy full SHA for eb98bc8

• Automatic Changelog Update (#729)

  SimpleStation14

  committed
  42a5793

  Copy full SHA for 42a5793

• Oni Speech Update (#724)

  Show description for 90f56f4
  

  angelofallars

  and

  DangerRevolution

  authored
  90f56f4

  Copy full SHA for 90f56f4

• Automatic Changelog Update (#724)

  SimpleStation14

  committed
  079e978

  Copy full SHA for 079e978

• Plushie Update! (#654)

  Show description for 666e820
  FoxxoTrystan

  authored
  666e820

  Copy full SHA for 666e820

• Automatic Changelog Update (#654)

  SimpleStation14

  committed
  794b8eb

  Copy full SHA for 794b8eb

• Revert "Early-Merge Psionic Refactor Changes"

  FoxxoTrystan

  authored
  bebe435

  Copy full SHA for bebe435

• Oni Pointy Ears And Tusks (#727)

  Show description for ecfed3e
  angelofallars

  authored
  ecfed3e

  Copy full SHA for ecfed3e

• Automatic Changelog Update (#727)

  SimpleStation14

  committed
  6615d83

  Copy full SHA for 6615d83

Commits on Aug 14, 2024

• Hotfix Psionic Regeneration (#730)

  Show description for 2067f85
  VMSolidus

  authored
  2067f85

  Copy full SHA for 2067f85

• Automatic Changelog Update (#730)

  SimpleStation14

  committed
  d2ff5b1

  Copy full SHA for d2ff5b1

• Vulpkanin Rework: Number Changes (#713)

  Show description for a9280bb
  

  angelofallars

  and

  VMSolidus

  authored
  a9280bb

  Copy full SHA for a9280bb

• Automatic Changelog Update (#713)

  SimpleStation14

  committed
  66a7260

  Copy full SHA for 66a7260

• Oni Horn Markings (#726)

  Show description for 5f25d1b
  dootythefrooty

  authored
  5f25d1b

  Copy full SHA for 5f25d1b

• Automatic Changelog Update (#726)

  SimpleStation14

  committed
  934a096

  Copy full SHA for 934a096

Commits on Aug 15, 2024

• Convert Harpy Singing Into a Trait (#714)

  Show description for 441dee2
  

  3 peopleauthored
  441dee2

  Copy full SHA for 441dee2

• Automatic Changelog Update (#714)

  SimpleStation14

  committed
  037065a

  Copy full SHA for 037065a

• Xenowears (Fansana#519)

  Show description for df73a1c
  

  3 peopleauthored
  df73a1c

  Copy full SHA for df73a1c

• Automatic Changelog Update (Fansana#519)

  SimpleStation14

  committed
  6aa2545

  Copy full SHA for 6aa2545

• Vulpkanin Update (#715)

  Show description for d9a0469
  

  3 peopleauthored
  d9a0469

  Copy full SHA for d9a0469

• Automatic Changelog Update (#715)

  SimpleStation14

  committed
  f93b8dc

  Copy full SHA for f93b8dc

• Merge branch 'Fansana:master' into revert-6-latest-experimental-psychics

  ShatteredSwords

  authored
  63ca2e5

  Copy full SHA for 63ca2e5

• Commit all files without any conflicts

  ShatteredSwords

  committed
  9d5dfbd

  Copy full SHA for 9d5dfbd

• Merge the files marked as conflicts

  ShatteredSwords

  committed
  79ad4c6

  Copy full SHA for 79ad4c6

• Revert "Merge the files marked as conflicts"

  Show description for 4b77327
  ShatteredSwords

  committed
  4b77327

  Copy full SHA for 4b77327

• Cherry-Pick Antag Refactor (#734)

  Show description for 08822e3
  

  7 peopleauthored
  08822e3

  Copy full SHA for 08822e3

Commits on Aug 16, 2024

• Merge branch 'Fansana:master' into revert-6-latest-experimental-psychics

  ShatteredSwords

  authored
  c8e4ce8

  Copy full SHA for c8e4ce8

• Reverting the specific line

  ShatteredSwords

  authored
  b14719b

  Copy full SHA for b14719b

• Line Reversions, Guidance from VM

  ShatteredSwords

  committed
  a213abd

  Copy full SHA for a213abd

• :blunt:

  ShatteredSwords

  committed
  c4e95ab

  Copy full SHA for c4e95ab

• I thought I fixed you!

  ShatteredSwords

  committed
  f481bfb

  Copy full SHA for f481bfb

• Delete the line

  ShatteredSwords

  committed
  16d69a5

  Copy full SHA for 16d69a5

• Editing via VM Guidance

  Show description for 1c9f299
  ShatteredSwords

  committed
  1c9f299

  Copy full SHA for 1c9f299

• Deletion

  ShatteredSwords

  committed
  a4db652

  Copy full SHA for a4db652

• Merge branch 'Fansana:master' into revert-6-latest-experimental-psychics

  ShatteredSwords

  authored
  4677146

  Copy full SHA for 4677146

• Adds Fake Blindfold (#718)

  Show description for ecc0da2
  DangerRevolution

  authored
  ecc0da2

  Copy full SHA for ecc0da2

• Automatic Changelog Update (#718)

  SimpleStation14

  committed
  9dd3113

  Copy full SHA for 9dd3113

• Merge remote-tracking branch 'EE/master' into Upstream-Merge-08/16/2024

  FoxxoTrystan

  committed
  a164b9a

  Copy full SHA for a164b9a

• yeeps

  FoxxoTrystan

  committed
  b3aa98a

  Copy full SHA for b3aa98a

• fixes

  FoxxoTrystan

  committed
  7203a0e

  Copy full SHA for 7203a0e

• oops

  FoxxoTrystan

  committed
  48503b0

  Copy full SHA for 48503b0

• Remove Duplicates

  FoxxoTrystan

  committed
  2324d84

  Copy full SHA for 2324d84

Commits on Aug 18, 2024

• Update Credits (#746)

  Show description for cea9699
  

  github-actions[bot]

  and

  SimpleStation14

  authored
  cea9699

  Copy full SHA for cea9699

• Merge branch 'Fansana:master' into Upstream-Merge-08/16/2024

  FoxxoTrystan

  authored
  e552b84

  Copy full SHA for e552b84

• Update arachne.yml

  FoxxoTrystan

  authored
  f9451d8

  Copy full SHA for f9451d8

• [S] Onis: Get A Boatload Of Troll Horns. (#741)

  Show description for 9d1dada
  angelofallars

  authored
  9d1dada

  Copy full SHA for 9d1dada

• Automatic Changelog Update (#741)

  SimpleStation14

  committed
  5931965

  Copy full SHA for 5931965

• Remove the Stupid Station Records Check From News (#739)

  Show description for b7fe64c
  Mnemotechnician

  authored
  b7fe64c

  Copy full SHA for b7fe64c

• Automatic Changelog Update (#739)

  SimpleStation14

  committed
  b501bf2

  Copy full SHA for b501bf2

Commits on Aug 19, 2024

• Revert "Cherry-Pick Antag Refactor (#734)" (#749)

  Show description for 009d45a
  VMSolidus

  authored
  009d45a

  Copy full SHA for 009d45a

Commits on Aug 20, 2024

• Merge branch 'Fansana:master' into Upstream-Merge-08/16/2024

  FoxxoTrystan

  authored
  2503a65

  Copy full SHA for 2503a65

• Merge remote-tracking branch 'EE/master' into Upstream-Merge-08/16/2024

  FoxxoTrystan

  committed
  8ac15a2

  Copy full SHA for 8ac15a2