Skip to content

Commit

Permalink
minor layout changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Errant-4 committed Sep 19, 2024
1 parent 3ecdb73 commit 81738b6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
6 changes: 1 addition & 5 deletions Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,7 @@ public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component)
var briefing = "";

if (component.GiveCodewords)
{
briefing = string.Format("{0}{1}",
briefing,
Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", component.Codewords))));
}
briefing = Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", component.Codewords)));

var issuer = _random.Pick(_prototypeManager.Index(component.ObjectiveIssuers).Values);

Expand Down
10 changes: 3 additions & 7 deletions Content.Server/Traitor/Uplink/UplinkSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,10 @@ public bool AddUplink(
{
// Try to find target item if none passed

//uplinkEntity ??= FindUplinkTarget(user); //TODO:ERRANT see if I can use this?
uplinkEntity ??= FindUplinkTarget(user);

if (uplinkEntity == null)
{
uplinkEntity = FindUplinkTarget(user);
if (uplinkEntity == null)
return ImplantUplink(user, balance, giveDiscounts); //TODO:ERRANT clean this up
}
return ImplantUplink(user, balance, giveDiscounts);

EnsureComp<UplinkComponent>(uplinkEntity.Value);

Expand All @@ -76,7 +72,7 @@ private void SetUplink(EntityUid user, EntityUid uplink, FixedPoint2 balance, bo
uplink,
store);

var uplinkInitializedEvent = new StoreInitializedEvent( //TODO:ERRANT fix this thing
var uplinkInitializedEvent = new StoreInitializedEvent(
TargetUser: user,
Store: uplink,
UseDiscounts: giveDiscounts,
Expand Down

0 comments on commit 81738b6

Please sign in to comment.