diff --git a/.github/labeler.yml b/.github/labeler.yml
index d4029285b52..85129b003b0 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -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"
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 1c1893884d2..df749b83b1d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -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'
diff --git a/Resources/Locale/en-US/_NF/paper/book-authorbooks.ftl b/Resources/Locale/en-US/_NF/paper/book-authorbooks.ftl
new file mode 100644
index 00000000000..92ac51e679a
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/paper/book-authorbooks.ftl
@@ -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)
diff --git a/Resources/Maps/_NF/Shuttles/Security/cleric.yml b/Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/cleric.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/cleric.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/empress.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/empress.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/enforcer.yml b/Resources/Maps/_NF/Shuttles/Nfsd/enforcer.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/enforcer.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/enforcer.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/fighter.yml b/Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/fighter.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/fighter.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/hospitaller.yml b/Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/hospitaller.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/hospitaller.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/inquisitor.yml b/Resources/Maps/_NF/Shuttles/Nfsd/inquisitor.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/inquisitor.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/inquisitor.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/interceptor.yml b/Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/interceptor.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/interceptor.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/marauder.yml b/Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/marauder.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/marauder.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/opportunity.yml b/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/opportunity.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/prowler.yml b/Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/prowler.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/prowler.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/rogue.yml b/Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/rogue.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/rogue.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/templar.yml b/Resources/Maps/_NF/Shuttles/Nfsd/templar.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/templar.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/templar.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/trident.yml b/Resources/Maps/_NF/Shuttles/Nfsd/trident.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/trident.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/trident.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/wasp.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml
diff --git a/Resources/Maps/_NF/Shuttles/Security/whiskey.yml b/Resources/Maps/_NF/Shuttles/Nfsd/whiskey.yml
similarity index 100%
rename from Resources/Maps/_NF/Shuttles/Security/whiskey.yml
rename to Resources/Maps/_NF/Shuttles/Nfsd/whiskey.yml
diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
index b52e8530085..19277a81b1b 100644
--- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
+++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
@@ -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
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
index cab98b052f8..46b68ddfcab 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml
@@ -112,6 +112,7 @@
   name: storage canister
   components:
     - type: Sprite
+      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       layers:
         - state: yellow
     - type: GasCanister
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -701,6 +709,7 @@
   noSpawn: true
   components:
     - type: Sprite
+      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       state: yellow-1
 
 - type: entity
@@ -709,6 +718,7 @@
   noSpawn: true
   components:
   - type: Sprite
+    sprite: _NF/Structures/Storage/canister.rsi # Frontier
     state: grey-1
 
 - type: entity
@@ -717,6 +727,7 @@
   noSpawn: true
   components:
   - type: Sprite
+    sprite: _NF/Structures/Storage/canister.rsi # Frontier
     state: blue-1
 
 - type: entity
@@ -725,6 +736,7 @@
   noSpawn: true
   components:
     - type: Sprite
+      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       state: red-1
 
 - type: entity
@@ -733,6 +745,7 @@
   noSpawn: true
   components:
     - type: Sprite
+      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       state: black-1
 
 - type: entity
@@ -741,6 +754,7 @@
   noSpawn: true
   components:
     - type: Sprite
+      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       state: orange-1
 
 - type: entity
@@ -758,6 +772,7 @@
   noSpawn: true
   components:
     - type: Sprite
+      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       state: water_vapor-1
 
 - type: entity
@@ -774,6 +789,7 @@
   noSpawn: true
   components:
     - type: Sprite
+      sprite: _NF/Structures/Storage/canister.rsi # Frontier
       state: redws-1
 
 - type: entity
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
index 5a38f92d927..e0093a21e2c 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml
@@ -125,6 +125,11 @@
     state: pda-sheriff
     bookSlot: # Frontier
       startingItem: HyperlinkBookNfsdSop
+      priority: -2
+      whitelist:
+        tags:
+        - BookSpaceLaw
+        - BookNfsdSop
   - type: PdaBorderColor
     borderColor: "#FFFDD0"
     accentHColor: "#896b49"
@@ -155,6 +160,11 @@
     state: pda-cadet
     bookSlot: # Frontier
       startingItem: HyperlinkBookNfsdSop
