sus (#226)

* sus

* панки

Content.Server/Antag/AntagSelectionSystem.cs

@@ -16,6 +16,7 @@ using Robust.Shared.Audio;
 using Robust.Server.GameObjects;
 using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
+using Content.Server.Roles;
 using Robust.Shared.Containers;
 using Content.Shared.Mobs.Components;
 using Content.Server.Station.Systems;
@@ -26,6 +27,7 @@ using Robust.Server.Containers;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Content.Server.Shuttles.Components;
+using Content.Shared.Players;
 
 namespace Content.Server.Antag;
 
@@ -43,6 +45,8 @@ public sealed class AntagSelectionSystem : GameRuleSystem<GameRuleComponent>
     [Dependency] private readonly StorageSystem _storageSystem = default!;
     [Dependency] private readonly StationSystem _stationSystem = default!;
     [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!;
+    [Dependency] private readonly RoleSystem _roles = default!; // WD
+    [Dependency] private readonly SharedPlayerSystem _sharedPlayerSystem = default!; // WD
 
     /// <summary>
     /// Attempts to start the game rule by checking if there are enough players in lobby and readied.
@@ -163,6 +167,9 @@ public sealed class AntagSelectionSystem : GameRuleSystem<GameRuleComponent>
 
         foreach (var player in candidates.Keys)
         {
+            if (_sharedPlayerSystem.ContentData(player) is not {Mind: { } mindId} || _roles.MindIsAntagonist(mindId))
+                continue;
+
             // Role prevents antag.
             if (!_jobs.CanBeAntag(player))
                 continue;

Content.Server/GameTicking/Rules/TraitorRuleSystem.cs

@@ -26,6 +26,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
+using Content.Server.Objectives;
 
 namespace Content.Server.GameTicking.Rules;
 
@@ -45,6 +46,7 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
     [Dependency] private readonly SharedRoleSystem _roleSystem = default!;
     [Dependency] private readonly SharedJobSystem _jobs = default!;
     [Dependency] private readonly ObjectivesSystem _objectives = default!;
+    [Dependency] private readonly RoleSystem _roles = default!; // WD
 
     private int PlayersPerTraitor => _cfg.GetCVar(CCVars.TraitorPlayersPerTraitor);
     private int MaxTraitors => _cfg.GetCVar(CCVars.TraitorMaxTraitors);
@@ -184,6 +186,14 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
             Log.Error("Mind picked for traitor did not have an attached entity.");
             return false;
         }
+        /*if (HasComp<CultistComponent>(mind.OwnedEntity)) // Cause no CultistRole this why i supposed to do this.......
+        {
+            return false;
+        }*/
+        if (_roles.MindIsAntagonist(mindId))
+        {
+            return false;
+        }
 
         // Calculate the amount of currency on the uplink.
         var startingBalance = _cfg.GetCVar(CCVars.TraitorStartingBalance);

Content.Server/White/MeatyOre/MeatyOreStoreSystem.cs

@@ -1,5 +1,5 @@
-using Content.Server.Chat.Managers;
-using System.Linq;
+using Content.Server.Chat.Managers;
+using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Json;
 using System.Threading.Tasks;
@@ -8,6 +8,7 @@ using Content.Server.GameTicking.Rules;
 using Content.Server.Mind;
  using Content.Server.Popups;
  using Content.Server.Roles;
+using Content.Server.Popups;
 using Content.Server.Store.Components;
 using Content.Server.Store.Systems;
 using Content.Server.White.Sponsors;
@@ -18,6 +19,7 @@ using Content.Shared.Humanoid;
  using Content.Shared.Mobs;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Roles.Jobs;
+using Content.Shared.Popups;
 using Content.Shared.Verbs;
 using Content.Shared.White;
 using Content.Shared.White.MeatyOre;
@@ -50,6 +52,7 @@ public sealed class MeatyOreStoreSystem : EntitySystem
     [Dependency] private readonly SharedJobSystem _jobSystem = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
 
+
     private HttpClient _httpClient = default!;
     private string _apiUrl = default!;
 

Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml

@@ -221,8 +221,9 @@
     - type: Sprite
       sprite: Objects/Weapons/Melee/double_esword.rsi
       layers:
-        - state: e_sword
-        - state: e_sword_blade
+        - state: e_sword_double
+        - state: e_sword_double_blade
+          color: "#FFFFFF"
           visible: false
           shader: unshaded
           map: [ "blade" ]
@@ -230,6 +231,7 @@
       size: 10
       sprite: Objects/Weapons/Melee/double_esword.rsi
     - type: Wieldable
+      wieldTime: 0
     - type: IncreaseDamageOnWield
       damage:
         types:

Resources/Textures/Objects/Weapons/Melee/double_esword.rsi/meta.json

@@ -8,26 +8,10 @@
   },
   "states": [
     {
-      "name": "icon",
-        "delays": [
-            [
-                0.15,
-                0.05,
-                0.1,
-                0.1,
-                0.05,
-                0.15,
-                0.15,
-                0.05,
-                0.1,
-                0.1,
-                0.05,
-                0.15
-            ]
-        ]
+      "name": "icon"
     },
     {
-      "name": "e_sword"
+      "name": "e_sword_double"
     },
     {
       "name": "inhand-left",
@@ -36,148 +20,66 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+	  {
+      "name": "wielded-inhand-right",
+      "directions": 4
     },
 	{
-      "name": "e_sword_blade",
+      "name": "e_sword_double_blade",
       "delays": [
-          [
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15,
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15
-          ]
+        [
+          0.1,
+          0.1
+        ]
       ]
     },
     {
       "name": "inhand-left-blade",
       "directions": 4,
       "delays": [
-          [
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15,
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15
-          ],
-          [
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15,
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15
-          ],
-          [
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15,
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15
-          ],
-          [
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15,
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15
-          ]
+        [
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ]
       ]
     },
     {
       "name": "inhand-right-blade",
       "directions": 4,
       "delays": [
-          [
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15,
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15
-          ],
-          [
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15,
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15
-          ],
-          [
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15,
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15
-          ],
-          [
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15,
-              0.15,
-              0.05,
-              0.1,
-              0.1,
-              0.05,
-              0.15
-          ]
+        [
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ]
       ]
     }
   ]