Code

pomegranates and aphrodisiacs#22

Code

Closed

SleepyScarecrow wants to merge 87 commits intoFansana:Suacy_SaucesFansana/floofstation1:Suacy_Saucesfrom SleepyScarecrow:masterSleepyScarecrow/floofstation1:masterCopy head branch name to clipboard

+5,418-1,508

Commits

Commits on Jun 13, 2024

• Discover polymorphism

  Mnemotechnician

  committed
  45c1bf0

  Copy full SHA for 45c1bf0

• Apply polymorphism + fix some obfuscation phrases

  Mnemotechnician

  committed
  3df0c63

  Copy full SHA for 3df0c63

Commits on Jun 14, 2024

• Oops

  Mnemotechnician

  committed
  f0af64c

  Copy full SHA for f0af64c

• Cleaned up imports

  Mnemotechnician

  committed
  86eaa73

  Copy full SHA for 86eaa73

• Refactored and localized commands; made them more user-friendly.

  Mnemotechnician

  committed
  6770f30

  Copy full SHA for 6770f30

• Added HandheldTranslatorComponent.SetLanguageOnInteract for convenience

  Mnemotechnician

  committed
  e4f5917

  Copy full SHA for e4f5917

Commits on Jun 15, 2024

• Refactor everything and pray it works:

  Show description for ad56d53
  Mnemotechnician

  committed
  ad56d53

  Copy full SHA for ad56d53

• Update yaml prototypes accordingly

  Mnemotechnician

  committed
  0e63714

  Copy full SHA for 0e63714

• Move LanguagePrototype.Replacement to ObfuscationMethod and remove ObfuscationMethod's dependency on LanguagePrototype

  Mnemotechnician

  committed
  44b625f

  Copy full SHA for 44b625f

Commits on Jun 18, 2024

• Do not log missing LanguageSpeakerComponents

  Mnemotechnician

  committed
  2f05074

  Copy full SHA for 2f05074

• Rewrite translator implants to use the existing implant infrastructure

  Mnemotechnician

  committed
  5a2dc13

  Copy full SHA for 5a2dc13

• Update the language menu when choosing a new language

  Mnemotechnician

  committed
  b3545d0

  Copy full SHA for b3545d0

• Fix handheld translators adjusting your current language

  Mnemotechnician

  committed
  734e764

  Copy full SHA for 734e764

• I fixes

  Mnemotechnician

  committed
  31d82fb

  Copy full SHA for 31d82fb

Commits on Jun 21, 2024

• Merge branch 'master' into refactor/languages

  Show description for fe43060
  Mnemotechnician

  authored
  fe43060

  Copy full SHA for fe43060

Commits on Jun 23, 2024

• Merge branch 'master' into refactor/languages

  Show description for 19667eb
  Mnemotechnician

  authored
  19667eb

  Copy full SHA for 19667eb

Commits on Jun 27, 2024

• Merge branch 'Simple-Station:master' into refactor/languages

  Mnemotechnician

  authored
  6adc50d

  Copy full SHA for 6adc50d

• Minor improvements

  Mnemotechnician

  committed
  d9d74de

  Copy full SHA for d9d74de

Commits on Jul 4, 2024

• Markers

  FoxxoTrystan

  committed
  cc4e86d

  Copy full SHA for cc4e86d

• The fonts!

  FoxxoTrystan

  committed
  37d95ce

  Copy full SHA for 37d95ce

• Merge branch 'Languages/Markers' into Languages_Markers

  FoxxoTrystan

  committed
  afe5bcb

  Copy full SHA for afe5bcb

• Merge branch 'master' into Languages_Markers

  FoxxoTrystan

  authored
  d73d983

  Copy full SHA for d73d983

Commits on Jul 5, 2024

• Furry Servers + Whitelist

  Skyedra

  committed
  6ad02f1

  Copy full SHA for 6ad02f1

• wordwrap

  Skyedra

  committed
  0c7cf61

  Copy full SHA for 0c7cf61

