Removes chem. and react. from every prototype ID (#3767)

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-04-08 15:48:02 +02:00
parent 69533a15d8
commit c28f22ebff
45 changed files with 862 additions and 860 deletions
--- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/booze_dispenser.yml
@@ -13,12 +13,12 @@
 - type: reagentDispenserInventory
  id: BoozeDispenserInventory
  inventory:
-  - chem.Ale
-  - chem.Beer
-  - chem.Cognac
-  - chem.Ice
-  - chem.Kahlua
-  - chem.Rum
-  - chem.Vodka
-  - chem.Whiskey
-  - chem.Wine
+  - Ale
+  - Beer
+  - Cognac
+  - Ice
+  - Kahlua
+  - Rum
+  - Vodka
+  - Whiskey
+  - Wine
--- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/chem_dispenser.yml
@@ -17,27 +17,27 @@
 - type: reagentDispenserInventory
  id: ChemDispenserStandardInventory
  inventory:
-  - chem.Aluminium
-  - chem.Carbon
-  - chem.Chlorine
-  - chem.Copper
-  - chem.Ethanol
-  - chem.Fluorine
-  - chem.Glucose
-  - chem.Hydrogen
-  - chem.Iron
-  - chem.Lithium
-  - chem.Mercury
-  - chem.Nitrogen
-  - chem.Nutriment
-  - chem.Oxygen
-  - chem.Phosphorus
-  - chem.Potassium
-  - chem.Radium
-  - chem.Silicon
-  - chem.Sodium
-  - chem.Sugar
-  - chem.Sulfur
-  - chem.SulfuricAcid
-  - chem.Uranium
-  - chem.Water
+  - Aluminium
+  - Carbon
+  - Chlorine
+  - Copper
+  - Ethanol
+  - Fluorine
+  - Glucose
+  - Hydrogen
+  - Iron
+  - Lithium
+  - Mercury
+  - Nitrogen
+  - Nutriment
+  - Oxygen
+  - Phosphorus
+  - Potassium
+  - Radium
+  - Silicon
+  - Sodium
+  - Sugar
+  - Sulfur
+  - SulfuricAcid
+  - Uranium
+  - Water
--- a/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml
@@ -13,9 +13,9 @@
 - type: reagentDispenserInventory
  id: SodaDispenserInventory
  inventory:
-  - chem.Coffee
-  - chem.Cola
-  - chem.Cream
-  - chem.Ice
-  - chem.Tea
-  - chem.Water
+  - Coffee
+  - Cola
+  - Cream
+  - Ice
+  - Tea
+  - Water
--- a/Resources/Prototypes/Entities/Constructible/Specific/barricades.yml
+++ b/Resources/Prototypes/Entities/Constructible/Specific/barricades.yml
@@ -46,14 +46,14 @@
      - !type:ExtinguishReaction
        touch: true
        reagents:
-          - chem.Water
+          - Water
      - !type:FlammableReaction
        touch: true
        reagents:
-          - chem.WeldingFuel
-          - chem.Thermite
-          - chem.Plasma
-          - chem.Ethanol
+          - WeldingFuel
+          - Thermite
+          - Plasma
+          - Ethanol
  - type: Appearance
    visuals:
    - type: FireVisualizer
--- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/fuel_tank.yml
@@ -25,5 +25,5 @@
  - type: SolutionContainer
    contents:
      reagents:
-      - ReagentId: chem.WeldingFuel
+      - ReagentId: WeldingFuel
        Quantity: 1500
--- a/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml
+++ b/Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml
@@ -17,5 +17,5 @@
  - type: SolutionContainer
    contents:
      reagents:
-      - ReagentId: chem.Water
+      - ReagentId: Water
        Quantity: 1500
--- a/Resources/Prototypes/Entities/Constructible/Watercloset/toilet.yml
+++ b/Resources/Prototypes/Entities/Constructible/Watercloset/toilet.yml
@@ -35,7 +35,7 @@
  - type: SolutionContainer
    contents:
      reagents:
-      - ReagentId: chem.Water
+      - ReagentId: Water
        Quantity: 180
-      - ReagentId: chem.Toxin
+      - ReagentId: Toxin
        Quantity: 20
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -391,7 +391,7 @@
  - type: SolutionContainer
    contents:
      reagents:
-      - ReagentId: chem.Nutriment
+      - ReagentId: Nutriment
        Quantity: 5
  - type: MouseAccent

--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -12,14 +12,14 @@
      - !type:ExtinguishReaction
        touch: true
        reagents:
-          - chem.Water
+          - Water
      - !type:FlammableReaction
        touch: true
        reagents:
-          - chem.WeldingFuel
-          - chem.Thermite
-          - chem.Plasma
-          - chem.Ethanol
+          - WeldingFuel
+          - Thermite
+          - Plasma
+          - Ethanol
  - type: UtilityAI
    behaviorSets:
    - Clothing
--- a/Resources/Prototypes/Entities/Mobs/Species/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -15,19 +15,19 @@
    - !type:ExtinguishReaction
      touch: true
      reagents:
-      - chem.Water
+      - Water
    - !type:FlammableReaction
      touch: true
      reagents:
-      - chem.WeldingFuel
-      - chem.Thermite
-      - chem.Plasma
-      - chem.Ethanol
+      - WeldingFuel
+      - Thermite
+      - Plasma
+      - Ethanol
    - !type:WashCreamPieReaction
      touch: true
      reagents:
-      - chem.Water
-      - chem.SpaceCleaner
+      - Water
+      - SpaceCleaner
  - type: Flashable
  - type: Hands
  - type: MovementSpeedModifier
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
@@ -71,7 +71,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Ale
+      - ReagentId: Ale
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/aleglass.rsi
@@ -87,7 +87,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Antifreeze
+      - ReagentId: Antifreeze
        Quantity: 20
  - type: Drink
  - type: Sprite
@@ -104,7 +104,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.AtomicBomb
+      - ReagentId: AtomicBomb
        Quantity: 20
  - type: Drink
  - type: Sprite
@@ -121,7 +121,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.B52
+      - ReagentId: B52
        Quantity: 20
  - type: Drink
  - type: Sprite
@@ -160,7 +160,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Beer
+      - ReagentId: Beer
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/beer.rsi
@@ -176,7 +176,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Beer
+      - ReagentId: Beer
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/beerglass.rsi
@@ -193,7 +193,7 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.BerryJuice
+        - ReagentId: BerryJuice
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/berryjuice.rsi
@@ -281,7 +281,7 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.CarrotJuice
+        - ReagentId: CarrotJuice
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/carrotjuice.rsi
@@ -320,7 +320,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Coffee
+      - ReagentId: Coffee
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/coffee.rsi
@@ -336,7 +336,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Cognac
+      - ReagentId: Cognac
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/cognacglass.rsi
@@ -352,7 +352,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Cola
+      - ReagentId: Cola
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/colabottle.rsi
@@ -368,7 +368,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Cream
+      - ReagentId: Cream
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/cream.rsi
@@ -384,7 +384,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.CubaLibre
+      - ReagentId: CubaLibre
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/cubalibreglass.rsi
@@ -599,7 +599,7 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.LimeJuice
+        - ReagentId: LimeJuice
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/glass_green.rsi
@@ -616,7 +616,7 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.OrangeJuice
+        - ReagentId: OrangeJuice
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/glass_orange.rsi
@@ -632,7 +632,7 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.LemonJuice
+        - ReagentId: LemonJuice
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/glass_yellow.rsi
@@ -649,7 +649,7 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.TomatoJuice
+        - ReagentId: TomatoJuice
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/glass_red.rsi
@@ -665,7 +665,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Milk
+      - ReagentId: Milk
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/glass_white.rsi
@@ -692,7 +692,7 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.GrapeJuice
+        - ReagentId: GrapeJuice
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/grapejuice.rsi
@@ -808,7 +808,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Ice
+      - ReagentId: Ice
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/iceglass.rsi
@@ -824,7 +824,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.IrishCarBomb
+      - ReagentId: IrishCarBomb
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/irishcarbomb.rsi
@@ -840,7 +840,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.IrishCoffee
+      - ReagentId: IrishCoffee
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/irishcoffeeglass.rsi
@@ -856,7 +856,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.IrishCream
+      - ReagentId: IrishCream
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/irishcreamglass.rsi
@@ -905,7 +905,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Kahlua
+      - ReagentId: Kahlua
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/kahluaglass.rsi
@@ -966,7 +966,7 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.LemonJuice
+        - ReagentId: LemonJuice
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/lemonjuice.rsi
@@ -983,9 +983,9 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.LemonJuice
+        - ReagentId: LemonJuice
          Quantity: 10
-        - ReagentId: chem.LimeJuice
+        - ReagentId: LimeJuice
          Quantity: 10
  - type: Sprite
    sprite: Objects/Consumable/Drinks/lemonlime.rsi
@@ -1002,7 +1002,7 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.LimeJuice
+        - ReagentId: LimeJuice
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/limejuice.rsi
@@ -1051,7 +1051,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.ManlyDorf
+      - ReagentId: ManlyDorf
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/manlydorfglass.rsi
@@ -1100,7 +1100,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Milk
+      - ReagentId: Milk
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/milk.rsi
@@ -1183,7 +1183,7 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.OrangeJuice
+        - ReagentId: OrangeJuice
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/orangejuice.rsi
@@ -1211,7 +1211,7 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.PoisonBerryJuice
+        - ReagentId: PoisonBerryJuice
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/poisonberryjuice.rsi
@@ -1526,7 +1526,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.SyndicateBomb
+      - ReagentId: SyndicateBomb
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/syndicatebomb.rsi
@@ -1542,7 +1542,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Tea
+      - ReagentId: Tea
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/teaglass.rsi
@@ -1558,7 +1558,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Tea
+      - ReagentId: Tea
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/teapot.rsi
@@ -1619,7 +1619,7 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.TomatoJuice
+        - ReagentId: TomatoJuice
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/tomatojuice.rsi
@@ -1713,7 +1713,7 @@
    maxVol: 20
    contents:
      reagents:
-        - ReagentId: chem.WatermelonJuice
+        - ReagentId: WatermelonJuice
          Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/watermelon.rsi
@@ -1745,7 +1745,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.WhiskeyCola
+      - ReagentId: WhiskeyCola
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/whiskeycolaglass.rsi
@@ -1761,7 +1761,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Whiskey
+      - ReagentId: Whiskey
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/whiskeyglass.rsi
@@ -1810,7 +1810,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Wine
+      - ReagentId: Wine
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/wineglass.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
@@ -46,7 +46,7 @@
  - type: SolutionContainer
    contents:
      reagents:
-      - ReagentId: chem.Absinthe
+      - ReagentId: Absinthe
        Quantity: 100

 - type: entity
@@ -70,7 +70,7 @@
    maxVol: 100
    contents:
      reagents:
-      - ReagentId: chem.Ale
+      - ReagentId: Ale
        Quantity: 100
  - type: Sprite
    sprite: Objects/Consumable/Drinks/alebottle.rsi
@@ -96,7 +96,7 @@
  - type: SolutionContainer
    contents:
      reagents:
-      - ReagentId: chem.Cognac
+      - ReagentId: Cognac
        Quantity: 100
  - type: Sprite
    sprite: Objects/Consumable/Drinks/cognacbottle.rsi
@@ -114,7 +114,7 @@
  - type: SolutionContainer
    contents:
      reagents:
-        - ReagentId: chem.Gin
+        - ReagentId: Gin
          Quantity: 100

 - type: entity
@@ -138,7 +138,7 @@
    maxVol: 80
    contents:
      reagents:
-      - ReagentId: chem.Water
+      - ReagentId: Water
        Quantity: 80
  - type: Sprite
    sprite: Objects/Consumable/Drinks/kahluabottle.rsi
@@ -209,7 +209,7 @@
    maxVol: 80
    contents:
      reagents:
-      - ReagentId: chem.Vodka
+      - ReagentId: Vodka
        Quantity: 80
  - type: Sprite
    sprite: Objects/Consumable/Drinks/vodkabottle.rsi
@@ -225,7 +225,7 @@
    maxVol: 80
    contents:
      reagents:
-      - ReagentId: chem.Whiskey
+      - ReagentId: Whiskey
        Quantity: 80
  - type: Sprite
    sprite: Objects/Consumable/Drinks/whiskeybottle.rsi
@@ -241,7 +241,7 @@
    maxVol: 80
    contents:
      reagents:
-      - ReagentId: chem.Wine
+      - ReagentId: Wine
        Quantity: 80
  - type: Sprite
    sprite: Objects/Consumable/Drinks/winebottle.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml
@@ -11,7 +11,7 @@
    caps: None
    contents:
      reagents:
-      - ReagentId: chem.Cola
+      - ReagentId: Cola
        Quantity: 20
  - type: SolutionTransfer
    transferAmount: 5
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks_cups.yml
@@ -236,7 +236,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Coffee
+      - ReagentId: Coffee
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/hot_coffee.rsi
@@ -252,7 +252,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Tea
+      - ReagentId: Tea
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/teacup.rsi
@@ -273,7 +273,7 @@
    maxVol: 20
    contents:
      reagents:
-      - ReagentId: chem.Lean
+      - ReagentId: Lean
        Quantity: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/lean.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/food.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/food.yml
--- a/Resources/Prototypes/Entities/Objects/Consumable/kitchen_reagent_containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/kitchen_reagent_containers.yml
@@ -8,7 +8,7 @@
    maxVol: 50
    contents:
      reagents:
-      - ReagentId: chem.Flour
+      - ReagentId: Flour
        Quantity: 50
  - type: SolutionTransfer
    transferAmount: 5
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -17,7 +17,7 @@
      caps: Refillable, Drainable
      contents:
        reagents:
-          - ReagentId: chem.Water
+          - ReagentId: Water
            Quantity: 100
    - type: ItemCooldown
    - type: Spray
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml
@@ -24,9 +24,9 @@
      caps: None
      contents:
        reagents:
-          - ReagentId: chem.Nutriment
+          - ReagentId: Nutriment
            Quantity: 5
-          - ReagentId: chem.Flour
+          - ReagentId: Flour
            Quantity: 5
    - type: Produce
      seed: wheat
@@ -43,9 +43,9 @@
      caps: None
      contents:
        reagents:
-          - ReagentId: chem.Nutriment
+          - ReagentId: Nutriment
            Quantity: 5
-          - ReagentId: chem.Glucose
+          - ReagentId: Glucose
            Quantity: 5
    - type: Produce
      seed: sugarcane
@@ -76,7 +76,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.Nutriment
+          - ReagentId: Nutriment
            Quantity: 6
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/banana.rsi
@@ -85,7 +85,7 @@
    - type: Juiceable
      result:
        reagents:
-          - ReagentId: chem.BananaJuice
+          - ReagentId: BananaJuice
            Quantity: 10

 - type: entity
@@ -98,7 +98,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.Nutriment
+          - ReagentId: Nutriment
            Quantity: 6
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/carrot.rsi
@@ -107,7 +107,7 @@
    - type: Juiceable
      result:
        reagents:
-          - ReagentId: chem.CarrotJuice
+          - ReagentId: CarrotJuice
            Quantity: 10

 - type: entity
@@ -120,7 +120,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.Nutriment
+          - ReagentId: Nutriment
            Quantity: 6
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/lemon.rsi
@@ -129,7 +129,7 @@
    - type: Juiceable
      result:
        reagents:
-          - ReagentId: chem.LimeJuice
+          - ReagentId: LimeJuice
            Quantity: 10

 - type: entity
@@ -142,7 +142,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.Nutriment
+          - ReagentId: Nutriment
            Quantity: 6
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/potato.rsi
@@ -151,7 +151,7 @@
    - type: Juiceable
      result:
        reagents:
-          - ReagentId: chem.PotatoJuice
+          - ReagentId: PotatoJuice
            Quantity: 10

 - type: entity
@@ -164,7 +164,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.Nutriment
+          - ReagentId: Nutriment
            Quantity: 6
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/tomato.rsi
@@ -173,7 +173,7 @@
    - type: Juiceable
      result:
        reagents:
-          - ReagentId: chem.TomatoJuice
+          - ReagentId: TomatoJuice
            Quantity: 10

 - type: entity
@@ -186,7 +186,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.Nutriment
+          - ReagentId: Nutriment
            Quantity: 6
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/eggplant.rsi
@@ -203,7 +203,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.Nutriment
+          - ReagentId: Nutriment
            Quantity: 6
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/apple.rsi
@@ -212,7 +212,7 @@
    - type: Juiceable
      result:
        reagents:
-          - ReagentId: chem.AppleJuice
+          - ReagentId: AppleJuice
            Quantity: 10

 - type: entity
@@ -226,7 +226,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.Nutriment
+          - ReagentId: Nutriment
            Quantity: 6
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/corn.rsi
@@ -243,7 +243,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.Nutriment
+          - ReagentId: Nutriment
            Quantity: 6
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/chanterelle.rsi
@@ -266,7 +266,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.THCOil
+          - ReagentId: THCOil
            Quantity: 5

 - type: entity
@@ -282,7 +282,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.THC
+          - ReagentId: THC
            Quantity: 2
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/tobacco.rsi
@@ -301,7 +301,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.THC
+          - ReagentId: THC
            Quantity: 10
    - type: Sprite
      sprite: Objects/Misc/reageant_fillings.rsi
@@ -335,7 +335,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.Nicotine
+          - ReagentId: Nicotine
            Quantity: 2
    - type: Sprite
      sprite: Objects/Specific/Hydroponics/tobacco.rsi
@@ -354,7 +354,7 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.Nicotine
+          - ReagentId: Nicotine
            Quantity: 10
    - type: Sprite
      sprite: Objects/Misc/reageant_fillings.rsi
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/sprays.yml
@@ -13,7 +13,7 @@
    caps: Drainable
    contents:
      reagents:
-        - ReagentId: chem.PlantBGone
+        - ReagentId: PlantBGone
          Quantity: 100
  - type: Item
    sprite: Objects/Tools/Hydroponics/sprays.rsi
@@ -34,7 +34,7 @@
    caps: Drainable
    contents:
      reagents:
-        - ReagentId: chem.WeedKiller
+        - ReagentId: WeedKiller
          Quantity: 50
  - type: Spillable
  - type: ItemCooldown
@@ -57,7 +57,7 @@
    caps: Drainable
    contents:
      reagents:
-        - ReagentId: chem.PestKiller
+        - ReagentId: PestKiller
          Quantity: 50
  - type: Item
    sprite: Objects/Tools/Hydroponics/sprays.rsi
--- a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml
@@ -35,7 +35,7 @@
    maxVol: 500
    contents:
      reagents:
-        - ReagentId: chem.Water
+        - ReagentId: Water
          Quantity: 500

  - type: Physics
@@ -235,7 +235,7 @@
      maxVol: 100
      contents:
        reagents:
-          - ReagentId: chem.Water
+          - ReagentId: Water
            Quantity: 100

 - type: entity
@@ -249,7 +249,7 @@
      maxVol: 100
      contents:
        reagents:
-          - ReagentId: chem.SpaceCleaner
+          - ReagentId: SpaceCleaner
            Quantity: 100


--- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml
@@ -7,7 +7,7 @@
  - type: SolutionContainer
    contents:
      reagents:
-      - ReagentId: chem.Nutriment
+      - ReagentId: Nutriment
        Quantity: 10
    maxVol: 11 # needs room for water
    caps: Refillable
@@ -20,7 +20,7 @@
        ingestion: true
        injection: true
        reagents:
-          - chem.Water
+          - Water
  - type: Rehydratable
    target: MonkeyMob_Content
  - type: CollisionWake
@@ -48,7 +48,7 @@
  - type: SolutionContainer
    contents:
      reagents:
-      - ReagentId: chem.Nutriment
+      - ReagentId: Nutriment
        Quantity: 10
    maxVol: 11 # needs room for water
    caps: Refillable
@@ -59,7 +59,7 @@
      ingestion: true
      injection: true
      reagents:
-        - chem.Water
+        - Water
  - type: Rehydratable
    target: CarpMob_Content
  - type: CollisionWake
--- a/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
@@ -119,7 +119,7 @@
      caps: Refillable
      contents:
        reagents:
-          - ReagentId: chem.WeldingFuel
+          - ReagentId: WeldingFuel
            Quantity: 100
    - type: Welder
      weldSoundCollection: Welder
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -23,7 +23,7 @@
    caps: Refillable
    contents:
      reagents:
-        - ReagentId: chem.WeldingFuel
+        - ReagentId: WeldingFuel
          Quantity: 100
  - type: Welder
    weldSoundCollection: Welder
@@ -47,7 +47,7 @@
    caps: Refillable
    contents:
      reagents:
-        - ReagentId: chem.WeldingFuel
+        - ReagentId: WeldingFuel
          Quantity: 1000
  - type: PointLight
    enabled: false
@@ -69,7 +69,7 @@
    caps: Refillable
    contents:
      reagents:
-        - ReagentId: chem.WeldingFuel
+        - ReagentId: WeldingFuel
          Quantity: 25
  - type: PointLight
    enabled: false
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -282,5 +282,5 @@
    - type: SolutionContainer
      contents:
        reagents:
-          - ReagentId: chem.Nutriment
+          - ReagentId: Nutriment
            Quantity: 8