forked from DeltaV-Station/Delta-v
-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Glacier Real (DeltaV-Station#1169) (DeltaV-Station#728)
* glacier real * troll * atmosia tweaks * 1 less can of plasma not too op * replace troll generator with solar crate * add StationSurface to glacier * add surface map * biome stuff upstream #28017 * unpause after loading * fix no terrain * comment out the surface spawning * shipyard * glacier justiceroid * updateprototype and cleanup * fix random shit * untroll * courier * add to test* fix * futureproofing * hot loop inlet lmao * tweak some pumps in atmosia * carpy and make salv locker lighting better * Edit lights, move salv dock, add justice maints, edit entity names for casing consistency, other minor edits --------- <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description Ports Glacier from DeltaV. Justice department has been yeeted. # Changelog 🆑 - add: Glacier Returns. --------- Co-authored-by: deltanedas <[email protected]> Co-authored-by: Velcroboy <[email protected]>
- Loading branch information
1 parent
0feb56e
commit 71a54b7
Showing
6 changed files
with
113,347 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
Content.Server/DeltaV/Station/Components/StationSurfaceComponent.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
using Content.Server.Station.Systems; | ||
using Robust.Shared.Utility; | ||
|
||
namespace Content.Server.Station.Components; | ||
|
||
/// <summary> | ||
/// Loads a surface map on mapinit. | ||
/// </summary> | ||
[RegisterComponent, Access(typeof(StationSurfaceSystem))] | ||
public sealed partial class StationSurfaceComponent : Component | ||
{ | ||
/// <summary> | ||
/// Path to the map to load. | ||
/// </summary> | ||
[DataField(required: true)] | ||
public ResPath? MapPath; | ||
|
||
/// <summary> | ||
/// The map that was loaded. | ||
/// </summary> | ||
[DataField] | ||
public EntityUid? Map; | ||
} |
41 changes: 41 additions & 0 deletions
41
Content.Server/DeltaV/Station/Systems/StationSurfaceSystem.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
using Content.Server.Parallax; | ||
using Content.Server.Station.Components; | ||
using Robust.Server.GameObjects; | ||
|
||
namespace Content.Server.Station.Systems; | ||
|
||
public sealed class StationSurfaceSystem : EntitySystem | ||
{ | ||
[Dependency] private readonly BiomeSystem _biome = default!; | ||
[Dependency] private readonly MapSystem _map = default!; | ||
[Dependency] private readonly MapLoaderSystem _mapLoader = default!; | ||
|
||
public override void Initialize() | ||
{ | ||
base.Initialize(); | ||
|
||
SubscribeLocalEvent<StationSurfaceComponent, MapInitEvent>(OnMapInit); | ||
} | ||
|
||
private void OnMapInit(Entity<StationSurfaceComponent> ent, ref MapInitEvent args) | ||
{ | ||
if (ent.Comp.MapPath is not {} path) | ||
return; | ||
|
||
var map = _map.CreateMap(out var mapId); | ||
if (!_mapLoader.TryLoad(mapId, path.ToString(), out _)) | ||
{ | ||
Log.Error($"Failed to load surface map {ent.Comp.MapPath}!"); | ||
Del(map); | ||
return; | ||
} | ||
|
||
// loading replaced the map entity with a new one so get the latest id | ||
map = _map.GetMap(mapId); | ||
_map.SetPaused(map, false); | ||
|
||
// Needs a cherrypick, but this system is unused entirely for now | ||
//_biome.SetEnabled(map); // generate the terrain after the grids loaded to prevent it getting hidden under it | ||
ent.Comp.Map = map; | ||
} | ||
} |
Oops, something went wrong.