Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixes (#248)

Browse Source 
* tweak: hotbar translation

* oops

* tweak: WhiteBox update

* tweak: Bagel, Meta and Train in map pool

* tweak: ERTsystem changes and new ERT map

* cvar fix

* nerf: radium no longer has a touch effect

* tweak: chem touch tweaks

* tweak: patch applies reagents over time

* patchComp fix and some tweaks

* some changes
This commit is contained in:
RinKeeper
2024-03-31 09:12:07 +03:00
committed by GitHub
parent 7ef173bc2b
commit e6790ef190
18 changed files with 67691 additions and 18837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/_White/ERTRecruitment/ERTMapComponent.cs
View File

@@ -12,5 +12,5 @@ public sealed partial class ERTMapComponent : Component
public EntityUid? Shuttle;
public static ResPath OutpostMap = new("/Maps/ERT/ERTStation.yml");
public static ResPath ShuttleMap = new("/Maps/ERT/ERTShuttle.yml");
//public static ResPath ShuttleMap = new("/Maps/ERT/ERTShuttle.yml");
}

13
Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs
View File

@@ -65,7 +65,7 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
if (query.MoveNext(out uid, out var ertMapComponent))
{
component.Outpost = uid;
component.Shuttle = ertMapComponent.Shuttle;
//component.Shuttle = ertMapComponent.Shuttle;
component.MapId = ertMapComponent.MapId;
}
}
@@ -93,10 +93,12 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
_chatSystem.DispatchStationAnnouncement(component.TargetStation.Value,Loc.GetString("ert-wait-message"),colorOverride: Color.Gold);
/*
if (TryComp<ShuttleComponent>(component.Shuttle, out var shuttle) && component.Outpost != null)
{
_shuttle.TryFTLDock(component.Shuttle.Value, shuttle, component.Outpost.Value);
}
*/
_recruitment.StartRecruitment(ERTRecruitmentRuleComponent.EventName);
}
@@ -167,6 +169,10 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
var outpost = outpostGrids[0];
// Listen I just don't want it to overlap.
// RinKeeper
// Now Shuttle is already on Outpost grid, so we dont need that.
/*
if (!_map.TryLoad(mapId, ERTMapComponent.ShuttleMap.ToString(), out var grids, new MapLoadOptions {Offset = Vector2.One * 1000f}) || !grids.Any())
{
_logger.Error( $"Error loading grid {ERTMapComponent.ShuttleMap}!");
@@ -183,10 +189,11 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
_mapManager.DeleteMap(mapId);
return false;
}
*/
var ERTMap = EnsureComp<ERTMapComponent>(outpost);
ERTMap.MapId = mapId;
ERTMap.Shuttle = shuttleId;
//ERTMap.Shuttle = shuttleId;
return true;
}

4
Content.Server/_White/ERTRecruitment/ERTRecruitmentRuleComponent.cs
View File

@@ -21,8 +21,8 @@ public sealed partial class ERTRecruitmentRuleComponent : Component
[ViewVariables]
public EntityUid? Outpost;
[ViewVariables]
public EntityUid? Shuttle;
//[ViewVariables]
// public EntityUid? Shuttle;
[ViewVariables]
public EntityUid? TargetStation;
}