ThatOneMoon · ThatOneMoon · Jul 12, 2025 · Jul 12, 2025
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -73,18 +73,18 @@
 - 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:
     - id: ClothingOuterArmorRiot
       amount: 2
     - id: ClothingHeadHelmetRiot
       amount: 2
-    - id: WeaponShotgunEnforcerRubber
-      amount: 2
-    - id: BoxBeanbag
+    - id: ClothingMaskGasSecurity
       amount: 2
     - id: RiotShield
       amount: 2
+    - id: TearGasGrenade
+      amount: 4
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_cargo.yml 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