+      priority: -2
+      whitelist:
+        tags:
+        - BookSpaceLaw
+        - BookNfsdSop
   - type: PdaBorderColor
     borderColor: "#FFFDD0"
     accentHColor: "#896b49"
@@ -185,6 +195,11 @@
     state: pda-deputy
     bookSlot: # Frontier
       startingItem: HyperlinkBookNfsdSop
+      priority: -2
+      whitelist:
+        tags:
+        - BookSpaceLaw
+        - BookNfsdSop
   - type: PdaBorderColor
     borderColor: "#FFFDD0"
     accentHColor: "#896b49"
@@ -215,6 +230,11 @@
     state: pda-brigmed
     bookSlot: # Frontier
       startingItem: HyperlinkBookNfsdSop
+      priority: -2
+      whitelist:
+        tags:
+        - BookSpaceLaw
+        - BookNfsdSop
   - type: PdaBorderColor
     borderColor: "#FFFDD0"
     accentHColor: "#896b49"
@@ -245,6 +265,11 @@
     state: pda-sergeant
     bookSlot: # Frontier
       startingItem: HyperlinkBookNfsdSop
+      priority: -2
+      whitelist:
+        tags:
+        - BookSpaceLaw
+        - BookNfsdSop
   - type: PdaBorderColor
     borderColor: "#FFFDD0"
     accentHColor: "#896b49"
@@ -275,6 +300,11 @@
     state: pda-bailiff
     bookSlot: # Frontier
       startingItem: HyperlinkBookNfsdSop
+      priority: -2
+      whitelist:
+        tags:
+        - BookSpaceLaw
+        - BookNfsdSop
   - type: PdaBorderColor
     borderColor: "#FFFDD0"
     accentHColor: "#896b49"
@@ -305,6 +335,11 @@
     state: pda-detective
     bookSlot: # Frontier
       startingItem: HyperlinkBookNfsdSop
+      priority: -2
+      whitelist:
+        tags:
+        - BookSpaceLaw
+        - BookNfsdSop
   - type: PdaBorderColor
     borderColor: "#774705"
   - type: Icon
@@ -321,6 +356,10 @@
     state: pda-sr
     penSlot:
       startingItem: PenCentcom
+      priority: -1
+      whitelist:
+        tags:
+        - Write
   - type: PdaBorderColor
     borderColor: "#789876"
     accentHColor: "#447987"
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/books_author.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/books_author.yml
new file mode 100644
index 00000000000..9b73fd8fc68
--- /dev/null
+++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/books_author.yml
@@ -0,0 +1,71 @@
+- type: entity
+  parent: BookBase
+  id: BookScienceTextbook
+  name: scientific academia vol.i
+  description: Volume One of the Science Textbook series.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_strong
+        color: "#542485"
+      - state: decor_wingette_circle
+        color: "#be69f0"
+      - state: icon_dna
+    - type: Paper
+      content: book-text-academia-volumeone
+
+- type: entity
+  parent: BookScienceTextbook
+  id: BookSciencePhilospher
+  name: cooking with the philospher's stone
+  description: A CentCom issued mixologist's book? All in the name of science, I guess.
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#542485"
+      - state: decor_wingette_circle
+        color: "#be69f0"
+      - state: icon_bar
+    - type: Paper
+      content: book-text-science-philospher
+
+- type: entity
+  parent: BookScienceTextbook
+  id: BookScienceDwarven
+  name: dwarven guide to free thinking
+  description: A CentCom issued account of a fisherman's journey. They really expect you to read this?
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#542485"
+      - state: decor_wingette_circle
+        color: "#be69f0"
+      - state: icon_fish
+    - type: Paper
+      content: book-text-science-dwarven
+
+- type: entity
+  parent: BookScienceTextbook
+  id: BookScienceClown
+  name: honker's hilarious tight-five
+  description: A CentCom issued Standup Comedy Script..? This is getting ridiculous!
+  components:
+    - type: Sprite
+      sprite: Objects/Misc/books.rsi
+      layers:
+      - state: paper
+      - state: cover_base
+        color: "#542485"
+      - state: decor_wingette_circle
+        color: "#be69f0"
+      - state: icon_banana
+    - type: Paper
+      content: book-text-science-clown
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml
index fdda560c9e7..cd49d37bc62 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Vehicles/vehicles.yml
@@ -58,19 +58,22 @@
   name: skeleton motorcycle
   description: Bad to the Bone.
   components:
