diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
index 26748e82268..aa77f438318 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -24,7 +24,7 @@
     sprite: Clothing/OuterClothing/Armor/riot.rsi
     state: icon
   product: CrateSecurityRiot
-  cost: 7500
+  cost: 4000 #Funky station, reduced form 7500 because it no longer has the two enforcer shotguns in the crate 
   category: cargoproduct-category-name-armory
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
index b51397e0944..c26e02cbd53 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
@@ -54,7 +54,7 @@
     sprite: Objects/Tools/Toolboxes/toolbox_yellow.rsi
     state: icon
   product: CrateEngineeringElectricalSupplies
-  cost: 4500
+  cost: 2000 # Funky Station, reduced from 4500, only has a single pair of gloves and a toolbox 
   category: cargoproduct-category-name-engineering
   group: market
 
@@ -104,7 +104,7 @@
     sprite: Clothing/Head/Helmets/eva.rsi
     state: icon
   product: CrateEvaKit
-  cost: 5000
+  cost: 2500 # Funky Station, reduced from 5000, made it just a single suit instead of two 
   category: cargoproduct-category-name-engineering
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index f4d29705d46..ebd3a5b51aa 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -225,7 +225,7 @@
     state: cash_1000000
   product: CrateCargoGambling
   cost: 10000
-  category: cargoproduct-category-name-fun
+  category: cargoproduct-category-name-cargo
   group: market
 
 - type: cargoProduct
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
index 93b55fbb24e..6d0e167d4bc 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
@@ -1,22 +1,22 @@
-- type: cargoProduct
-  id: SecurityArmor
-  icon:
-    sprite: Clothing/OuterClothing/Armor/bulletproof.rsi
-    state: icon
-  product: CrateSecurityArmor
-  cost: 1250
-  category: cargoproduct-category-name-security
-  group: market
+#- type: cargoProduct #Funky Station, replaced by the standard armor crate 
+#  id: SecurityArmor
+#  icon:
+#    sprite: Clothing/OuterClothing/Armor/bulletproof.rsi
+#    state: icon
+#  product: CrateSecurityArmor
+#  cost: 1250
+#  category: cargoproduct-category-name-security
+#  group: market
 
-- type: cargoProduct
-  id: SecurityHelmet
-  icon:
-    sprite: Clothing/Head/Helmets/security.rsi
-    state: icon
-  product: CrateSecurityHelmet
-  cost: 550
-  category: cargoproduct-category-name-security
-  group: market
+#- type: cargoProduct #Funky Station, replaced by the standard armor crate
+#  id: SecurityHelmet
+#  icon:
+#    sprite: Clothing/Head/Helmets/security.rsi
+#    state: icon
+#  product: CrateSecurityHelmet
+#  cost: 550
+#  category: cargoproduct-category-name-security
+#  group: market
 
 - type: cargoProduct
   id: SecurityNonLethal
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index d31375d53f2..ea7a032064c 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -22,7 +22,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockChefvendFilled
-  cost: 680
+  cost: 1250 #Funky station, increased from 680
   category: cargoproduct-category-name-service
   group: market
 
@@ -52,7 +52,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockDinnerwareFilled
-  cost: 2000
+  cost: 1500 #Funky station, reduced from 2000 
   category: cargoproduct-category-name-service
   group: market
 
@@ -152,8 +152,8 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockSalvageEquipmentFilled
-  cost: 1500
-  category: cargoproduct-category-name-engineering
+  cost: 2000 # Funky station, increased from 1500
+  category: cargoproduct-category-name-cargo #Also this was in the engineering category for some reason
   group: market
 
 - type: cargoProduct
@@ -162,7 +162,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockSecTechFilled
-  cost: 2200
+  cost: 6500 # Funky station, increased from 2200, includes way to many supplies for such a low price
   category: cargoproduct-category-name-security
   group: market
 
@@ -172,7 +172,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockSeedsFilled
-  cost: 3600
+  cost: 1600 # Funky station, reduced from 3600 
   category: cargoproduct-category-name-hydroponics
   group: market
 
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
index b1187ecd6c8..586035c60fe 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -73,8 +73,8 @@
 - type: entity
   id: CrateSecurityRiot
   parent: [ CrateWeaponSecure, BaseSecurityContraband ]
