Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #111 from Corvax-Frontier/upstream030524
Browse files Browse the repository at this point in the history
Upstream030524
  • Loading branch information
Vonsant authored May 3, 2024
2 parents f169298 + 95a1928 commit 647f428
Show file tree
Hide file tree
Showing 94 changed files with 507 additions and 76 deletions.
14 changes: 7 additions & 7 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
# - "Resources/Maps/**/*.yml" # All .yml files in the Resources/Maps directory, recursive.

"Map-Admin":
- "Resources/Maps/_NF/Admin/*.yml" # Grid Files
- "Resources/Maps/_NF/Admin/**/*.yml" # Grid Files

"Map-Bluespace":
- "Resources/Maps/_NF/Bluespace/*.yml" # Grid Files
- "Resources/Maps/_NF/Bluespace/**/*.yml" # Grid Files

"Map-Dungeon":
- "Resources/Maps/_NF/Dungeon/*.yml" # Grid Files
- "Resources/Maps/_NF/Dungeon/**/*.yml" # Grid Files

"Map-Outpost":
- "Resources/Maps/_NF/Outpost/*.yml" # Map Files
- "Resources/Prototypes/_MF/Maps/Outpost/*.yml" # Prototypes Files

"Map-Shuttle":
- "Resources/Maps/_NF/Shuttles/*.yml" # Grid Files
- "Resources/Prototypes/_NF/Shipyard/*.yml" # Prototypes Files
- "Resources/Maps/_NF/Shuttles/**/*.yml" # Grid Files
- "Resources/Prototypes/_NF/Shipyard/**/*.yml" # Prototypes Files

"Map-POI":
- "Resources/Maps/_NF/POI/*.yml" # Grid Files
- "Resources/Prototypes/_MF/Maps/POI/*.yml" # Prototypes Files
- "Resources/Maps/_NF/POI/**/*.yml" # Grid Files
- "Resources/Prototypes/_MF/Maps/POI/**/*.yml" # Prototypes Files

