Skip to content

Commit

Permalink
Fix whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
Joel McBride committed Sep 5, 2024
1 parent ead7049 commit 918d570
Show file tree
Hide file tree
Showing 40 changed files with 71 additions and 91 deletions.
2 changes: 1 addition & 1 deletion Content.Benchmarks/MapLoadBenchmark.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public async Task Cleanup()
}

public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Origin", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Cog" };

[ParamsSource(nameof(MapsSource))]
public string Map;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protected override void Open()
{
stationName = gridMetaData.EntityName;
}

if (EntMan.TryGetComponent<StationMapComponent>(Owner, out var comp) && comp.ShowLocation)
_window.Set(stationName, gridUid, Owner);
else
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Stylesheets/StyleNano.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,7 @@ public StyleNano(IResourceCache resCache) : base(resCache)
.Class(StyleClassItemStatusNotHeld)
.Prop("font", notoSansItalic10)
.Prop("font-color", ItemStatusNotHeldColor),

Element<RichTextLabel>()
.Class(StyleClassCrewManifestGender)
.Prop("font", notoSansItalic10)
Expand Down
2 changes: 1 addition & 1 deletion Content.Server/Announcements/AnnounceCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void Execute(IConsoleShell shell, string argStr, string[] args)

shell.WriteLine("Sent!");
}

