From a8242a38a3cd3883aca423e8fb87a8476089c798 Mon Sep 17 00:00:00 2001
From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com>
Date: Tue, 28 May 2024 21:34:09 -0400
Subject: [PATCH] Mirror: CargoConsoleMenu localization (#127)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## Mirror of PR #25931: [CargoConsoleMenu
localization](https://github.com/space-wizards/space-station-14/pull/25931)
from
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)
###### `6e38b992cfc607e09178efc178b86f35152f0cde`
PR opened by modern-nm at
2024-03-08 14:46:29 UTC
PR merged by web-flow at
2024-03-09 06:56:40 UTC
---
PR changed 20 files with 211 additions and 195 deletions.
The PR had the following labels:
- Changes: UI
---
Original Body
>
>
>
> ## About the PR
>
> This PR adds localization capability for CargoConsoleMenu (name of
entity: ComputerCargoOrders)
>
> ## Why / Balance
>
>
> Please let me tell you a story of my vision. First i decided to make
these changes on one of russian community servers. But taking into
account future changes of .yml files by space-wizards community (they
are regularly added to our space-station build), we will have to
constantly edit xml files to remove duplicate categories — imagine
someone added cargoproduct with category "Fun", when we have tons of
items with category "Развлечения".
>
> To summarize: my PR makes possible to localize categories of
"cargoproduct" and makes communities do less work when upstream comes
>
> ## Technical details
>
>
> New code considers strings comparisons of prototype.Category
(Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs) using
Loc.GetString(...). And that's all.
>
> ## Media
>
> Off course there are no visible changes on eng-localization
>
>
![Снимок_ножницы](https://github.com/space-wizards/space-station-14/assets/87994977/5cdbf5df-c4cc-42e6-861b-aa35a009e957)
>
> That's how these changes look like on our community build, using other
.ftl file
>
>
![Снимок_ножницы2](https://github.com/space-wizards/space-station-14/assets/87994977/20023fc8-5cdf-4069-981b-edbfa98fa31d)
>
>
> - [x] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
>
> ## Breaking changes
>
>
>
> .yml
> - every category of type "cargoProduct" was edited to
"cargoproduct-category-name-{categoryName}"
>
> .ftl
> - file "cargoproduct-categories.ftl" was added to english localization
to localize categories of cargoProduct
>
> .cs
> - CargoConsoleMenu.xaml.cs got tweaks which prevent issues with
strings comparisons
>
> **Changelog**
>
>
---------
Signed-off-by: VMSolidus
Co-authored-by: MODERN <87994977+modern-nm@users.noreply.github.com>
Co-authored-by: VMSolidus
---
.../Cargo/UI/CargoConsoleMenu.xaml.cs | 4 +-
.../catalog/cargo/cargoproduct-categories.ftl | 16 +++++
.../Prototypes/Catalog/Cargo/cargo_armory.yml | 12 ++--
.../Catalog/Cargo/cargo_atmospherics.yml | 22 +++----
.../Prototypes/Catalog/Cargo/cargo_botany.yml | 10 ++--
.../Prototypes/Catalog/Cargo/cargo_cargo.yml | 4 +-
.../Catalog/Cargo/cargo_circuitboards.yml | 2 +-
.../Catalog/Cargo/cargo_emergency.yml | 16 ++---
.../Catalog/Cargo/cargo_engineering.yml | 28 ++++-----
.../Catalog/Cargo/cargo_engines.yml | 36 ++++++------
.../Prototypes/Catalog/Cargo/cargo_food.yml | 16 ++---
.../Prototypes/Catalog/Cargo/cargo_fun.yml | 58 +++++++++----------
.../Catalog/Cargo/cargo_livestock.yml | 46 +++++++--------
.../Catalog/Cargo/cargo_materials.yml | 22 +++----
.../Catalog/Cargo/cargo_medical.yml | 30 +++++-----
.../Catalog/Cargo/cargo_science.yml | 6 +-
.../Catalog/Cargo/cargo_security.yml | 18 +++---
.../Catalog/Cargo/cargo_service.yml | 38 ++++++------
.../Catalog/Cargo/cargo_shuttle.yml | 6 +-
.../Catalog/Cargo/cargo_vending.yml | 52 ++++++++---------
20 files changed, 229 insertions(+), 213 deletions(-)
create mode 100644 Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index baf0d31f1f1..e60335bc45c 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -93,7 +93,7 @@ public void PopulateProducts()
if (search.Length == 0 && _category == null ||
search.Length != 0 && prototype.Name.ToLowerInvariant().Contains(search) ||
search.Length != 0 && prototype.Description.ToLowerInvariant().Contains(search) ||
- search.Length == 0 && _category != null && prototype.Category.Equals(_category))
+ search.Length == 0 && _category != null && Loc.GetString(prototype.Category).Equals(_category))
{
var button = new CargoProductRow
{
@@ -122,7 +122,7 @@ public void PopulateCategories()
foreach (var prototype in ProductPrototypes)
{
- if (!_categoryStrings.Contains(prototype.Category))
+ if (!_categoryStrings.Contains(Loc.GetString(prototype.Category)))
{
_categoryStrings.Add(Loc.GetString(prototype.Category));
}
diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl
new file mode 100644
index 00000000000..f2451527b09
--- /dev/null
+++ b/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl
@@ -0,0 +1,16 @@
+cargoproduct-category-name-armory = Armory
+cargoproduct-category-name-atmospherics = Atmospherics
+cargoproduct-category-name-cargo = Cargo
+cargoproduct-category-name-circuitboards = Circuitboards
+cargoproduct-category-name-emergency = Emergency
+cargoproduct-category-name-engineering = Engineering
+cargoproduct-category-name-food = Food
+cargoproduct-category-name-fun = Fun
+cargoproduct-category-name-hydroponics = Hydroponics
+cargoproduct-category-name-livestock = Livestock
+cargoproduct-category-name-materials = Materials
+cargoproduct-category-name-medical = Medical
+cargoproduct-category-name-science = Science
+cargoproduct-category-name-security = Security
+cargoproduct-category-name-service = Service
+cargoproduct-category-name-shuttle = Shuttle
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
index 399181b4fab..6341042bf89 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml
@@ -5,7 +5,7 @@
state: icon
product: CrateArmorySMG
cost: 9000
- category: Armory
+ category: cargoproduct-category-name-armory
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: icon
product: CrateArmoryShotgun
cost: 7000
- category: Armory
+ category: cargoproduct-category-name-armory
group: market
- type: cargoProduct
@@ -25,7 +25,7 @@
state: implanter0
product: CrateTrackingImplants
cost: 1000
- category: Armory
+ category: cargoproduct-category-name-armory
group: market
- type: cargoProduct
@@ -35,7 +35,7 @@
state: training-bomb
product: CrateTrainingBombs
cost: 3000
- category: Armory
+ category: cargoproduct-category-name-armory
group: market
- type: cargoProduct
@@ -45,7 +45,7 @@
state: icon
product: CrateArmoryLaser
cost: 4800
- category: Armory
+ category: cargoproduct-category-name-armory
group: market
- type: cargoProduct
@@ -55,5 +55,5 @@
state: icon
product: CrateArmoryPistols
cost: 5200
- category: Armory
+ category: cargoproduct-category-name-armory
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
index 0aa49383992..c85210adf6a 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
@@ -5,7 +5,7 @@
state: grey
product: AirCanister
cost: 1100
- category: Atmospherics
+ category: cargoproduct-category-name-atmospherics
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: blue
product: OxygenCanister
cost: 1100
- category: Atmospherics
+ category: cargoproduct-category-name-atmospherics
group: market
- type: cargoProduct
@@ -25,7 +25,7 @@
state: blue
product: LiquidOxygenCanister
cost: 2500
- category: Atmospherics
+ category: cargoproduct-category-name-atmospherics
group: market
- type: cargoProduct
@@ -35,7 +35,7 @@
state: red
product: NitrogenCanister
cost: 1100
- category: Atmospherics
+ category: cargoproduct-category-name-atmospherics
group: market
- type: cargoProduct
@@ -45,7 +45,7 @@
state: red
product: LiquidNitrogenCanister
cost: 2500
- category: Atmospherics
+ category: cargoproduct-category-name-atmospherics
group: market
- type: cargoProduct
@@ -55,7 +55,7 @@
state: black
product: CarbonDioxideCanister
cost: 2200 # Until someone fixes it co2 can be used to oneshot people so it's more expensive
- category: Atmospherics
+ category: cargoproduct-category-name-atmospherics
group: market
- type: cargoProduct
@@ -65,7 +65,7 @@
state: black
product: LiquidCarbonDioxideCanister
cost: 4000
- category: Atmospherics
+ category: cargoproduct-category-name-atmospherics
group: market
- type: cargoProduct
@@ -75,7 +75,7 @@
state: yellow
product: StorageCanister
cost: 1010 # No gases in it so it's cheaper
- category: Atmospherics
+ category: cargoproduct-category-name-atmospherics
group: market
#- type: cargoProduct
@@ -87,7 +87,7 @@
# state: water_vapor
# product: WaterVaporCanister
# cost: 2600
-# category: Atmospherics
+# category: cargoproduct-category-name-atmospherics
# group: market
- type: cargoProduct
@@ -97,7 +97,7 @@
state: orange
product: PlasmaCanister
cost: 4000
- category: Atmospherics
+ category: cargoproduct-category-name-atmospherics
group: market
#- type: cargoProduct
@@ -109,5 +109,5 @@
# state: green
# product: TritiumCanister
# cost: 15500
-# category: Atmospherics
+# category: cargoproduct-category-name-atmospherics
# group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
index 4a80b76a3fa..a6671ff0998 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml
@@ -5,7 +5,7 @@
state: seed
product: CrateHydroponicsSeedsExotic
cost: 1000
- category: Hydroponics
+ category: cargoproduct-category-name-hydroponics
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: seed
product: CrateHydroponicsSeedsMedicinal
cost: 500
- category: Hydroponics
+ category: cargoproduct-category-name-hydroponics
group: market
- type: cargoProduct
@@ -25,7 +25,7 @@
state: icon
product: CrateHydroponicsTools
cost: 500
- category: Hydroponics
+ category: cargoproduct-category-name-hydroponics
group: market
- type: cargoProduct
@@ -35,7 +35,7 @@
state: seed
product: CrateHydroponicsSeeds
cost: 550
- category: Hydroponics
+ category: cargoproduct-category-name-hydroponics
group: market
- type: cargoProduct
@@ -45,5 +45,5 @@
state: jug
product: CratePlantBGone
cost: 750
- category: Hydroponics
+ category: cargoproduct-category-name-hydroponics
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
index 9dac47b6f15..fb3b2da41a8 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml
@@ -15,7 +15,7 @@
state: orebox
product: OreBox
cost: 500
- category: Logistics # DeltaV - Logistics Department replacing Cargo
+ category: cargoproduct-category-name-cargo
group: market
- type: cargoProduct
@@ -25,5 +25,5 @@
state: icon
product: CrateCargoLuxuryHardsuit
cost: 15000
- category: Logistics # DeltaV - Logistics Department replacing Cargo
+ category: cargoproduct-category-name-cargo
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
index 0af5b5db016..a96780fc3ed 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml
@@ -5,5 +5,5 @@
state: cpuboard
product: CrateCrewMonitoringBoards
cost: 2000
- category: Circuitboards
+ category: cargoproduct-category-name-circuitboards
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
index 2777f859a07..2715e0c3501 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml
@@ -5,7 +5,7 @@
state: icon
product: CrateEmergencyExplosive
cost: 650
- category: Emergency
+ category: cargoproduct-category-name-emergency
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: fire_extinguisher_closed
product: CrateEmergencyFire
cost: 1500
- category: Emergency
+ category: cargoproduct-category-name-emergency
group: market
- type: cargoProduct
@@ -25,7 +25,7 @@
state: icon
product: CrateEmergencyInternals
cost: 500
- category: Emergency
+ category: cargoproduct-category-name-emergency
group: market
- type: cargoProduct
@@ -35,7 +35,7 @@
state: icon
product: CrateEmergencyInternalsLarge
cost: 2000
- category: Emergency
+ category: cargoproduct-category-name-emergency
group: market
- type: cargoProduct
@@ -45,7 +45,7 @@
state: radiation
product: CrateEmergencyRadiation
cost: 1000
- category: Emergency
+ category: cargoproduct-category-name-emergency
group: market
- type: cargoProduct
@@ -55,7 +55,7 @@
state: item_wall
product: CrateEmergencyInflatablewall
cost: 500
- category: Emergency
+ category: cargoproduct-category-name-emergency
group: market
- type: cargoProduct
@@ -65,7 +65,7 @@
state: icon
product: CrateSlimepersonLifeSupport
cost: 300
- category: Emergency
+ category: cargoproduct-category-name-emergency
group: market
- type: cargoProduct
@@ -75,5 +75,5 @@
state: icon
product: CrateGenericBiosuit
cost: 800
- category: Emergency
+ category: cargoproduct-category-name-emergency
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
index b5468fd982c..754e30f133a 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml
@@ -5,7 +5,7 @@
state: coillv-30
product: CrateEngineeringCableLV
cost: 300
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: coilmv-30
product: CrateEngineeringCableMV
cost: 300
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -25,7 +25,7 @@
state: coilhv-30
product: CrateEngineeringCableHV
cost: 300
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -35,7 +35,7 @@
state: coilall-30
product: CrateEngineeringCableBulk
cost: 750
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -45,7 +45,7 @@
state: icon
product: CrateEngineeringElectricalSupplies
cost: 4500
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -55,7 +55,7 @@
state: icon
product: CrateEngineeringStationBeaconBundle
cost: 500
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -65,7 +65,7 @@
state: icon
product: CrateEngineeringJetpack
cost: 1000
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -75,7 +75,7 @@
state: icon
product: CrateEngineeringMiniJetpack
cost: 750
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -85,7 +85,7 @@
state: icon
product: CrateAirlockKit
cost: 1100
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -95,7 +95,7 @@
state: icon
product: CrateEvaKit
cost: 5000
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -105,7 +105,7 @@
state: ammo
product: CrateRCDAmmo
cost: 2500
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -115,7 +115,7 @@
state: icon
product: CrateRCD
cost: 800
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -125,7 +125,7 @@
state: base
product: CrateParticleDecelerators
cost: 15000
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -135,5 +135,5 @@
state: sheaterOff
product: SpaceHeaterAnchored
cost: 300
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
index ece817b746e..bd00b0c2d4c 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml
@@ -5,7 +5,7 @@
state: jar
product: CrateEngineeringAMEJar
cost: 2000
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: icon
product: CrateEngineeringSingularityGenerator
cost: 4000
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -25,7 +25,7 @@
state: icon
product: CrateEngineeringSingularityContainment
cost: 1000
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
#- type: cargoProduct
@@ -37,7 +37,7 @@
# state: emitter2
# product: CrateEngineeringSingularityEmitter
# cost: 3000
-# category: Engineering
+# category: cargoproduct-category-name-engineering
# group: market
- type: cargoProduct
@@ -47,7 +47,7 @@
state: ca_on
product: CrateEngineeringSingularityCollector
cost: 1000
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -57,7 +57,7 @@
state: completed
product: CrateEngineeringParticleAccelerator
cost: 2000
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -67,18 +67,18 @@
state: solar-assembly-part
product: CrateEngineeringSolar
cost: 500
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
-#- type: cargoProduct
-# id: EngineTeslaGenerator
-# icon:
-# sprite: Structures/Power/Generation/Tesla/generator.rsi
-# state: icon
-# product: CrateEngineeringTeslaGenerator
-# cost: 4000
-# category: Engineering
-# group: market
+- type: cargoProduct
+ id: EngineTeslaGenerator
+ icon:
+ sprite: Structures/Power/Generation/Tesla/generator.rsi
+ state: icon
+ product: CrateEngineeringTeslaGenerator
+ cost: 4000
+ category: cargoproduct-category-name-engineering
+ group: market
- type: cargoProduct
id: EngineTeslaCoil
@@ -87,7 +87,7 @@
state: coil
product: CrateEngineeringTeslaCoil
cost: 1200
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -97,5 +97,5 @@
state: grounding_rod
product: CrateEngineeringTeslaGroundingRod
cost: 400
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
index e5069959296..1a6f8380961 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml
@@ -5,7 +5,7 @@
state: margherita-slice
product: CrateFoodPizza
cost: 450
- category: Food
+ category: cargoproduct-category-name-food
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: margherita
product: CrateFoodPizzaLarge
cost: 1800
- category: Food
+ category: cargoproduct-category-name-food
group: market
- type: cargoProduct
@@ -25,7 +25,7 @@
state: nutribrick
product: CrateFoodMRE
cost: 1000
- category: Food
+ category: cargoproduct-category-name-food
group: market
- type: cargoProduct
@@ -35,7 +35,7 @@
state: flour-big
product: CrateFoodCooking
cost: 750
- category: Food
+ category: cargoproduct-category-name-food
group: market
- type: cargoProduct
@@ -45,7 +45,7 @@
state: tin
product: CrateFoodDinnerware
cost: 750
- category: Food
+ category: cargoproduct-category-name-food
group: market
- type: cargoProduct
@@ -55,7 +55,7 @@
state: icon
product: CrateFoodBarSupply
cost: 750
- category: Food
+ category: cargoproduct-category-name-food
group: market
- type: cargoProduct
@@ -65,7 +65,7 @@
state: icon
product: CrateFoodSoftdrinks
cost: 1200
- category: Food
+ category: cargoproduct-category-name-food
group: market
- type: cargoProduct
@@ -75,5 +75,5 @@
state: icon
product: CrateFoodSoftdrinksLarge
cost: 2400
- category: Food
+ category: cargoproduct-category-name-food
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index d84fedd543f..c29458a1ee5 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -5,7 +5,7 @@
state: icon
product: CrateFunInstrumentsVariety
cost: 2000
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: tuba
product: CrateFunInstrumentsBrass
cost: 2500
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -25,7 +25,7 @@
state: icon
product: CrateFunInstrumentsString
cost: 2500
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -35,7 +35,7 @@
state: icon
product: CrateFunInstrumentsWoodwind
cost: 2500
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -45,7 +45,7 @@
state: icon
product: CrateFunInstrumentsKeyedPercussion
cost: 2500
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -55,7 +55,7 @@
state: icon
product: CrateFunInstrumentsSpecial
cost: 10000
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -65,7 +65,7 @@
state: box
product: CrateFunArtSupplies
cost: 500
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -85,7 +85,7 @@
state: birthday
product: CrateFunParty
cost: 1000
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -95,7 +95,7 @@
state: display
product: CrateFunWaterGuns
cost: 750
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -105,7 +105,7 @@
state: plushie_h
product: CrateFunPlushie
cost: 1000
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -115,7 +115,7 @@
state: plushie_lizard
product: CrateFunLizardPlushieBulk
cost: 500
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -125,7 +125,7 @@
state: d6_6
product: CrateFunBoardGames
cost: 1500
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -135,7 +135,7 @@
state: implanter0
product: CrateFunSadTromboneImplants
cost: 1000
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -145,7 +145,7 @@
state: implanter0
product: CrateFunLightImplants
cost: 1000
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -155,7 +155,7 @@
state: icon
product: CrateFunBoxing
cost: 500
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -165,7 +165,7 @@
state: crate_icon
product: CrateFunPirate
cost: 400
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -175,7 +175,7 @@
state: crate_icon
product: CrateFunToyBox
cost: 900
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -185,7 +185,7 @@
state: implanter0
product: CrateFunBikeHornImplants
cost: 1000
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -195,7 +195,7 @@
state: fig_box
product: CrateFunMysteryFigurines
cost: 4000
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
- type: cargoProduct
@@ -205,15 +205,15 @@
state: icon
product: CrateFunDartsSet
cost: 900
- category: Fun
+ category: cargoproduct-category-name-fun
group: market
-#- type: cargoProduct
-# id: FunCrateGambling
-# icon:
-# sprite: Objects/Economy/cash.rsi
-# state: cash_1000000
-# product: CrateCargoGambling
-# cost: 10000
-# category: Fun
-# group: market
+- type: cargoProduct
+ id: FunCrateGambling
+ icon:
+ sprite: Objects/Economy/cash.rsi
+ state: cash_1000000
+ product: CrateCargoGambling
+ cost: 10000
+ category: cargoproduct-category-name-fun
+ group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
index 6ef0ab4e211..922e2951b6c 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml
@@ -5,7 +5,7 @@
state: 0
product: CrateNPCBee
cost: 7000
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: butterfly
product: CrateNPCButterflies
cost: 4400
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -25,7 +25,7 @@
state: cat
product: CrateNPCCat
cost: 1200
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -35,7 +35,7 @@
state: icon-1
product: CrateNPCChicken
cost: 4000
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -45,7 +45,7 @@
state: crab
product: CrateNPCCrab
cost: 3000
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -55,7 +55,7 @@
state: icon-0
product: CrateNPCDuck
cost: 6000
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -65,7 +65,7 @@
state: corgi
product: CrateNPCCorgi
cost: 1200
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -75,7 +75,7 @@
state: puppy
product: CrateNPCPuppyCorgi
cost: 1200
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -85,7 +85,7 @@
state: cow
product: CrateNPCCow
cost: 3200
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -95,7 +95,7 @@
state: goat
product: CrateNPCGoat
cost: 1200
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -105,7 +105,7 @@
state: goose
product: CrateNPCGoose
cost: 2100
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -115,7 +115,7 @@
state: icon
product: CrateNPCGorilla
cost: 1100
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -125,7 +125,7 @@
state: box
product: CrateNPCMonkeyCube
cost: 2000
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -135,7 +135,7 @@
state: box_kobold
product: CrateNPCKoboldCube
cost: 2000
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -145,7 +145,7 @@
state: icon-0
product: CrateNPCMouse
cost: 4400
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -155,7 +155,7 @@
state: parrot
product: CrateNPCParrot
cost: 3000
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -165,7 +165,7 @@
state: penguin
product: CrateNPCPenguin
cost: 2100
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -175,7 +175,7 @@
state: pig
product: CrateNPCPig
cost: 1100
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -185,7 +185,7 @@
state: snake
product: CrateNPCSnake
cost: 3000
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -195,7 +195,7 @@
state: icon-0
product: CrateNPCHamster
cost: 2800
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -205,7 +205,7 @@
state: lizard
product: CrateNPCLizard
cost: 1100
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -215,7 +215,7 @@
state: kangaroo
product: CrateNPCKangaroo
cost: 2800
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
- type: cargoProduct
@@ -225,5 +225,5 @@
state: mothroach
product: CrateNPCMothroach
cost: 5000
- category: Livestock
+ category: cargoproduct-category-name-livestock
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
index e3b07af13ba..6f945001d93 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml
@@ -5,7 +5,7 @@
state: glass_3
product: CrateMaterialGlass
cost: 1000
- category: Materials
+ category: cargoproduct-category-name-materials
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: steel_3
product: CrateMaterialSteel
cost: 1000
- category: Materials
+ category: cargoproduct-category-name-materials
group: market
- type: cargoProduct
@@ -25,7 +25,7 @@
state: plastic_3
product: CrateMaterialPlastic
cost: 1500
- category: Materials
+ category: cargoproduct-category-name-materials
group: market
- type: cargoProduct
@@ -35,7 +35,7 @@
state: brass_3
product: CrateMaterialBrass
cost: 2500
- category: Materials
+ category: cargoproduct-category-name-materials
group: market
- type: cargoProduct
@@ -45,7 +45,7 @@
state: plasteel_3
product: CrateMaterialPlasteel
cost: 3000
- category: Materials
+ category: cargoproduct-category-name-materials
group: market
- type: cargoProduct
@@ -55,7 +55,7 @@
state: cloth_3
product: CrateMaterialTextiles
cost: 1000
- category: Materials
+ category: cargoproduct-category-name-materials
group: market
- type: cargoProduct
@@ -65,7 +65,7 @@
state: plasma_3
product: CrateMaterialPlasma
cost: 2000
- category: Materials
+ category: cargoproduct-category-name-materials
group: market
- type: cargoProduct
@@ -75,7 +75,7 @@
state: cardboard_3
product: CrateMaterialCardboard
cost: 750
- category: Materials
+ category: cargoproduct-category-name-materials
group: market
- type: cargoProduct
@@ -85,7 +85,7 @@
state: paper_3
product: CrateMaterialPaper
cost: 1000
- category: Materials
+ category: cargoproduct-category-name-materials
group: market
- type: cargoProduct
@@ -95,7 +95,7 @@
state: fueltank
product: WeldingFuelTankFull
cost: 1500
- category: Materials
+ category: cargoproduct-category-name-materials
group: market
- type: cargoProduct
@@ -105,5 +105,5 @@
state: watertank
product: WaterTankFull
cost: 1000
- category: Materials
+ category: cargoproduct-category-name-materials
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
index 01a7192b35b..1addf523e4b 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
@@ -5,7 +5,7 @@
state: firstaid
product: CrateMedicalSupplies
cost: 2400
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: beaker
product: CrateChemistrySupplies
cost: 750
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -25,7 +25,7 @@
state: vial
product: CrateChemistryVials
cost: 1000
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -35,7 +35,7 @@
state: burnkit
product: CrateEmergencyBurnKit
cost: 700
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -45,7 +45,7 @@
state: toxinkit
product: CrateEmergencyToxinKit
cost: 600
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -55,7 +55,7 @@
state: o2kit
product: CrateEmergencyO2Kit
cost: 600
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -65,7 +65,7 @@
state: brutekit
product: CrateEmergencyBruteKit
cost: 600
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -75,7 +75,7 @@
state: advkit
product: CrateEmergencyAdvancedKit
cost: 1200
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -85,7 +85,7 @@
state: radkit
product: CrateEmergencyRadiationKit
cost: 600
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -95,7 +95,7 @@
state: bag_folded
product: CrateBodyBags
cost: 700
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -105,7 +105,7 @@
state: icon
product: CrateVirologyBiosuit
cost: 800
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -115,7 +115,7 @@
state: implanter0
product: CrateMindShieldImplants
cost: 3000
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -125,7 +125,7 @@
state: icon
product: CrateChemistryP
cost: 850
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -135,7 +135,7 @@
state: icon
product: CrateChemistryS
cost: 750
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -145,5 +145,5 @@
state: icon
product: CrateChemistryD
cost: 750
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
index f370155e075..756a223e74d 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml
@@ -5,7 +5,7 @@
state: artifact_container_icon
product: CrateArtifactContainer
cost: 500
- category: Epistemics # DeltaV - Epistemics Department replacing Science
+ category: cargoproduct-category-name-science
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: ano13
product: RandomArtifactSpawner
cost: 2000
- category: Epistemics # DeltaV - Epistemics Department replacing Science
+ category: cargoproduct-category-name-science
group: market
- type: cargoProduct
@@ -25,5 +25,5 @@
state: icon
product: CrateScienceBiosuit
cost: 800
- category: Epistemics # DeltaV - Epistemics Department replacing Science
+ category: cargoproduct-category-name-science
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
index a616202bdba..2ad7628ddb3 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml
@@ -4,8 +4,8 @@
sprite: DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi # DeltaV - resprite
state: icon
product: CrateSecurityArmor
- cost: 1000 # DeltaV - raise price for buffed armour
- category: Security
+ cost: 800
+ category: cargoproduct-category-name-security
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: icon
product: CrateSecurityHelmet
cost: 550
- category: Security
+ category: cargoproduct-category-name-security
group: market
- type: cargoProduct
@@ -25,7 +25,7 @@
state: base
product: CrateSecurityNonlethal
cost: 4000
- category: Security
+ category: cargoproduct-category-name-security
group: market
- type: cargoProduct
@@ -35,7 +35,7 @@
state: icon
product: CrateSecurityRiot
cost: 5500
- category: Security
+ category: cargoproduct-category-name-security
group: market
- type: cargoProduct
@@ -45,7 +45,7 @@
state: box_security
product: CrateSecuritySupplies
cost: 500
- category: Security
+ category: cargoproduct-category-name-security
group: market
- type: cargoProduct
@@ -55,7 +55,7 @@
state: handcuff
product: CrateRestraints
cost: 1000
- category: Security
+ category: cargoproduct-category-name-security
group: market
- type: cargoProduct
@@ -65,7 +65,7 @@
state: icon
product: CrateSecurityBiosuit
cost: 800
- category: Security
+ category: cargoproduct-category-name-security
group: market
- type: cargoProduct
@@ -75,5 +75,5 @@
state: idle
product: DeployableBarrier
cost: 1000
- category: Security
+ category: cargoproduct-category-name-security
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
index a2c0af9ce7f..f27adb65a4a 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml
@@ -5,7 +5,7 @@
state: cleaner
product: CrateServiceJanitorialSupplies
cost: 560
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: normal
product: CrateServiceReplacementLights
cost: 600
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -25,7 +25,7 @@
state: mousetrap
product: CrateMousetrapBoxes
cost: 500
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -35,7 +35,7 @@
state: icon
product: CrateServiceTheatre
cost: 1800
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -45,7 +45,7 @@
state: closed
product: CrateServiceSmokeables
cost: 1500
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -55,7 +55,7 @@
state: closed
product: CrateServiceCustomSmokable
cost: 1000
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -65,7 +65,7 @@
state: pen
product: CrateServiceBureaucracy
cost: 1000
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -75,7 +75,7 @@
state: default
product: CrateServicePersonnel
cost: 1000
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -85,7 +85,7 @@
state: book0
product: CrateServiceBooks
cost: 1000
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -95,7 +95,7 @@
state: book_engineering2
product: CrateServiceGuidebooks
cost: 1300
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -105,7 +105,7 @@
state: icon
product: CrateServiceSodaDispenser
cost: 850
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -115,7 +115,7 @@
state: icon
product: CrateServiceBoozeDispenser
cost: 750
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -125,7 +125,7 @@
state: box
product: CrateServiceBox
cost: 400
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -135,7 +135,7 @@
state: icon
product: CrateJanitorBiosuit
cost: 800
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -145,7 +145,7 @@
state: icon-hot
product: FoodCartHot
cost: 2000
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -155,7 +155,7 @@
state: icon-cold
product: FoodCartCold
cost: 2000
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -165,7 +165,7 @@
state: icon
product: PetCarrier
cost: 500
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -175,7 +175,7 @@
state: icon
product: CrateJanitorExplosive
cost: 1000
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -185,6 +185,6 @@
state: icon-cart
product: JanitorialTrolley
cost: 300
- category: Service
+ category: cargoproduct-category-name-service
group: market
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
index 96a193881ef..278104caed1 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml
@@ -5,7 +5,7 @@
state: base
product: CrateEngineeringThruster
cost: 1500
- category: Shuttle
+ category: cargoproduct-category-name-shuttle
group: market
- type: cargoProduct
@@ -15,7 +15,7 @@
state: base
product: CrateEngineeringGyroscope
cost: 4000
- category: Shuttle
+ category: cargoproduct-category-name-shuttle
group: market
# - type: cargoProduct
@@ -25,6 +25,6 @@
# state: avionics-systems
# product: CrateEngineeringShuttle
# cost: 3000
- # category: Shuttle
+ # category: cargoproduct-category-name-shuttle
# group: market
# locked: true # only the QM has permission to order by default
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index 76ab0499170..3e303c32127 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -13,7 +13,7 @@
state: base
product: CrateVendingMachineRestockBoozeFilled
cost: 3500
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -24,7 +24,7 @@
state: base
product: CrateVendingMachineRestockChefvendFilled
cost: 680
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -34,7 +34,7 @@
state: base
product: CrateVendingMachineRestockClothesFilled
cost: 8050
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -44,7 +44,7 @@
state: base
product: CrateVendingMachineRestockDinnerwareFilled
cost: 2000
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -55,7 +55,7 @@
state: base
product: CrateVendingMachineRestockCondimentStationFilled
cost: 300
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -65,7 +65,7 @@
state: base
product: CrateVendingMachineRestockEngineeringFilled
cost: 3200
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -75,7 +75,7 @@
state: base
product: CrateVendingMachineRestockGamesFilled
cost: 750
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -85,7 +85,7 @@
state: base
product: CrateVendingMachineRestockHotDrinksFilled
cost: 1200
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -95,7 +95,7 @@
state: base
product: CrateVendingMachineRestockMedicalFilled
cost: 1750
- category: Medical
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -104,8 +104,8 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockChemVendFilled
- cost: 6300 #Delta V - was 3820, see rebase PR #53
- category: Medical
+ cost: 3820
+ category: cargoproduct-category-name-medical
group: market
- type: cargoProduct
@@ -115,7 +115,7 @@
state: base
product: CrateVendingMachineRestockNutriMaxFilled
cost: 2400
- category: Hydroponics
+ category: cargoproduct-category-name-hydroponics
group: market
- type: cargoProduct
@@ -125,7 +125,7 @@
state: base
product: CrateVendingMachineRestockPTechFilled
cost: 1200
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -135,7 +135,7 @@
state: base
product: CrateVendingMachineRestockRobustSoftdrinksFilled
cost: 1200
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -145,7 +145,7 @@
state: base
product: CrateVendingMachineRestockSalvageEquipmentFilled
cost: 1000
- category: Engineering
+ category: cargoproduct-category-name-engineering
group: market
- type: cargoProduct
@@ -155,7 +155,7 @@
state: base
product: CrateVendingMachineRestockSecTechFilled
cost: 2200
- category: Security
+ category: cargoproduct-category-name-security
group: market
- type: cargoProduct
@@ -165,7 +165,7 @@
state: base
product: CrateVendingMachineRestockSeedsFilled
cost: 3375
- category: Hydroponics
+ category: cargoproduct-category-name-hydroponics
group: market
- type: cargoProduct
@@ -175,7 +175,7 @@
state: base
product: CrateVendingMachineRestockSmokesFilled
cost: 1200
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -185,7 +185,7 @@
state: base
product: CrateVendingMachineRestockVendomatFilled
cost: 1200
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -195,7 +195,7 @@
state: base
product: CrateVendingMachineRestockRoboticsFilled
cost: 1600
- category: Epistemics # DeltaV - Epistemics Department replacing Science
+ category: cargoproduct-category-name-science
group: market
- type: cargoProduct
@@ -205,7 +205,7 @@
state: base
product: CrateVendingMachineRestockTankDispenserFilled
cost: 1000
- category: Atmospherics
+ category: cargoproduct-category-name-atmospherics
group: market
- type: cargoProduct
@@ -215,7 +215,7 @@
state: base
product: CrateVendingMachineRestockHappyHonkFilled
cost: 2100
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -225,7 +225,7 @@
state: base
product: CrateVendingMachineRestockGetmoreChocolateCorpFilled
cost: 1200
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -235,7 +235,7 @@
state: base
product: CrateVendingMachineRestockChangFilled
cost: 1200
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -245,7 +245,7 @@
state: base
product: CrateVendingMachineRestockDiscountDansFilled
cost: 1200
- category: Service
+ category: cargoproduct-category-name-service
group: market
- type: cargoProduct
@@ -255,5 +255,5 @@
state: base
product: CrateVendingMachineRestockDonutFilled
cost: 1200
- category: Service
+ category: cargoproduct-category-name-service
group: market