-  name: swat crate
-  description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open.
+  name: riot gear crate
+  description: Contains two sets of riot armor, helmets, gas masks and shields as well as four tear gas grenades, Requires Armory access to open.
   components:
   - type: StorageFill
     contents:
@@ -82,9 +82,9 @@
       amount: 2
     - id: ClothingHeadHelmetRiot
       amount: 2
-    - id: WeaponShotgunEnforcerRubber
-      amount: 2
-    - id: BoxBeanbag
+    - id: ClothingMaskGasSecurity
       amount: 2
     - id: RiotShield
       amount: 2
+    - id: TearGasGrenade
+      amount: 4
\ No newline at end of file
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
index 242287ea23b..1fbd0dc43d5 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
@@ -108,12 +108,12 @@
   name: electrical supplies crate
   description: NT is not responsible for any workplace infighting relating to the insulated gloves included within these crates.
   components:
-  - type: StorageFill
+  - type: StorageFill # Funky station, reduced to just a single set of items, price down to just 2000
     contents:
       - id: ToolboxElectricalFilled
-        amount: 2
+        amount: 1
       - id: ClothingHandsGlovesColorYellow
-        amount: 2
+        amount: 1
 
 - type: entity
   id: CrateEngineeringStationBeaconBundle
@@ -165,14 +165,15 @@
   id: CrateEvaKit
   parent: CrateCommandSecure
   name: EVA kit
-  description: A set consisting of two prestigious EVA suits and helmets.
+  description: A crate containing a standard EVA suit and helmet.
   components:
-  - type: StorageFill
+  - type: StorageFill # Funky station, reduced to just having a single suit and helmet, added air tanks, price down to just 2000
     contents:
       - id: ClothingHeadHelmetEVA
-        amount: 2
       - id: ClothingOuterHardsuitEVA
-        amount: 2
+      - id: NitrogenTankFilled 
+      - id: OxygenTankFilled
+
 
 - type: entity
   id: CrateRCDAmmo
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
index 3934812ae4e..bd436b1c973 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml
@@ -47,11 +47,13 @@
   id: CrateMaterialWood
   parent: CrateGenericSteel
   name: wood crate
-  description: Bunch of wood planks.
+  description: 90 wooden planks.
   components:
   - type: StorageFill
     contents:
       - id: MaterialWoodPlank
+        amount: 3 # Funky 
+          
 
 - type: entity
   id: CrateMaterialBrass
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
index a63875d5c36..a478fc74370 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
@@ -1,20 +1,24 @@
 - type: entity
-  id: CrateMedicalSupplies
+  id: CrateMedicalSupplies 
   parent: CrateMedical
-  name: medical supplies crate
+  name: medical supplies crate  
   description: Basic medical supplies.
   components:
-  - type: StorageFill
+  - type: StorageFill # Funky Station, changed the fills to only be treatment supplies 
     contents:
-      - id: MedkitFilled
-        amount: 2
+      - id: Brutepack
+        amount: 4
       - id: Gauze
-        amount: 2
+        amount: 4
       - id: Bloodpack
-        amount: 2
-      - id: BoxLatexGloves
-      - id: BoxSterileMask
-      - id: BoxMouthSwab
+        amount: 4
+      - id: Ointment
+        amount: 4  
+      - id: PillCanisterTricordrazine
+        amount: 4
+      - id: PillCanisterGranibitulari
+        amount: 4
+      - id: HandheldHealthAnalyzer   
 
 - type: entity
   id: CrateChemistrySupplies
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
index 9d07ad63c5b..abb69854151 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -1,27 +1,24 @@
 - type: entity
   id: CrateSalvageEquipment
   name: "salvage equipment crate"
-  description: For the daring.
+  description: For the daring. Contains a Spationaugh Hardsuit, air tanks, magboots, tool belt, PKA, GPS and Radio. # Funky Station
   suffix: Filled
-  parent: CrateGenericSteel
+  parent: CratePrivateSecure
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterHardsuitSalvage
-      - id: ClothingMaskBreath
+      - id: ClothingOuterHardsuitSpatio
+      - id: ClothingMaskGasExplorer
       - id: OxygenTankFilled
-      - id: FireExtinguisher
+      - id: NitrogenTankFilled
       - id: ClothingShoesBootsMag
