Code

Floofstation Release V7#391

Code

Merged

FoxxoTrystan merged 133 commits intoFansana:stableFansana/floofstation1:stablefrom FoxxoTrystan:Floofstation-V7FoxxoTrystan/floofstation1:Floofstation-V7Copy head branch name to clipboardDec 7, 2024

+8,914-4,082

Commits

Commits on Nov 4, 2024

• Changes/Consent

  FoxxoTrystan

  committed
  c86e6ad

  Copy full SHA for c86e6ad

• apply warning 2

  FoxxoTrystan

  committed
  b3cd068

  Copy full SHA for b3cd068

Commits on Nov 5, 2024

• Changes .ftl

  FoxxoTrystan

  committed
  6d936cc

  Copy full SHA for 6d936cc

Commits on Nov 10, 2024

• The return of the techfabs

  Mnemotechnician

  committed
  1e42299

  Copy full SHA for 1e42299

• Eugh

  Mnemotechnician

  committed
  f9a0d25

  Copy full SHA for f9a0d25

• Merge remote-tracking branch 'floofstation/master' into floof/feat/dept-lathes

  Show description for 73d6090
  Mnemotechnician

  committed
  73d6090

  Copy full SHA for 73d6090

Commits on Nov 14, 2024

• resomi

  FoxxoTrystan

  committed
  878d6da

  Copy full SHA for 878d6da

• displacement edit

  FoxxoTrystan

  committed
  2bb8d4a

  Copy full SHA for 2bb8d4a

• sounds

  FoxxoTrystan

  committed
  874db34

  Copy full SHA for 874db34

Commits on Nov 19, 2024

• Merge branch 'master' into Resomi

  FoxxoTrystan

  committed
  6e4839b

  Copy full SHA for 6e4839b

• initial commit

  Memeji

  committed
  657a0e2

  Copy full SHA for 657a0e2

Commits on Nov 21, 2024

• ONI MELEE

  Show description for 90a67bf
  VividPups

  committed
  90a67bf

  Copy full SHA for 90a67bf

• displacement

  FoxxoTrystan

  committed
  924360f

  Copy full SHA for 924360f

• clothes

  FoxxoTrystan

  committed
  a68c693

  Copy full SHA for a68c693

• changes

  FoxxoTrystan

  committed
  d7c7090

  Copy full SHA for d7c7090

• fixes

  FoxxoTrystan

  committed
  c16a41c

  Copy full SHA for c16a41c

• fix linter

  FoxxoTrystan

  committed
  f90115f

  Copy full SHA for f90115f

• json fixes

  FoxxoTrystan

  committed
  d079648

  Copy full SHA for d079648

• fix sounds

  FoxxoTrystan

  committed
  1ca228c

  Copy full SHA for 1ca228c

• linter fixes

  FoxxoTrystan

  committed
  22e23fe

  Copy full SHA for 22e23fe

Commits on Nov 22, 2024

• consent

  FoxxoTrystan

  committed
  fc6b4d4

  Copy full SHA for fc6b4d4

• consent

  FoxxoTrystan

  committed
  cfd6fc6

  Copy full SHA for cfd6fc6

• Merge branch 'master' into hypnosis-changes

  FoxxoTrystan

  authored
  0efd470

  Copy full SHA for 0efd470

Commits on Nov 23, 2024

• Merge branch 'Fansana:master' into hypnosis-changes

  FoxxoTrystan

  authored
  a461f57

  Copy full SHA for a461f57

• Merge branch 'master' into hypnosis-changes

  FoxxoTrystan

  authored
  a9f48d6

  Copy full SHA for a9f48d6

• new

  Memeji

  committed
  b5a68a5

  Copy full SHA for b5a68a5

• Merge branch 'Fansana:master' into Nikko-Items

  Memeji

  authored
  de78937

  Copy full SHA for de78937

• Update announcements.yml

  Memeji

  authored
  75138ab

  Copy full SHA for 75138ab

