From ede8df60071631bde97ca8f743124a2d0a6c7223 Mon Sep 17 00:00:00 2001 From: SweptWasTaken Date: Fri, 11 Jun 2021 16:53:03 -0700 Subject: [PATCH] Cargo IDs are ACTUALLY PascalCase --- .../Prototypes/Catalog/Cargo/cargo_armory.yml | 4 +- .../Catalog/Cargo/cargo_atmospherics.yml | 14 +-- .../Prototypes/Catalog/Cargo/cargo_botany.yml | 8 +- .../Catalog/Cargo/cargo_emergency.yml | 8 +- .../Catalog/Cargo/cargo_engineering.yml | 8 +- .../Catalog/Cargo/cargo_engines.yml | 18 ++-- .../Prototypes/Catalog/Cargo/cargo_fun.yml | 6 +- .../Catalog/Cargo/cargo_livestock.yml | 26 +++--- .../Catalog/Cargo/cargo_materials.yml | 8 +- .../Catalog/Cargo/cargo_security.yml | 12 +-- .../Catalog/Cargo/cargo_service.yml | 6 +- .../Constructible/Power/cargo_console.yml | 88 +++++++++---------- 12 files changed, 103 insertions(+), 103 deletions(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index 2177e2c478..1f420dfeac 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 262cc8efc9..c34b5fefc8 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 53f3d02785..9dcb327a3e 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: hydroponicsTools + 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 6c9709a5e0..994e7b648f 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 5083fa33f4..0d1e25e8fa 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 9077aab737..301095d32e 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: engineSolar + 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 eee2a5ff10..23496dd129 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 26f0741bc2..b40f9d0147 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 18eb1262f4..872f65c5e3 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 125387b356..e20b4a7a50 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 663c6b846d..06165e1282 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/Entities/Constructible/Power/cargo_console.yml b/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml index a3265cb096..fbbd73a9e1 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 - - 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 + - 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