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

Floofstation Release V2 #340

Merged
merged 36 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5f4be71
Botany - Initial commit
Memeji Oct 24, 2024
d94e7d8
A few changes, meat weat can be used. Seeds added to vendor.
Memeji Oct 25, 2024
190001c
Merge branch 'Nikko-Master-Unstable' into Nikko-Botany
Memeji Oct 30, 2024
36e59b1
Floof Botany update, last changes. Adding to inventories.
Memeji Oct 30, 2024
0eea1ef
Merge branch 'master' into Nikko-Botany
Memeji Nov 4, 2024
61aebf0
Fixing some test fail issues
Memeji Nov 4, 2024
83d0ded
Frontier modifications
Memeji Nov 4, 2024
73c9f89
Update Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds…
Memeji Nov 4, 2024
f5556a4
Meat wheat fix
Memeji Nov 4, 2024
8e813be
Merge branch 'Nikko-Botany' of https://github.com/Memeji/floofstation…
Memeji Nov 4, 2024
23d6a90
Increase cost of seed crates and refill due to selling for more now.
Memeji Nov 4, 2024
694cdee
NTNF (ERT)
JasmineRickards Nov 5, 2024
4bf9253
The SESWC Combat boots
VividPups Nov 6, 2024
80b15d6
updates
VividPups Nov 7, 2024
fd3f438
Updated
VividPups Nov 7, 2024
7999d80
Update Resources/Prototypes/Floof/Entities/Clothing/Shoes/Combatmags.yml
VividPups Nov 7, 2024
9975faa
Merge branch 'Fansana:master' into Nikko-Botany
Memeji Nov 7, 2024
9562871
fix test
Fansana Nov 7, 2024
36d3983
enable cherry pie
Fansana Nov 7, 2024
d801507
Update cargo_botany.yml
Memeji Nov 7, 2024
63d4a63
Update cargo_vending.yml
Memeji Nov 7, 2024
57097ab
Merge pull request #284 from Memeji/Nikko-Botany
Fansana Nov 7, 2024
c3f6de5
Merge pull request #334 from JasmineRickards/ert
Fansana Nov 7, 2024
27765e9
move sprite to floof
Fansana Nov 7, 2024
9c31277
fix path and update sprite
Fansana Nov 7, 2024
7a3d414
update copyright
Fansana Nov 7, 2024
982c78f
Merge pull request #335 from VividPups/Combat-boots-
Fansana Nov 8, 2024
ee75654
Fix Unable to Call Shuttle
FoxxoTrystan Nov 9, 2024
108d2ac
Merge branch 'Fansana:master' into FoxxoTrystan-shuttle-patch
FoxxoTrystan Nov 9, 2024
53e7942
Update CommunicationsConsoleSystem.cs
FoxxoTrystan Nov 9, 2024
86259a7
Merge branch 'Fansana:FoxxoTrystan-shuttle-patch' into FoxxoTrystan-s…
FoxxoTrystan Nov 9, 2024
80cb08f
Merge pull request #338 from FoxxoTrystan/FoxxoTrystan-shuttle-patch
Fansana Nov 9, 2024
fd81538
Update CODEOWNERS
FoxxoTrystan Nov 10, 2024
7ddec31
Merge branch 'stable'
FoxxoTrystan Nov 10, 2024
a05ea2e
Update CODEOWNERS
Fansana Nov 10, 2024
99ed774
update changelog
Fansana Nov 11, 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
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,10 @@ private bool CanCallOrRecall(CommunicationsConsoleComponent comp)
|| !comp.CanShuttle)
return false;

// Calling shuttle checks
if (_roundEndSystem.ExpectedCountdownEnd is null)
return comp.CanShuttle;

// Recalling shuttle checks
var recallThreshold = _cfg.GetCVar(CCVars.EmergencyRecallTurningPoint);