public CompletionResult GetCompletion(IConsoleShell shell, string[] args)
{
switch (args.Length)
Expand Down
2 changes: 0 additions & 2 deletions Content.Server/Antag/AntagSelectionSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -515,5 +515,3 @@ public record struct AntagSelectLocationEvent(ICommonSession? Session, Entity<An
/// </summary>
[ByRefEvent]
public readonly record struct AfterAntagEntitySelectedEvent(ICommonSession? Session, EntityUid EntityUid, Entity<AntagSelectionComponent> GameRule, AntagSelectionDefinition Def);


8 changes: 4 additions & 4 deletions Content.Server/Fluids/EntitySystems/PuddleSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ private void UpdateSlow(EntityUid uid, Solution solution)
var minViscosity = 0f;
/// declare a total viscosity variable
var totalViscosity = 0f;

/// for each reagent in the puddle, grab the reagent's information in the reagentProto variable.
foreach (var (reagent, _) in solution.Contents)
{
Expand All @@ -439,18 +439,18 @@ private void UpdateSlow(EntityUid uid, Solution solution)
/// do the opposite to minimum viscosity.
minViscosity = Math.Min(minViscosity, reagentProto.Viscosity);
}

/// total viscosity is the average of all viscosities in the solution
totalViscosity = maxViscosity + minViscosity;

/// if totalviscosity is not zero, ensure that the uid has the speedmodifiercontactcomponent, and then modify its speed by the total viscosity
if (totalViscosity != 0)
{
var comp = EnsureComp<SpeedModifierContactsComponent>(uid);
var speed = 1 - totalViscosity;
_speedModContacts.ChangeModifiers(uid, speed, comp);
}

/// if totalviscosity *is* zero, remove the speedmodifiercontactcomponent, because it's not doing anything
else
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ protected override void Added(EntityUid uid, BluespaceArtifactRuleComponent comp
return;

base.Added(uid, component, gameRule, args);

_announcer.SendAnnouncement(
_announcer.GetAnnouncementId(args.RuleId),
Filter.Broadcast(),
Expand Down
4 changes: 2 additions & 2 deletions Content.Server/StationEvents/Events/RandomSentienceRule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public sealed class RandomSentienceRule : StationEventSystem<RandomSentienceRule
[Dependency] private readonly IPrototypeManager _prototype = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly AnnouncerSystem _announcer = default!;

protected override void Started(EntityUid uid, RandomSentienceRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
{
if (!TryGetRandomStation(out var station))
Expand Down Expand Up @@ -71,7 +71,7 @@ protected override void Started(EntityUid uid, RandomSentienceRuleComponent comp
var kind1 = groupList.Count > 0 ? groupList[0] : "???";
var kind2 = groupList.Count > 1 ? groupList[1] : "???";
var kind3 = groupList.Count > 2 ? groupList[2] : "???";

_announcer.SendAnnouncement(
_announcer.GetAnnouncementId(args.RuleId),
Filter.Broadcast(),
Expand Down
2 changes: 1 addition & 1 deletion Content.Server/StationEvents/Events/VentClogRule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public sealed class VentClogRule : StationEventSystem<VentClogRuleComponent>
{
[Dependency] private readonly SmokeSystem _smoke = default!;
[Dependency] private readonly AnnouncerSystem _announcer = default!;

protected override void Added(EntityUid uid, VentClogRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
{
base.Added(uid, component, gameRule, args);
Expand Down
8 changes: 4 additions & 4 deletions Content.Shared/Excretion/ExcretionComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,25 +55,25 @@ public sealed partial class ExcretionComponent : Component
[ViewVariables(VVAccess.ReadWrite)]
[AutoNetworkedField]
public ThirstThreshold MinThirstThreshold = ThirstThreshold.Okay;

/// <summary>
/// The amount of slowdown applied to snails.
/// </summary>
[DataField("snailSlowdownModifier"), ViewVariables(VVAccess.ReadWrite)]
[AutoNetworkedField]
public float SnailSlowdownModifier = 0.5f;

/// The reagent to be spilled.
[DataField("excretedReagent")]
[ViewVariables(VVAccess.ReadWrite)]
[AutoNetworkedField]
public string ExcretedReagent = "Mucin";

/// <summary>
/// The amount of reagent to be spilled.
/// </summary>
[DataField("excretedVolume"), ViewVariables(VVAccess.ReadWrite)]
[AutoNetworkedField]
public float ExcretedVolume = 15f;

}
5 changes: 2 additions & 3 deletions Content.Shared/Excretion/ExcretionSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private void OnExcretionDoAfter(EntityUid uid, ExcretionComponent comp, Excretio
{
/*
/// if there aren't values for the desired reagent and its volume, don't do anything.
if ((comp.ExcretedReagent != "") &&
if ((comp.ExcretedReagent != "") &&
(comp.ExcretedVolume !<= 0))
{
*/
Expand All @@ -121,7 +121,7 @@ private void OnExcretionDoAfter(EntityUid uid, ExcretionComponent comp, Excretio

args.Repeat = false;
}

}

/// <summary>
Expand All @@ -134,4 +134,3 @@ public sealed partial class ExcretionActionEvent : InstantActionEvent { }
/// </summary>
[Serializable, NetSerializable]
public sealed partial class ExcretionDoAfterEvent : SimpleDoAfterEvent { }

4 changes: 2 additions & 2 deletions Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,13 @@ private void UpdateEffects(EntityUid uid, ThirstComponent component)
throw new ArgumentOutOfRangeException($"No thirst threshold found for {component.CurrentThirstThreshold}");
}
}

/// a check that returns if the entity is below a thirst threshold (used in Excretion system)
public bool IsThirstBelowState(EntityUid uid, ThirstThreshold threshold, float? drink = null, ThirstComponent? comp = null)
{
if (!Resolve(uid, ref comp))
return false; // If entity does not have the ability to be thirsty, don't check it.

return GetThirstThreshold (comp) < threshold;
}

Expand Down
8 changes: 4 additions & 4 deletions Content.Shared/SnailSpeed/SnailSpeedSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ public override void Initialize()
SubscribeLocalEvent<SnailSpeedComponent, MapInitEvent>(OnMapInit);
SubscribeLocalEvent<SnailSpeedComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovespeed);
}

private void OnMapInit(EntityUid uid, SnailSpeedComponent comp, MapInitEvent args)
{
_movementSpeedModifier.RefreshMovementSpeedModifiers(uid);
}

/// apply constant movespeed modifier as long as entity is not flying
private void OnRefreshMovespeed(EntityUid uid, SnailSpeedComponent component, RefreshMovementSpeedModifiersEvent args)
{
if (_jetpack.IsUserFlying(uid))
return;


args.ModifySpeed(component.SnailSlowdownModifier, component.SnailSlowdownModifier);
}

Expand Down
23 changes: 11 additions & 12 deletions Resources/Locale/en-US/accent/gray.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ accent-gray-words-replace-75 = jamga
accent-gray-words-76 = coming
accent-gray-words-replace-76 = ouuti
accent-gray-words-77 = what
accent-gray-words-replace-77 = seben
Expand All @@ -250,7 +250,7 @@ accent-gray-words-replace-83 = tek
accent-gray-words-84 = your
accent-gray-words-replace-84 = mou
accent-gray-words-85 = be
accent-gray-words-85 = be
accent-gray-words-replace-85 = zooti
accent-gray-words-86 = grab
Expand All @@ -271,7 +271,7 @@ accent-gray-words-replace-90 = milx
accent-gray-words-91 = motherfucker
accent-gray-words-replace-91 = jambupisk
accent-gray-words-92 = was
accent-gray-words-92 = was
accent-gray-words-replace-92 = thikee
accent-gray-words-93 = out
Expand Down Expand Up @@ -313,7 +313,7 @@ accent-gray-words-replace-104 = sporp
accent-gray-words-105 = ways
accent-gray-words-replace-105 = spop
accent-gray-words-106 = are
accent-gray-words-106 = are
accent-gray-words-replace-106 = zazz
accent-gray-words-107 = pussy
Expand All @@ -328,7 +328,7 @@ accent-gray-words-replace-109 = tronk
accent-gray-words-110 = to
accent-gray-words-replace-110 = blagh
accent-gray-words-111 = too
accent-gray-words-111 = too
accent-gray-words-replace-111 = blaagh
accent-gray-words-112 = one
Expand Down Expand Up @@ -382,7 +382,7 @@ accent-gray-words-replace-127 = ziip
accent-gray-words-128 = also
accent-gray-words-replace-128 = frup
accent-gray-words-129 = and
accent-gray-words-129 = and
accent-gray-words-replace-129 = pib
accent-gray-words-130 = as
Expand All @@ -409,7 +409,7 @@ accent-gray-words-replace-136 = zii
accent-gray-words-137 = find
accent-gray-words-replace-137 = bli
accent-gray-words-138 = then
accent-gray-words-138 = then
accent-gray-words-replace-138 = zwep
accent-gray-words-139 = hi
Expand Down Expand Up @@ -475,11 +475,11 @@ accent-gray-words-replace-158 = glormun
accent-gray-words-159 = having
accent-gray-words-replace-159 = buugo
accent-gray-words-160 = has
accent-gray-words-160 = has
accent-gray-words-replace-160 = beeg
accent-gray-words-161 = fixed
accent-gray-words-replace-161 = yuumba
accent-gray-words-replace-161 = yuumba
accent-gray-words-162 = fixing
accent-gray-words-replace-162 = yoombun
Expand Down Expand Up @@ -538,7 +538,7 @@ accent-gray-words-replace-179 = glurm
accent-gray-words-180 = drinking
accent-gray-words-replace-180 = sipsun
accent-gray-words-181 = drunk
accent-gray-words-181 = drunk
accent-gray-words-replace-181 = supsi
accent-gray-words-182 = came
Expand All @@ -557,7 +557,7 @@ accent-gray-words-186 = powering
accent-gray-words-replace-186 = grambun
accent-gray-words-187 = spaced
accent-gray-words-replace-187 = urth
accent-gray-words-replace-187 = urth
accent-gray-words-188 = spacing
accent-gray-words-replace-188 = erthun
Expand Down Expand Up @@ -687,4 +687,3 @@ accent-gray-words-replace-230 = dum jut
accent-gray-words-231 = hello
accent-gray-words-replace-231 = oum
1 change: 0 additions & 1 deletion Resources/Locale/en-US/markings/gray.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ marking-GrayCuteEyes = Gray Eyes (Cute)
marking-GrayCoolEyes-eyes_cool = Gray Eyes (Cool)
marking-GrayCoolEyes = Gray Eyes (Cool)
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/reagents/meta/biological.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ reagent-name-grey-matter = grey matter
reagent-desc-grey-matter = Thought juice, the stuff that leaks out of your ears.
reagent-name-mucin = mucin
reagent-desc-mucin = A fascinating secretion capable of accelerating the movement of anyone walking on it.
reagent-desc-mucin = A fascinating secretion capable of accelerating the movement of anyone walking on it.
1 change: 0 additions & 1 deletion Resources/Locale/en-US/species/species.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ species-name-snail = Gastropoid
## Misc species things

snail-hurt-by-salt-popup = The salty solution burns like acid!
4 changes: 2 additions & 2 deletions Resources/Maps/boat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99474,7 +99474,7 @@ entities:
prize rows cost


1: 50,000
1: 50,000

2: 150,000

Expand Down Expand Up @@ -99791,7 +99791,7 @@ entities:

█ ▀█     █     <3[/color]

───────────────────────────────────────
───────────────────────────────────────

Each NT Officaly approved passenger is to be given 10,000.

Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Jukebox/Standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,13 @@
path: /Audio/Jukebox/you_blow_my_mind.ogg

- type: jukebox
id: TheNomai
id: TheNomai
name: Andrew Prahlow - The Nomai
path:
path: /Audio/Jukebox/the_nomai.ogg

- type: jukebox
id: TheFluteTune
id: TheFluteTune
name: J-Cut & Kolt Siewerts - The Flute Tune (Soulpride Remix)
path:
path: /Audio/Jukebox/the_flute_tune.ogg
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Datasets/Names/snail_last.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@
- Cowrie
- Natici
- Glossa

2 changes: 0 additions & 2 deletions Resources/Prototypes/Decals/rainbowsign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,3 @@
sprite:
sprite: Decals/rainbowsign.rsi
state: rainbow7


1 change: 0 additions & 1 deletion Resources/Prototypes/Decals/signs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,3 @@
sprite:
sprite: Decals/signs.rsi
state: security

1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -994,4 +994,3 @@
prototypes:
- MobBros
- MobSorb

1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1062,4 +1062,3 @@
interactFailureString: petting-failure-bear
interactSuccessSound:
path: /Audio/Animals/sloth_squeak.ogg

1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Mobs/Species/gray.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,3 @@
components:
- type: Sprite
scale: 1, 0.8

1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Mobs/Species/snail.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,3 @@
32:
sprite: Mobs/Species/Snail/displacement.rsi
state: mask

Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
- ReagentId: Nutriment
Quantity: 3
- ReagentId: TeriyakiSauce
Quantity: 1
Quantity: 1
- type: Sprite
state: teriyaki

Expand Down
Loading

0 comments on commit 918d570

Please sign in to comment.