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.

Sign up for GitHub

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

Xeno Companion Crate #247

Merged
merged 52 commits into from
Oct 12, 2024
Merged

Xeno Companion Crate #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
f1efdf0
Update cargo-gifts.ftl
fenndragon Oct 5, 2024
bc7d818
Update xenopet.yml
fenndragon Oct 5, 2024
ac703a5
Update xenopet.yml
fenndragon Oct 5, 2024
86a3c8c
Update xenopet.yml
fenndragon Oct 5, 2024
27180c1
Add files via upload
fenndragon Oct 5, 2024
4abed81
Add files via upload
fenndragon Oct 5, 2024
4e9f029
Update xenopet.yml
fenndragon Oct 5, 2024
7806220
textures
fenndragon Oct 5, 2024
88ab27e
Update meta.json
fenndragon Oct 5, 2024
65bb058
setup
fenndragon Oct 5, 2024
9677711
Merge branch 'Xenospawners' of https://github.com/fenndragon/floofsta…
fenndragon Oct 5, 2024
a5c676c
Update xenopet.yml
fenndragon Oct 5, 2024
c5864a3
Update xenopet.yml
fenndragon Oct 5, 2024
6963b4a
edits
fenndragon Oct 5, 2024
ff0cfd9
Update xenopet.yml
fenndragon Oct 5, 2024
8b1d484
Merge branch 'Fansana:master' into Xenospawners
fenndragon Oct 5, 2024
4831cdc
fix
fenndragon Oct 5, 2024
710886a
Merge branch 'Xenospawners' of https://github.com/fenndragon/floofsta…
fenndragon Oct 5, 2024
9f2f8fc
Merge branch 'Fansana:master' into Xenospawners
fenndragon Oct 6, 2024
041e272
Merge branch 'Fansana:master' into Xenospawners
fenndragon Oct 7, 2024
f44c4c5
fixes
fenndragon Oct 8, 2024
57a4fb2
Merge branch 'Xenospawners' of https://github.com/fenndragon/floofsta…
fenndragon Oct 8, 2024
576a9cb
Update xenopet.yml
fenndragon Oct 8, 2024
ef37c89
Update xenopet.yml
fenndragon Oct 8, 2024
ce9c7ca
Update xenopet.yml
fenndragon Oct 8, 2024
654b772
Merge branch 'master' of https://github.com/fenndragon/floofstation1
fenndragon Oct 8, 2024
278304e
Merge branch 'master' into Xenospawners
fenndragon Oct 8, 2024
97de236
fix
fenndragon Oct 9, 2024
17f9fd3
Update xenopet.yml
fenndragon Oct 9, 2024
5b1a2fb
Update xenopet.yml
fenndragon Oct 9, 2024
af0374b
Update rehydrateable.yml
fenndragon Oct 9, 2024
e576956
Update toys.yml
fenndragon Oct 9, 2024
0790fdf
Update fun.yml
fenndragon Oct 9, 2024
607b0fc
Update crates.yml
fenndragon Oct 9, 2024
4692c7f
Update cargo_gifts.yml
fenndragon Oct 9, 2024
8c96e0b
Update events.yml
fenndragon Oct 9, 2024
cf143ce
Update cargo_fun.yml
fenndragon Oct 9, 2024
d122d6f
Merge branch 'Fansana:master' into Xenospawners
fenndragon Oct 9, 2024
6f500b1
Merge branch 'Fansana:master' into Xenospawners
fenndragon Oct 9, 2024
8e5bb74
Update meta.json
fenndragon Oct 9, 2024
8d83356
Update xenopet.yml
fenndragon Oct 9, 2024
a653f4f
Delete Resources/Textures/Structures/Storage/Crates/podfill.rsi direc…
fenndragon Oct 9, 2024
334a908
Rename npraetorian.png to nPraetorian.png
fenndragon Oct 9, 2024
a5299a6
Update meta.json
fenndragon Oct 9, 2024
8592eed
Merge branch 'Fansana:master' into Xenospawners
fenndragon Oct 11, 2024
30b26e2
Update events.yml
fenndragon Oct 11, 2024
125fd9c
Merge branch 'Fansana:master' into Xenospawners
fenndragon Oct 11, 2024
5bb6eda
floof folder move
fenndragon Oct 11, 2024
e3b1df0
Delete Resources/Prototypes/Floof/Entities/Objects/Fun/New Text Docum…
fenndragon Oct 11, 2024
5fc685b
remove game rules
Fansana Oct 12, 2024
8ed7246
Update cargo_fun.yml
fenndragon Oct 12, 2024
66eed20
Update cargo_fun.yml
fenndragon Oct 12, 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
5 changes: 5 additions & 0 deletions Resources/Locale/en-US/Floof/station-events/events/cargo-gifts.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cargo-gift-nt-lab = NT Biotech
cargo-gift-cc-lab = Central R&D
cargo-gift-trade-dest = Trade Depot

cargo-gift-friendly-xenos = a Xeno Companion Crate
1 change: 0 additions & 1 deletion Resources/Prototypes/Catalog/Fills/Crates/fun.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,4 +303,3 @@
- id: BoxDarts
amount: 1
prob: 0.05

Loading
Loading