Code

Floof Merge 11/10/24#30

Code

Merged

sleepyyapril merged 123 commits intomasterTheDenSS14/TheDen:masterfrom floofmergeTheDenSS14/TheDen:floofmergeCopy head branch name to clipboardNov 11, 2024

+47,924-35,209

Commits

Commits on Oct 28, 2024

• add neck floof

  Fansana

  committed
  72291e6

  Copy full SHA for 72291e6

• better gun and wielded checks

  Fansana

  committed
  1eaaa50

  Copy full SHA for 1eaaa50

• Mosin Rework (#1391)

  Show description for 983f412
  

  VividPups

  authored and

  Fansana

  committed
  983f412

  Copy full SHA for 983f412

• Merge pull request #301 from Fansana/mosin-rework

  Show description for 6517640
  Fansana

  authored
  6517640

  Copy full SHA for 6517640

• Merge pull request #300 from Fansana/neck-floof

  Show description for 9ee2985
  Fansana

  authored
  9ee2985

  Copy full SHA for 9ee2985

Commits on Oct 29, 2024

• give thermal insulation to penguins

  Fansana

  committed
  283e2fd

  Copy full SHA for 283e2fd

• Update animals.yml

  Fansana

  authored
  6c13b69

  Copy full SHA for 6c13b69

• Merge pull request #302 from Fansana/thermal-insulation-for-penguins

  Show description for 197592b
  Fansana

  authored
  197592b

  Copy full SHA for 197592b

• Remove Gax Station from map pool

  Memeji

  committed
  f58d1f8

  Copy full SHA for f58d1f8

• fix steal objective

  Fansana

  committed
  ab6652f

  Copy full SHA for ab6652f

• Automatic Changelog Update (#298)

  

  Floof-Station-Bot

  authored and

  neuPanda

  committed
  4721d89

  Copy full SHA for 4721d89

• Automatic Changelog Update (#297)

  

  Floof-Station-Bot

  authored and

  neuPanda

  committed
  1c6c399

  Copy full SHA for 1c6c399

• Automatic Changelog Update (#299)

  

  Floof-Station-Bot

  authored and

  neuPanda

  committed
  3739edd

  Copy full SHA for 3739edd

• Automatic Changelog Update (#301)

  

  Floof-Station-Bot

  authored and

  neuPanda

  committed
  6ebd6e2

  Copy full SHA for 6ebd6e2

• Automatic Changelog Update (#300)

  

  Floof-Station-Bot

  authored and

  neuPanda

  committed
  5e8719c

  Copy full SHA for 5e8719c

• Automatic Changelog Update (#302)

  

  Floof-Station-Bot

  authored and

  neuPanda

  committed
  e7ba3db

  Copy full SHA for e7ba3db

• Remove Rape and SA from S-LAW

  Show description for 437ec45
  

  neuPanda

  authored and

  neuPanda

  committed
  437ec45

  Copy full SHA for 437ec45

• Merge pull request #306 from neuPanda/patch-1

  Show description for 3d26809
  Memeji

  authored
  3d26809

  Copy full SHA for 3d26809

• Merge pull request #303 from Memeji/Nikko-Small-Changes

  Show description for eb84a12
  Fansana

  authored
  eb84a12

  Copy full SHA for eb84a12

Commits on Oct 30, 2024

• add filled clown and mime locker to every map

  Fansana

  committed
  6eddd6c

  Copy full SHA for 6eddd6c

• Update global.json

  Fansana

  authored
  73d84ee

  Copy full SHA for 73d84ee

• Update locker.yml remove comments

  Fansana

  authored
  889fa22

  Copy full SHA for 889fa22

• remove plastic banana

  Fansana

  authored
  a71e6a2

  Copy full SHA for a71e6a2

• Update running.png

  fenndragon

  committed
  5717dc4

  Copy full SHA for 5717dc4

• Merge branch 'Fansana:unstable' into dragon

  fenndragon

  authored
  3895d92

  Copy full SHA for 3895d92

• Update presets.yml

  Show description for 5e7d630
  fenndragon

  authored
  5e7d630

  Copy full SHA for 5e7d630

• Update presets.yml

  Show description for f8a2cd1
  fenndragon

  authored
  f8a2cd1

  Copy full SHA for f8a2cd1

• dragon

  fenndragon

  committed
  8724ef0

  Copy full SHA for 8724ef0

• Update Adolescent_dragon.yml

  fenndragon

  authored
  5546a4f

  Copy full SHA for 5546a4f

• Merge branch 'Fansana:unstable' into Fixes

  fenndragon

  authored
  d62e168

  Copy full SHA for d62e168

• Update presets.yml

  fenndragon

  authored
  b397408

  Copy full SHA for b397408

• Update presets.yml

  fenndragon

  authored
  b24843d

  Copy full SHA for b24843d

• Update Floof.yml

  Fansana

  authored
  6a29511

  Copy full SHA for 6a29511

• Update Adolescent_dragon.yml

  fenndragon

  authored
  f37957f

  Copy full SHA for f37957f

• Merge pull request #307 from Fansana/mime-clown-locker

  Show description for 2ca065a
  Fansana

  authored
  2ca065a

  Copy full SHA for 2ca065a

• Update Adolescent_dragon.yml

  fenndragon

  committed
  d3c2a04

  Copy full SHA for d3c2a04

• Merge pull request #310 from fenndragon/Fixes

  Show description for ea18369
  Fansana

  authored
  ea18369

  Copy full SHA for ea18369

• Update Floof.yml

  Fansana

  authored
  0dea9cb

  Copy full SHA for 0dea9cb

• Merge pull request #304 from Fansana/fix-cloak-steal-objective-RD-cloak

  Show description for 07579fb
  Fansana

  authored
  07579fb

  Copy full SHA for 07579fb

• Merge branch 'Fansana:unstable' into dragon

  fenndragon

  authored
  a6e4ce1

  Copy full SHA for a6e4ce1

Commits on Oct 31, 2024

• Oooh Hypno

  FoxxoTrystan

  committed
  87e5c64

  Copy full SHA for 87e5c64

• Update Adolescent_dragon.yml

  fenndragon

  authored
  468704d

  Copy full SHA for 468704d

• Apply Fixes and changes

  FoxxoTrystan

  committed
  c8f610e

  Copy full SHA for c8f610e

• FTL/Fixes

  FoxxoTrystan

  committed
  9a52527

  Copy full SHA for 9a52527

• dingus

  FoxxoTrystan

  committed
  23f26ba

  Copy full SHA for 23f26ba

• fixes

  FoxxoTrystan

  committed
  66b7909

  Copy full SHA for 66b7909

• Noice

  FoxxoTrystan

  committed
  4e107d3

  Copy full SHA for 4e107d3

• FinalTouch

  FoxxoTrystan

  committed
  3c6970b

  Copy full SHA for 3c6970b

• Merge pull request #309 from fenndragon/dragon

  Show description for 5c94c65
  FoxxoTrystan

  authored
  5c94c65

  Copy full SHA for 5c94c65

• New reptile sounds (#32064)

  Show description for 3b24813
  

  Minemoder5000

  authored and

  Fansana

  committed
  3b24813

  Copy full SHA for 3b24813

Commits on Nov 1, 2024

• Merge branch 'unstable'

  FoxxoTrystan

  committed
  c0efed8

  Copy full SHA for c0efed8

• Fixes

  FoxxoTrystan

  committed
  f5a3b81

  Copy full SHA for f5a3b81

• Revert "Add Filled Clown and Mime Locker to Every Map"

  FoxxoTrystan

  authored
  e88710c

  Copy full SHA for e88710c

• MindSwap Fix

  FoxxoTrystan

  committed
  ae4341c

  Copy full SHA for ae4341c

• Oops

  FoxxoTrystan

  committed
  87dc1da

  Copy full SHA for 87dc1da

• Merge pull request #314 from Fansana/revert-307-mime-clown-locker

  Show description for 7bc704a
  Fansana

  authored
  7bc704a

  Copy full SHA for 7bc704a

• Merge pull request #313 from Fansana/cherry-pick-cocoonfix

  Show description for 02e89b5
  Fansana

  authored
  02e89b5

  Copy full SHA for 02e89b5

• Automatic Changelog Update (#313)

  Floof-Station-Bot

  committed
  f1bcbab

  Copy full SHA for f1bcbab

Commits on Nov 2, 2024

• Update presets.yml

  fenndragon

  authored
  87a94a8

  Copy full SHA for 87a94a8

• Update uplink_catalog.yml

  fenndragon

  authored
  5aafa65

  Copy full SHA for 5aafa65

• Update uplink_catalog.yml

  fenndragon

  authored
  003d694

  Copy full SHA for 003d694

• Update uplink_catalog.yml

  fenndragon

  authored
  36916f2

  Copy full SHA for 36916f2

• Update uplink_catalog.yml

  fenndragon

  authored
  b370624

  Copy full SHA for b370624

• Update presets.yml

  fenndragon

  authored
  10fa00d

  Copy full SHA for 10fa00d

• Update presets.yml

  fenndragon

  authored
  69b8774

  Copy full SHA for 69b8774

• Update presets.yml

  fenndragon

  authored
  d4d9e16

  Copy full SHA for d4d9e16

• Update changelog.yml

  FoxxoTrystan

  authored
  672f946

  Copy full SHA for 672f946

• Update xenopet.yml

  fenndragon

  authored
  dd0dcd4

  Copy full SHA for dd0dcd4

• Merge branch 'Fansana:unstable' into xenos

  fenndragon

  authored
  b1ce3ae

  Copy full SHA for b1ce3ae

Commits on Nov 3, 2024

• Merge pull request #315 from fenndragon/Fixes

  Show description for 32d4d88
  FoxxoTrystan

  authored
  32d4d88

  Copy full SHA for 32d4d88

• Merge pull request #311 from FoxxoTrystan/hypnosis

  Show description for 103092f
  FoxxoTrystan

  authored
  103092f

  Copy full SHA for 103092f

• Merge pull request #312 from Fansana/thumping

  Show description for 870c35d
  FoxxoTrystan

  authored
  870c35d

  Copy full SHA for 870c35d

• Update changelog.yml

  FoxxoTrystan

  authored
  879d0e6

  Copy full SHA for 879d0e6

• Merge branch 'master' into unstable

  FoxxoTrystan

  committed
  912fc58

  Copy full SHA for 912fc58

• Merge branch 'Fansana:unstable' into xenos

  fenndragon

  authored
  775bc11

  Copy full SHA for 775bc11

• update changelog

  Fansana

  committed
  571e28b

  Copy full SHA for 571e28b

• update changelog

  Fansana

  committed
  a8213bd

  Copy full SHA for a8213bd

• remove unstable pr

  Fansana

  committed
  0737ee0

  Copy full SHA for 0737ee0

• disallow PRs on stable

  Fansana

  committed
  3e197e2

  Copy full SHA for 3e197e2

• Merge pull request #320 from Fansana/stable

  Show description for 7b5f1b2
  Fansana

  authored
  7b5f1b2

  Copy full SHA for 7b5f1b2

• update allowlist

  Fansana

  committed
  1abd458

  Copy full SHA for 1abd458

• use stable instead of master

  FoxxoTrystan

  authored
  79b69ae

  Copy full SHA for 79b69ae

• use stable instead of master

  FoxxoTrystan

  authored
  06caaf0

  Copy full SHA for 06caaf0

• Changlog workflow only on stable merge.

  FoxxoTrystan

  authored
  ade783c

  Copy full SHA for ade783c

Commits on Nov 4, 2024

• aaa

  Show description for 24efdb1
  VividPups

  committed
  24efdb1

  Copy full SHA for 24efdb1

• Merge pull request #319 from Fansana/unstable

  Show description for b31884e
  Memeji

  authored
  b31884e

  Copy full SHA for b31884e

• Update uplink_catalog.yml

  VividPups

  committed
  b86dc28

  Copy full SHA for b86dc28

• Fix hypno.ftl

  Show description for 7941094
  FoxxoTrystan

  authored
  7941094

  Copy full SHA for 7941094

• Update psionicPowers.yml

  FoxxoTrystan

  authored
  71d6476

  Copy full SHA for 71d6476

• Update psionicPowers.yml

  FoxxoTrystan

  authored
  6638b6b

  Copy full SHA for 6638b6b

• Merge pull request #323 from Fansana/Disable-Power

  Show description for 36faed7
  Memeji

  authored
  36faed7

  Copy full SHA for 36faed7

• Hmm yes

  FoxxoTrystan

  committed
  580dcf0

  Copy full SHA for 580dcf0

• updated as requested

  Show description for a8d49e0
  VividPups

  committed
  a8d49e0

  Copy full SHA for a8d49e0

• fix voltage reaction

  Fansana

  committed
  af785a0

  Copy full SHA for af785a0

Commits on Nov 5, 2024

• fix construction container

  Fansana

  committed
  e2bac46

  Copy full SHA for e2bac46

• Merge pull request #328 from Fansana/fix-voltage-reaction

  Show description for 7b46cb0
  Memeji

  authored
  7b46cb0

  Copy full SHA for 7b46cb0

• Merge pull request #329 from Fansana/fix-sleepingbag

  Show description for d72497a
  FoxxoTrystan

  authored
  d72497a

  Copy full SHA for d72497a

• prescription hud fix

  

  KyuPolaris

  committed
  b19655e

  Copy full SHA for b19655e

• fixes build test?

  FoxxoTrystan

  committed
  eb473dd

  Copy full SHA for eb473dd

• This is a better way to handle it.

  FoxxoTrystan

  committed
  ad887d6

  Copy full SHA for ad887d6

• oops

  FoxxoTrystan

  committed
  164d9db

  Copy full SHA for 164d9db

• Merge pull request #331 from FoxxoTrystan/ethereal-build-fix

  Show description for 7d05d1d
  FoxxoTrystan

  authored
  7d05d1d

  Copy full SHA for 7d05d1d

• Update hud.yml

  Fansana

  authored
  2851a6e

  Copy full SHA for 2851a6e

• Merge branch 'Fansana:master' into edit-lpo

  FoxxoTrystan

  authored
  81643a4

  Copy full SHA for 81643a4

• Merge pull request #330 from KyuPolaris/prescriptionhudfix

  Show description for b299cdb
  Memeji

  authored
  b299cdb

  Copy full SHA for b299cdb

• Merge branch 'Fansana:master' into Hypo

  VividPups

  authored
  ac87ec0

  Copy full SHA for ac87ec0

Commits on Nov 6, 2024

• Merge pull request #325 from FoxxoTrystan/edit-lpo

  Show description for aef34f6
  FoxxoTrystan

  authored
  aef34f6

  Copy full SHA for aef34f6

Commits on Nov 7, 2024

• Merge pull request #316 from fenndragon/xenos

  Show description for 64d6737
  FoxxoTrystan

  authored
  64d6737

  Copy full SHA for 64d6737

• moved files

  Show description for 97b0434
  VividPups

  committed
  97b0434

  Copy full SHA for 97b0434

• Merge pull request #322 from VividPups/Hypo

  Show description for 46c6618
  FoxxoTrystan

  authored
  46c6618

  Copy full SHA for 46c6618

• Merge pull request #336 from Fansana/master

  Show description for 5c096e2
  Fansana

  authored
  5c096e2

  Copy full SHA for 5c096e2

Commits on Nov 10, 2024

• Merge branch 'stable' of https://github.com/Fansana/floofstation1 into floofmerge

  sleepyyapril

  committed
  0c5108b

  Copy full SHA for 0c5108b

• Space law!

  sleepyyapril

  committed
  7841d5c

  Copy full SHA for 7841d5c

• Fix double hud

  sleepyyapril

  committed
  2ba7e62

  Copy full SHA for 2ba7e62

• no shadowkin

  sleepyyapril

  committed
  9f40515

  Copy full SHA for 9f40515

• Merge branch 'master' of https://github.com/TheDenSS14/TheDen into floofmerge

  sleepyyapril

  committed
  a18b459

  Copy full SHA for a18b459

• Merge branch 'master' of https://github.com/TheDenSS14/TheDen into floofmerge

  sleepyyapril

  committed
  d3885b4

  Copy full SHA for d3885b4

Commits on Nov 11, 2024

• use floof's sharedInteractionSystem

  sleepyyapril

  committed
  81dfa68

  Copy full SHA for 81dfa68

• Saltern update

  sleepyyapril

  committed
  e16f950

  Copy full SHA for e16f950

• SharedInteractionSystem

  sleepyyapril

  committed
  e6ff1b5

  Copy full SHA for e6ff1b5

• saltern ee...?

  sleepyyapril

  committed
  c7432b9

  Copy full SHA for c7432b9

• aaa

  sleepyyapril

  committed
  0013eff

  Copy full SHA for 0013eff

• I'll give it a try!

  sleepyyapril

  committed
  a0530f9

  Copy full SHA for a0530f9