Code

Floofstation Release V12#493

Code

Merged

FoxxoTrystan merged 93 commits intoFansana:stableFansana/floofstation1:stablefrom FoxxoTrystan:releasev12FoxxoTrystan/floofstation1:releasev12Copy head branch name to clipboardJan 18, 2025

+332,654-144,877

Commits

Commits on Jan 3, 2025

• reworked saltern

  WhiteLightningTwister

  committed
  ef49dcc

  Copy full SHA for ef49dcc

Commits on Jan 5, 2025

• fix invalid configurator

  Fansana

  committed
  8a213bc

  Copy full SHA for 8a213bc

Commits on Jan 8, 2025

• - Added Pepper Plush

  Show description for ed798a9
  JenreyDominos

  committed
  ed798a9

  Copy full SHA for ed798a9

Commits on Jan 9, 2025

• psionic fix

  fenndragon

  committed
  cb26381

  Copy full SHA for cb26381

Commits on Jan 10, 2025

• Increase artifact analyzer's point-to-glimmer ratio

  Mnemotechnician

  committed
  58bb643

  Copy full SHA for 58bb643

Commits on Jan 11, 2025

• feat: drunkard accent trait

  Show description for f615e07
  mazziechai

  committed
  f615e07

  Copy full SHA for f615e07

• feat: check SlurredSpeech if its effect is greater than DrunkardAccent

  Show description for c714dcc
  mazziechai

  committed
  c714dcc

  Copy full SHA for c714dcc

• Add Train PostMapInitTest.cs

  Show description for eafd1e9
  Dunrab

  authored
  eafd1e9

  Copy full SHA for eafd1e9

• initial train map file

  Show description for ad7234a
  Dunrab

  authored
  ad7234a

  Copy full SHA for ad7234a

• Initial train jobs file

  Show description for bf95dc4
  Dunrab

  authored
  bf95dc4

  Copy full SHA for bf95dc4

• Update core.yml

  fenndragon

  committed
  8bf92ab

  Copy full SHA for 8bf92ab

• made visual disabilities and cybereyes mutually exclusive

  Tirochora

  committed
  100b6d6

  Copy full SHA for 100b6d6

• Merge pull request Fansana#476 from mazziechai/feature/slurred-speech-trait

  Show description for 6a4b2c3
  FoxxoTrystan

  authored
  6a4b2c3

  Copy full SHA for 6a4b2c3

