juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ADAPTATION

Browse Source
This commit is contained in:
Ed
2025-07-08 11:46:35 +03:00
parent 7a8326d41e
commit 3f7bb1f5c6
17 changed files with 28 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
View File

@@ -11,7 +11,6 @@ namespace Content.Server.Fluids.EntitySystems;
public sealed partial class PuddleSystem
{
[Dependency] private readonly SharedMapSystem _maps = default!; //CP14
[Dependency] private readonly WeatherSystem _weather = default!; //CP14
private static readonly TimeSpan EvaporationCooldown = TimeSpan.FromSeconds(1);
@@ -24,7 +23,7 @@ public sealed partial class PuddleSystem
var xform = Transform(entity);
if (TryComp<MapGridComponent>(xform.GridUid, out var mapGrid))
{
var tileRef = _maps.GetTileRef(xform.GridUid.Value, mapGrid, xform.Coordinates);
var tileRef = _map.GetTileRef(xform.GridUid.Value, mapGrid, xform.Coordinates);
entity.Comp.CP14ForceEvaporation = _weather.CanWeatherAffect(xform.GridUid.Value, mapGrid, tileRef);
}
//CP14 End force evaporation under sky

1
Content.Server/Medical/HealthAnalyzerSystem.cs
View File

@@ -13,6 +13,7 @@ using Content.Shared.Item.ItemToggle.Components;
using Content.Shared.MedicalScanner;
using Content.Shared.Mobs.Components;
using Content.Shared.Popups;
using Content.Shared.Traits.Assorted;
using Robust.Server.GameObjects;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;

17
Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
View File

@@ -137,23 +137,6 @@ public sealed partial class ShuttleSystem
var parallax = EnsureComp<ParallaxComponent>(mapUid);
parallax.Parallax = ftlMap.Parallax;
//CP14 FTL map tweaks
var mapLight = EnsureComp<MapLightComponent>(mapUid);
mapLight.AmbientLightColor = ftlMap.AmbientColor;
var moles = new float[Atmospherics.AdjustedNumberOfGases];
moles[(int) Gas.Oxygen] = 21.824779f;
moles[(int) Gas.Nitrogen] = 82.10312f;
var mixture = new GasMixture(moles, Atmospherics.T20C);
_atmos.SetMapAtmosphere(mapUid, false, mixture);
var gravity = EnsureComp<GravityComponent>(mapUid);
gravity.Enabled = true;
gravity.Inherent = true;
//CP14 FTL map tweaks ends
return mapUid;
}

2
Content.Server/_CP14/Demiplane/CP14DemiplaneSystem.cs
View File

@@ -117,7 +117,7 @@ public sealed partial class CP14DemiplaneSystem : CP14SharedDemiplaneSystem
if (entity is null)
return;
_flash.Flash(entity.Value, null, null, 3000f, 0.5f);
_flash.Flash(entity.Value, null, null, TimeSpan.FromSeconds(3f), 0.5f);
_transform.SetCoordinates(entity.Value, coordinates);
_audio.PlayGlobal(sound, entity.Value);
}

2
Content.Server/_CP14/GameTicking/Rules/CP14VampireRuleSystem.cs
View File

@@ -83,7 +83,7 @@ public sealed class CP14VampireRuleSystem : GameRuleSystem<CP14VampireRuleCompon
private void OnVampireInit(Entity<CP14VampireComponent> ent, ref MapInitEvent args)
{
_bloodstream.ChangeBloodReagent(ent, ent.Comp.NewBloodReagent);
_bloodstream.ChangeBloodReagent(ent.Owner, ent.Comp.NewBloodReagent);
foreach (var (organUid, _) in _body.GetBodyOrgans(ent))
{

9
Content.Server/_CP14/Temperature/CP14FireSpreadSystem.cs
View File

@@ -24,10 +24,11 @@ public sealed partial class CP14FireSpreadSystem : CP14SharedFireSpreadSystem
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly SharedMapSystem _mapSystem = default!;
[Dependency] private readonly SharedMapSystem _map = default!;
[Dependency] private readonly TileSystem _tile = default!;
[Dependency] private readonly ITileDefinitionManager _tileDef = default!;
[Dependency] private readonly SmokingSystem _smoking = default!;
[Dependency] private readonly TurfSystem _turf = default!;
private readonly EntProtoId _fireProto = "CP14Fire";
@@ -160,7 +161,7 @@ public sealed partial class CP14FireSpreadSystem : CP14SharedFireSpreadSystem
return;
var localPos = xform.Coordinates.Position;
var tileRefs = _mapSystem.GetLocalTilesIntersecting(xform.ParentUid,
var tileRefs = _map.GetLocalTilesIntersecting(xform.ParentUid,
grid,
new Box2(
localPos + new Vector2(-spread.Comp.Radius, -spread.Comp.Radius),
@@ -172,12 +173,12 @@ public sealed partial class CP14FireSpreadSystem : CP14SharedFireSpreadSystem
if (!_random.Prob(spread.Comp.ProbTile))
continue;
var tile = tileRef.Tile.GetContentTileDefinition();
var tile = _turf.GetContentTileDefinition(tileRef);
if (tile.BurnedTile is null)
continue;
Spawn(_fireProto, _mapSystem.ToCenterCoordinates(tileRef, grid));
Spawn(_fireProto, _map.ToCenterCoordinates(tileRef, grid));
_tile.ReplaceTile(tileRef, (ContentTileDefinition)_tileDef[tile.BurnedTile]);
}
}