-      - id: HandHeldMassScanner
       - id: Pickaxe
-      - id: Welder
-      - id: Wrench
-      - id: Screwdriver
-      - id: Crowbar
-      - id: Wirecutter
-      - id: ClothingBeltUtility
+      - id: ClothingBeltUtilityFilled
       - id: OreBag
-      - id: ClothingBeltSalvageWebbing
+      - id: WeaponProtoKineticAccelerator
+      - id: ClothingEyesGlassesMeson
+      - id: HandheldGPSBasic
+      - id: RadioHandheld
 
 - type: entity
   id: CrateSalvageAssortedGoodies
@@ -90,38 +87,38 @@
       - id: WeaponRevolverMateba
         prob: 0.0001
 
-- type: entity
-  parent: CrateGenericSteel
-  id: CratePartsT3
-  name: tier 3 parts crate
-  description: Contains 5 random tier 3 parts for upgrading machines.
-  # TODO add contents.
-  #components:
-  #- type: StorageFill
-  #  contents:
-  #   - id: SalvagePartsT3Spawner
-  #    amount: 5
+#- type: entity
+# parent: CrateGenericSteel
+# id: CratePartsT3
+# name: tier 3 parts crate
+# description: Contains 5 random tier 3 parts for upgrading machines.
+# TODO add contents.
+#components:
+#- type: StorageFill
+#  contents:
+#   - id: SalvagePartsT3Spawner
+#    amount: 5
 
-- type: entity
-  parent: CrateGenericSteel
-  id: CratePartsT3T4
-  name: tier 3/4 parts crate
-  description: Contains 5 random tier 3 or 4 parts for upgrading machines.
-  # TODO add contents.
-  #components:
-  # type: StorageFill
-  #  contents:
-  #  - id: SalvagePartsT3T4Spawner
-  #     amount: 5
+# - type: entity
+# parent: CrateGenericSteel
+# id: CratePartsT3T4
+# name: tier 3/4 parts crate
+# description: Contains 5 random tier 3 or 4 parts for upgrading machines.
+# TODO add contents.
+#components:
+# type: StorageFill
+#  contents:
+#  - id: SalvagePartsT3T4Spawner
+#     amount: 5
 
-- type: entity
-  parent: CrateGenericSteel
-  id: CratePartsT4
-  name: tier 4 parts crate
-  description: Contains 5 random tier 4 parts for upgrading machines.
-  # TODO add contents.
-  #components:
-  #- type: StorageFill
-  #  contents:
-  #  - id: SalvagePartsT4Spawner
-  #    amount: 5
+# - type: entity  
+# parent: CrateGenericSteel
+# id: CratePartsT4
+# name: tier 4 parts crate
+# description: Contains 5 random tier 4 parts for upgrading machines.
+# TODO add contents.
+#components:
+#- type: StorageFill
+#  contents:
+#  - id: SalvagePartsT4Spawner
+#    amount: 5
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
index 378f8cb7588..12e091d15bd 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml
@@ -142,7 +142,7 @@
 
 - type: entity
   id: CrateVendingMachineRestockSalvageEquipmentFilled
-  parent: CrateGenericSteel
+  parent: CratePrivateSecure # Funky station
   name: Salvage restock crate
   description: Contains a restock box for the salvage vendor.
   components:
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
index a12ff6773ea..3d42100110b 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
@@ -234,6 +234,8 @@
     sprite: Structures/Storage/Crates/privatecrate_secure.rsi
   - type: Sprite
     sprite: Structures/Storage/Crates/privatecrate_secure.rsi
