Cargo Catalouge Expansion Port

Resources/Prototypes/Catalog/Cargo/cargo_armory.yml

@@ -20,20 +20,20 @@
 - type: cargoProduct
   id: ArmorySmg
   icon:
-    sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
+    sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
     state: icon
   product: CrateArmorySMG
-  cost: 9000
+  cost: 8000 # Funky change, from 9000 to 8000
   category: cargoproduct-category-name-armory
   group: market
 
 - type: cargoProduct
   id: ArmoryShotgun
   icon:
-    sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
+    sprite: Objects/Weapons/Guns/Shotguns/pump.rsi
     state: icon
   product: CrateArmoryShotgun
-  cost: 7000
+  cost: 6500 # Funky change, from 7000 to 6500
   category: cargoproduct-category-name-armory
   group: market
 
@@ -43,7 +43,7 @@
     sprite: Clothing/OuterClothing/Armor/riot.rsi
     state: icon
   product: CrateSecurityRiot
-  cost: 7500
+  cost: 4000
   category: cargoproduct-category-name-armory
   group: market
 
@@ -63,7 +63,7 @@
     sprite: Structures/Machines/bomb.rsi
     state: training-bomb
   product: CrateTrainingBombs
-  cost: 3000
+  cost: 1000 # Funky change, from 3000 to 1000
   category: cargoproduct-category-name-armory
   group: market
 
@@ -83,7 +83,7 @@
     sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
     state: icon
   product: CrateArmoryPistols
-  cost: 5200
+  cost: 3000 # Funky change, from 5200 to 3000
   category: cargoproduct-category-name-armory
   group: market
 

Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml

@@ -18,15 +18,15 @@
   category: cargoproduct-category-name-cargo
   group: market
 
-- type: cargoProduct
-  id: CargoLuxuryHardsuit
-  icon:
-    sprite: Clothing/Head/Hardsuits/luxury.rsi
-    state: icon
-  product: CrateCargoLuxuryHardsuit
-  cost: 15000
-  category: cargoproduct-category-name-cargo
-  group: market
+#- type: cargoProduct # Funky change, made no lunger purchasable, Luxury is unique to the QM.
+#  id: CargoLuxuryHardsuit
+#  icon:
+#    sprite: Clothing/Head/Hardsuits/luxury.rsi
+#    state: icon
+#  product: CrateCargoLuxuryHardsuit
+#  cost: 15000
+#  category: cargoproduct-category-name-cargo
+#  group: market
 
 - type: cargoProduct
   id: CargoParcelWrap

Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

@@ -257,15 +257,15 @@
   category: cargoproduct-category-name-fun
   group: market
 
-- type: cargoProduct
-  id: HydratedScurret
-  icon:
-    sprite: Structures/Wallmounts/posters.rsi
-    state: poster55_legit
-  product: CrateFunScurret
-  cost: 25000 # You will surely not regret buying this
-  category: cargoproduct-category-name-fun
-  group: market
+#- type: cargoProduct # Funky change, removed ability to purchase this, added into the gamba pool instead. 
+#  id: HydratedScurret
+#  icon:
+#    sprite: Structures/Wallmounts/posters.rsi
+#    state: poster55_legit
+#  product: CrateFunScurret
+#  cost: 25000 # You will surely not regret buying this #
+#  category: cargoproduct-category-name-fun
+#  group: market
 
 - type: cargoProduct
   id: FunCrateGambling
@@ -274,7 +274,7 @@
     state: cash_1000000
   product: CrateCargoGambling
   cost: 10000
-  category: cargoproduct-category-name-fun
+  category: cargoproduct-category-name-cargo # Funky change, gamba crates are classified as a cargo department crate. 
   group: market
 
 - type: cargoProduct

Resources/Prototypes/Catalog/Cargo/cargo_security.yml

@@ -21,25 +21,25 @@
 # SPDX-FileCopyrightText: 2025 T <theo75cg@gmail.com>
 # SPDX-License-Identifier: MIT
 
-- 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

Resources/Prototypes/Catalog/Fills/Crates/armory.yml

@@ -25,26 +25,26 @@
   name: SMG crate
   description: Contains two SMGs with four mags. Requires Armory access to open.
   components:
-  - type: EntityTableContainerFill
+  - type: EntityTableContainerFill # Funky change, replaced the WT550 with a Drozd SMG
     containers:
       entity_storage: !type:AllSelector
         children:
-        - id: WeaponSubMachineGunWt550
+        - id: WeaponSubMachineGunDrozd
           amount: 2
-        - id: MagazinePistolSubMachineGunTopMounted
+        - id: MagazinePistolSubMachineGun
           amount: 4
 
 - type: entity
   parent: [ CrateWeaponSecure, BaseSecurityContraband ]
   id: CrateArmoryShotgun
   name: shotgun crate
-  description: For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open.
+  description: For when the enemy absolutely needs to be replaced with lead. Contains two Kammerer Shotguns, and some standard shotgun shells. Requires Armory access to open. # Funky change, replaced the Enforcers with Kammerers
   components:
   - type: EntityTableContainerFill
     containers:
       entity_storage: !type:AllSelector
         children:
-        - id: WeaponShotgunEnforcer
+        - id: WeaponShotgunKammerer
           amount: 2
         - id: BoxLethalshot
           amount: 4
@@ -101,25 +101,23 @@
           amount: 4
 
 - type: entity
-  parent: [ CrateWeaponSecure, BaseSecurityContraband ]
   id: CrateSecurityRiot
-  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.
+  parent: [ CrateWeaponSecure, BaseSecurityContraband ]
+  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. # Funky change
   components:
-  - type: EntityTableContainerFill
-    containers:
-      entity_storage: !type:AllSelector
-        children:
-        - id: ClothingOuterArmorRiot
-          amount: 2
-        - id: ClothingHeadHelmetRiot
-          amount: 2
-        - id: WeaponShotgunEnforcerRubber
-          amount: 2
-        - id: BoxBeanbag
-          amount: 2
-        - id: RiotShield
-          amount: 2
+  - type: StorageFill
+    contents:
+    - id: ClothingOuterArmorRiot
+      amount: 2
+    - id: ClothingHeadHelmetRiot
+      amount: 2
+    - id: ClothingMaskGasSecurity
+      amount: 2
+    - id: RiotShield
+      amount: 2
+    - id: TearGasGrenade
+      amount: 4
 
 - type: entity
   parent: [ CrateWeaponSecure, BaseSecurityContraband ]

Resources/Prototypes/Catalog/Fills/Crates/materials.yml

@@ -74,12 +74,13 @@
   parent: CrateGenericSteel
   id: CrateMaterialWood
   name: wood crate
-  description: Bunch of wood planks.
+  description: 90 wooden planks.
   components:
   - type: EntityTableContainerFill
     containers:
       entity_storage:
         id: MaterialWoodPlank
+        amount: 3 # Funky change
 
 - type: entity
   parent: CrateGenericSteel

Resources/Prototypes/Catalog/Fills/Crates/medical.yml

@@ -23,19 +23,23 @@
   name: medical supplies crate
   description: Basic medical supplies.
   components:
-  - type: EntityTableContainerFill
+  - type: EntityTableContainerFill # Funky Station, changed the fills to only be treatment supplies
     containers:
       entity_storage: !type:AllSelector
         children:
-        - id: MedkitFilled
-          amount: 2
+        - id: Brutepack
+          amount: 3
         - id: Gauze
-          amount: 2
+          amount: 3
         - id: Bloodpack
-          amount: 2
-        - id: BoxLatexGloves
-        - id: BoxSterileMask
-        - id: BoxMouthSwab
+          amount: 3
+        - id: Ointment
+          amount: 3
+        - id: PillCanisterTricordrazine
+          amount: 3
+#        - id: PillCanisterGranibitulari
+#          amount: 3
+        - id: HandheldHealthAnalyzer
 
 - type: entity
   parent: CrateMedical

Resources/Prototypes/Catalog/Fills/Crates/salvage.yml

@@ -27,27 +27,24 @@
   id: CrateSalvageEquipment
   name: "salvage equipment crate"
   suffix: Filled
-  description: For the daring.
+  description: For the daring. Contains a Spationaugh Hardsuit, air tanks, magboots, tool belt, PKA, GPS and Radio. # Funky Station
   components:
   - type: EntityTableContainerFill
     containers:
       entity_storage: !type:AllSelector
         children:
-        - 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
   parent: CrateGenericSteel

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -958,7 +958,7 @@
 - type: entity
   name: energy magnum
   parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband]
-  id: WeaponEnergyMagnum
+  id: sWeaponEnergyMagnum
   description: A high powered self-charging energy pistol designed for elite security personnel. It has has three firing modes allowing for either high damage, window piercing, or non-lethal disabling.
   components:
   - type: Sprite

Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_cargo.yml

@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: 2025 ThatOneMoon <91613003+ThatOneGuy227@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 ThatOneMoon <juozas.dringelis@gmail.com>
+# SPDX-FileCopyrightText: 2025 mkanke-real <mikekanke@gmail.com>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+- 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

Resources/Prototypes/_Funkystation/Catalog/Cargo/cargo_engineering.yml

@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: 2025 8tv <eightev@gmail.com>
+# SPDX-FileCopyrightText: 2025 AtlasHD <99688062+AtlasHDD@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 ThatOneMoon <91613003+ThatOneGuy227@users.noreply.github.com>
+# SPDX-FileCopyrightText: 2025 ThatOneMoon <juozas.dringelis@gmail.com>
+# SPDX-FileCopyrightText: 2025 unknown <alexander.kuepper1234@gmail.com>
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+- type: cargoProduct
+  id: EngineeringEquipment
+  icon:
+    sprite:  Clothing/OuterClothing/Hardsuits/engineering.rsi
+    state: icon
+  product: CrateEngineeringEquipment
+  cost: 6000
+  category: cargoproduct-category-name-engineering
+  group: market
+
+- type: cargoProduct
+  id: EngineeringAtmosEquipment
+  icon:
+    sprite: Clothing/OuterClothing/Hardsuits/atmospherics.rsi
+    state: icon
+  product: CrateEngineeringAtmosEquipment
+  cost: 8000
+  category: cargoproduct-category-name-engineering
+  group: market