• Frictionfull Space (#514)

  Show description for e092203
  Mnemotechnician

  authored
  e092203

  Copy full SHA for e092203

• Automatic Changelog Update (#514)

  SimpleStation14

  committed
  81dd782

  Copy full SHA for 81dd782

• Port All Carrying/PseudoItem/EscapeInventory Tweaks From DeltaV (#484)

  Show description for 58be850
  Mnemotechnician

  authored
  58be850

  Copy full SHA for 58be850

• Automatic Changelog Update (#484)

  SimpleStation14

  committed
  00d786a

  Copy full SHA for 00d786a

• Port Paper Signatures (Fansana#456)

  Show description for 476e6de
  

  Mnemotechnician

  and

  DEATHB4DEFEAT

  authored
  476e6de

  Copy full SHA for 476e6de

• Automatic Changelog Update (Fansana#456)

  SimpleStation14

  committed
  692ceff

  Copy full SHA for 692ceff

• Felinid Soft Thieving + Trait (#500)

  Show description for e06045c
  

  WarMechanic

  and

  DEATHB4DEFEAT

  authored
  e06045c

  Copy full SHA for e06045c

• Cherry-Pick Carrypets From Delta-V (#501)

  Show description for 4609f9e
  

  Mnemotechnician

  and

  Froffy025

  authored
  4609f9e

  Copy full SHA for 4609f9e

• Automatic Changelog Update (#500)

  SimpleStation14

  committed
  4ebb3cc

  Copy full SHA for 4ebb3cc

• Automatic Changelog Update (#501)

  SimpleStation14

  committed
  d971e7c

  Copy full SHA for d971e7c

• Fix Them Pesky Job Requirements (#511)

  Show description for d5f73ad
  Mnemotechnician

  authored
  d5f73ad

  Copy full SHA for d5f73ad

• Automatic Changelog Update (#511)

  SimpleStation14

  committed
  c4f7700

  Copy full SHA for c4f7700

• Restore Old Event Rates (#509)

  Show description for aaee45a
  Mnemotechnician

  authored
  aaee45a

  Copy full SHA for aaee45a

• Automatic Changelog Update (#509)

  SimpleStation14

  committed
  50092e9

  Copy full SHA for 50092e9

• More Loadout Items Wave 1 (Fansana#425)

  Show description for 8de45e7
  

  7 peopleauthored
  8de45e7

  Copy full SHA for 8de45e7

• Automatic Changelog Update (Fansana#425)

  SimpleStation14

  committed
  529c5a4

  Copy full SHA for 529c5a4

• Trichromat Modification Trait (#505)

  Show description for 5d36483
  VMSolidus

  authored
  5d36483

  Copy full SHA for 5d36483

• Refactor the Language System (Fansana#459)

  Show description for 9d5f3b6
  Mnemotechnician

  authored
  9d5f3b6

  Copy full SHA for 9d5f3b6

• Automatic Changelog Update (Fansana#459)

  SimpleStation14

  committed
  726fd0f

  Copy full SHA for 726fd0f

Commits on Jul 6, 2024

• Add Item Transfer System (Fansana#476)

  Show description for c8a9002
  

  Spatison

  and

  DangerRevolution

  authored
  c8a9002

  Copy full SHA for c8a9002

• Automatic Changelog Update (Fansana#476)

  SimpleStation14

  committed
  a6073ef

  Copy full SHA for a6073ef

• Merge branch 'master' into Languages_Markers

  Show description for 2e1ff7d
  FoxxoTrystan

  authored
  2e1ff7d

  Copy full SHA for 2e1ff7d

• Merge remote-tracking branch 'EE/master' into Upstream-Merge-04/06/2024

  FoxxoTrystan

  committed
  1ab4945

  Copy full SHA for 1ab4945

• Merge pull request Fansana#8 from Skyedra/furryServers

  Show description for 6dde73c
  Fansana

  authored
  6dde73c

  Copy full SHA for 6dde73c

• Merge branch 'Fansana:master' into Upstream-Merge-04/06/2024

  FoxxoTrystan

  authored
  3070900

  Copy full SHA for 3070900

• ItemBase

  FoxxoTrystan

  committed
  10fe119

  Copy full SHA for 10fe119

• Rules Update

  

  SnowyFoxxo

  authored and

  SnowyFoxxo

  committed
  32cb105

  Copy full SHA for 32cb105

• Access

  FoxxoTrystan

  committed
  4af960e

  Copy full SHA for 4af960e

• Rules Update

  

  SnowyFoxxo

  authored and

  SnowyFoxxo

  committed
  99df5ce

  Copy full SHA for 99df5ce

• Shocking!

  FoxxoTrystan

  committed
  cdd188c

  Copy full SHA for cdd188c

• Rules Update

  

  SnowyFoxxo

  authored and

  SnowyFoxxo

  committed
  59c1841

  Copy full SHA for 59c1841

• Rules Update

  

  SnowyFoxxo

  authored and

  SnowyFoxxo

  committed
  6ed8f29

  Copy full SHA for 6ed8f29

• Rules Update

  

  SnowyFoxxo

  authored and

  SnowyFoxxo

  committed
  6e64c9c

  Copy full SHA for 6e64c9c

Commits on Jul 7, 2024

• Merge pull request Fansana#12 from SnowyFoxxo/master

  Show description for f0d101f
  Fansana

  authored
  f0d101f

  Copy full SHA for f0d101f

• Merge pull request Fansana#9 from FoxxoTrystan/Upstream-Merge-04/06/2024

  Show description for 97d3896
  Fansana

  authored
  97d3896

  Copy full SHA for 97d3896

• Merge pull request Fansana#11 from FoxxoTrystan/Shockcollars

  Show description for 7db0342
  Fansana

  authored
  7db0342

  Copy full SHA for 7db0342

• Floof Directory and merge conflict fix

  FoxxoTrystan

  committed
  21b3577

  Copy full SHA for 21b3577

• Merge remote-tracking branch 'EE-Fox/Languages_Markers' into Experimental-Languages/Markers

  FoxxoTrystan

  committed
  b4b561e

  Copy full SHA for b4b561e

• Subtle Command

  FoxxoTrystan

  committed
  90dfe8b

  Copy full SHA for 90dfe8b

• ChatChannel

  FoxxoTrystan

  committed
  537a118

  Copy full SHA for 537a118

• Merge pull request Fansana#13 from FoxxoTrystan/Experimental-Languages/Markers

  Show description for f146c5d
  Fansana

  authored
  f146c5d

  Copy full SHA for f146c5d

• Merge pull request Fansana#14 from FoxxoTrystan/Subtle

  Show description for 1594fb1
  Fansana

  authored
  1594fb1

  Copy full SHA for 1594fb1

• secret commit

  Fansana

  committed
  2989b82

  Copy full SHA for 2989b82

Commits on Jul 9, 2024

• Merge pull request Fansana#15 from Fansana/Suacy_Sauces

  Show description for 920a99c
  Fansana

  authored
  920a99c

  Copy full SHA for 920a99c

• Rules Update

  

  SnowyFoxxo

  authored and

  SnowyFoxxo

  committed
  61d2759

  Copy full SHA for 61d2759

• Merge branch 'master' of https://github.com/SnowyFoxxo/floofstation1

  

  SnowyFoxxo

  authored and

  SnowyFoxxo

  committed
  dac8f0b

  Copy full SHA for dac8f0b

Commits on Jul 11, 2024

• Added Bunny Suit and Bunny Ears to bartender's available job items in the loadout. -You're welcome, Mars

  Memeji

  committed
  113a436

  Copy full SHA for 113a436

Commits on Jul 12, 2024

• Merge pull request Fansana#16 from SnowyFoxxo/master

  Show description for 3b37f16
  Fansana

  authored
  3b37f16

  Copy full SHA for 3b37f16

• Merge pull request Fansana#17 from Fansana/Nikkos_Toybox

  Show description for 1409eea
  Fansana

  authored
  1409eea

  Copy full SHA for 1409eea

• LoinCloth

  FoxxoTrystan

  committed
  4922b3a

  Copy full SHA for 4922b3a

• Merge branch 'Fansana:master' into Nudity-Permit

  FoxxoTrystan

  authored
  c592b74

  Copy full SHA for c592b74

• Added A new drink!

  Memeji

  committed
  9865d8a

  Copy full SHA for 9865d8a

• Add #Floofstation comment to SodaInv.

  Show description for d650e11
  FoxxoTrystan

  authored
  d650e11

  Copy full SHA for d650e11

• FloofLogs

  FoxxoTrystan

  committed
  6cd36e4

  Copy full SHA for 6cd36e4

• Oops

  FoxxoTrystan

  committed
  78793b0

  Copy full SHA for 78793b0

Commits on Jul 13, 2024

• Merge pull request Fansana#19 from FoxxoTrystan/FloofChangelogs

  Show description for d157f88
  Fansana

  authored
  d157f88

  Copy full SHA for d157f88

• Merge branch 'Fansana:master' into Nudity-Permit

  FoxxoTrystan

  authored
  28b1b81

  Copy full SHA for 28b1b81

• Merge pull request Fansana#18 from Fansana/Nikkos_Toybox

  Show description for 92368a6
  FoxxoTrystan

  authored
  92368a6

  Copy full SHA for 92368a6

• Merge pull request Fansana#10 from FoxxoTrystan/Nudity-Permit

  Show description for cb45132
  FoxxoTrystan

  authored
  cb45132

  Copy full SHA for cb45132

• Oops

  FoxxoTrystan

  committed
  b68171a

  Copy full SHA for b68171a

• Merge pull request Fansana#20 from FoxxoTrystan/Fix-Human-SolCommon

  Show description for b377e65
  FoxxoTrystan

  authored
  b377e65

  Copy full SHA for b377e65

• pomegranate & aphrodisiacs

  SleepyScarecrow

  committed
  2ce0bcb

  Copy full SHA for 2ce0bcb

• Merge branch 'master' of https://github.com/Fansana/floofstation1

  SleepyScarecrow

  committed
  8b3121c

  Copy full SHA for 8b3121c