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

Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream

Browse Source 
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
This commit is contained in:
Ed
2025-02-23 23:07:55 +03:00
parent d383d329c1 408c6ab443
commit 07e0606ecf
406 changed files with 70688 additions and 45859 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Localizations/ContentLocalizationManager.cs
View File

@@ -159,8 +159,9 @@ namespace Content.Shared.Localizations
/// </summary>
public static string FormatPlaytime(TimeSpan time)
{
time = TimeSpan.FromMinutes(Math.Ceiling(time.TotalMinutes));
var hours = (int)time.TotalHours;
var minutes = (int)Math.Ceiling(time.TotalMinutes);
var minutes = time.Minutes;
return Loc.GetString($"zzzz-fmt-playtime", ("hours", hours), ("minutes", minutes));
}