Bugfixes (#783)
* fix force evaporation * knowledge book in bank * music in loadouts * Update general.yml * localization sync * fix round leave and manifest * ship sound replacement * fix traveling ship gravity * forgot this role knowledge
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
using Content.Server.Weather;
|
||||
using Content.Shared.Chemistry.Components;
|
||||
using Content.Shared.FixedPoint;
|
||||
using Content.Shared.Fluids.Components;
|
||||
@@ -10,7 +11,7 @@ namespace Content.Server.Fluids.EntitySystems;
|
||||
public sealed partial class PuddleSystem
|
||||
{
|
||||
[Dependency] private readonly SharedMapSystem _maps = default!; //CP14
|
||||
[Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; //CP14
|
||||
[Dependency] private readonly WeatherSystem _weather = default!; //CP14
|
||||
private static readonly TimeSpan EvaporationCooldown = TimeSpan.FromSeconds(1);
|
||||
|
||||
private void OnEvaporationMapInit(Entity<EvaporationComponent> entity, ref MapInitEvent args)
|
||||
@@ -23,9 +24,7 @@ public sealed partial class PuddleSystem
|
||||
if (TryComp<MapGridComponent>(xform.GridUid, out var mapGrid))
|
||||
{
|
||||
var tileRef = _maps.GetTileRef(xform.GridUid.Value, mapGrid, xform.Coordinates);
|
||||
var tileDef = (ContentTileDefinition) _tileDefManager[tileRef.Tile.TypeId];
|
||||
|
||||
entity.Comp.CP14ForceEvaporation = tileDef.SuckReagents;
|
||||
entity.Comp.CP14ForceEvaporation = _weather.CanWeatherAffect(xform.GridUid.Value, mapGrid, tileRef);
|
||||
}
|
||||
//CP14 End force evaporation under sky
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user