фиксы говцена

space-sunrise · Oct 30, 2024 · 34f46ac · 34f46ac
1 parent 2782739
commit 34f46ac
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 18 deletions.
diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs
@@ -8,6 +8,7 @@
 using Content.Shared.PDA;
 using Content.Shared.Store;
 using Content.Shared.Store.Components;
+using Content.Shared.Tag;
 using Robust.Shared.Prototypes;
 
 namespace Content.Server.Traitor.Uplink;

diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -63,6 +63,8 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
     /// </summary>
     public const float GracePeriod = 0.05f;
 
+    public const string IgnoreMeleeTag = "IgnoreMelee";
+
     public override void Initialize()
     {
         base.Initialize();
@@ -727,15 +729,10 @@ protected HashSet<EntityUid> ArcRayCast(Vector2 position, Angle angle, Angle arc
         for (var i = 0; i < increments; i++)
         {
             var castAngle = new Angle(baseAngle + increment * i);
-            var res = _physics.IntersectRay(mapId,
-                new CollisionRay(position,
-                    castAngle.ToWorldVec(),
-                    AttackMask),
-                range,
-                ignore,
-                false)
-                .Where(x => !_tagSystem.HasTag(x.HitEntity, "IgnoreMelee")
-                ).ToList();
+            var ray = new CollisionRay(position, castAngle.ToWorldVec(), AttackMask);
+            var res = _physics.IntersectRay(mapId, ray, range, ignore, false)
+                .Where(x => !_tagSystem.HasTag(x.HitEntity, IgnoreMeleeTag))
+                .ToList();
 
             if (res.Count != 0)
             {

diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml
@@ -70,9 +70,9 @@
     canShuttle: false
     title: comms-console-announcement-title-station-ai
     color: "#2ed2fd"
+    announceVoice: PortalGlados
   - type: Speech
     speechVerb: Robotic
-    announceVoice: PortalGlados
 
 - type: entity
   id: AiHeldIntellicard

diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
@@ -10,17 +10,10 @@
     {
       "name": "icon"
     },
-    {
-      "name": "s"
-    },
     {
       "name": "equipped-INNERCLOTHING",
       "directions": 4
     },
-    {
-      "name": "s-equipped-INNERCLOTHING",
-      "directions": 4
-    },
     {
       "name": "equipped-INNERCLOTHING-monkey",
       "directions": 4

diff --git a/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
@@ -11,7 +11,7 @@
             "name": "state-laws"
         },
         {
-            "name": "state-manifest",
+            "name": "state-manifest"
         },
         {
             "name": "no-action"