diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index c7f0a426ab..2177e2c478 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml @@ -1,6 +1,6 @@ - type: cargoProduct name: "smg crate" - id: armorysmg + id: armorySmg description: "Contains three WT-550 SMGs with six mags. Requires Armory access to open." icon: sprite: Objects/Weapons/Guns/SMGs/wt550.rsi @@ -12,7 +12,7 @@ - type: cargoProduct name: "shotgun crate" - id: armoryshotgun + id: armoryShotgun description: "For when the enemy absolutely needs to be replaced with lead. Contains three Gladstone Combat Shotguns, and some standard shotgun shells. Requires Armory access to open." icon: sprite: Objects/Weapons/Guns/Shotguns/gladstone.rsi diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml index cebfe67e26..262cc8efc9 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml @@ -1,6 +1,6 @@ - type: cargoProduct name: "air canister" - id: atmosphericsair + id: atmosphericsAir description: "Air canister" icon: sprite: Constructible/Atmos/canister.rsi @@ -12,7 +12,7 @@ - type: cargoProduct name: "oxygen canister" - id: atmosphericsoxygen + id: atmosphericsOxygen description: "Oxygen canister" icon: sprite: Constructible/Atmos/canister.rsi @@ -24,7 +24,7 @@ - type: cargoProduct name: "nitrogen canister" - id: atmosphericsnitrogen + id: atmosphericsNitrogen description: "Nitrogen canister" icon: sprite: Constructible/Atmos/canister.rsi @@ -36,7 +36,7 @@ - type: cargoProduct name: "carbon dioxide canister" - id: atmosphericscarbondioxide + id: atmosphericsCarbonDioxide description: "Carbon dioxide canister" icon: sprite: Constructible/Atmos/canister.rsi @@ -48,7 +48,7 @@ - type: cargoProduct name: "water vapor canister" - id: atmosphericswatervapor + id: atmosphericsWaterVapor description: "Water vapor canister" icon: sprite: Constructible/Atmos/canister.rsi @@ -60,7 +60,7 @@ - type: cargoProduct name: "plasma canister" - id: atmosphericsplasma + id: atmosphericsPlasma description: "Plasma canister" icon: sprite: Constructible/Atmos/canister.rsi @@ -72,7 +72,7 @@ - type: cargoProduct name: "tritium canister" - id: atmosphericstritium + id: atmosphericsTritium description: "Tritium canister" icon: sprite: Constructible/Atmos/canister.rsi diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml index 5c98b62d8a..53f3d02785 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml @@ -1,6 +1,6 @@ - type: cargoProduct name: "exotic seeds crate" - id: hydroponicsseedsexotic + id: hydroponicsSeedsExotic description: "Any entrepreneuring botanist's dream. Contains many different exotic seeds. Requires Hydroponics access to open." icon: sprite: Objects/Specific/Hydroponics/banana.rsi @@ -12,7 +12,7 @@ - type: cargoProduct name: "hydroponics crate" - id: hydroponics + id: hydroponicsTools description: "Supplies for growing a great garden! Contains two bottles of ammonia, two Plant-B-Gone spray bottles, a hatchet, cultivator, plant analyzer, as well as a pair of leather gloves and a botanist's apron." icon: sprite: Objects/Tools/Hydroponics/hoe.rsi @@ -24,7 +24,7 @@ - type: cargoProduct name: "seeds crate" - id: hydroponicsseeds + id: hydroponicsSeeds description: "Big things have small beginnings. Contains nine different seeds." icon: sprite: Objects/Specific/Hydroponics/apple.rsi @@ -36,7 +36,7 @@ #- type: cargoProduct # name: "hydroponics backpack crate" -# id: hydroponicsbackpack +# id: hydroponicsBackpack # description: "Bring on the flood with this high-capacity backpack crate. Contains 500 units of life-giving H2O. Requires hydroponics access to open." # icon: # sprite: diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml index 22e850b3b6..6c9709a5e0 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml @@ -1,6 +1,6 @@ - type: cargoProduct name: "explosive emergency crate" - id: emergencyexplosive + id: emergencyExplosive description: "Science gone bonkers? Beeping behind the airlock? Buy now and be the hero the station des... I mean needs! (time not included)" icon: sprite: Clothing/Head/Helmets/bombsuit.rsi @@ -12,7 +12,7 @@ - type: cargoProduct name: "firefighting crate" - id: emergencyfire + id: emergencyFire description: "Only you can prevent station fires. Partner up with two firefighter suits, gas masks, flashlights, large oxygen tanks, extinguishers, and hardhats!" icon: sprite: Objects/Misc/fire_extinguisher.rsi @@ -24,7 +24,7 @@ - type: cargoProduct name: "internals crate" - id: emergencyinternals + id: emergencyInternals description: "Master your life energy and control your breathing with three breath masks, three emergency oxygen tanks and three large air tanks." icon: sprite: Clothing/Mask/breath.rsi @@ -36,7 +36,7 @@ - type: cargoProduct name: "radiation protection crate" - id: emergencyradiation + id: emergencyRadiation description: "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a bottle of vodka and some glasses too, considering the life-expectancy of people who order this." icon: sprite: Constructible/Misc/decals.rsi diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml index 9329632c5e..5083fa33f4 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml @@ -1,6 +1,6 @@ - type: cargoProduct name: "LV cables crate" - id: engineeringcablelv + id: engineeringCableLv description: "3 coils of LV cables." icon: sprite: Objects/Tools/cable-coils.rsi @@ -12,7 +12,7 @@ - type: cargoProduct name: "MV cables crate" - id: engineeringcablemv + id: engineeringCableMv description: "3 coils of MV cables." icon: sprite: Objects/Tools/cable-coils.rsi @@ -24,7 +24,7 @@ - type: cargoProduct name: "HV cables crate" - id: engineeringcablehv + id: engineeringCableHv description: "3 coils of HV cables." icon: sprite: Objects/Tools/cable-coils.rsi @@ -36,7 +36,7 @@ - type: cargoProduct name: "bulk cables crate" - id: engineeringcablebulk + id: engineeringCableBulk description: "2 coils each for every cable type." icon: sprite: Objects/Tools/cable-coils.rsi diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml index 9b3b2365ad..9077aab737 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml @@ -1,6 +1,6 @@ - type: cargoProduct name: "packaged antimatter reactor crate" - id: engineameshielding + id: engineAmeShielding description: "9 parts for the main body of an antimatter reactor, or for expanding an existing one." icon: sprite: Objects/Power/AME/ame_part.rsi @@ -12,7 +12,7 @@ - type: cargoProduct name: "antimatter containment jar crate" - id: engineamejar + id: engineAmeJar description: "3 antimatter jars, for fuelling an antimatter reactor." icon: sprite: Objects/Power/AME/ame_jar.rsi @@ -24,7 +24,7 @@ - type: cargoProduct name: "antimatter control unit crate" - id: engineamecontrol + id: engineAmeControl description: "The control unit of an antimatter reactor." icon: sprite: Constructible/Power/ame_controller.rsi @@ -36,7 +36,7 @@ - type: cargoProduct name: "singularity generator crate" - id: enginesingularitygenerator + id: engineSingularityGenerator description: "Contains a singularity generator. The mother of the beast." icon: sprite: Constructible/Power/Singularity/generator.rsi @@ -48,7 +48,7 @@ - type: cargoProduct name: "singularity containment crate" - id: enginesingularitycontainment + id: engineSingularityContainment description: "Contains a singularity containment field generator." icon: sprite: Constructible/Power/Singularity/containment.rsi @@ -60,7 +60,7 @@ - type: cargoProduct name: "emitter crate" - id: enginesingularityemitter + id: engineSingularityEmitter description: "Contains an emitter. Used only for dangerous applications." icon: sprite: Constructible/Power/Singularity/emitter.rsi @@ -72,7 +72,7 @@ - type: cargoProduct name: "radiation collector crate" - id: enginesingularitycollector + id: engineSingularityCollector description: "Contains a radiation collector. Safety first!" icon: sprite: Constructible/Power/Singularity/collector.rsi @@ -84,7 +84,7 @@ - type: cargoProduct name: "particle accelerator crate" - id: engineparticleaccelerator + id: engineParticleAccelerator description: "Contains all the boards needed to construct a Particle Accelerator." icon: sprite: Constructible/Specific/Engines/PA/control_box.rsi @@ -96,7 +96,7 @@ - type: cargoProduct name: "solar assembly parts" - id: enginessolar + id: engineSolar description: "Parts for constructing solar panels and trackers." icon: sprite: Objects/Power/solar_parts.rsi diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index 0a7f8b7ff4..eee2a5ff10 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -1,6 +1,6 @@ - type: cargoProduct name: "big band instrument collection" - id: funinstruments + id: funInstruments description: "Get your sad station movin' and groovin' with this fine collection! Contains thirteen different instruments" icon: sprite: Objects/Fun/Instruments/accordion.rsi @@ -12,7 +12,7 @@ - type: cargoProduct name: "art supplies" - id: funartsupplies + id: funArtSupplies description: "Make some happy little accidents with lots of crayons!" icon: sprite: Objects/Fun/crayons.rsi @@ -24,7 +24,7 @@ - type: cargoProduct name: "plushie crate" - id: funplushies + id: funPlushies description: "A buncha soft plushies. Throw them around and then wonder how you're gonna explain this purchase to NT" icon: sprite: Objects/Fun/toys.rsi diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml index 3df323eb5f..26f0741bc2 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml @@ -1,6 +1,6 @@ - type: cargoProduct name: "bee crate" - id: livestockbee + id: livestockBee description: "A crate containing a swarm of eight bees" icon: sprite: Mobs/Animals/bee.rsi @@ -12,7 +12,7 @@ - type: cargoProduct name: "butterfly crate" - id: livestockbutterfly + id: livestockButterfly description: "A crate containing five butterflies" icon: sprite: Mobs/Animals/butterfly.rsi @@ -24,7 +24,7 @@ - type: cargoProduct name: "cat crate" - id: livestockcat + id: livestockCat description: "A crate containing a single cat" icon: sprite: Mobs/Pets/cat.rsi @@ -36,7 +36,7 @@ - type: cargoProduct name: "chicken crate" - id: livestockchicken + id: livestockChicken description: "A crate containing a four fully grown chickens" icon: sprite: Mobs/Animals/chicken.rsi @@ -48,7 +48,7 @@ - type: cargoProduct name: "corgi crate" - id: livestockcorgi + id: livestockCorgi description: "A crate containing a single corgi" icon: sprite: Mobs/Pets/corgi.rsi @@ -60,7 +60,7 @@ - type: cargoProduct name: "cow crate" - id: livestockcow + id: livestockCow description: "A crate containing a single cow" icon: sprite: Mobs/Animals/cow.rsi @@ -72,7 +72,7 @@ - type: cargoProduct name: "goat crate" - id: livestockgoat + id: livestockGoat description: "A crate containing a single goat" icon: sprite: Mobs/Animals/goat.rsi @@ -84,7 +84,7 @@ - type: cargoProduct name: "goose crate" - id: livestockgoose + id: livestockGoose description: "A crate containing two geese" icon: sprite: Mobs/Animals/goose.rsi @@ -96,7 +96,7 @@ - type: cargoProduct name: "gorilla crate" - id: livestockgorilla + id: livestockGorilla description: "A crate containing a single gorilla" icon: sprite: Mobs/Animals/gorilla.rsi @@ -108,7 +108,7 @@ - type: cargoProduct name: "monkey cube crate" - id: livestockmonkeycube + id: livestockMonkeyCube description: "A crate containing three boxes of monkey cubes " icon: sprite: Mobs/Animals/monkey.rsi @@ -120,7 +120,7 @@ - type: cargoProduct name: "parrot crate" - id: livestockparrot + id: livestockParrot description: "A crate containing three parrots" icon: sprite: Mobs/Animals/parrot.rsi @@ -132,7 +132,7 @@ - type: cargoProduct name: "penguin crate" - id: livestockpenguin + id: livestockPenguin description: "A crate containing two penguins" icon: sprite: Mobs/Animals/penguin.rsi @@ -144,7 +144,7 @@ - type: cargoProduct name: "snake crate" - id: livestocksnake + id: livestockSnake description: "A crate containing three snakes" icon: sprite: Mobs/Animals/snake.rsi diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index 3e2e801d79..18eb1262f4 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -1,6 +1,6 @@ - type: cargoProduct name: "crate of glass sheets" - id: materialglass + id: materialGlass description: "90 sheets of glass, packed with care." icon: sprite: Objects/Materials/Sheets/glass.rsi @@ -12,7 +12,7 @@ - type: cargoProduct name: "crate of steel sheets" - id: materialsteel + id: materialSteel description: "90 sheets of steel." icon: sprite: Objects/Materials/Sheets/metal.rsi @@ -24,7 +24,7 @@ - type: cargoProduct name: "crate of plastic sheets" - id: materialplastic + id: materialPlastic description: "90 sheets of plastic." icon: sprite: Objects/Materials/Sheets/other.rsi @@ -36,7 +36,7 @@ - type: cargoProduct name: "crate of plasteel sheets" - id: materialplasteel + id: materialPlasteel description: "90 sheets of plasteel." icon: sprite: Objects/Materials/Sheets/metal.rsi diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index cd1c1514cf..125387b356 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -1,6 +1,6 @@ - type: cargoProduct name: "armor crate" - id: securityarmor + id: securityArmor description: "Three vests of well-rounded, decently-protective armor. Requires Security access to open." icon: sprite: Clothing/OuterClothing/Vests/oldarmor.rsi @@ -12,7 +12,7 @@ - type: cargoProduct name: "helmet crate" - id: securityhelmet + id: securityHelmet description: "Contains three standard-issue brain buckets. Requires Security access to open." icon: sprite: Clothing/Head/Helmets/security.rsi @@ -24,7 +24,7 @@ - type: cargoProduct name: "non-lethals crate" - id: securitynonlethal + id: securityNonLethal description: "Stamina-draining disabler weapons. Requires Security access to open." icon: sprite: Objects/Weapons/Guns/Battery/taser.rsi @@ -36,7 +36,7 @@ - type: cargoProduct name: "Lasers Crate" - id: securitylaser + id: securityLaser description: "Contains three lethal, high-energy laser guns. Requires Security access to open." icon: sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi @@ -48,7 +48,7 @@ - type: cargoProduct name: "riot crate" - id: securityriot + id: securityRiot description: "Contains two sets of heavy body armor and helmets and 2 shotguns with 6 rounds of beanbag shells each. Requires Armory access to open." icon: sprite: Clothing/OuterClothing/Armor/riot.rsi @@ -60,7 +60,7 @@ - type: cargoProduct name: "security supplies crate" - id: securitysupplies + id: securitySupplies description: "Contains various supplies for the station's Security team. Requires Security access to open." icon: sprite: Objects/Storage/boxes.rsi diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml index 2f621124c3..663c6b846d 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml @@ -1,6 +1,6 @@ - type: cargoProduct name: "janitorial supplies crate" - id: servicejanitorial + id: serviceJanitorial description: "Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, a single mop and bucket, spray cleaner, and soap." icon: sprite: Objects/Specific/Janitorial/janitorial.rsi @@ -12,7 +12,7 @@ - type: cargoProduct name: "replacement lights crate" - id: servicelightsreplacement + id: serviceLightsReplacement description: "May the light of Aether shine upon this station! Or at least, the light of forty two light tubes and twenty one light bulbs." icon: sprite: Objects/Power/light_bulb.rsi @@ -24,7 +24,7 @@ - type: cargoProduct name: "lung cancer crate" - id: servicesmokeables + id: serviceSmokeables description: "Tired of a quick death on the station? Order this crate and chain-smoke your way to a coughy demise!" icon: sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi diff --git a/Resources/Prototypes/Datasets/markets.yml b/Resources/Prototypes/Datasets/markets.yml deleted file mode 100644 index 39e69de98e..0000000000 --- a/Resources/Prototypes/Datasets/markets.yml +++ /dev/null @@ -1,33 +0,0 @@ -- type: dataset - id: galacticmarket - values: - - emergencyexplosive - - emergencyfire - - emergencyinternals - - emergencyradiation - - armorysmg - - armoryshotgun - - securityarmor - - securityriot - - securitylaser - - securityhelmet - - securitysupplies - - securitynonlethal - - hydroponics - - hydroponicsseeds - - hydroponicsseedsexotic - - servicejanitorial - - servicelightsreplacement - - engineameshielding - - engineamejar - - engineamecontrol - - funplushies - - funartsupplies - - funinstruments - - materialsteel - - materialglass - - materialplastic - - enginesingularityemitter - - enginesingularitycollector - - enginesingularitygenerator - - enginesingularitycontainment diff --git a/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml b/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml index 4b17840fce..a3265cb096 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml @@ -13,50 +13,50 @@ - type: CargoOrderDatabase - type: GalacticMarket products: - - emergencyexplosive - - emergencyfire - - emergencyinternals - - emergencyradiation - - armorysmg - - armoryshotgun - - securityarmor - - securityriot - - securitylaser - - securityhelmet - - securitysupplies - - securitynonlethal - - hydroponics - - hydroponicsseeds - - hydroponicsseedsexotic - - servicejanitorial - - servicelightsreplacement - - engineeringcablelv - - engineeringcablemv - - engineeringcablehv - - engineeringcablebulk - - engineameshielding - - engineamejar - - engineamecontrol - - enginessolar - - funplushies - - funartsupplies - - funinstruments - - materialsteel - - materialglass - - materialplastic - - materialplasteel - - enginesingularityemitter - - enginesingularitycollector - - enginesingularitygenerator - - enginesingularitycontainment - - engineparticleaccelerator - - atmosphericsair - - atmosphericsoxygen - - atmosphericsnitrogen - - atmosphericscarbondioxide -# - atmosphericswatervapor -# - atmosphericsplasma -# - atmosphericstritium + - emergencyExplosive + - emergencyFire + - emergencyInternals + - emergencyRadiation + - armorySmg + - armoryShotgun + - securityArmor + - securityRiot + - securityLaser + - securityHelmet + - securitySupplies + - securityNonLethal + - hydroponicsTools + - hydroponicsSeeds + - hydroponicsSeedsExotic + - serviceJanitorial + - serviceLightsReplacement + - engineeringCableLv + - engineeringCableMv + - engineeringCableHv + - engineeringCableBulk + - engineAmeShielding + - engineAmeJar + - engineAmeControl + - engineSolar + - funPlushies + - funArtSupplies + - funInstruments + - materialSteel + - materialGlass + - materialPlastic + - materialPlasteel + - engineSingularityEmitter + - engineSingularityCollector + - engineSingularityGenerator + - engineSingularityContainment + - engineParticleAccelerator + - atmosphericsAir + - atmosphericsOxygen + - atmosphericsNitrogen + - atmosphericsCarbonDioxide +# - atmosphericsWaterVapor +# - atmosphericsPlasma +# - atmosphericsTritium - type: UserInterface interfaces: - key: enum.CargoConsoleUiKey.Key