tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes remaining renamed chems (#2889)

Browse Source
This commit is contained in:
Swept
2021-01-02 07:05:32 +00:00
committed by GitHub
parent 63a7d2d433
commit cd9e5a590b
9 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.Atmos; using Content.Server.Atmos;
using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Mobs;
@@ -218,7 +218,7 @@ namespace Content.Server.GameObjects.Components.Atmos
{ {
switch (reagent.ID) switch (reagent.ID)
{ {
case "chem.H2O": case "chem.Water":
Extinguish(); Extinguish();
AdjustFireStacks(-1.5f); AdjustFireStacks(-1.5f);
return ReagentUnit.Zero; return ReagentUnit.Zero;

4
Content.Server/GameObjects/Components/Chemistry/RehydratableComponent.cs
View File

@@ -1,4 +1,4 @@
#nullable enable #nullable enable
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Server.Utility; using Content.Server.Utility;
using Content.Shared.Chemistry; using Content.Shared.Chemistry;
@@ -31,7 +31,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
public override void ExposeData(ObjectSerializer serializer) public override void ExposeData(ObjectSerializer serializer)
{ {
base.ExposeData(serializer); base.ExposeData(serializer);
serializer.DataField(ref _catalystPrototype, "catalyst", "chem.H2O"); serializer.DataField(ref _catalystPrototype, "catalyst", "chem.Water");
serializer.DataField(ref _targetPrototype, "target", null); serializer.DataField(ref _targetPrototype, "target", null);
} }

4
Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.GameObjects.Components.Mobs; using Content.Server.GameObjects.Components.Mobs;
using Content.Server.Utility; using Content.Server.Utility;
using Content.Shared.Chemistry; using Content.Shared.Chemistry;
using Content.Shared.GameObjects.Components.Nutrition; using Content.Shared.GameObjects.Components.Nutrition;
@@ -42,7 +42,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
switch (reagent.ID) switch (reagent.ID)
{ {
case "chem.SpaceCleaner": case "chem.SpaceCleaner":
case "chem.H2O": case "chem.Water":
Wash(); Wash();
break; break;
} }

2
Resources/Prototypes/Entities/Constructible/Specific/Dispensers/soda_dispenser.yml
View File

@@ -17,5 +17,5 @@
- chem.Coffee - chem.Coffee
- chem.Tea - chem.Tea
- chem.Ice - chem.Ice
- chem.H2O - chem.Water
- chem.Cream - chem.Cream

2
Resources/Prototypes/Entities/Constructible/Storage/StorageTanks/water_tank.yml
View File

@@ -19,5 +19,5 @@
- type: SolutionContainer - type: SolutionContainer
contents: contents:
reagents: reagents:
- ReagentId: chem.H2O - ReagentId: chem.Water
Quantity: 1500 Quantity: 1500

3
Resources/Prototypes/Entities/Objects/Consumable/drinks_bottles.yml
View File

@@ -111,7 +111,7 @@
maxVol: 80 maxVol: 80
contents: contents:
reagents: reagents:
- ReagentId: chem.H2O - ReagentId: chem.Water
Quantity: 80 Quantity: 80
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/kahluabottle.rsi sprite: Objects/Consumable/Drinks/kahluabottle.rsi
@@ -218,4 +218,3 @@
Quantity: 80 Quantity: 80
- type: Sprite - type: Sprite
sprite: Objects/Consumable/Drinks/winebottle.rsi sprite: Objects/Consumable/Drinks/winebottle.rsi

2
Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
View File

@@ -17,7 +17,7 @@
caps: AddTo, RemoveFrom, NoExamine caps: AddTo, RemoveFrom, NoExamine
contents: contents:
reagents: reagents:
- ReagentId: chem.H2O - ReagentId: chem.Water
Quantity: 100 Quantity: 100
- type: ItemCooldown - type: ItemCooldown
- type: Spray - type: Spray

2
Resources/Prototypes/Entities/Objects/Specific/janitor.yml
View File

@@ -222,7 +222,7 @@
caps: AddTo, RemoveFrom caps: AddTo, RemoveFrom
contents: contents:
reagents: reagents:
- ReagentId: chem.H2O - ReagentId: chem.Water
Quantity: 100 Quantity: 100
- type: entity - type: entity

12
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
View File

@@ -186,7 +186,7 @@
result: FoodSpaghettiBoiled result: FoodSpaghettiBoiled
time: 5 time: 5
reagents: reagents:
chem.H2O: 5 chem.Water: 5
solids: solids:
FoodSpaghetti: 1 FoodSpaghetti: 1
@@ -196,7 +196,7 @@
result: FoodPastaTomato result: FoodPastaTomato
time: 10 time: 10
reagents: reagents:
chem.H2O: 5 chem.Water: 5
solids: solids:
FoodSpaghetti: 1 FoodSpaghetti: 1
FoodTomato: 2 FoodTomato: 2
@@ -207,7 +207,7 @@
result: FoodMeatballSpaghetti result: FoodMeatballSpaghetti
time: 10 time: 10
reagents: reagents:
chem.H2O: 5 chem.Water: 5
solids: solids:
FoodSpaghetti: 1 FoodSpaghetti: 1
FoodMeatball: 2 FoodMeatball: 2
@@ -218,7 +218,7 @@
result: FoodCrabSpaghetti result: FoodCrabSpaghetti
time: 10 time: 10
reagents: reagents:
chem.H2O: 5 chem.Water: 5
solids: solids:
FoodCrabMeat: 2 FoodCrabMeat: 2
@@ -294,7 +294,7 @@
result: FoodMeatballSoup result: FoodMeatballSoup
time: 10 time: 10
reagents: reagents:
chem.H2O: 10 chem.Water: 10
solids: solids:
FoodMeatball: 1 FoodMeatball: 1
FoodCarrot: 1 FoodCarrot: 1
@@ -306,7 +306,7 @@
result: FoodNettleSoup result: FoodNettleSoup
time: 10 time: 10
reagents: reagents:
chem.H2O: 10 chem.Water: 10
solids: solids:
FoodNettle: 1 FoodNettle: 1
FoodEgg: 1 FoodEgg: 1