-_-

Content.Server/Flash/FlashSystem.cs

@@ -21,7 +21,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Random;
 using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
-using Content.Shared._CorvaxNext.Flash.Components; //CorvaxNext
 
 namespace Content.Server.Flash
 {
@@ -118,9 +117,9 @@ public void Flash(EntityUid target,
             TimeSpan? stunDuration = null)
         {
             //CorvaxNext duration modifier for resomi
-            if (TryComp<FlashModifierComponent>(target, out var CompUser))
+            if (TryComp<FlashModifierComponent>(target, out var flashModifier))
             {
-                flashDuration *= CompUser.Modifier;
+                flashDuration *= flashModifier.Modifier;
             }
 
             var attempt = new FlashAttemptEvent(target, user, used);

Content.Server/_CorvaxNext/Resomi/Abilities/AgillitySkillSystem.cs

@@ -12,6 +12,7 @@
 using Robust.Shared.Physics;
 
 namespace Content.Server._CorvaxNext.Resomi.Abilities;
+
 public sealed class AgillitySkillSystem : SharedAgillitSkillSystem
 {
     [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
@@ -45,6 +46,7 @@ private void SwitchAgility(Entity<AgillitySkillComponent> ent, ref SwitchAgillit
             DeactivateAgility(ent.Owner, ent.Comp, action);
         }
     }
+
     private void ActivateAgility(Entity<AgillitySkillComponent> ent, Entity<BaseActionComponent> action)
     {
         if (!TryComp<MovementSpeedModifierComponent>(ent.Owner, out var comp))
@@ -60,6 +62,7 @@ private void ActivateAgility(Entity<AgillitySkillComponent> ent, Entity<BaseActi
         var ev = new SwitchAgillity(action, ent.Comp.Active);
         RaiseLocalEvent(ent.Owner, ref ev);
     }
+
     private void DeactivateAgility(EntityUid uid, AgillitySkillComponent component, Entity<BaseActionComponent> action)
     {
         if (!TryComp<MovementSpeedModifierComponent>(uid, out var comp))

Content.Server/_CorvaxNext/Speech/Components/ResomiAccentComponent.cs

@@ -1,10 +1,4 @@
 namespace Content.Server._CorvaxNext.Speech.Components;
 
-/// <summary>
-///     Hiss!
-/// </summary>
 [RegisterComponent]
-public sealed partial class ResomiAccentComponent : Component
-{
-
-}
+public sealed partial class ResomiAccentComponent : Component;

Content.Server/_CorvaxNext/Speech/EntitySystems/ResomiAccentSystem.cs

@@ -1,20 +1,14 @@
 using System.Text.RegularExpressions;
 using Content.Server._CorvaxNext.Speech.Components;
 using Content.Server.Speech;
-using Content.Server.Speech.EntitySystems;
 using Robust.Shared.Random;
 
 namespace Content.Server._CorvaxNext.Speech.EntitySystems;
 
 public sealed class ResomiAccentSystem : EntitySystem
 {
-    private static readonly Regex RegexLowerS = new("s+");
-    private static readonly Regex RegexUpperS = new("S+");
-    private static readonly Regex RegexInternalX = new(@"(\w)x");
-    private static readonly Regex RegexLowerEndX = new(@"\bx([\-|r|R]|\b)");
-    private static readonly Regex RegexUpperEndX = new(@"\bX([\-|r|R]|\b)");
 
-    [Dependency] private readonly IRobustRandom _random = default!; // Corvax-Localization
+    [Dependency] private readonly IRobustRandom _random = default!;
 
     public override void Initialize()
     {
@@ -26,7 +20,6 @@ private void OnAccent(EntityUid uid, ResomiAccentComponent component, AccentGetE
     {
         var message = args.Message;
 
-        // Corvax-Next-Localization-Start
         // ш => шшш
         message = Regex.Replace(
             message,
@@ -63,7 +56,6 @@ private void OnAccent(EntityUid uid, ResomiAccentComponent component, AccentGetE
             "Р+",
             _random.Pick(new List<string>() { "РР", "РРР" })
         );
-        // Corvax-Next-Localization-End
         args.Message = message;
     }
 }

Content.Shared/Flash/Components/FlashModifierComponent.cs

@@ -0,0 +1,13 @@
+ namespace Content.Shared.Flash.Components;
+
+
+/// <summary>
+/// Corvax-Next-Resomi
+/// </summary>
+
+[RegisterComponent]
+public sealed partial class FlashModifierComponent : Component
+{
+    [DataField]
+    public float Modifier = 1f;
+}

Content.Shared/Wieldable/Components/WieldableComponent.cs

@@ -38,7 +38,7 @@ public sealed partial class WieldableComponent : Component
 
     public string? OldInhandPrefix = null;
 
-    public EntityUid? User = null; //Corvax-Next
+    public EntityUid? User = null; // Corvax-Next-Resomi
 }
 
 [Serializable, NetSerializable]

Content.Shared/Wieldable/WieldableSystem.cs

@@ -19,7 +19,7 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Network;
 using Robust.Shared.Timing;
-using Content.Shared._CorvaxNext.Resomi.Abilities; //Corvax-Next
+using Content.Shared._CorvaxNext.Resomi.Abilities;
 
 namespace Content.Shared.Wieldable;
 
@@ -109,7 +109,7 @@ private void OnDeselectWieldable(EntityUid uid, WieldableComponent component, Ha
     private void OnGunRefreshModifiers(Entity<GunWieldBonusComponent> bonus, ref GunRefreshModifiersEvent args)
     {
         if (TryComp(bonus, out WieldableComponent? wield) &&
-            wield.Wielded && !HasComp<WeaponsUseInabilityComponent>(wield.User)) //Corvax-Next
+            wield.Wielded && !HasComp<WeaponsUseInabilityComponent>(wield.User)) //Corvax-Next-Resomi
         {
             args.MinAngle += bonus.Comp.MinAngle;
             args.MaxAngle += bonus.Comp.MaxAngle;
@@ -257,7 +257,7 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use
         var othersMessage = Loc.GetString("wieldable-component-successful-wield-other", ("user", user), ("item", used));
         _popupSystem.PopupPredicted(selfMessage, othersMessage, user, user);
 
-        component.User = user; //Corvax-Next
+        component.User = user; //Corvax-Next-Resomi
 
         var targEv = new ItemWieldedEvent();
         RaiseLocalEvent(used, ref targEv);

Content.Shared/_CorvaxNext/Resomi/Abilities/SharedAgillitySkillSystem.cs

@@ -20,6 +20,7 @@ public abstract class SharedAgillitSkillSystem : EntitySystem
     [Dependency] protected readonly SharedActionsSystem _actions = default!;
 
     protected const int BaseCollisionGroup = (int)(CollisionGroup.MobMask);
+
     public override void Initialize()
     {
         SubscribeLocalEvent<AgillitySkillComponent, StartCollideEvent>(DoJump);

Content.Shared/_CorvaxNext/Resomi/SharedResomi.cs

@@ -4,9 +4,7 @@
 
 namespace Content.Shared._CorvaxNext.Resomi;
 
-public sealed partial class SwitchAgillityActionEvent : InstantActionEvent
-{
-}
+public sealed partial class SwitchAgillityActionEvent : InstantActionEvent;
 
 /// <summary>
 /// Rises when the action state changes

Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5ea6d8b4422027d0c22cb415d1f05a08bf39aaa0, equipped-OUTERCLOTHING-resomi made by Pofitlo",
   "size": {
     "x": 32,
     "y": 32
@@ -18,6 +18,10 @@
       "name": "equipped-OUTERCLOTHING-vox",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC0-1.0",
-  "copyright": "Modified from detective coat found in https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 by Flareguy. vox state modified from detective state found in vgstation13 at https://github.com/vgstation-coders/vgstation13/blob//icons/mob/species/vox/suit.dmi. icon state by Flareguy. ",
+  "copyright": "Modified from detective coat found in https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 by Flareguy. vox state modified from detective state found in vgstation13 at https://github.com/vgstation-coders/vgstation13/blob//icons/mob/species/vox/suit.dmi. icon state by Flareguy, equipped-OUTERCLOTHING-resomi made by Pofitlo",
   "size": {
     "x": 32,
     "y": 32
@@ -18,6 +18,10 @@
       "name": "equipped-OUTERCLOTHING-vox",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Coats/dogi.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Made by PuroSlavKing (github) for SS14",
+  "copyright": "Made by PuroSlavKing (github) for SS14, equipped-OUTERCLOTHING-resomi made by Pofitlo",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Coats/expensive_coat.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/cae6017c486dbadef2b2d86ddc58d7226c17597c/icons/mob/clothing/suit.dmi, https://github.com/ParadiseSS13/Paradise/blob/cab0fa52972c777ec3929cc2e03a74088349486f/icons/obj/clothing/suits.dmi",
+  "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/cae6017c486dbadef2b2d86ddc58d7226c17597c/icons/mob/clothing/suit.dmi, https://github.com/ParadiseSS13/Paradise/blob/cab0fa52972c777ec3929cc2e03a74088349486f/icons/obj/clothing/suits.dmi, equipped-OUTERCLOTHING-resomi made by Pofitlo",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,10 @@
       "name": "equipped-OUTERCLOTHING-vox",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
     {
       "name": "icon"
     }

Resources/Textures/Clothing/OuterClothing/Coats/gentlecoat.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, equipped-OUTERCLOTHING-resomi made by Pofitlo",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json

@@ -18,6 +18,10 @@
       "name": "equipped-OUTERCLOTHING-vox",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Coats/jensencoat.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79, equipped-OUTERCLOTHING-resomi made by Pofitlo",
   "size": {
     "x": 32,
     "y": 32
@@ -18,6 +18,10 @@
       "name": "equipped-OUTERCLOTHING-vox",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, reptilian made by murouxlul(705433554602950793)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8, reptilian made by murouxlul(705433554602950793), sprites for resomi made by Pofitlo",
   "size": {
     "x": 32,
     "y": 32
@@ -37,6 +37,14 @@
       "name": "open-equipped-OUTERCLOTHING-vox",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
+    {
+      "name": "open-equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand updated by github:Morb0, reptilian made by murouxlul(705433554602950793)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand updated by github:Morb0, reptilian made by murouxlul(705433554602950793), sprites for resomi made by Pofitlo",
   "size": {
     "x": 32,
     "y": 32
@@ -37,6 +37,14 @@
       "name": "open-equipped-OUTERCLOTHING-vox",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
+    {
+      "name": "open-equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand recolored by github:Morb0, reptilian made by murouxlul(705433554602950793)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 & inhand recolored by github:Morb0, reptilian made by murouxlul(705433554602950793), sprites for resomi made by Pofitlo",
   "size": {
     "x": 32,
     "y": 32
@@ -37,6 +37,14 @@
       "name": "open-equipped-OUTERCLOTHING-vox",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
+    {
+      "name": "open-equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/OuterClothing/Coats/labcoat_gene.rsi/meta.json

@@ -37,6 +37,14 @@
       "name": "open-equipped-OUTERCLOTHING-vox",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
+    {
+      "name": "open-equipped-OUTERCLOTHING-resomi",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4