Expand Down
64 changes: 64 additions & 0 deletions Resources/Changelog/Floof.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1344,3 +1344,67 @@ Entries:
id: 180
time: '2024-11-01T20:32:06.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/313
- author: FoxxoTrystan
changes:
- type: Fix
message: Fix the call the shuttle button.
id: 181
time: '2024-11-09T15:55:29.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/338
- author: VividPups
changes:
- type: Add
message: New Combat Boots!
id: 182
time: '2024-11-08T00:42:08.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/335
- author: Memeji
changes:
- type: Add
message: 18 plants
- type: Tweak
message: Added plant mutations to existing plants.
id: 183
time: '2024-11-07T22:30:55.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/284
- author: VividPups
changes:
- type: Add
message: New way for Syndies to deal with those pesky psionic
id: 184
time: '2024-11-07T04:47:49.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/322
- author: fenndragon
changes:
- type: Add
message: 'inventory, body, and grabbing setups for NT xenos '
id: 185
time: '2024-11-07T01:18:41.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/316
- author: FoxxoTrystan
changes:
- type: Tweak
message: >-
LPO no longer has the CC Stamp and they have a new communication
console.
id: 186
time: '2024-11-06T13:15:11.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/325
- author: KyuPolaris
changes:
- type: Fix
message: >-
Prescription Lenses re-added to prescription MedHUDs and prescription
SecHUDs.
id: 187
time: '2024-11-05T23:03:37.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/330
- author: Fansana
changes:
- type: Fix
message: >-
fix Voltage drink, now required VodkaRedBool instead of vodka and energy
drink
id: 188
time: '2024-11-05T00:33:06.0000000+00:00'
url: https://github.com/Fansana/floofstation1/pull/328
8 changes: 7 additions & 1 deletion Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,10 @@ flavor-complex-yeolhandy = like oranges and solitude
flavor-complex-thecutecaptain = like moonlight
flavor-complex-axelsale = like a long day on the frontier
flavor-complex-jenntonic = sweet with a hidden bite
flavor-complex-hallelujah = a moment of peace
flavor-complex-hallelujah = a moment of peace
flavor-complex-false-meat = not entirely unlike meat
flavor-complex-true-nature = like the true nature of reality
flavor-complex-numbing-tranquility = like numbing tranquility
flavor-complex-blue-pumpkin = like a mouthful of pool water
flavor-base-strange = strange
flavor-complex-cherry = like cherries
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reagent-name-tea-powder = tea powder
reagent-desc-tea-powder = Finely ground tea leaves, used for making tea.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
reagent-name-juice-cherry = cherry juice
reagent-desc-juice-cherry = Tasty cherry juice, sweet and tangy.

reagent-name-juice-blue-pumpkin = blue pumpkin juice
reagent-desc-juice-blue-pumpkin = The juice of a blue pumpkin. Smells like pool water.
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/Floof/reagents/meta/medicine.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ reagent-desc-traumoxadone = A cryogenics chemical. Used to treat severe trauma v

reagent-name-stelloxadone = stelloxadone
reagent-desc-stelloxadone = A cryogenics chemical. Used to aggressively dissolve toxins from the body. Works regardless of the patient being alive or dead. Product of Mystic Medical

reagent-name-haloperidol = haloperidol
reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Reduces druggy effects and jitteriness. Causes drowsiness.
22 changes: 22 additions & 0 deletions Resources/Locale/en-US/Floof/seeds/seeds.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
seeds-meatwheat-name = meatwheat
seeds-meatwheat-display-name = meatwheat stalks
seeds-extradimensionalorange-name = extradimensional orange
seeds-extradimensionalorange-display-name = extradimensional orange trees
seeds-teaplant-name = tea plant
seeds-teaplant-display-name = tea plants
seeds-papercane-name = papercane
seeds-papercane-display-name = papercanes
seeds-goldenapple-name = golden apple
seeds-goldenapple-display-name = golden apple tree
seeds-worldpea-name = world peas
seeds-worldpea-display-name = world pea vines
seeds-holymelon-name = holymelon
seeds-holymelon-display-name = holymelon vines
seeds-capfruit-name = capfruit
seeds-capfruit-display-name = capfruit tree
seeds-cherry-name = cherry
seeds-cherry-display-name = cherry tree
seeds-anomaly-berry-name = anomaly berry
seeds-anomaly-berry-display-name = anomaly berries
seeds-blue-pumpkin-name = blue pumpkin
seeds-blue-pumpkin-display-name = blue pumpkins
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_NF/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
flavor-complex-pear = like pears
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reagent-name-coffeegrounds = coffee grounds
reagent-desc-coffeegrounds = Aromatic and richly textured, these grounds exude a robust scent that promises a flavorful brew.
7 changes: 7 additions & 0 deletions Resources/Locale/en-US/_NF/seeds/seeds.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Seeds
seeds-spesos-name = spesos
seeds-spesos-display-name = spesos
seeds-pear-name = pear
seeds-pear-display-name = pear
seeds-coffee-name = coffee
seeds-coffee-display-name = coffee plant
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/reagents/meta/fun.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
reagent-name-Quartzite = Quartzite
reagent-desc-Quartzite = Millions of microscopic crystaline shards. Will cause internal bleeding, do not drink.
7 changes: 7 additions & 0 deletions Resources/Locale/en-US/deltav/seeds.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Seeds
seeds-CrystalThistle-name = CrystalThistle
seeds-CrystalThistle-display-name = CrystalThistle
seeds-GhostPepper-name = Ghost Pepper
seeds-GhostPepper-display-name = Ghost Pepper
seeds-CosmicRevenant-name = Cosmic Revenant
seeds-CosmicRevenant-display-name = Cosmic Revenant Pepper
Loading
Loading