• keeping it mono

  Memeji

  committed
  073d68f

  Copy full SHA for 073d68f

• robust tool

  Memeji

  committed
  2e206e2

  Copy full SHA for 2e206e2

• Update announcements.yml

  Fansana

  authored
  10a040e

  Copy full SHA for 10a040e

Commits on Nov 24, 2024

• Merge branch 'Fansana:master' into hypnosis-changes

  FoxxoTrystan

  authored
  3bfb9b3

  Copy full SHA for 3bfb9b3

• test fix?

  FoxxoTrystan

  committed
  8684f58

  Copy full SHA for 8684f58

• dipose fix?

  FoxxoTrystan

  committed
  cee02fa

  Copy full SHA for cee02fa

Commits on Nov 25, 2024

• Allow kin to use

  FoxxoTrystan

  committed
  fe502a9

  Copy full SHA for fe502a9

• allow kin to zoink (powred ones)

  FoxxoTrystan

  committed
  c48fa10

  Copy full SHA for c48fa10

• Automatic Changelog Update (Fansana#381)

  Floof-Station-Bot

  committed
  aa2de35

  Copy full SHA for aa2de35

Commits on Nov 26, 2024

• Remove MassMindSwap

  FoxxoTrystan

  authored
  e58455a

  Copy full SHA for e58455a

• Merge pull request Fansana#382 from Fansana/FoxxoTrystan-patch-1

  Show description for 062171b
  FoxxoTrystan

  authored
  062171b

  Copy full SHA for 062171b

• Automatic Changelog Update (Fansana#382)

  Floof-Station-Bot

  committed
  f7c4fae

  Copy full SHA for f7c4fae

Commits on Nov 27, 2024

• Update pickaxe.yml

  fenndragon

  authored
  a11ec92

  Copy full SHA for a11ec92

• Update pickaxe.yml

  Show description for 5513b7d
  fenndragon

  authored
  5513b7d

  Copy full SHA for 5513b7d

Commits on Nov 28, 2024

• start

  FoxxoTrystan

  committed
  db09d3a

  Copy full SHA for db09d3a

• Update roundstart.yml

  Show description for c5fc9b5
  fenndragon

  authored
  c5fc9b5

  Copy full SHA for c5fc9b5

• Merge branch 'Fansana:master' into Fixes

  fenndragon

  authored
  2f750c6

  Copy full SHA for 2f750c6

• Merge branch 'master' of https://github.com/Fansana/floofstation1 into floof/feat/dept-lathes

  Mnemotechnician

  committed
  9ce7c65

  Copy full SHA for 9ce7c65

• No submodule update.

  Mnemotechnician

  committed
  0de9445

  Copy full SHA for 0de9445

Commits on Nov 29, 2024

• THE VORE STARTS

  FoxxoTrystan

  committed
  5230a85

  Copy full SHA for 5230a85

Commits on Nov 30, 2024

• THE VORE

  FoxxoTrystan

  committed
  8f14885

  Copy full SHA for 8f14885

Commits on Dec 1, 2024

• Ship update

  Show description for 9cc5952
  JasmineRickards

  committed
  9cc5952

  Copy full SHA for 9cc5952

• Merge branch 'Fansana:master' into master

  JasmineRickards

  authored
  c8e5fd3

  Copy full SHA for c8e5fd3

• Merge pull request Fansana#5 from JasmineRickards/master

  Show description for 079b861
  JasmineRickards

  authored
  079b861

  Copy full SHA for 079b861

• vore noises

  FoxxoTrystan

  committed
  ab65727

  Copy full SHA for ab65727

• voredigest

  FoxxoTrystan

  committed
  b8af22d

  Copy full SHA for b8af22d

• ent

  FoxxoTrystan

  committed
  028774b

  Copy full SHA for 028774b

Commits on Dec 2, 2024

• Initial commit

  Memeji

  committed
  87583e1

  Copy full SHA for 87583e1

• tiny fixes

  FoxxoTrystan

  committed
  4003a4b

  Copy full SHA for 4003a4b

• Merge pull request Fansana#327 from FoxxoTrystan/hypnosis-changes

  Show description for e2bdba3
  FoxxoTrystan

  authored
  e2bdba3

  Copy full SHA for e2bdba3

• Automatic Changelog Update (Fansana#327)

  Floof-Station-Bot

  committed
  f992ba0

  Copy full SHA for f992ba0

• Merge branch 'master' into vore-update

  FoxxoTrystan

  authored
  2f9d83f

  Copy full SHA for 2f9d83f

• Merge branch 'master' into Resomi

  FoxxoTrystan

  committed
  cc53ced

  Copy full SHA for cc53ced

• Merge pull request Fansana#342 from Mnemotechnician/floof/feat/dept-lathes

  Show description for 5f606ad
  Memeji

  authored
  5f606ad

  Copy full SHA for 5f606ad

• Automatic Changelog Update (Fansana#342)

  Floof-Station-Bot

  committed
  bde63df

  Copy full SHA for bde63df

• Merge pull request Fansana#372 from FoxxoTrystan/Resomi

  Show description for 896a090
  FoxxoTrystan

  authored
  896a090

  Copy full SHA for 896a090

• Automatic Changelog Update (Fansana#372)

  Floof-Station-Bot

  committed
  148670f

  Copy full SHA for 148670f

• Merge pull request Fansana#386 from JasmineRickards/ert

  Show description for e4a891d
  FoxxoTrystan

  authored
  e4a891d

  Copy full SHA for e4a891d

• Merge branch 'Fansana:master' into Nikko-Items

  Memeji

  authored
  4d45297

  Copy full SHA for 4d45297

• finals

  FoxxoTrystan

  committed
  10ea7ec

  Copy full SHA for 10ea7ec

• Updating to master and adding other stuff

  Memeji

  committed
  f5c8be3

  Copy full SHA for f5c8be3

• Remove request

  FoxxoTrystan

  committed
  e387643

  Copy full SHA for e387643

• THE PERMIT

  FoxxoTrystan

  committed
  5e3f2a7

  Copy full SHA for 5e3f2a7

• Merge pull request Fansana#387 from FoxxoTrystan/vore-update

  Show description for b9f5ef4
  FoxxoTrystan

  authored
  b9f5ef4

  Copy full SHA for b9f5ef4

• Automatic Changelog Update (Fansana#387)

  Floof-Station-Bot

  committed
  f95e2a4

  Copy full SHA for f95e2a4

• Merge pull request Fansana#388 from FoxxoTrystan/syni-remove

  Show description for b2ccda0
  FoxxoTrystan

  authored
  b2ccda0

  Copy full SHA for b2ccda0

• Automatic Changelog Update (Fansana#388)

  Floof-Station-Bot

  committed
  eea462b

  Copy full SHA for eea462b

• Merge branch 'Fansana:master' into nudity-permit

  FoxxoTrystan

  authored
  1994417

  Copy full SHA for 1994417

• Commit final

  Memeji

  committed
  dfa4701

  Copy full SHA for dfa4701

• Merge branch 'stable'

  FoxxoTrystan

  committed
  54538a5

  Copy full SHA for 54538a5

• Loadout fixes

  Memeji

  committed
  77152e5

  Copy full SHA for 77152e5

• Merge pull request Fansana#389 from FoxxoTrystan/nudity-permit

  Show description for 4d4ee5f
  FoxxoTrystan

  authored
  4d4ee5f

  Copy full SHA for 4d4ee5f

• Automatic Changelog Update (Fansana#389)

  Floof-Station-Bot

  committed
  865777e

  Copy full SHA for 865777e

• Fix for speed loader issue

  Memeji

  committed
  7185df5

  Copy full SHA for 7185df5

• servicegroup fix

  FoxxoTrystan

  committed
  b8ba6bb

  Copy full SHA for b8ba6bb

• Commit for tags

  Memeji

  committed
  2392adb

  Copy full SHA for 2392adb

• Merge branch 'Nikko-Loadout' of https://github.com/Memeji/floofstation1 into Nikko-Loadout

  Memeji

  committed
  1055d3c

  Copy full SHA for 1055d3c

• Price of cargo vending from 1000 to 1300

  Memeji

  committed
  c95ae48

  Copy full SHA for c95ae48

• Update Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml

  Show description for 055e2c6
  

  Memeji

  and

  FoxxoTrystan

  authored
  055e2c6

  Copy full SHA for 055e2c6

• Update Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml

  Show description for 84da438
  

  Memeji

  and

  FoxxoTrystan

  authored
  84da438

  Copy full SHA for 84da438

• Update cloaks.yml

  Memeji

  authored
  e768118

  Copy full SHA for e768118

• Update cloaks.yml

  Memeji

  authored
  8c17a7e

  Copy full SHA for 8c17a7e

• Update pickaxe.yml

  Show description for b6286ae
  fenndragon

  authored
  b6286ae

  Copy full SHA for b6286ae

• Merge pull request Fansana#390 from Memeji/Nikko-Loadout

  Show description for 01c82b1
  FoxxoTrystan

  authored
  01c82b1

  Copy full SHA for 01c82b1

• Automatic Changelog Update (Fansana#390)

  Floof-Station-Bot

  committed
  83eb85b

  Copy full SHA for 83eb85b

Commits on Dec 3, 2024

• Disable Resomi

  FoxxoTrystan

  committed
  1f14fd0

  Copy full SHA for 1f14fd0

• Resomi Fixes

  FoxxoTrystan

  committed
  da3ae12

  Copy full SHA for da3ae12

• fix .rsi

  FoxxoTrystan

  committed
  55de706

  Copy full SHA for 55de706

• Merge pull request Fansana#392 from FoxxoTrystan/resomi-fixes

  Show description for 6bfbcda
  FoxxoTrystan

  authored
  6bfbcda

  Copy full SHA for 6bfbcda

• Automatic Changelog Update (Fansana#392)

  Floof-Station-Bot

  committed
  3cad8aa

  Copy full SHA for 3cad8aa

• Merge branch 'master' into Floofstation-V7

  FoxxoTrystan

  committed
  61f5b8c

  Copy full SHA for 61f5b8c

• enable resomi

  FoxxoTrystan

  committed
  8752232

  Copy full SHA for 8752232

Commits on Dec 4, 2024

• Various fixes and tweaks

  Mnemotechnician

  committed
  1b9d287

  Copy full SHA for 1b9d287

• Update Melee.yml

  VividPups

  committed
  95a0a76

  Copy full SHA for 95a0a76

• Merge branch 'master' into Oni-Brassnuckles

  VividPups

  authored
  6a5c81e

  Copy full SHA for 6a5c81e

• Update pickaxe.yml

  fenndragon

  authored
  c2b6771

  Copy full SHA for c2b6771

Commits on Dec 5, 2024

• Update publish-testing.yml

  Fansana

  authored
  3363b22

  Copy full SHA for 3363b22

• Update publish-stable.yml

  Fansana

  authored
  8390f72

  Copy full SHA for 8390f72

• Merge pull request Fansana#393 from Mnemotechnician/floof/tweak/various-issues

  Show description for 7b443cf
  FoxxoTrystan

  authored
  7b443cf

  Copy full SHA for 7b443cf

• Automatic Changelog Update (Fansana#393)

  Floof-Station-Bot

  committed
  3fcbf6b

  Copy full SHA for 3fcbf6b

• Merge branch 'master' into Floofstation-V7

  FoxxoTrystan

  committed
  902971f

  Copy full SHA for 902971f

• Some Language Fixes (#1223)

  Show description for 27cbf1e
  Mnemotechnician

  committed
  27cbf1e

  Copy full SHA for 27cbf1e

• Update roundstart.yml

  fenndragon

  authored
  7c0c9e0

  Copy full SHA for 7c0c9e0

• Update roundstart.yml

  fenndragon

  authored
  075cc2f

  Copy full SHA for 075cc2f

Commits on Dec 6, 2024

• no glimmer raise hypno

  FoxxoTrystan

  committed
  7698eda

  Copy full SHA for 7698eda

• Merge branch 'master' into Floofstation-V7

  FoxxoTrystan

  committed
  8af552c

  Copy full SHA for 8af552c

Commits on Dec 7, 2024

• Merge pull request Fansana#395 from Mnemotechnician/floof/cherrypick/ee1223

  Show description for 6e825b8
  FoxxoTrystan

  authored
  6e825b8

  Copy full SHA for 6e825b8

• Automatic Changelog Update (Fansana#395)

  Floof-Station-Bot

  committed
  70fe049

  Copy full SHA for 70fe049

• add rubyfang oc

  Fansana

  committed
  d6cbbdf

  Copy full SHA for d6cbbdf

• Merge pull request Fansana#383 from fenndragon/mining-drill

  Show description for 233f005
  FoxxoTrystan

  authored
  233f005

  Copy full SHA for 233f005

• Automatic Changelog Update (Fansana#383)

  Floof-Station-Bot

  committed
  4355f23

  Copy full SHA for 4355f23

• Update Content.Server/Polymorph/Components/PolymorphProviderComponent.cs

  Show description for b929a34
  

  Fansana

  and

  FoxxoTrystan

  authored
  b929a34

  Copy full SHA for b929a34

• Update Content.Server/Polymorph/Systems/PolymorphSystem.Provider.cs

  Show description for 9921d67
  

  Fansana

  and

  FoxxoTrystan

  authored
  9921d67

  Copy full SHA for 9921d67

• Update Content.Server/Polymorph/Systems/PolymorphSystem.Provider.cs

  Show description for 5e20d50
  

  Fansana

  and

  FoxxoTrystan

  authored
  5e20d50

  Copy full SHA for 5e20d50

• Update Content.Server/Polymorph/Systems/PolymorphSystem.Provider.cs

  Show description for 89c892b
  

  Fansana

  and

  FoxxoTrystan

  authored
  89c892b

  Copy full SHA for 89c892b

• Update Content.Server/Polymorph/Components/PolymorphProviderComponent.cs

  Show description for a5c3ee5
  

  Fansana

  and

  FoxxoTrystan

  authored
  a5c3ee5

  Copy full SHA for a5c3ee5

• Update Content.Server/Polymorph/Systems/PolymorphSystem.Provider.cs

  Show description for 565419a
  

  Fansana

  and

  FoxxoTrystan

  authored
  565419a

  Copy full SHA for 565419a

• Update Content.Server/Polymorph/Components/PolymorphProviderComponent.cs

  FoxxoTrystan

  authored
  708e739

  Copy full SHA for 708e739

• Merge pull request Fansana#396 from Fansana/rubyfang-oc

  Show description for 0942002
  FoxxoTrystan

  authored
  0942002

  Copy full SHA for 0942002

• Merge branch 'master' into Floofstation-V7

  FoxxoTrystan

  committed
  e2378ad

  Copy full SHA for e2378ad

• Merge pull request Fansana#371 from VividPups/Oni-Brassnuckles

  Show description for 04aba54
  Fansana

  authored
  04aba54

  Copy full SHA for 04aba54

• Automatic Changelog Update (Fansana#371)

  Floof-Station-Bot

  committed
  3ff62fc

  Copy full SHA for 3ff62fc

• Merge pull request Fansana#385 from fenndragon/Fixes

  Show description for 6574ec0
  Fansana

  authored
  6574ec0

  Copy full SHA for 6574ec0

• Automatic Changelog Update (Fansana#385)

  Floof-Station-Bot

  committed
  344bada

  Copy full SHA for 344bada

• Merge branch 'master' into Floofstation-V7

  FoxxoTrystan

  committed
  354cbf7

  Copy full SHA for 354cbf7