-    - type: Storage
-      grid:
-      - 0,0,1,3
-      - 3,0,6,3
-      - 8,0,9,3
-      maxItemSize: Huge
-    - type: ContainerContainer
-      containers:
-        storagebase: !type:Container
-    - type: UserInterface
-      interfaces:
-      - key: enum.StorageUiKey.Key
-        type: StorageBoundUserInterface
+  - type: Storage
+    grid:
+    - 0,0,1,3
+    - 3,0,6,3
+    - 8,0,9,3
+    maxItemSize: Huge
+    blacklist:
+      components:
+      - HumanoidAppearance
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+  - type: UserInterface
+    interfaces:
+    - key: enum.StorageUiKey.Key
+      type: StorageBoundUserInterface
 
 # New Frontier vehicles
 - type: entity
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/cleric.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml
similarity index 88%
rename from Resources/Prototypes/_NF/Shipyard/Security/cleric.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml
index b1127bf998a..80e01fdc905 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/cleric.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/cleric.yml
@@ -6,12 +6,12 @@
   category: Small
   group: None
   mapchecker_group_override: Security  # Treat this as a security vessel for mapchecker purposes
-  shuttlePath: /Maps/_NF/Shuttles/Security/cleric.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/cleric.yml
 
 - type: gameMap
   id: Cleric
   mapName: 'NSF Cleric'
-  mapPath: /Maps/_NF/Shuttles/Security/cleric.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/cleric.yml
   minPlayers: 0
   stations:
     Cleric:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/empress.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
similarity index 85%
rename from Resources/Prototypes/_NF/Shipyard/Security/empress.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
index 5026c85b033..fa266144d43 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/empress.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
@@ -2,15 +2,15 @@
   id: Empress
   name: NSF Императрица
   description: Крупногабаритный патрульшый шаттл ДСБФ. Рекомендованный состав команды 4-8 человек.
-  price: 170000 #Appraisal value is 173000
+  price: 170000 #Appraisal value is 150000
   category: Large
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/empress.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/empress.yml
 
 - type: gameMap
   id: Empress
   mapName: 'NSF Empress'
-  mapPath: /Maps/_NF/Shuttles/Security/empress.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/empress.yml
   minPlayers: 0
   stations:
     Empress:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/enforcer.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/enforcer.yml
similarity index 87%
rename from Resources/Prototypes/_NF/Shipyard/Security/enforcer.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/enforcer.yml
index e2acbb858a0..1b647e25388 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/enforcer.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/enforcer.yml
@@ -5,12 +5,12 @@
   # price: 21350
   # category: Small
   # group: Security
-  # shuttlePath: /Maps/_NF/Shuttles/Security/enforcer.yml
+  # shuttlePath: /Maps/_NF/Shuttles/Nfsd/enforcer.yml
 
 # - type: gameMap
   # id: Enforcer
   # mapName: 'NSF Enforcer'
-  # mapPath: /Maps/_NF/Shuttles/Security/enforcer.yml
+  # mapPath: /Maps/_NF/Shuttles/Nfsd/enforcer.yml
   # minPlayers: 0
   # stations:
     # Enforcer:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/fighter.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml
similarity index 88%
rename from Resources/Prototypes/_NF/Shipyard/Security/fighter.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml
index 8047253975d..c3f8fa2ed9d 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/fighter.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/fighter.yml
@@ -6,12 +6,12 @@
   category: Small
   group: None
   mapchecker_group_override: Security  # Treat this as a security vessel for mapchecker purposes
-  shuttlePath: /Maps/_NF/Shuttles/Security/fighter.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/fighter.yml
 
 - type: gameMap
   id: Fighter
   mapName: 'NSF Fighter'
