From 4becd815b19da7ec590be97c719e9b9f0e3ae66a Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Tue, 9 Aug 2022 14:28:35 +1000 Subject: [PATCH] Nerf carp spawn rate (#10456) --- Content.Server/Dragon/DragonSystem.Rule.cs | 4 ++-- Content.Server/Dragon/DragonSystem.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Server/Dragon/DragonSystem.Rule.cs b/Content.Server/Dragon/DragonSystem.Rule.cs index 9fe7f49fba..a7a53be21d 100644 --- a/Content.Server/Dragon/DragonSystem.Rule.cs +++ b/Content.Server/Dragon/DragonSystem.Rule.cs @@ -56,11 +56,11 @@ public sealed partial class DragonSystem if (TryComp(dragon.Owner, out var actor)) { - args.AddLine(Loc.GetString("dragon-round-end-dragon-player", ("name", dragon.Owner), ("rifts", met), ("player", actor.PlayerSession))); + args.AddLine(Loc.GetString("dragon-round-end-dragon-player", ("name", dragon.Owner), ("count", met), ("player", actor.PlayerSession))); } else { - args.AddLine(Loc.GetString("dragon-round-end-dragon", ("name", dragon.Owner), ("rifts", met))); + args.AddLine(Loc.GetString("dragon-round-end-dragon", ("name", dragon.Owner), ("count", met))); } } } diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs index dfcfebc3b4..22d935989a 100644 --- a/Content.Server/Dragon/DragonSystem.cs +++ b/Content.Server/Dragon/DragonSystem.cs @@ -130,7 +130,7 @@ namespace Content.Server.Dragon comp.State = DragonRiftState.Finished; Dirty(comp); } - else + else if (comp.State != DragonRiftState.Finished) { comp.Accumulator += frameTime; }