"Sprites":
- "**/*.rsi/*.png"
Expand Down
15 changes: 15 additions & 0 deletions Resources/Changelog/Changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4487,3 +4487,18 @@ Entries:
message: Fixed mailpod power issue
id: 4969
time: '2024-05-02T01:21:52.0000000+00:00'
- author: erhardsteinhauer
changes:
- type: Fix
message: Added felinids/goblins/vulps to hoverbike built-in storage blacklist.
id: 4970
time: '2024-05-03T00:27:37.0000000+00:00'
- author: Wolfking6116
changes:
- type: Add
message: >-
CentCom has sent out some educational texts about Artifexium Refinement
to be included in a Research Director's Standard Kit across the Frontier
Sector.
id: 4971
time: '2024-05-03T11:04:14.0000000+00:00'
153 changes: 153 additions & 0 deletions Resources/Locale/en-US/_NF/paper/book-authorbooks.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
book-text-academia-volumeone = Scientific Academia Vol.I
Title: Scientific Academia Vol.I
Author: Bertle "Book" Bartleby
Introduction
Congratulations on recieving your honourary starters guide to the Scientific Method on the Frontier. In this three hundred and forty seven page thesis I will explain... (Oh, it seems someone has torn out the rest of the pages.)
book-text-science-philospher = Cooking with the Philospher's Stone
Section: Mystical Culinary Delights
1. Starmetal Elixir
Ingredients:
1 tsp ground Starmetal
1 cup hot water
1 tbsp honey
2 slices of lemon
Instructions:
In a small pot, bring the water to a gentle boil.
Add the ground Starmetal and let it simmer for 5 minutes.
Remove from heat and strain the mixture into a cup.
Add honey and lemon slices for taste.
Enjoy the elixir warm, ideal for enhancing magical focus.
2. Dragon's Blood Stew
Ingredients:
1 lb diced meat (your choice)
2 tbsp Dragon's Blood resin (crushed)
1 onion, chopped
2 carrots, chopped
2 potatoes, chopped
4 cups beef or vegetable broth
Salt and pepper to taste
1 tsp thyme
Instructions:
In a large pot, brown the meat over medium heat.
Add the onions and cook until translucent.
Add the Dragon's Blood resin, carrots, potatoes, broth, salt, pepper, and thyme.
Bring to a boil, then reduce heat and simmer for 1 hour, or until the meat is tender.
Serve hot, perfect for a hearty meal after a long quest.
3. Starmetal and Dragon's Blood Tea
Ingredients:
1 tsp ground Starmetal
1 tsp Dragon's Blood resin (crushed)
1 cup boiling water
Honey or sugar to taste
Instructions:
In a teapot or cup, combine the ground Starmetal and crushed Dragon's Blood resin.
Pour boiling water over the mixture and let it steep for 5 minutes.
Strain the tea into a cup and add honey or sugar to taste.
Enjoy this mystical blend for a magical boost in energy.
book-text-science-dwarven = Dwarven Guide to Free Thinking
Title: Dwarven Guide to Free Thinking
Author: Grimbald Stoneheart
Introduction
Welcome, dear reader, to a journey unlike any other. I am Grimbald Stoneheart, a dwarf who has delved deep into the mines of knowledge and emerged with precious gems of wisdom. In this guide, I will share with you the secrets of opening one's mind, with a special focus on the potent substance known as Nåzomvim. Prepare to embark on a journey that will expand your horizons and challenge your perceptions.
Chapter 1: Understanding Nåzomvim
Nåzomvim, a rare and powerful substance, is extracted from the mystical Nåzom Tatlosh. A fish found in the depths of underground lakes. Revered for its mind-expanding properties, it is a key to unlocking the doors of perception. However, it must be approached with respect and caution, for its potency is not to be underestimated.
Chapter 2: Preparing the Mind
Before one can fully embrace the effects of Nåzomvim, it is essential to prepare the mind. This involves practices such as meditation, deep breathing, and visualization. These techniques help to clear the mind of clutter and create a receptive state for the transformative experience ahead.
Chapter 3: The Ritual of Consumption
The consumption of Nåzomvim is a sacred ritual. It should be done in a quiet, comfortable space, free from distractions. A small dose is all that is needed to begin the journey. As the Nåzomvim takes effect, one may feel a sense of euphoria, followed by a profound opening of the mind.
Chapter 4: Navigating the Expanded Mind
With the mind open, you will experience thoughts and ideas flowing freely, unbound by the constraints of conventional thinking. It is a time to explore, to question, and to discover. Keep a journal nearby to record your insights and revelations, for they may prove invaluable.
Chapter 5: Integration and Reflection
After the effects of Nåzomvim have subsided, it is crucial to take time for integration and reflection. This is when the true value of the experience is realized. Reflect on what you have learned and how it can be applied to your life. The goal is not just to think freely but to live freely as well.
Conclusion
The journey of opening one's mind is a lifelong quest, and Nåzomvim is but one tool in the vast arsenal of knowledge. Embrace the lessons learned, and continue to seek out new experiences and perspectives. Remember, the mind is like a forge; it must be constantly tended and fueled to produce the finest creations.
May your mind be as open as the halls of our ancestors, and may your thoughts flow as freely as the mountain streams.
With wisdom and respect,
Grimbald Stoneheart
book-text-science-clown = Honker's Hilarious Tight-Five
Title: Honker's Hilarious Tight-Five
Setting: A small, dimly lit stage on a spaceship. A spotlight shines on a microphone stand at the center. The audience, consisting of various aliens and humans, is buzzing with anticipation. Suddenly, the lights dim, and a spotlight illuminates Honker, the space clown, who bounces onto the stage wearing a bright, mismatched outfit with oversized shoes and a red nose that honks.
Honker: (Waving) Hey there, galaxy gang! It's me, Honker, your favorite space clown! (Honks nose) Ready to blast off into some laughs?
Audience: (Applause and cheers)
Honker: So, I was floating around the Milky Way the other day, and I bumped into an asteroid. I said, "Hey, watch where you're going!" And the asteroid said, "I've been here for millions of years, where have you been?" I said, "Stuck in traffic on Mars, where else?" (Honks nose)
Audience: (Laughter)
Honker: Speaking of Mars, you ever notice how Martians never laugh? I asked one why, and he said, "We don't have a sense of humor. It's not in our atmosphere." So I gave him a balloon animal, and guess what? It floated away! (Mimics balloon floating away) Guess their sense of humor isn't the only thing that's light! (Honks nose)
Audience: (More laughter)
Honker: And what's the deal with space food? I ordered a pizza on the moon, and it took light-years to arrive! When it finally got there, I was like, "This is cold!" And the delivery guy said, "What did you expect? It's a cheese moon!" (Shrugs) At least it was crater-free! (Honks nose)
Audience: (Laughing)
Honker: You know, I tried to start a band with some aliens. We called ourselves "The Cosmic Jokers." But we had to break up. Turns out, a black hole can't play drums, and a supernova is terrible at keeping time. The only thing we were good at was causing a big bang! (Honks nose)
Audience: (Laughter and applause)
Honker: (Bowing) Thank you, thank you! You've been a stellar audience! Remember, in space, no one can hear you scream, but everyone can hear you laugh! Keep smiling, and may your stars always shine bright! (Honks nose one last time)
Audience: (Applause and cheers as Honker takes a bow and exits the stage)
Honker: (Bouncing back into the spotlight) Oh, I almost forgot to tell ya about the time I tried to inject an asteroid with laughter! (Pauses for effect) You see, I thought, if I could just get this space rock to crack up, maybe we'd get along better.
Audience: (Curious murmuring)
Honker: So, there I am, floating up to this giant rock with a giant syringe filled with pure, concentrated laughter. (Mimics holding a large syringe) I push in the plunger, and you know what happened?
Audience: (Leans in) What?
Honker: It started giggling! A little chuckle at first, then a full-on belly laugh! (Imitates asteroid laughing) Turns out, all it needed was a good joke! So I asked, "Why did the astronaut break up with the planet?" "Because it needed space!"
Audience: (Laughter)
Honker: And just like that, we were on a rock 'n' roll! Literally, that asteroid laughed so hard, it changed its orbit! Now, whenever it passes by, it gives a little chuckle. Reminding us all, even the stoniest faces in the universe can crack a smile!
Audience: (Laughter and applause)
Honker: (Bows) Thank you, thank you! Remember, laughter's the best medicine, even for asteroids! Keep spreading those smiles, and let's make the universe a happier place, one rock at a time! (Honks nose)
Audience: (Cheers and applause as Honker exits the stage)
12 changes: 12 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,15 @@
- id: BookInspiration
prob: 0.1
orGroup: BookAuthor
- id: BookScienceTextbook # Frontier
prob: 0.1 # Frontier
orGroup: BookAuthor # Frontier
- id: BookSciencePhilospher # Frontier
prob: 0.1 # Frontier
orGroup: BookAuthor # Frontier
- id: BookScienceDwarven # Frontier
prob: 0.1 # Frontier
orGroup: BookAuthor # Frontier
- id: BookScienceClown # Frontier
prob: 0.1 # Frontier
orGroup: BookAuthor # Frontier
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
name: storage canister
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: yellow
- type: GasCanister
Expand Down Expand Up @@ -161,6 +162,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain air mixture. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: grey
- type: GasCanister
Expand Down Expand Up @@ -201,6 +203,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain oxygen. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: blue
- type: GasCanister
Expand Down Expand Up @@ -255,6 +258,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain nitrogen. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: red
- type: GasCanister
Expand Down Expand Up @@ -311,6 +315,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain carbon dioxide. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: black
- type: GasCanister
Expand Down Expand Up @@ -371,6 +376,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain plasma. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: orange
- type: GasCanister
Expand Down Expand Up @@ -460,6 +466,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain water vapor. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: water_vapor
- type: GasCanister
Expand Down Expand Up @@ -551,6 +558,7 @@
description: A canister that can contain any type of gas. This one is supposed to contain nitrous oxide. It can be attached to connector ports using a wrench.
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
layers:
- state: redws
- type: GasCanister
Expand Down Expand Up @@ -674,7 +682,7 @@
damageModifierSet: Metallic
- type: InteractionOutline
- type: Sprite
sprite: Structures/Storage/canister.rsi
sprite: _NF/Structures/Storage/canister.rsi
state: grey-1
- type: Physics
bodyType: Dynamic
Expand All @@ -701,6 +709,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: yellow-1

- type: entity
Expand All @@ -709,6 +718,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: grey-1

- type: entity
Expand All @@ -717,6 +727,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: blue-1

- type: entity
Expand All @@ -725,6 +736,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: red-1

- type: entity
Expand All @@ -733,6 +745,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: black-1

- type: entity
Expand All @@ -741,6 +754,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: orange-1

- type: entity
Expand All @@ -758,6 +772,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: water_vapor-1

- type: entity
Expand All @@ -774,6 +789,7 @@
noSpawn: true
components:
- type: Sprite
sprite: _NF/Structures/Storage/canister.rsi # Frontier
state: redws-1

- type: entity
Expand Down
Loading

0 comments on commit 647f428

Please sign in to comment.