-  mapPath: /Maps/_NF/Shuttles/Security/fighter.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/fighter.yml
   minPlayers: 0
   stations:
     Fighter:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml
similarity index 86%
rename from Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml
index b87cc78fdb2..42c16b1936e 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/hospitaller.yml
@@ -5,12 +5,12 @@
   price: 28220
   category: Small
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/hospitaller.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/hospitaller.yml
 
 - type: gameMap
   id: Hospitaller
   mapName: 'NSF Hospitaller'
-  mapPath: /Maps/_NF/Shuttles/Security/hospitaller.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/hospitaller.yml
   minPlayers: 0
   stations:
     Hospitaller:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/inquisitor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml
similarity index 86%
rename from Resources/Prototypes/_NF/Shipyard/Security/inquisitor.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml
index be4cf23776c..219ad071b08 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/inquisitor.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/inquisitor.yml
@@ -5,12 +5,12 @@
   price: 29000
   category: Small
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/inquisitor.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/inquisitor.yml
 
 - type: gameMap
   id: Inquisitor
   mapName: 'NSF Inquisitor'
-  mapPath: /Maps/_NF/Shuttles/Security/inquisitor.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/inquisitor.yml
   minPlayers: 0
   stations:
     Inquisitor:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml
similarity index 86%
rename from Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml
index a37454ddc4b..0c48d05e9a7 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/interceptor.yml
@@ -5,12 +5,12 @@
   price: 21350
   category: Small
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/interceptor.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/interceptor.yml
 
 - type: gameMap
   id: Interceptor
   mapName: 'NSF Interceptor'
-  mapPath: /Maps/_NF/Shuttles/Security/interceptor.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/interceptor.yml
   minPlayers: 0
   stations:
     Interceptor:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/marauder.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml
similarity index 86%
rename from Resources/Prototypes/_NF/Shipyard/Security/marauder.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml
index c869e177d00..6d7add89281 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/marauder.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml
@@ -5,12 +5,12 @@
   price: 111550
   category: Large
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/marauder.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/marauder.yml
 
 - type: gameMap
   id: Marauder
   mapName: 'NSF Marauder'
-  mapPath: /Maps/_NF/Shuttles/Security/marauder.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/marauder.yml
   minPlayers: 0
   stations:
     Marauder:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/opportunity.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/opportunity.yml
similarity index 87%
rename from Resources/Prototypes/_NF/Shipyard/Security/opportunity.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/opportunity.yml
index d4437f1c2bf..dcb6086fe75 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/opportunity.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/opportunity.yml
@@ -5,12 +5,12 @@
   # price: 70000
   # category: Medium
   # group: Security
-  # shuttlePath: /Maps/_NF/Shuttles/Security/opportunity.yml
+  # shuttlePath: /Maps/_NF/Shuttles/Nfsd/opportunity.yml
 
 # - type: gameMap
   # id: Opportunity
   # mapName: 'NSF Opportunity'
-  # mapPath: /Maps/_NF/Shuttles/Security/opportunity.yml
+  # mapPath: /Maps/_NF/Shuttles/Nfsd/opportunity.yml
   # minPlayers: 0
   # stations:
     # Opportunity:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/prowler.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml
similarity index 86%
rename from Resources/Prototypes/_NF/Shipyard/Security/prowler.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml
index cd88c15e080..f0fd0703ac7 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/prowler.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/prowler.yml
@@ -5,12 +5,12 @@
   price: 49220
   category: Medium
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/prowler.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/prowler.yml
 
 - type: gameMap
   id: Prowler
   mapName: 'NSF Prowler'
-  mapPath: /Maps/_NF/Shuttles/Security/prowler.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/prowler.yml
   minPlayers: 0
   stations:
     Prowler:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/rogue.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml
similarity index 88%
rename from Resources/Prototypes/_NF/Shipyard/Security/rogue.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml
index 8f1129834b1..2e097cf84e9 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/rogue.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/rogue.yml
@@ -6,12 +6,12 @@
   category: Small
   group: None
   mapchecker_group_override: Security  # Treat this as a security vessel for mapchecker purposes