+  - type: AccessReader
+    access: [["Cargo"]] # Funky station, Cargo itself dosent have its own secure crate. 
 
 - type: entity
   parent: CrateBaseSecure
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_botany.yml
new file mode 100644
index 00000000000..82e76325ef3
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_botany.yml
@@ -0,0 +1,9 @@
+- type: cargoProduct
+  id: HydroponicsChemicals
+  icon:
+    sprite: Objects/Specific/Chemistry/jug.rsi
+    state: jug
+  product: CrateHydroponicsChemicals
+  cost: 4000
+  category: cargoproduct-category-name-hydroponics
+  group: market
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_cargo.yml
new file mode 100644
index 00000000000..b778eed146f
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_cargo.yml
@@ -0,0 +1,19 @@
+- type: cargoProduct
+  id: FultonSupplies
+  icon:
+    sprite: Objects/Tools/fulton.rsi
+    state: extraction_pack
+  product: CrateFultonSupplies
+  cost: 1000
+  category: cargoproduct-category-name-cargo
+  group: market
+
+- type: cargoProduct
+  id: SalvageEquipment
+  icon:
+    sprite: Clothing/OuterClothing/Hardsuits/spatio.rsi
+    state: icon
+  product: CrateSalvageEquipment
+  cost: 7500
+  category: cargoproduct-category-name-cargo
+  group: market
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_engineering.yml
new file mode 100644
index 00000000000..933cedaead3
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_engineering.yml
@@ -0,0 +1,29 @@
+- type: cargoProduct
+  id: EngineeringEquipment
+  icon:
+    sprite:  Clothing/OuterClothing/Hardsuits/engineering.rsi
+    state: icon
+  product: CrateEngineeringEquipment
+  cost: 7000
+  category: cargoproduct-category-name-engineering
+  group: market
+
+- type: cargoProduct
+  id: EngineeringAtmosEquipment
+  icon:
+    sprite: Clothing/OuterClothing/Hardsuits/atmospherics.rsi
+    state: icon
+  product: CrateEngineeringAtmosEquipment
+  cost: 9000
+  category: cargoproduct-category-name-engineering
+  group: market  
+
+- type: cargoProduct
+  id: BasicHardsuit
+  icon:
+    sprite: Clothing/OuterClothing/Hardsuits/basic.rsi
+    state: icon
+  product: CrateBasicHardsuit
+  cost: 4500
+  category: cargoproduct-category-name-engineering
+  group: market  
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_materials.yml
new file mode 100644
index 00000000000..7046cc790c2
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_materials.yml
@@ -0,0 +1,49 @@
+- type: cargoProduct
+  id: MaterialGlassBulk
+  icon:
+    sprite: Objects/Materials/Sheets/glass.rsi
+    state: glass_3
+  product: CrateMaterialGlassBulk
+  cost: 4250
+  category: cargoproduct-category-name-materials
+  group: market
+
+- type: cargoProduct
+  id: MaterialSteelBulk
+  icon:
+    sprite: Objects/Materials/Sheets/metal.rsi
+    state: steel_3
+  product: CrateMaterialSteelBulk
+  cost: 4250
+  category: cargoproduct-category-name-materials
+  group: market
+
+- type: cargoProduct
+  id: MaterialPlasticBulk
+  icon:
+    sprite: Objects/Materials/Sheets/other.rsi
+    state: plastic_3
+  product: CrateMaterialPlasticBulk
+  cost: 5500
+  category: cargoproduct-category-name-materials
+  group: market
+
+- type: cargoProduct
+  id: MaterialPlasmaBulk
+  icon:
+    sprite: Objects/Materials/Sheets/other.rsi
+    state: plasma_3
+  product: CrateMaterialPlasmaBulk
+  cost: 5500
+  category: cargoproduct-category-name-materials
+  group: market
+
+- type: cargoProduct
+  id: MaterialWood
+  icon:
+    sprite: Objects/Materials/materials.rsi
+    state: wood_3
+  product: CrateMaterialWood
+  cost: 1000
+  category: cargoproduct-category-name-materials
+  group: market      
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_medical.yml
new file mode 100644
index 00000000000..9279db22e5b
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_medical.yml
@@ -0,0 +1,49 @@
+- type: cargoProduct
+  id: EmergencyDefibrillator
+  icon:
+    sprite: Objects/Specific/Medical/defib.rsi
+    state: icon
+  product: CrateEmergencyDefibrillator
+  cost: 1400
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: EmergencyMedipens
+  icon:
+    sprite: Objects/Specific/Medical/medipen.rsi
+    state: medipen
+  product: CrateEmergencyMedipens
+  cost: 2500
+  category: cargoproduct-category-name-medical
+  group: market
+
+- type: cargoProduct
+  id: MedicalEquipment
+  icon:
+    sprite: Objects/Specific/Medical/healthanalyzer.rsi
+    state: icon
+  product: CrateMedicalEquipment
+  cost: 2500
+  category: cargoproduct-category-name-medical
+  group: market    
+
+- type: cargoProduct
+  id: MedicalParamedSuit
+  icon:
+    sprite: Objects/Specific/Medical/firstaidkits.rsi
+    state: firstaid
+  product: CrateMedicalParamedSuit
+  cost: 6500
+  category: cargoproduct-category-name-medical
+  group: market      
+
+- type: cargoProduct
+  id: MedicalBiomass
+  icon:
+    sprite: Objects/Misc/monkeycube.rsi
+    state: cube
+  product: CrateMedicalBiomass
+  cost: 3000
+  category: cargoproduct-category-name-medical
+  group: market    
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_security.yml
new file mode 100644
index 00000000000..e730e7ba6c0
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_security.yml
@@ -0,0 +1,39 @@
+- type: cargoProduct
+  id: SwatArmor
+  icon:
+    sprite: Clothing/Mask/swat.rsi
+    state: icon
+  product: CrateSecuritySwat
+  cost: 6500
+  category: cargoproduct-category-name-security
+  group: market
+
+- type: cargoProduct
+  id: SecurityHardsuit
+  icon:
+    sprite: Clothing/OuterClothing/Hardsuits/security.rsi
+    state: icon
+  product: CrateSecurityHardsuit
+  cost: 9000
+  category: cargoproduct-category-name-security
+  group: market
+
+- type: cargoProduct
+  id: SecurityEquipment
+  icon:
+    sprite: Clothing/Belt/security.rsi
+    state: icon
+  product: CrateSecurityEquipment
+  cost: 3000
+  category: cargoproduct-category-name-security
+  group: market    
+
+- type: cargoProduct
+  id: SecurityBasicArmor
+  icon:
+    sprite: Clothing/Head/Helmets/security.rsi
+    state: icon
+  product: CrateSecurityBasicArmor
+  cost: 2000
+  category: cargoproduct-category-name-security
+  group: market
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_service.yml
new file mode 100644
index 00000000000..d61af28372d
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_service.yml
@@ -0,0 +1,29 @@
+- type: cargoProduct
+  id: BulkCleanNade
+  icon:
+    sprite: Objects/Weapons/Grenades/janitor.rsi
+    state: icon
+  product: CrateServiceBulkCleanerGranades 
+  cost: 850
+  category: cargoproduct-category-name-service
+  group: market
+  
+- type: cargoProduct
+  id: ServiceColoredLightTubes
+  icon:
+    sprite: Objects/Power/light_tube.rsi
+    state: normal
+  product: CrateServiceColoredLightTubes 
+  cost: 800
+  category: cargoproduct-category-name-service
+  group: market
+
+- type: cargoProduct
+  id: ServiceColoredLightBulb
+  icon:
+    sprite: Objects/Power/light_bulb.rsi
+    state: normal
+  product: CrateServiceColoredLightBulb 
+  cost: 800
+  category: cargoproduct-category-name-service
+  group: market    
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Boxes/general.yml
new file mode 100644
index 00000000000..bb04e724d24
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Boxes/general.yml
@@ -0,0 +1,39 @@
+- type: entity
+  name: colored lighttube box
+  parent: BoxLightbulb
+  id: BoxLightTubeColored
+  components:
+  - type: StorageFill
+    contents:
+      - id: LightTubeCrystalBlue
+      - id: LightTubeCrystalBlue
+      - id: LightTubeCrystalCyan
+      - id: LightTubeCrystalCyan
+      - id: LightTubeCrystalGreen
+      - id: LightTubeCrystalGreen
+      - id: LightTubeCrystalOrange
+      - id: LightTubeCrystalOrange
+      - id: LightTubeCrystalPink
+      - id: LightTubeCrystalPink
+      - id: LightTubeCrystalRed
+      - id: LightTubeCrystalRed
+
+- type: entity
+  name: colored lighttube box
+  parent: BoxLightbulb
+  id: BoxLightBulbColored
+  components:
+  - type: StorageFill
+    contents:
+      - id: LightBulbCrystalBlue
+      - id: LightBulbCrystalBlue
+      - id: LightBulbCrystalCyan
+      - id: LightBulbCrystalCyan
+      - id: LightBulbCrystalGreen
+      - id: LightBulbCrystalGreen
+      - id: LightBulbCrystalOrange
+      - id: LightBulbCrystalOrange
+      - id: LightBulbCrystalPink
+      - id: LightBulbCrystalPink
+      - id: LightBulbCrystalRed
+      - id: LightBulbCrystalRed
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/armory.yml
new file mode 100644
index 00000000000..22f7201a520
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/armory.yml
@@ -0,0 +1,65 @@
+- type: entity
+  id: CrateSecuritySwat
+  parent: [ CrateWeaponSecure, BaseSecurityContraband ]
+  name: swat gear crate
+  description: Contains two sets of swat armor, helmets, gas masks, jackboots, combat gloves and shields as well as four flashbangs. Requires Armory access to open.
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterArmorBulletproof
+      amount: 2
+    - id: ClothingHeadHelmetSwat
+      amount: 2
+    - id: ClothingMaskGasSwat
+      amount: 2
+    - id: RiotBulletShield
+      amount: 2
+    - id: ClothingShoesBootsJackFilled
+      amount: 2
+    - id: ClothingHandsGlovesCombat
+      amount: 2
+    - id: GrenadeFlashBang
+      amount: 4
+
+- type: entity
+  id: CrateSecurityHardsuit
+  parent: [ CrateWeaponSecure, BaseSecurityContraband ]
+  name: security hardsuit crate
+  description: Contains a security hardsuit and pair of airtanks. Requires Armory access to open.
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterHardsuitSecurity
+    - id: NitrogenTank
+    - id: OxygenTank
+
+- type: entity
+  id: CrateSecurityEquipment
+  parent: CrateSecgear
+  name: security equipment crate 
+  description: Supplies for protecting and serving, contains a armor vest, helmet, flash, disabler, security glasses and belt, holobarrier projector, jackboots, seclite and the security guidebooks. Requires Security access to open.
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterArmorBasic
+    - id: ClothingHeadHelmetBasic
+    - id: Flash
+    - id: ClothingBeltSecurityFilled
+    - id: WeaponDisabler
+    - id: FlashlightSeclite
+    - id: ClothingEyesGlassesSecurity
+    - id: BookSecurity
+    - id: BookSpaceLaw
+
+- type: entity
+  id: CrateSecurityBasicArmor
+  parent: CrateSecgear
+  name: standard armor crate 
+  description: Contains three sets of standard issue security armor vests and helmets. Requires Security access to open.
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingHeadHelmetBasic
+      amount: 3
+    - id: ClothingOuterArmorBasic
+      amount: 3
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/botany.yml
new file mode 100644
index 00000000000..145a9e11288
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/botany.yml
@@ -0,0 +1,24 @@
+- type: entity
+  id: CrateHydroponicsChemicals 
+  parent: CrateHydroSecure
+  name: botanical chemicals crate 
+  description: Any entrepreneuring botanist's dream. Contains many botanical chemicals. Requires Hydroponics access to open.
+  components:
+  - type: StorageFill
+    contents:
+      - id: DiethylamineChemistryBottle
+        amount: 4
+      - id: EZNutrientChemistryBottle
+        amount: 4
+      - id: RobustHarvestChemistryBottle
+        amount: 2
+      - id: Left4ZedChemistryBottle
+        amount: 4
+      - id: UnstableMutagenChemistryBottle
+        amount: 4
+      - id: SedinChemistryBottle
+        amount: 2
+      - id: CryoxadoneChemistryBottle
+        amount: 2
+      - id: PhalanximineChemistryBottle
+        amount: 2
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/cargo.yml
new file mode 100644
index 00000000000..46df4d2cc95
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/cargo.yml
@@ -0,0 +1,13 @@
+- type: entity
+  id: CrateFultonSupplies 
+  parent: CratePrivateSecure
+  name: fulton supplies crate
+  description: Contains 20 fulltons and a beacon to link with. 
+  components:
+  - type: StorageFill
+    contents:
+    - id: Fulton
+      amount: 2
+    - id: FultonBeacon
+
+    
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/engineering.yml
new file mode 100644
index 00000000000..4a761525768
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/engineering.yml
@@ -0,0 +1,51 @@
+- type: entity
+  id: CrateEngineeringEquipment
+  parent: CrateEngineeringSecure
+  name: engineer equipment crate
+  description: Various engineering gear parts.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingBeltUtilityEngineering
+      - id: ClothingEyesGlassesMeson
+      - id: ClothingOuterHardsuitEngineering
+      - id: ClothingShoesBootsMag
+      - id: NitrogenTankFilled
+      - id: OxygenTankFilled
+      - id: RCD
+      - id: RCDAmmo
+
+- type: entity
+  id: CrateEngineeringAtmosEquipment
+  parent: CrateEngineeringSecure
+  name: atmospheric technician equipment crate
+  description: Contains a Amospheric Hardsuit and Firesuit, fire fighting backpack, atmospheric gas mask, filled tool belt, meson glasses, RCD and RPD alsongide the engineering guidebook.
+  components:
+  - type: StorageFill
+    contents:
+     - id: ClothingBeltUtilityEngineering
+     - id: ClothingEyesGlassesMeson
+     - id: ClothingOuterHardsuitAtmos
+     - id: ClothingHeadHelmetAtmosFire
+     - id: ClothingOuterSuitAtmosFire
+     - id: ClothingMaskGasAtmos
+     - id: ClothingBackpackFirefighterTank
+     - id: RPD
+     - id: ClothingShoesBootsMag
+     - id: NitrogenTankFilled
+     - id: OxygenTankFilled
+     - id: RCD
+     - id: RCDAmmo     
+     - id: HolofanProjector
+
+- type: entity
+  id: CrateBasicHardsuit
+  parent: CrateCommandSecure
+  name: basic hardsuit kit
+  description: A crate containing a basic hardsuit, rated for civilian use.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterHardsuitBasic
+      - id: NitrogenTankFilled 
+      - id: OxygenTankFilled    
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/materials.yml
new file mode 100644
index 00000000000..dbdb536fafd
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/materials.yml
@@ -0,0 +1,43 @@
+- type: entity
+  id: CrateMaterialGlassBulk
+  parent: CrateGenericSteel
+  name: bulk glass sheet crate
+  description: 270 sheets of glass, packed with extreme care.
+  components:
+  - type: StorageFill
+    contents:
+      - id: SheetGlass
+        amount: 9
+
+- type: entity
+  id: CrateMaterialSteelBulk
+  parent: CrateGenericSteel
+  name: bulk steel sheet crate
+  description: 270 sheets of steel.
+  components:
+  - type: StorageFill
+    contents:
+      - id: SheetSteel
+        amount: 9
+
+- type: entity
+  id: CrateMaterialPlasticBulk
+  parent: CrateGenericSteel
+  name: bulk plastic sheet crate
+  description: 270 sheets of plastic.
+  components:
+  - type: StorageFill
+    contents:
+      - id: SheetPlastic
+        amount: 9
+
+- type: entity
+  id: CrateMaterialPlasmaBulk
+  parent: CratePlasma
+  name: bulk solid plasma crate
+  description: 90 sheets of plasma.
+  components:
+  - type: StorageFill
+    contents:
+      - id: SheetPlasma
+        amount: 3
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/medical.yml
new file mode 100644
index 00000000000..f54e81307e1
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/medical.yml
@@ -0,0 +1,118 @@
+- type: entity
+  id: CrateMedicalSupplies
+  parent: CrateMedical
+  name: medical supplies crate
+  description: Basic medical supplies.
+  components:
+  - type: StorageFill
+    contents:
+      - id: Brutepack
+        amount: 4
+      - id: Gauze
+        amount: 4
+      - id: Bloodpack
+        amount: 4
+      - id: Ointment
+        amount: 4  
+      - id: PillCanisterTricordrazine
+        amount: 4
+      - id: PillCanisterGranibitulari
+        amount: 4
+      - id: HandheldHealthAnalyzer    
+
+- type: entity
+  id: CrateMedicalSuppliesBrute
+  parent: CrateMedical
+  name: brute medical supplies crate
+  description: Brute treatment medical supplies.
+  components:
+  - type: StorageFill
+    contents:
+      - id: Brutepack
+        amount: 4
+      - id: Gauze
+        amount: 4
+      - id: SyringeSaline
+        amount: 8 
+      - id: PillCanisterLibital
+        amount: 4
+      - id: PillCanisterProbital
+        amount: 4
+      - id: HandheldHealthAnalyzer  
+
+- type: entity
+  id: CrateMedicalSuppliesAdvanced
+  parent: CrateMedical
+  name: advanced medical supplies crate
+  description: Advanced medical supplies.
+  components:
+  - type: StorageFill
+    contents:
+      - id: MedicatedSuture
+        amount: 5
+      - id: RegenerativeMesh
+        amount: 5
+      - id: SyringeSaline
+        amount: 8
+      - id: HandheldHealthAnalyzer    
+
+- type: entity
+  id: CrateEmergencyDefibrillator
+  parent: CrateMedical
+  name: emergency defibrillator crate
+  description: Crate that contains a defibrillator.
+  components:
+  - type: StorageFill
+    contents:
+    - id: Defibrillator         
+
+- type: entity
+  id: CrateEmergencyMedipens
+  parent: CrateMedical
+  name: emergency medipens crate
+  description: Crate that contains six emergency medipens 
+  components:
+  - type: StorageFill
+    contents:
+    - id: EmergencyMedipen         
+      amount: 6
+ 
+- type: entity
+  id: CrateMedicalEquipment
+  parent: CrateMedical
+  name: medical equipment crate
+  description: For treating big and small injuries alike, contains a medical belt and hud, health analyzer, basic topicals, medical mask and pair of gloves as well as the medical guidebooks.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingEyesHudMedical
+      - id: ClothingMaskSterile
+      - id: ClothingHandsGlovesNitrile
+      - id: BookChemicalCompendium
+      - id: BookMedicalReferenceBook
+      - id: ClothingBeltMedicalFilled
+      - id: EmergencyMedipen
+      - id: Syringe   
+      - id: HandheldHealthAnalyzer   
+
+- type: entity
+  id: CrateMedicalParamedSuit
+  parent: CrateMedicalSecure
+  name: paramedic voidsuit crate
+  description: Contains a paramedic void suit and set of air tanks. Requires Medical access to open.
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingOuterHardsuitVoidParamed
+      - id: NitrogenTank
+      - id: OxygenTank
+
+- type: entity
+  id: CrateMedicalBiomass
+  parent: CrateMedical
+  name: biomass crate 
+  description: Crate that contains 100 units of biomass.
+  components:
+  - type: StorageFill
+    contents:
+    - id: MaterialBiomass
\ No newline at end of file
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/service.yml
new file mode 100644
index 00000000000..62b8f354059
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Catalog/Fills/Crates/service.yml
@@ -0,0 +1,31 @@
+- type: entity
+  id: CrateServiceBulkCleanerGranades
+  parent: CratePlastic
+  name: bulk clenades box 
+  description: When just a mop is not enough to do the job.
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxCleanerGrenades
+      amount: 3
+
+- type: entity
+  id: CrateServiceColoredLightTubes
+  parent: CratePlastic
+  name: colored lightube box
+  description: Contains a set of diffrent colored light tubes.
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxLightTubeColored
+
+- type: entity
+  id: CrateServiceColoredLightBulb
+  parent: CratePlastic
+  name: colored lightbulb box 
+  description: Contains a set of diffrent colored light bulbs.
+  components:
+  - type: StorageFill
+    contents:
+    - id: BoxLightBulbColored
+
diff --git a/Resources/Prototypes/_Funkystation/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/_Funkystation/Entities/Objects/Specific/chemistry-bottles.yml
new file mode 100644
index 00000000000..5d0da59dc61
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Entities/Objects/Specific/chemistry-bottles.yml
@@ -0,0 +1,61 @@
+- type: entity
+  id: DiethylamineChemistryBottle
+  suffix: Diethylamine
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-diethylamine
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Diethylamine
+          Quantity: 30
+
+- type: entity
+  id: SedinChemistryBottle
+  suffix: Sedin
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-sedin
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Sedin
+          Quantity: 30
+
+- type: entity
+  id: CryoxadoneChemistryBottle
+  suffix: Cryoxadone
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-cryoxadone
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Cryoxadone
+          Quantity: 30
+
+- type: entity
+  id: PhalanximineChemistryBottle
+  suffix: Phalanximine
+  parent: BaseChemistryBottleFilled
+  components:
+  - type: Label
+    currentLabel: reagent-name-phalanximine
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: Phalanximine
+          Quantity: 30
+
+                              
\ No newline at end of file