• Automatic Changelog Update (Fansana#476)

  Floof-Station-Bot

  committed
  e07cd52

  Copy full SHA for e07cd52

• smaller evac shuttle

  Show description for 0afe28c
  Dunrab

  authored
  0afe28c

  Copy full SHA for 0afe28c

• small map udpates

  Show description for 0dd054a
  Dunrab

  authored
  0dd054a

  Copy full SHA for 0dd054a

• Fix the Flavor of Holy Vice (Fansana#479)

  Show description for 0eb9bca
  Tirochora

  authored
  0eb9bca

  Copy full SHA for 0eb9bca

• Automatic Changelog Update (Fansana#479)

  Floof-Station-Bot

  committed
  09b91d5

  Copy full SHA for 09b91d5

Commits on Jan 12, 2025

• add brigmed

  Show description for 2e5b0d7
  Dunrab

  authored
  2e5b0d7

  Copy full SHA for 2e5b0d7

• added a Psychologis job slot

  Show description for 41cde55
  Dunrab

  authored
  41cde55

  Copy full SHA for 41cde55

• Merge pull request Fansana#474 from Mnemotechnician/floof/tweak/easier-xenoarch

  Show description for 9b77dcd
  Memeji

  authored
  9b77dcd

  Copy full SHA for 9b77dcd

• Automatic Changelog Update (Fansana#474)

  Floof-Station-Bot

  committed
  de23ba7

  Copy full SHA for de23ba7

• more updates to train

  Show description for 705a343
  Dunrab

  authored
  705a343

  Copy full SHA for 705a343

• Forgot to change the mapPath

  Show description for d4241a9
  Dunrab

  authored
  d4241a9

  Copy full SHA for d4241a9

• more clean up

  Show description for 1ac25d0
  Dunrab

  authored
  1ac25d0

  Copy full SHA for 1ac25d0

• Merge pull request Fansana#480 from Tirochora/visualexclusivity

  Show description for 2b39469
  FoxxoTrystan

  authored
  2b39469

  Copy full SHA for 2b39469

• Merge pull request Fansana#478 from fenndragon/Core-update

  Show description for 88dd728
  FoxxoTrystan

  authored
  88dd728

  Copy full SHA for 88dd728

• Automatic Changelog Update (Fansana#480)

  Floof-Station-Bot

  committed
  5df0bbb

  Copy full SHA for 5df0bbb

• Automatic Changelog Update (Fansana#478)

  Floof-Station-Bot

  committed
  579f01d

  Copy full SHA for 579f01d

• Merge pull request Fansana#477 from Dunrab/map-addition-train

  Show description for b2b6ecd
  FoxxoTrystan

  authored
  b2b6ecd

  Copy full SHA for b2b6ecd

• Automatic Changelog Update (Fansana#477)

  Floof-Station-Bot

  committed
  015a498

  Copy full SHA for 015a498

Commits on Jan 13, 2025

• Update to PR

  JenreyDominos

  committed
  08f70be

  Copy full SHA for 08f70be

Commits on Jan 14, 2025

• CC Locker PR update

  JenreyDominos

  committed
  ad0da7b

  Copy full SHA for ad0da7b

• Merge branch 'Fansana:master' into master

  JenreyDominos

  authored
  fac5573

  Copy full SHA for fac5573

• Added CC Locker textures

  JenreyDominos

  committed
  0e4acee

  Copy full SHA for 0e4acee

• Merge remote-tracking branch 'origin/master'

  JenreyDominos

  committed
  ba31813

  Copy full SHA for ba31813

• salvage borg

  fenndragon

  committed
  fdcd917

  Copy full SHA for fdcd917

• salvborg

  fenndragon

  committed
  ea88d80

  Copy full SHA for ea88d80

Commits on Jan 15, 2025

• Gorilla

  FoxxoTrystan

  committed
  49699c3

  Copy full SHA for 49699c3

• patch

  FoxxoTrystan

  committed
  05d66b8

  Copy full SHA for 05d66b8

• Port Gladiabot from EE PR

  Show description for cc30b09
  Timfa2112

  committed
  cc30b09

  Copy full SHA for cc30b09

• salvborg

  fenndragon

  committed
  aaa9fab

  Copy full SHA for aaa9fab

Commits on Jan 16, 2025

• Update psionicPowers.yml

  fenndragon

  committed
  a7763bd

  Copy full SHA for a7763bd

• Update revenant.yml

  fenndragon

  authored
  2a45d8b

  Copy full SHA for 2a45d8b

• Merge pull request Fansana#482 from JenreyDominos/CC-Outpost,-Shuttle,-Plushie,-and-locker

  Show description for bade2f1
  FoxxoTrystan

  authored
  bade2f1

  Copy full SHA for bade2f1

• Automatic Changelog Update (Fansana#482)

  Floof-Station-Bot

  committed
  f2e51a6

  Copy full SHA for f2e51a6

• Merge pull request Fansana#485 from Timfa2112/gladiabot

  Show description for 66fa9f3
  FoxxoTrystan

  authored
  66fa9f3

  Copy full SHA for 66fa9f3

• Automatic Changelog Update (Fansana#485)

  Floof-Station-Bot

  committed
  433ef36

  Copy full SHA for 433ef36

• Update Resources/Prototypes/Nyanotrasen/psionicPowers.yml

  Show description for 7fbb308
  

  fenndragon

  and

  FoxxoTrystan

  authored
  7fbb308

  Copy full SHA for 7fbb308

• Update Resources/Prototypes/Actions/psionics.yml

  Show description for b927503
  

  fenndragon

  and

  FoxxoTrystan

  authored
  b927503

  Copy full SHA for b927503

• Update Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml

  Show description for 25ecbaa
  

  fenndragon

  and

  FoxxoTrystan

  authored
  25ecbaa

  Copy full SHA for 25ecbaa

• sprites

  fenndragon

  committed
  e1790fd

  Copy full SHA for e1790fd

Commits on Jan 17, 2025

• xenonids update 1

  fenndragon

  committed
  64112eb

  Copy full SHA for 64112eb

• rsi

  fenndragon

  committed
  6a2355e

  Copy full SHA for 6a2355e

• Update psionics.yml

  Show description for 4c1d9c7
  fenndragon

  authored
  4c1d9c7

  Copy full SHA for 4c1d9c7

• initial edge rework

  Show description for b23c9ea
  Dunrab

  authored
  b23c9ea

  Copy full SHA for b23c9ea

• update

  Show description for 820af40
  VividPups

  committed
  820af40

  Copy full SHA for 820af40

• Update events.yml

  fenndragon

  authored
  aa33105

  Copy full SHA for aa33105

• remove dino plush

  Fansana

  committed
  443be13

  Copy full SHA for 443be13

• do not add this

  Fansana

  committed
  a21efe1

  Copy full SHA for a21efe1

• Update README.md

  Fansana

  authored
  079a30e

  Copy full SHA for 079a30e

• Update README.md

  Fansana

  authored
  602c37e

  Copy full SHA for 602c37e

• Update README.md

  Fansana

  authored
  b2a99bf

  Copy full SHA for b2a99bf

• Merge pull request Fansana#491 from VividPups/mop-bucket

  Show description for a5e06c2
  FoxxoTrystan

  authored
  a5e06c2

  Copy full SHA for a5e06c2

• Automatic Changelog Update (Fansana#491)

  Floof-Station-Bot

  committed
  0e0153d

  Copy full SHA for 0e0153d

• Gorilla Mob

  FoxxoTrystan

  committed
  7e4b9d2

  Copy full SHA for 7e4b9d2

• Update Xenos.yml

  fenndragon

  committed
  ecdb822

  Copy full SHA for ecdb822

• Gorilla Faction

  FoxxoTrystan

  committed
  35d05a7

  Copy full SHA for 35d05a7

• Cargorilla

  FoxxoTrystan

  committed
  f8c9220

  Copy full SHA for f8c9220

• Merge branch 'master' into Gorilla-Update

  FoxxoTrystan

  committed
  3b7c6b6

  Copy full SHA for 3b7c6b6

• Implant

  FoxxoTrystan

  committed
  3df4161

  Copy full SHA for 3df4161

• uplink

  FoxxoTrystan

  committed
  8288dbd

  Copy full SHA for 8288dbd

• fixes

  FoxxoTrystan

  committed
  719adbf

  Copy full SHA for 719adbf

• added missing jobs

  Show description for 237a92f
  Dunrab

  authored
  237a92f

  Copy full SHA for 237a92f

• more changes

  Show description for 5453637
  Dunrab

  authored
  5453637

  Copy full SHA for 5453637

• Update xeno.yml

  fenndragon

  committed
  1160a8c

  Copy full SHA for 1160a8c

Commits on Jan 18, 2025

• a few more changes

  Show description for b3b6eb4
  Dunrab

  authored
  b3b6eb4

  Copy full SHA for b3b6eb4

• Merge pull request Fansana#490 from Dunrab/map-rework-edge

  Show description for 99ff594
  FoxxoTrystan

  authored
  99ff594

  Copy full SHA for 99ff594

• Automatic Changelog Update (Fansana#490)

  Floof-Station-Bot

  committed
  232c40d

  Copy full SHA for 232c40d

• Merge pull request Fansana#487 from fenndragon/quality

  Show description for 28f309b
  Fansana

  authored
  28f309b

  Copy full SHA for 28f309b

• Automatic Changelog Update (Fansana#487)

  Floof-Station-Bot

  committed
  23fde83

  Copy full SHA for 23fde83

• Merge pull request Fansana#484 from FoxxoTrystan/borg-zipties-patch

  Show description for 848c9cf
  Fansana

  authored
  848c9cf

  Copy full SHA for 848c9cf

• Merge pull request Fansana#486 from fenndragon/salvborg

  Show description for 07be707
  Fansana

  authored
  07be707

  Copy full SHA for 07be707

• Automatic Changelog Update (Fansana#484)

  Floof-Station-Bot

  committed
  1bc62df

  Copy full SHA for 1bc62df

• Automatic Changelog Update (Fansana#486)

  Floof-Station-Bot

  committed
  e028d07

  Copy full SHA for e028d07

• move warden locker

  Fansana

  committed
  8f324fd

  Copy full SHA for 8f324fd

• remove invalid

  Fansana

  committed
  27b05d3

  Copy full SHA for 27b05d3

• Merge pull request Fansana#488 from fenndragon/Warden

  Show description for 7491079
  FoxxoTrystan

  authored
  7491079

  Copy full SHA for 7491079

• Automatic Changelog Update (Fansana#488)

  Floof-Station-Bot

  committed
  502c1a1

  Copy full SHA for 502c1a1

• Merge pull request Fansana#483 from FoxxoTrystan/Gorilla-Update

  Show description for ac0fb45
  FoxxoTrystan

  authored
  ac0fb45

  Copy full SHA for ac0fb45

• Automatic Changelog Update (Fansana#483)

  Floof-Station-Bot

  committed
  3c3d8de

  Copy full SHA for 3c3d8de

• Merge pull request Fansana#451 from WhiteLightningTwister/saltern-rework

  Show description for 063abee
  Fansana

  authored
  063abee

  Copy full SHA for 063abee

• Automatic Changelog Update (Fansana#451)

  Floof-Station-Bot

  committed
  c1fde1e

  Copy full SHA for c1fde1e