-  shuttlePath: /Maps/_NF/Shuttles/Security/rogue.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/rogue.yml
 
 - type: gameMap
   id: Rogue
   mapName: 'NSF Rogue'
-  mapPath: /Maps/_NF/Shuttles/Security/rogue.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/rogue.yml
   minPlayers: 0
   stations:
     Rogue:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/templar.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml
similarity index 86%
rename from Resources/Prototypes/_NF/Shipyard/Security/templar.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml
index 859b9fac251..ab3226a13c3 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/templar.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/templar.yml
@@ -5,12 +5,12 @@
   price: 24220
   category: Small
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/templar.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/templar.yml
 
 - type: gameMap
   id: Templar
   mapName: 'NSF Templar'
-  mapPath: /Maps/_NF/Shuttles/Security/templar.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/templar.yml
   minPlayers: 0
   stations:
     Templar:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/trident.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/trident.yml
similarity index 88%
rename from Resources/Prototypes/_NF/Shipyard/Security/trident.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/trident.yml
index 68fe82e456b..f6e98070f04 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/trident.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/trident.yml
@@ -5,12 +5,12 @@
   # price: 49300
   # category: Medium
   # group: Security
-  # shuttlePath: /Maps/_NF/Shuttles/Security/trident.yml
+  # shuttlePath: /Maps/_NF/Shuttles/Nfsd/trident.yml
 
 # - type: gameMap
   # id: Trident
   # mapName: 'NSF Trident'
-  # mapPath: /Maps/_NF/Shuttles/Security/trident.yml
+  # mapPath: /Maps/_NF/Shuttles/Nfsd/trident.yml
   # minPlayers: 0
   # stations:
     # Trident:
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/wasp.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml
similarity index 87%
rename from Resources/Prototypes/_NF/Shipyard/Security/wasp.yml
rename to Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml
index e935c4659e4..bb8c325ee4b 100644
--- a/Resources/Prototypes/_NF/Shipyard/Security/wasp.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/wasp.yml
@@ -5,12 +5,12 @@
   price: 135000
   category: Large
   group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/wasp.yml
+  shuttlePath: /Maps/_NF/Shuttles/Nfsd/wasp.yml
 
 - type: gameMap
   id: Wasp
   mapName: 'NSF Wasp'
-  mapPath: /Maps/_NF/Shuttles/Security/wasp.yml
+  mapPath: /Maps/_NF/Shuttles/Nfsd/wasp.yml
   minPlayers: 0
   stations:
     Wasp:
diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml
new file mode 100644
index 00000000000..f2a7363cc6b
--- /dev/null
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/whiskey.yml
@@ -0,0 +1,26 @@
+# - type: vessel
+#  id: Whiskey
+#  name: NSF Whiskey
+#  description: A heavy duty NSFD rescue ship, suited for one to two brigmedics and a pilot.
+#  price: 55000
+#  category: Medium
+#  group: Security
+#  shuttlePath: /Maps/_NF/Shuttles/Nfsd/whiskey.yml
+
+# - type: gameMap
+#  id: Whiskey
+#  mapName: 'NSF Whiskey'
+#  mapPath: /Maps/_NF/Shuttles/Nfsd/whiskey.yml
+#  minPlayers: 0
+#  stations:
+#    Whiskey:
+#      stationProto: StandardFrontierVessel
+#      components:
+#        - type: StationNameSetup
+#          mapNameTemplate: 'Whiskey {1}'
+#          nameGenerator:
+#            !type:NanotrasenNameGenerator
+#            prefixCreator: '14'
+#        - type: StationJobs
+#          overflowJobs: []
+#          availableJobs: {}
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml b/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml
deleted file mode 100644
index 6368e94a1c5..00000000000
--- a/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- type: vessel
-  id: Whiskey
-  name: NSF Виски
-  description: Среднегабаритный медицинский шаттл ДСБФ. Рекомендованный состав команды 2-4 человека.
-  price: 55000
-  category: Medium
-  group: Security
-  shuttlePath: /Maps/_NF/Shuttles/Security/whiskey.yml
-
-- type: gameMap
-  id: Whiskey
-  mapName: 'NSF Whiskey'
-  mapPath: /Maps/_NF/Shuttles/Security/whiskey.yml
-  minPlayers: 0
-  stations:
-    Whiskey:
-      stationProto: StandardFrontierVessel
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: 'Виски {1}'
-          nameGenerator:
-            !type:NanotrasenNameGenerator
-            prefixCreator: '14'
-        - type: StationJobs
-          overflowJobs: []
-          availableJobs: {}
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/black-1.png b/Resources/Textures/Structures/Storage/canister.rsi/black-1.png
index 2f7fc54a31d..791f22c9585 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/black-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/black-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/black.png b/Resources/Textures/Structures/Storage/canister.rsi/black.png
index 2b07b2b087d..c7c4d4732e8 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/black.png and b/Resources/Textures/Structures/Storage/canister.rsi/black.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png b/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png
index 1cb0f83ebf1..f07bedd7eab 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/blue.png b/Resources/Textures/Structures/Storage/canister.rsi/blue.png
index c39f1ff26e9..412994d96c8 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/blue.png and b/Resources/Textures/Structures/Storage/canister.rsi/blue.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png b/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png
index 9360a41c58b..7996e1b26db 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png
index 89f617973f8..5f13bbacae6 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png
index 6f9566ee13c..2e548fcaca2 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png
index 1a0a4023636..094ee1e3c60 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png
index 87a68af474a..014ed7833d4 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-oa1.png b/Resources/Textures/Structures/Storage/canister.rsi/can-oa1.png
index 8489866f74b..8153aa5ae7d 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-oa1.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-oa1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-open.png b/Resources/Textures/Structures/Storage/canister.rsi/can-open.png
index 61d286efb55..67f9117ebd8 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-open.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-open.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png b/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png
index d7bef4b366c..1782cc29e89 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/grey.png b/Resources/Textures/Structures/Storage/canister.rsi/grey.png
index 6668cd6789b..f7ef5a60f9a 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/grey.png and b/Resources/Textures/Structures/Storage/canister.rsi/grey.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png b/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png
index 136b36ca3cd..4d0714e5457 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/orange.png b/Resources/Textures/Structures/Storage/canister.rsi/orange.png
index 7681cc2f064..2c8b6b429fe 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/orange.png and b/Resources/Textures/Structures/Storage/canister.rsi/orange.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/red-1.png b/Resources/Textures/Structures/Storage/canister.rsi/red-1.png
index 84ccd606c9d..0f43f9d1421 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/red-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/red-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/red.png b/Resources/Textures/Structures/Storage/canister.rsi/red.png
index 3ee22dae499..4e1a047b387 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/red.png and b/Resources/Textures/Structures/Storage/canister.rsi/red.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png b/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png
index 5f924fffce0..d5c412875d8 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/redws.png b/Resources/Textures/Structures/Storage/canister.rsi/redws.png
index 63065177708..8390cb6539a 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/redws.png and b/Resources/Textures/Structures/Storage/canister.rsi/redws.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/black-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/black-1.png
new file mode 100644
index 00000000000..2f7fc54a31d
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/black-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/black.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/black.png
new file mode 100644
index 00000000000..2b07b2b087d
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/black.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue-1.png
new file mode 100644
index 00000000000..1cb0f83ebf1
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue.png
new file mode 100644
index 00000000000..c39f1ff26e9
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/blue.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-connector.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-connector.png
new file mode 100644
index 00000000000..9360a41c58b
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-connector.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o0.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o0.png
new file mode 100644
index 00000000000..89f617973f8
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o0.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o1.png
new file mode 100644
index 00000000000..6f9566ee13c
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o2.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o2.png
new file mode 100644
index 00000000000..1a0a4023636
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o2.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o3.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o3.png
new file mode 100644
index 00000000000..87a68af474a
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-o3.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-oa1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-oa1.png
new file mode 100644
index 00000000000..8489866f74b
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-oa1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-open.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-open.png
new file mode 100644
index 00000000000..61d286efb55
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/can-open.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue-1.png
new file mode 100644
index 00000000000..1cb0f83ebf1
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue.png
new file mode 100644
index 00000000000..f664d0f3bf0
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/darkblue.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon-1.png
new file mode 100644
index 00000000000..1cb0f83ebf1
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon.png
new file mode 100644
index 00000000000..c39f1ff26e9
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/frezon.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/green-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/green-1.png
new file mode 100644
index 00000000000..df9958d3e6a
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/green-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/green.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/green.png
new file mode 100644
index 00000000000..75d21b09181
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/green.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys-1.png
new file mode 100644
index 00000000000..ecc5294699b
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys.png
new file mode 100644
index 00000000000..a414a192812
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/greenys.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey-1.png
new file mode 100644
index 00000000000..d7bef4b366c
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey.png
new file mode 100644
index 00000000000..6668cd6789b
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/grey.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/locked.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/locked.png
new file mode 100644
index 00000000000..9edd84975f3
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/locked.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/canister.rsi/meta.json
new file mode 100644
index 00000000000..95d67cc8ae1
--- /dev/null
+++ b/Resources/Textures/_NF/Structures/Storage/canister.rsi/meta.json
@@ -0,0 +1,122 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Frezon canister modified from tgstation, the rest are taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "black"
+    },
+    {
+      "name": "black-1"
+    },
+    {
+      "name": "blue"
+    },
+    {
+      "name": "blue-1"
+    },
+    {
+      "name": "can-connector"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "can-o0",
+      "delays": [
+        [
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "can-o1"
+    },
+    {
+      "name": "can-o2"
+    },
+    {
+      "name": "can-o3"
+    },
+    {
+      "name": "can-oa1"
+    },
+    {
+      "name": "can-open"
+    },
+    {
+      "name": "grey"
+    },
+    {
+      "name": "grey-1"
+    },
+    {
+      "name": "orange"
+    },
+    {
+      "name": "orange-1"
+    },
+    {
+      "name": "red"
+    },
+    {
+      "name": "red-1"
+    },
+    {
+      "name": "redws"
+    },
+    {
+      "name": "redws-1"
+    },
+    {
+      "name": "yellow"
+    },
+    {
+      "name": "yellow-1"
+    },
+    {
+      "name": "green"
+    },
+    {
+      "name": "green-1"
+    },
+    {
+      "name": "greenys"
+    },
+    {
+      "name": "greenys-1"
+    },
+    {
+      "name": "darkblue"
+    },
+    {
+      "name": "darkblue-1"
+    },
+    {
+      "name": "frezon"
+    },
+    {
+      "name": "frezon-1"
+    },
+    {
+      "name": "water_vapor"
+    },
+    {
+      "name": "water_vapor-1"
+    },
+    {
+      "name": "scrubber-connector"
+    },
+    {
+      "name": "scrubber-open"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/orange-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/orange-1.png
new file mode 100644
index 00000000000..136b36ca3cd
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/orange-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/orange.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/orange.png
new file mode 100644
index 00000000000..7681cc2f064
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/orange.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/red-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/red-1.png
new file mode 100644
index 00000000000..84ccd606c9d
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/red-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/red.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/red.png
new file mode 100644
index 00000000000..3ee22dae499
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/red.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws-1.png
new file mode 100644
index 00000000000..5f924fffce0
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws.png
new file mode 100644
index 00000000000..63065177708
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/redws.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-connector.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-connector.png
new file mode 100644
index 00000000000..261bbdb3403
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-connector.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-open.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-open.png
new file mode 100644
index 00000000000..4eb9d1e7082
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/scrubber-open.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/unlocked.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/unlocked.png
new file mode 100644
index 00000000000..5ba12d06af2
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/unlocked.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor-1.png
new file mode 100644
index 00000000000..2f7fc54a31d
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor.png
new file mode 100644
index 00000000000..993c5ac4ff6
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/water_vapor.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow-1.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow-1.png
new file mode 100644
index 00000000000..c12694850d3
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow-1.png differ
diff --git a/Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow.png b/Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow.png
new file mode 100644
index 00000000000..fc98a456822
Binary files /dev/null and b/Resources/Textures/_NF/Structures/Storage/canister.rsi/yellow.png differ