diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index 58cd7b6238..c7f0a426ab 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: cargo.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: cargo.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 235c6c701c..cebfe67e26 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: cargo.atmosphericsair + id: atmosphericsair description: "Air canister" icon: sprite: Constructible/Atmos/canister.rsi @@ -12,7 +12,7 @@ - type: cargoProduct name: "oxygen canister" - id: cargo.atmosphericsoxygen + id: atmosphericsoxygen description: "Oxygen canister" icon: sprite: Constructible/Atmos/canister.rsi @@ -24,7 +24,7 @@ - type: cargoProduct name: "nitrogen canister" - id: cargo.atmosphericsnitrogen + id: atmosphericsnitrogen description: "Nitrogen canister" icon: sprite: Constructible/Atmos/canister.rsi @@ -36,7 +36,7 @@ - type: cargoProduct name: "carbon dioxide canister" - id: cargo.atmosphericscarbondioxide + id: atmosphericscarbondioxide description: "Carbon dioxide canister" icon: sprite: Constructible/Atmos/canister.rsi @@ -48,7 +48,7 @@ - type: cargoProduct name: "water vapor canister" - id: cargo.atmosphericswatervapor + id: atmosphericswatervapor description: "Water vapor canister" icon: sprite: Constructible/Atmos/canister.rsi @@ -60,7 +60,7 @@ - type: cargoProduct name: "plasma canister" - id: cargo.atmosphericsplasma + id: atmosphericsplasma description: "Plasma canister" icon: sprite: Constructible/Atmos/canister.rsi @@ -72,7 +72,7 @@ - type: cargoProduct name: "tritium canister" - id: cargo.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 01c3fa2e24..5c98b62d8a 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: cargo.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: cargo.hydroponics + id: hydroponics 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: cargo.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: cargo.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 1bfd1a3a1f..22e850b3b6 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: cargo.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: cargo.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: cargo.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: cargo.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 1e6111f77e..9329632c5e 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: cargo.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: cargo.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: cargo.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: cargo.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 b5db133182..9b3b2365ad 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: cargo.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: cargo.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: cargo.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: cargo.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: cargo.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: cargo.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: cargo.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: cargo.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: cargo.enginessolar + id: enginessolar 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 bdb2996f0d..0a7f8b7ff4 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: cargo.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: cargo.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: cargo.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_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index bc5cddd519..3e2e801d79 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: cargo.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: cargo.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: cargo.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: cargo.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 560b34a3cc..cd1c1514cf 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: cargo.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: cargo.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: cargo.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: cargo.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: cargo.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: cargo.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 51e5a9ec5f..2f621124c3 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: cargo.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: cargo.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: cargo.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 index 00daf60da4..39e69de98e 100644 --- a/Resources/Prototypes/Datasets/markets.yml +++ b/Resources/Prototypes/Datasets/markets.yml @@ -1,33 +1,33 @@ - type: dataset id: galacticmarket values: - - cargo.emergencyexplosive - - cargo.emergencyfire - - cargo.emergencyinternals - - cargo.emergencyradiation - - cargo.armorysmg - - cargo.armoryshotgun - - cargo.securityarmor - - cargo.securityriot - - cargo.securitylaser - - cargo.securityhelmet - - cargo.securitysupplies - - cargo.securitynonlethal - - cargo.hydroponics - - cargo.hydroponicsseeds - - cargo.hydroponicsseedsexotic - - cargo.servicejanitorial - - cargo.servicelightsreplacement - - cargo.engineameshielding - - cargo.engineamejar - - cargo.engineamecontrol - - cargo.funplushies - - cargo.funartsupplies - - cargo.funinstruments - - cargo.materialsteel - - cargo.materialglass - - cargo.materialplastic - - cargo.enginesingularityemitter - - cargo.enginesingularitycollector - - cargo.enginesingularitygenerator - - cargo.enginesingularitycontainment + - 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 0edb24c752..4b17840fce 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/cargo_console.yml @@ -13,47 +13,47 @@ - type: CargoOrderDatabase - type: GalacticMarket products: - - cargo.emergencyexplosive - - cargo.emergencyfire - - cargo.emergencyinternals - - cargo.emergencyradiation - - cargo.armorysmg - - cargo.armoryshotgun - - cargo.securityarmor - - cargo.securityriot - - cargo.securitylaser - - cargo.securityhelmet - - cargo.securitysupplies - - cargo.securitynonlethal - - cargo.hydroponics - - cargo.hydroponicsseeds - - cargo.hydroponicsseedsexotic - - cargo.servicejanitorial - - cargo.servicelightsreplacement - - cargo.engineeringcablelv - - cargo.engineeringcablemv - - cargo.engineeringcablehv - - cargo.engineeringcablebulk - - cargo.engineameshielding - - cargo.engineamejar - - cargo.engineamecontrol - - cargo.enginessolar - - cargo.funplushies - - cargo.funartsupplies - - cargo.funinstruments - - cargo.materialsteel - - cargo.materialglass - - cargo.materialplastic - - cargo.materialplasteel - - cargo.enginesingularityemitter - - cargo.enginesingularitycollector - - cargo.enginesingularitygenerator - - cargo.enginesingularitycontainment - - cargo.engineparticleaccelerator - - cargo.atmosphericsair - - cargo.atmosphericsoxygen - - cargo.atmosphericsnitrogen - - cargo.atmosphericscarbondioxide + - 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