Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pomegranates and aphrodisiacs #22

Closed
wants to merge 87 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
45c1bf0
Discover polymorphism
Mnemotechnician Jun 13, 2024
3df0c63
Apply polymorphism + fix some obfuscation phrases
Mnemotechnician Jun 13, 2024
f0af64c
Oops
Mnemotechnician Jun 14, 2024
86eaa73
Cleaned up imports
Mnemotechnician Jun 14, 2024
6770f30
Refactored and localized commands; made them more user-friendly.
Mnemotechnician Jun 14, 2024
e4f5917
Added HandheldTranslatorComponent.SetLanguageOnInteract for convenience
Mnemotechnician Jun 14, 2024
ad56d53
Refactor everything and pray it works:
Mnemotechnician Jun 15, 2024
0e63714
Update yaml prototypes accordingly
Mnemotechnician Jun 15, 2024
44b625f
Move LanguagePrototype.Replacement to ObfuscationMethod and remove Ob…
Mnemotechnician Jun 15, 2024
2f05074
Do not log missing LanguageSpeakerComponents
Mnemotechnician Jun 18, 2024
5a2dc13
Rewrite translator implants to use the existing implant infrastructure
Mnemotechnician Jun 18, 2024
b3545d0
Update the language menu when choosing a new language
Mnemotechnician Jun 18, 2024
734e764
Fix handheld translators adjusting your current language
Mnemotechnician Jun 18, 2024
31d82fb
I fixes
Mnemotechnician Jun 18, 2024
fe43060
Merge branch 'master' into refactor/languages
Mnemotechnician Jun 21, 2024
19667eb
Merge branch 'master' into refactor/languages
Mnemotechnician Jun 23, 2024
6adc50d
Merge branch 'Simple-Station:master' into refactor/languages
Mnemotechnician Jun 27, 2024
d9d74de
Minor improvements
Mnemotechnician Jun 27, 2024
cc4e86d
Markers
FoxxoTrystan Jul 4, 2024
37d95ce
The fonts!
FoxxoTrystan Jul 4, 2024
afe5bcb
Merge branch 'Languages/Markers' into Languages_Markers
FoxxoTrystan Jul 4, 2024
d73d983
Merge branch 'master' into Languages_Markers
FoxxoTrystan Jul 4, 2024
6ad02f1
Furry Servers + Whitelist
Skyedra Jul 5, 2024
0c7cf61
wordwrap
Skyedra Jul 5, 2024
e092203
Frictionfull Space (#514)
Mnemotechnician Jul 5, 2024
81dd782
Automatic Changelog Update (#514)
SimpleStation14 Jul 5, 2024
58be850
Port All Carrying/PseudoItem/EscapeInventory Tweaks From DeltaV (#484)
Mnemotechnician Jul 5, 2024
00d786a
Automatic Changelog Update (#484)
SimpleStation14 Jul 5, 2024
476e6de
Port Paper Signatures (#456)
Mnemotechnician Jul 5, 2024
692ceff
Automatic Changelog Update (#456)
SimpleStation14 Jul 5, 2024
e06045c
Felinid Soft Thieving + Trait (#500)
WarMechanic Jul 5, 2024
4609f9e
Cherry-Pick Carrypets From Delta-V (#501)
Mnemotechnician Jul 5, 2024
4ebb3cc
Automatic Changelog Update (#500)
SimpleStation14 Jul 5, 2024
d971e7c
Automatic Changelog Update (#501)
SimpleStation14 Jul 5, 2024
d5f73ad
Fix Them Pesky Job Requirements (#511)
Mnemotechnician Jul 5, 2024
c4f7700
Automatic Changelog Update (#511)
SimpleStation14 Jul 5, 2024
aaee45a
Restore Old Event Rates (#509)
Mnemotechnician Jul 5, 2024
50092e9
Automatic Changelog Update (#509)
SimpleStation14 Jul 5, 2024
8de45e7
More Loadout Items Wave 1 (#425)
VMSolidus Jul 5, 2024
529c5a4
Automatic Changelog Update (#425)
SimpleStation14 Jul 5, 2024
5d36483
Trichromat Modification Trait (#505)
VMSolidus Jul 5, 2024
9d5f3b6
Refactor the Language System (#459)
Mnemotechnician Jul 5, 2024
726fd0f
Automatic Changelog Update (#459)
SimpleStation14 Jul 5, 2024
c8a9002
Add Item Transfer System (#476)
Spatison Jul 6, 2024
a6073ef
Automatic Changelog Update (#476)
SimpleStation14 Jul 6, 2024
2e1ff7d
Merge branch 'master' into Languages_Markers
FoxxoTrystan Jul 6, 2024
1ab4945
Merge remote-tracking branch 'EE/master' into Upstream-Merge-04/06/2024
FoxxoTrystan Jul 6, 2024
6dde73c
Merge pull request #8 from Skyedra/furryServers
Fansana Jul 6, 2024
3070900
Merge branch 'Fansana:master' into Upstream-Merge-04/06/2024
FoxxoTrystan Jul 6, 2024
10fe119
ItemBase
FoxxoTrystan Jul 6, 2024
32cb105
Rules Update
Jul 6, 2024
4af960e
Access
FoxxoTrystan Jul 6, 2024
99df5ce
Rules Update
Jul 6, 2024
cdd188c
Shocking!
FoxxoTrystan Jul 6, 2024
59c1841
Rules Update
Jul 6, 2024
6ed8f29
Rules Update
Jul 6, 2024
6e64c9c
Rules Update
Jul 6, 2024
f0d101f
Merge pull request #12 from SnowyFoxxo/master
Fansana Jul 7, 2024
97d3896
Merge pull request #9 from FoxxoTrystan/Upstream-Merge-04/06/2024
Fansana Jul 7, 2024
7db0342
Merge pull request #11 from FoxxoTrystan/Shockcollars
Fansana Jul 7, 2024
21b3577
Floof Directory and merge conflict fix
FoxxoTrystan Jul 7, 2024
b4b561e
Merge remote-tracking branch 'EE-Fox/Languages_Markers' into Experime…
FoxxoTrystan Jul 7, 2024
90dfe8b
Subtle Command
FoxxoTrystan Jul 7, 2024
537a118
ChatChannel
FoxxoTrystan Jul 7, 2024
f146c5d
Merge pull request #13 from FoxxoTrystan/Experimental-Languages/Markers
Fansana Jul 7, 2024
1594fb1
Merge pull request #14 from FoxxoTrystan/Subtle
Fansana Jul 7, 2024
2989b82
secret commit
Fansana Jul 7, 2024
920a99c
Merge pull request #15 from Fansana/Suacy_Sauces
Fansana Jul 9, 2024
61d2759
Rules Update
Jul 9, 2024
dac8f0b
Merge branch 'master' of https://github.com/SnowyFoxxo/floofstation1
Jul 9, 2024
113a436
Added Bunny Suit and Bunny Ears to bartender's available job items in…
Memeji Jul 11, 2024
3b37f16
Merge pull request #16 from SnowyFoxxo/master
Fansana Jul 12, 2024
1409eea
Merge pull request #17 from Fansana/Nikkos_Toybox
Fansana Jul 12, 2024
4922b3a
LoinCloth
FoxxoTrystan Jul 12, 2024
c592b74
Merge branch 'Fansana:master' into Nudity-Permit
FoxxoTrystan Jul 12, 2024
9865d8a
Added A new drink!
Memeji Jul 12, 2024
d650e11
Add #Floofstation comment to SodaInv.
FoxxoTrystan Jul 12, 2024
6cd36e4
FloofLogs
FoxxoTrystan Jul 12, 2024
78793b0
Oops
FoxxoTrystan Jul 12, 2024
d157f88
Merge pull request #19 from FoxxoTrystan/FloofChangelogs
Fansana Jul 13, 2024
28b1b81
Merge branch 'Fansana:master' into Nudity-Permit
FoxxoTrystan Jul 13, 2024
92368a6
Merge pull request #18 from Fansana/Nikkos_Toybox
FoxxoTrystan Jul 13, 2024
cb45132
Merge pull request #10 from FoxxoTrystan/Nudity-Permit
FoxxoTrystan Jul 13, 2024
b68171a
Oops
FoxxoTrystan Jul 13, 2024
b377e65
Merge pull request #20 from FoxxoTrystan/Fix-Human-SolCommon
FoxxoTrystan Jul 13, 2024
2ce0bcb
pomegranate & aphrodisiacs
SleepyScarecrow Jul 13, 2024
8b3121c
Merge branch 'master' of https://github.com/Fansana/floofstation1
SleepyScarecrow Jul 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Automatic Changelog Update (#514)
SimpleStation14 committed Jul 5, 2024
commit 81dd78259e66b6fda06fcb7c4b76b365eb4f652a
8 changes: 8 additions & 0 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
@@ -4285,3 +4285,11 @@ Entries:
message: Equipping clothing using the Z key works correctly again.
id: 6136
time: '2024-07-03T19:48:29.0000000+00:00'
- author: Mnemotechnician
changes:
- type: Tweak
message: >-
Space stations now have a tiny bit of velocity dampening to prevent them
from being flunged into the void.
id: 6137
time: '2024-07-05T16:53:25.0000000+00:00'