Chem entity nerf (#11037)
This commit is contained in:
@@ -37,7 +37,7 @@ namespace Content.Client.Chemistry.UI
|
|||||||
|
|
||||||
private static bool IsSpinValid(int n)
|
private static bool IsSpinValid(int n)
|
||||||
{
|
{
|
||||||
return n is > 0 and <= 25;
|
return n is > 0 and <= MaxEntitySpawns;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -281,6 +281,9 @@ namespace Content.Server.Chemistry.Components
|
|||||||
var handSys = _sysMan.GetEntitySystem<SharedHandsSystem>();
|
var handSys = _sysMan.GetEntitySystem<SharedHandsSystem>();
|
||||||
var solSys = _sysMan.GetEntitySystem<SolutionContainerSystem>();
|
var solSys = _sysMan.GetEntitySystem<SolutionContainerSystem>();
|
||||||
|
|
||||||
|
pillAmount = Math.Clamp(pillAmount, 0, MaxEntitySpawns);
|
||||||
|
bottleAmount = Math.Clamp(bottleAmount, 0, MaxEntitySpawns);
|
||||||
|
|
||||||
if (action == UiAction.CreateBottles)
|
if (action == UiAction.CreateBottles)
|
||||||
{
|
{
|
||||||
var individualVolume = BufferSolution.TotalVolume / FixedPoint2.New(bottleAmount);
|
var individualVolume = BufferSolution.TotalVolume / FixedPoint2.New(bottleAmount);
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ namespace Content.Shared.Chemistry.Components
|
|||||||
[Virtual]
|
[Virtual]
|
||||||
public class SharedChemMasterComponent : Component
|
public class SharedChemMasterComponent : Component
|
||||||
{
|
{
|
||||||
|
public const int MaxEntitySpawns = 10;
|
||||||
public static string BeakerSlotId = "ChemMaster-beaker";
|
public static string BeakerSlotId = "ChemMaster-beaker";
|
||||||
|
|
||||||
[DataField("beakerSlot")]
|
[DataField("beakerSlot")]
|
||||||
|
|||||||
@@ -42,6 +42,8 @@
|
|||||||
solution: drink
|
solution: drink
|
||||||
- type: TrashOnEmpty
|
- type: TrashOnEmpty
|
||||||
solution: drink
|
solution: drink
|
||||||
|
- type: StaticPrice
|
||||||
|
price: 0
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: bottle
|
name: bottle
|
||||||
|
|||||||
@@ -268,6 +268,8 @@
|
|||||||
- type: DeleteOnTrigger
|
- type: DeleteOnTrigger
|
||||||
- type: Extractable
|
- type: Extractable
|
||||||
grindableSolutionName: food
|
grindableSolutionName: food
|
||||||
|
- type: StaticPrice
|
||||||
|
price: 0
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: pill canister
|
name: pill canister
|
||||||
|
|||||||
Reference in New Issue
Block a user