A Lot Of Stuff (#883)

2025-01-13 21:21:18 +03:00
parent ba02c8aad2 e86f560161
commit d5f4c31b20
32 changed files with 251 additions and 57 deletions
--- a/Content.Server/Speech/EntitySystems/GnomeAccentSystem.cs
+++ b/Content.Server/Speech/EntitySystems/GnomeAccentSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.Speech.Components;
-using System.Text.RegularExpressions;

 namespace Content.Server.Speech.EntitySystems;

@@ -22,25 +21,6 @@ public sealed class GnomeAccentSystem : EntitySystem

        msg = _replacement.ApplyReplacements(msg, "gnome");

-        // Пиздец, а не код
-
-        msg = Regex.Replace(msg, @"(?<!\w)\bне", "ГНЕМ", RegexOptions.IgnoreCase);
-        msg = Regex.Replace(msg, @"(?<!\w)\bнет", "ГНЕМТ", RegexOptions.IgnoreCase);
-
-        msg = Regex.Replace(msg, @"(?<!\w)\bнахуй", "ГНАМХУЙ", RegexOptions.IgnoreCase);
-        msg = Regex.Replace(msg, @"(?<!\w)\bпидоры", "ГНОМЕРЫ", RegexOptions.IgnoreCase);
-        msg = Regex.Replace(msg, @"(?<!\w)\bхуесос", "ГНОХУСОМ", RegexOptions.IgnoreCase);
-        msg = Regex.Replace(msg, @"(?<!\w)\bебал", "ГНОМИЛ", RegexOptions.IgnoreCase);
-        msg = Regex.Replace(msg, @"(?<!\w)\bзаебал", "ЗАГНОМИЛ", RegexOptions.IgnoreCase);
-        msg = Regex.Replace(msg, @"(?<!\w)\bубил", "УГНОМИЛ", RegexOptions.IgnoreCase);
-        msg = Regex.Replace(msg, @"(?<!\w)\bубит", "УГНОМЛЕН", RegexOptions.IgnoreCase);
-        msg = Regex.Replace(msg, @"(?<!\w)\bебнул", "УГНОМЛЕН", RegexOptions.IgnoreCase);
-        msg = Regex.Replace(msg, @"(?<!\w)\bстрелял", "СТРЕГНОМИЛ", RegexOptions.IgnoreCase);
-        msg = Regex.Replace(msg, @"(?<!\w)\bзаколол", "СГНОМИЛ", RegexOptions.IgnoreCase);
-
-        msg = Regex.Replace(msg, @"(?<!\w)\bмой", "муй", RegexOptions.None);
-        msg = Regex.Replace(msg, @"(?<!\w)\bдруг", "бро", RegexOptions.None);
-        msg = Regex.Replace(msg, @"(?<!\w)\bдрузья", "друганы", RegexOptions.None);
        return msg;
    }

--- a/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs
+++ b/Content.Server/_White/ERTRecruitment/ERTRecruitmentRule.cs
@@ -104,7 +104,7 @@ public sealed class ERTRecruitmentRule : StationEventSystem<ERTRecruitmentRuleCo
        }
        */

-        _recruitment.StartRecruitment(ERTRecruitmentRuleComponent.EventName);
+        _recruitment.StartRecruitment(ERTRecruitmentRuleComponent.EventName, component.OverallPlaytime);
    }

    protected override void Ended(EntityUid uid, ERTRecruitmentRuleComponent component, GameRuleComponent gameRule, GameRuleEndedEvent args)
--- a/Content.Server/_White/ERTRecruitment/ERTRecruitmentRuleComponent.cs
+++ b/Content.Server/_White/ERTRecruitment/ERTRecruitmentRuleComponent.cs
@@ -16,6 +16,11 @@ public sealed partial class ERTRecruitmentRuleComponent : Component
    /// </summary>
    [DataField] public int MinPlayers = 3;

+    /// <summary>
+    /// Minimal playtime to be eligible for recruitment.
+    /// </summary>
+    [DataField] public TimeSpan OverallPlaytime = TimeSpan.FromHours(10);
+
    public static SoundSpecifier ERTYes = new SoundPathSpecifier("/Audio/Announcements/ert_yes.ogg");
    public static SoundSpecifier ERTNo = new SoundPathSpecifier("/Audio/Announcements/ert_no.ogg");

--- a/Content.Server/_White/GhostRecruitment/GhostRecruitmentSystem.cs
+++ b/Content.Server/_White/GhostRecruitment/GhostRecruitmentSystem.cs
@@ -11,6 +11,12 @@ using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
+using Content.Shared.Roles;
+using Content.Server.Roles;
+using Content.Shared.Roles.Jobs;
+using Content.Server.Station.Systems;
+using Robust.Shared.Prototypes;
+using Content.Server.Players.PlayTimeTracking;

 namespace Content.Server._White.GhostRecruitment;

@@ -23,18 +29,26 @@ public sealed class GhostRecruitmentSystem : EntitySystem
    [Dependency] private readonly MindSystem _mind = default!;
    [Dependency] private readonly IRobustRandom _random = default!;
    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly SharedRoleSystem _roleSystem = default!;
+    [Dependency] private readonly StationSpawningSystem _spawningSystem = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IPlayTimeTrackingManager _playTimeTracking = default!;

    private readonly Dictionary<ICommonSession, GhostRecruitmentEuiAccept> _openUis = new();

    /// <summary>
    /// starts recruiting ghosts, showing them a menu with a choice to recruit.
    /// </summary>
-    /// <param name="recruitmentName">name of recruitment. <see cref="GhostRecruitmentSpawnPointComponent"/></param>
-    public void StartRecruitment(string recruitmentName)
+    /// <param name="recruitmentName">Name of recruitment. <see cref="GhostRecruitmentSpawnPointComponent"/></param>
+    /// <param name="overallPlaytime">Minimal playtime to be eligible for recruitment.</param>
+    public void StartRecruitment(string recruitmentName, TimeSpan? overallPlaytime)
    {
        var query = EntityQueryEnumerator<GhostComponent, ActorComponent>();
        while (query.MoveNext(out var uid, out _, out var actorComponent))
        {
+            if (overallPlaytime != null && _playTimeTracking.GetOverallPlaytime(actorComponent.PlayerSession) < overallPlaytime)
+                continue;
+
            OpenEui(uid, recruitmentName, actorComponent);
        }
    }
@@ -121,13 +135,20 @@ public sealed class GhostRecruitmentSystem : EntitySystem
        if (!entityUid.HasValue)
            return;

-        var mind = actorComponent.PlayerSession.GetMind();
+        var userId = actorComponent.PlayerSession.UserId;
+        var entityName = EntityManager.GetComponent<MetaDataComponent>((EntityUid) entityUid).EntityName;

-        if (!mind.HasValue)
-            return;
+        var newMind = _mind.CreateMind(userId, entityName);

-        _mind.TransferTo(mind.Value, entityUid.Value);
-        _mind.UnVisit(mind.Value);
+        var job = new JobComponent { Prototype = component.JobId };
+
+        _roleSystem.MindAddRole(newMind, job);
+        _mind.SetUserId(newMind, userId);
+        _mind.TransferTo(newMind, entityUid);
+
+        _prototypeManager.TryIndex(job.Prototype, out var jobProto);
+        if (jobProto != null)
+            _spawningSystem.SetPdaAndIdCardData((EntityUid) entityUid, entityName, jobProto, null);
    }

    private EntityUid? Spawn(EntityUid spawnerUid, GhostRecruitmentSpawnPointComponent? component = null)
--- a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
+++ b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
@@ -16,6 +16,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager;
+using Robust.Shared.Timing;
 using System.Diagnostics.CodeAnalysis;

 namespace Content.Shared.Polymorph.Systems;
@@ -36,7 +37,6 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
    [Dependency] private readonly SharedContainerSystem _container = default!;
    [Dependency] private readonly SharedPopupSystem _popup = default!;
    [Dependency] private readonly SharedTransformSystem _xform = default!;
-
    public override void Initialize()
    {
        base.Initialize();
@@ -44,6 +44,7 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
        SubscribeLocalEvent<ChameleonDisguiseComponent, InteractHandEvent>(OnDisguiseInteractHand, before: [typeof(SharedItemSystem)]);
        SubscribeLocalEvent<ChameleonDisguiseComponent, DamageChangedEvent>(OnDisguiseDamaged);
        SubscribeLocalEvent<ChameleonDisguiseComponent, ComponentShutdown>(OnDisguiseShutdown);
+        SubscribeLocalEvent<ChameleonDisguiseComponent, GotEquippedHandEvent>(OnPickup); // WD

        SubscribeLocalEvent<ChameleonProjectorComponent, AfterInteractEvent>(OnInteract);
        SubscribeLocalEvent<ChameleonProjectorComponent, GetVerbsEvent<UtilityVerb>>(OnGetVerbs);
@@ -62,6 +63,14 @@ public abstract class SharedChameleonProjectorSystem : EntitySystem
        args.Handled = true;
    }

+    /// <summary>
+    /// WD. Horrible fix, but functional.
+    /// </summary>
+    private void OnPickup(Entity<ChameleonDisguiseComponent> ent, ref GotEquippedHandEvent args)
+    {
+        Timer.Spawn(100, () => TryReveal(ent.Comp.User));
+    }
+
    private void OnDisguiseDamaged(Entity<ChameleonDisguiseComponent> ent, ref DamageChangedEvent args)
    {
        // anything that would damage both like an explosion gets doubled
--- a/Content.Shared/_White/GhostRecruitment/GhostRecruitmentSpawnPointComponent.cs
+++ b/Content.Shared/_White/GhostRecruitment/GhostRecruitmentSpawnPointComponent.cs
@@ -13,4 +13,7 @@ public sealed partial class GhostRecruitmentSpawnPointComponent : Component
    public string RecruitmentName = "default";

    [DataField("priority")] public int Priority = 5;
+
+    [DataField]
+    public string JobId = "Passenger";
 }
--- a/Resources/Locale/ru-RU/_white/accent/gnome.ftl
+++ b/Resources/Locale/ru-RU/_white/accent/gnome.ftl
@@ -0,0 +1,64 @@
+accent-gnome-words-1 = не
+accent-gnome-words-replace-1 = гнем
+accent-gnome-words-2 = нет
+accent-gnome-words-replace-2 = гнемт
+accent-gnome-words-3 = нахуй
+accent-gnome-words-replace-3 = гнамхуй
+accent-gnome-words-4 = пидор
+accent-gnome-words-replace-4 = гномер
+accent-gnome-words-5 = пидоры
+accent-gnome-words-replace-5 = гномеры
+accent-gnome-words-6 = пидору
+accent-gnome-words-replace-6 = гномеру
+accent-gnome-words-7 = пидорам
+accent-gnome-words-replace-7 = гномерам
+accent-gnome-words-8 = хуесос
+accent-gnome-words-replace-8 = гнохусос
+accent-gnome-words-9 = хуесосы
+accent-gnome-words-replace-9 = гнохусосы
+accent-gnome-words-10 = хуесосу
+accent-gnome-words-replace-10 = гнохусосу
+accent-gnome-words-11 = хуесосам
+accent-gnome-words-replace-11 = гнохусосам
+accent-gnome-words-12 = ебал
+accent-gnome-words-replace-12 = гномил
+accent-gnome-words-13 = заебал
+accent-gnome-words-replace-13 = загномил
+accent-gnome-words-14 = убил
+accent-gnome-words-replace-14 = угномил
+accent-gnome-words-15 = убили
+accent-gnome-words-replace-15 = угномили
+accent-gnome-words-16 = убит
+accent-gnome-words-replace-16 = угномлен
+accent-gnome-words-17 = убиты
+accent-gnome-words-replace-17 = угномлены
+accent-gnome-words-18 = ебнул
+accent-gnome-words-replace-18 = угномил
+accent-gnome-words-19 = ебнули
+accent-gnome-words-replace-19 = угномили
+accent-gnome-words-20 = ёбнул
+accent-gnome-words-replace-20 = угномил
+accent-gnome-words-21 = ёбнули
+accent-gnome-words-replace-21 = угномили
+accent-gnome-words-22 = стрелял
+accent-gnome-words-replace-22 = стрегномил
+accent-gnome-words-23 = стреляли
+accent-gnome-words-replace-23 = стрегномили
+accent-gnome-words-24 = заколол
+accent-gnome-words-replace-24 = сгномил
+accent-gnome-words-25 = закололи
+accent-gnome-words-replace-25 = сгномили
+accent-gnome-words-26 = мой
+accent-gnome-words-replace-26 = муй
+accent-gnome-words-27 = мое
+accent-gnome-words-replace-27 = муе
+accent-gnome-words-28 = моё
+accent-gnome-words-replace-28 = муё
+accent-gnome-words-29 = друг
+accent-gnome-words-replace-29 = бро
+accent-gnome-words-30 = друзья
+accent-gnome-words-replace-30 = друганы
+accent-gnome-words-31 = пиздец
+accent-gnome-words-replace-31 = гномздец
+accent-gnome-words-32 = пизда
+accent-gnome-words-replace-32 = гномзда
--- a/Resources/Locale/ru-RU/clothing/underwear.ftl
+++ b/Resources/Locale/ru-RU/clothing/underwear.ftl
@@ -4,7 +4,7 @@ ent-ClothingUnderwearBottomBoxersWhite = боксеры
    .desc = Белые.
 ent-ClothingUnderwearBottomBoxersCap = капитанские боксеры
    .desc = Боксеры капитана.
-ent-ClothingUnderwearBottomBoxersInspector = кожанные трусы инспектора
+ent-ClothingUnderwearBottomBoxersInspector = кожаные трусы инспектора
    .desc = Обтягивающие кожаные трусы инспектора на подтяжках, весьма экстравагантно... но зачем?
 ent-ClothingUnderwearBottomBoxersCE = боксеры старшего инженера
    .desc = Боксеры старшего инженера.
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -165,7 +165,7 @@
      - id: ClothingEyesGlassesSunglasses
      - id: ClothingUniformJumpsuitCentcomOfficial
      - id: ClothingShoesBootsJack
-      - id: ClothingHandsGlovesColorBlack
+      - id: ClothingHandsGlovesColorBlackSecurity # WD
      - id: ClothingHeadsetAltCentComFake
      - id: Paper
      - id: Pen
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -65,7 +65,7 @@
        prob: 0.5
      - id: ClothingEyesGlassesSecurity
      - id: ClothingHeadsetAltSecurity # WD
-      - id: ClothingHandsGlovesColorBlack
+      - id: ClothingHandsGlovesColorBlackSecurity # WD
      - id: ClothingShoesBootsJack
      - id: WeaponMeleeNeedle
        prob: 0.1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
@@ -17,7 +17,7 @@
    ClothingNeckTieDet: 2
    ClothingShoesLeather: 2
    ClothingShoesColorBrown: 2
-    ClothingHandsGlovesColorBlack: 2
+    ClothingHandsGlovesColorBlackSecurity: 2 # WD
    ClothingHandsGlovesLatex: 2
    CigPackGreen: 4
    SmokingPipeFilledTobacco: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -19,7 +19,7 @@
    ClothingUniformJumpskirtSec: 4
    ClothingUniformJumpsuitSecGrey: 4
    ClothingUniformJumpsuitSecBlue: 4
-    ClothingHandsGlovesColorBlack: 4
+    ClothingHandsGlovesColorBlackSecurity: 4 # WD
    ClothingShoesBootsJack: 4
    ClothingShoesBootsCombat: 4
    ClothingHeadHatBeretSecurity: 3
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/loot.yml
@@ -135,7 +135,7 @@
        - WeaponDisabler
        - ClothingOuterArmorBulletproof
        - FlashlightSeclite
-        - ClothingHandsGlovesColorBlack
+        - ClothingHandsGlovesColorBlackSecurity # WD
        - ClothingHeadHelmetBasic
        - Handcuffs
        - Zipties
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -822,6 +822,7 @@
    stealGroup: AnimalTropico


+# WD
 - type: entity #WHY MUST YOU THROW ERRORS HOW DARE YOU
  name: Gnome #this thing is covered in comments, its for my sanity, ignore them please.
  parent: [BaseSimpleMob, MobCombat, MobAtmosExposed]
@@ -995,6 +996,5 @@
      collection: GnomesDeathCollection
    canOtherHearDeathSound: True
  - type: Thieving
-    stripTimeReduction: 4
+    stripTimeReduction: 2.5
  - type: Pacified
-
--- a/Resources/Prototypes/Entities/White/mag-gloves.yml
+++ b/Resources/Prototypes/Entities/White/mag-gloves.yml
@@ -23,6 +23,7 @@
    - type: Fiber
      fiberMaterial: fibers-nanomachines
    - type: FingerprintMask
+    - type: Insulated
    - type: MagneticGloves
      glovesActiveTime: 60
      glovesCooldown: 60
--- a/Resources/Prototypes/Loadouts/Jobs/common.yml
+++ b/Resources/Prototypes/Loadouts/Jobs/common.yml
@@ -173,6 +173,16 @@
  equipment:
    gloves: ClothingHandsGlovesColorBlack

+
+- type: itemLoadout # WD
+  id: GlovesColorBlackSecurity
+  equipment: GlovesColorBlackSecurity
+- type: startingGear
+  id: GlovesColorBlackSecurity
+  equipment:
+    gloves: ClothingHandsGlovesColorBlackSecurity
+
+
 - type: itemLoadout
  id: GlovesColorWhite
  equipment: GlovesColorWhite
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -745,6 +745,14 @@
  - GlovesColorBlack
  - GlovesFingerless

+- type: loadoutGroup # WD
+  id: CommonGlovesSecurity
+  name: loadout-group-gloves
+  minLimit: 0
+  loadouts:
+  - GlovesColorBlackSecurity
+  - GlovesFingerless
+
 - type: loadoutGroup
  id: CommonShoes
  name: loadout-group-shoes
@@ -1584,7 +1592,7 @@
  minLimit: 0
  loadouts:
  - GlovesLatex
-  - GlovesColorBlack
+  - GlovesColorBlackSecurity # WD
  - GlovesForensic

 - type: loadoutGroup
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -481,7 +481,7 @@
  - CommonSecurityCommandMask # WD
  - HeadofSecurityNeck
  - HeadofSecurityJumpsuit
-  - CommonGloves # WD
+  - CommonGlovesSecurity # WD
  - CommonSecurityBelt # WD
  - CommonSecurityBackpack
  - CommonSecurityShoes
@@ -502,7 +502,7 @@
  - CommonSecurityNeck
  - WardenJumpsuit
  - CommonSecurityBackpack
-  - CommonGloves # WD
+  - CommonGlovesSecurity # WD
  - CommonSecurityBelt # WD
  - CommonSecurityShoes
  - WardenPDA
@@ -523,7 +523,7 @@
  - CommonSecurityBackpack
  - SecurityOuterClothing
  - CommonSecurityBelt # WD
-  - CommonGloves # WD
+  - CommonGlovesSecurity # WD
  - CommonSecurityShoes
  - SeniorOfficerPDA
  - CommonSecurityJobTrinkets # WD
@@ -560,7 +560,7 @@
  - CommonSecurityBackpack
  - SecurityOuterClothing
  - CommonSecurityBelt # WD
-  - CommonGloves # WD
+  - CommonGlovesSecurity # WD
  - CommonSecurityShoes
  - SecurityPDA
  - CommonSecurityJobTrinkets # WD
@@ -596,7 +596,7 @@
  - CommonSecurityNeck
  - SecurityCadetJumpsuit
  - CommonSecurityBackpack
-  - CommonGloves # WD
+  - CommonGlovesSecurity # WD
  - CommonSecurityShoes
  - SecurityCadetPDA
  - CommonSecurityJobTrinkets # WD
--- a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml
@@ -20,7 +20,7 @@
    shoes: ClothingShoesBootsCombatFilled
    head: ClothingHeadHatCentcom
    eyes: ClothingEyesGlassesSunglasses
-    gloves: ClothingHandsGlovesColorBlack
+    gloves: ClothingHandsGlovesColorBlackSecurity # WD
    outerClothing: ClothingOuterArmorBasic
    id: CentcomPDA
    ears: ClothingHeadsetAltCentCom
--- a/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_armory.yml
+++ b/Resources/Prototypes/_Honk/Catalog/Cargo/cargo_armory.yml
@@ -1,7 +1,7 @@
 - type: cargoProduct
  id: ArmoryKLMG
  icon:
-    sprite: _Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi
+    sprite: White/_Honk/Objects/Weapons/Guns/LMGs/klmg-icons.rsi
    state: icon
  product: CrateArmoryKLMG
  cost: 14000
--- a/Resources/Prototypes/_White/Accents/word_replacements.yml
+++ b/Resources/Prototypes/_White/Accents/word_replacements.yml
@@ -133,3 +133,39 @@
    accent-bomzh-words-130: accent-bomzh-words-replace-130
    accent-bomzh-words-131: accent-bomzh-words-replace-131
    accent-bomzh-words-132: accent-bomzh-words-replace-132
+
+- type: accent
+  id: gnome
+  wordReplacements:
+    accent-gnome-words-1: accent-gnome-words-replace-1
+    accent-gnome-words-2: accent-gnome-words-replace-2
+    accent-gnome-words-3: accent-gnome-words-replace-3
+    accent-gnome-words-4: accent-gnome-words-replace-4
+    accent-gnome-words-5: accent-gnome-words-replace-5
+    accent-gnome-words-6: accent-gnome-words-replace-6
+    accent-gnome-words-7: accent-gnome-words-replace-7
+    accent-gnome-words-8: accent-gnome-words-replace-8
+    accent-gnome-words-9: accent-gnome-words-replace-9
+    accent-gnome-words-10: accent-gnome-words-replace-10
+    accent-gnome-words-11: accent-gnome-words-replace-11
+    accent-gnome-words-12: accent-gnome-words-replace-12
+    accent-gnome-words-13: accent-gnome-words-replace-13
+    accent-gnome-words-14: accent-gnome-words-replace-14
+    accent-gnome-words-15: accent-gnome-words-replace-15
+    accent-gnome-words-16: accent-gnome-words-replace-16
+    accent-gnome-words-17: accent-gnome-words-replace-17
+    accent-gnome-words-18: accent-gnome-words-replace-18
+    accent-gnome-words-19: accent-gnome-words-replace-19
+    accent-gnome-words-20: accent-gnome-words-replace-20
+    accent-gnome-words-21: accent-gnome-words-replace-21
+    accent-gnome-words-22: accent-gnome-words-replace-22
+    accent-gnome-words-23: accent-gnome-words-replace-23
+    accent-gnome-words-24: accent-gnome-words-replace-24
+    accent-gnome-words-25: accent-gnome-words-replace-25
+    accent-gnome-words-26: accent-gnome-words-replace-26
+    accent-gnome-words-27: accent-gnome-words-replace-27
+    accent-gnome-words-28: accent-gnome-words-replace-28
+    accent-gnome-words-29: accent-gnome-words-replace-29
+    accent-gnome-words-30: accent-gnome-words-replace-30
+    accent-gnome-words-31: accent-gnome-words-replace-31
+    accent-gnome-words-32: accent-gnome-words-replace-32
--- a/Resources/Prototypes/_White/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/_White/Entities/Clothing/Hands/gloves.yml
@@ -0,0 +1,17 @@
+- type: entity
+  parent: ClothingHandsGlovesColorBlack
+  id: ClothingHandsGlovesColorBlackSecurity
+  name: офицерские перчатки
+  description: Кожаные чёрные перчатки, которые немного спасут вас от поджаривания.
+  components:
+    - type: Sprite
+      sprite: White/Clothing/Hands/Gloves/blacksecurity.rsi
+    - type: Clothing
+      sprite: White/Clothing/Hands/Gloves/blacksecurity.rsi
+    - type: Fiber
+      fiberMaterial: fibers-leather
+      fiberColor: fibers-black
+    - type: Item
+      sprite: White/Clothing/Hands/Gloves/blacksecurity.rsi
+    - type: Insulated
+      coefficient: 0.5
--- a/Resources/Prototypes/_White/Entities/Markers/Spawners/ERT.yml
+++ b/Resources/Prototypes/_White/Entities/Markers/Spawners/ERT.yml
@@ -17,6 +17,7 @@
      prototype: RandomHumanoidSpawnerERTLeader
      recruitmentName: ERTRecruitment
      priority: 1
+      jobId: ERTLeader
    - type: Sprite
      layers:
        - state: green
@@ -31,6 +32,7 @@
      prototype: RandomHumanoidSpawnerERTLeaderEVA
      recruitmentName: ERTRecruitment
      priority: 1
+      jobId: ERTLeader
    - type: Sprite
      layers:
        - state: green
@@ -44,6 +46,7 @@
    - type: GhostRecruitmentSpawnPoint
      prototype: RandomHumanoidSpawnerERTJanitor
      recruitmentName: ERTRecruitment
+      jobId: ERTJanitor
    - type: Sprite
      layers:
        - state: green
@@ -57,6 +60,7 @@
    - type: GhostRecruitmentSpawnPoint
      prototype: RandomHumanoidSpawnerERTJanitorEVA
      recruitmentName: ERTRecruitment
+      jobId: ERTJanitor
    - type: Sprite
      layers:
        - state: green
@@ -71,6 +75,7 @@
      prototype: RandomHumanoidSpawnerERTEngineer
      recruitmentName: ERTRecruitment
      priority: 2
+      jobId: ERTEngineer
    - type: Sprite
      layers:
        - state: green
@@ -85,6 +90,7 @@
      prototype: RandomHumanoidSpawnerERTEngineerEVA
      recruitmentName: ERTRecruitment
      priority: 2
+      jobId: ERTEngineer
    - type: Sprite
      layers:
        - state: green
@@ -99,6 +105,7 @@
      prototype: RandomHumanoidSpawnerERTSecurity
      recruitmentName: ERTRecruitment
      priority: 2
+      jobId: ERTSecurity
    - type: Sprite
      layers:
        - state: green
@@ -113,6 +120,7 @@
      prototype: RandomHumanoidSpawnerERTSecurityEVA
      recruitmentName: ERTRecruitment
      priority: 2
+      jobId: ERTSecurity
    - type: Sprite
      layers:
        - state: green
@@ -127,6 +135,7 @@
      prototype: RandomHumanoidSpawnerERTMedical
      recruitmentName: ERTRecruitment
      priority: 2
+      jobId: ERTMedical
    - type: Sprite
      layers:
        - state: green
@@ -141,6 +150,7 @@
      prototype: RandomHumanoidSpawnerERTMedicalEVA
      recruitmentName: ERTRecruitment
      priority: 2
+      jobId: ERTMedical
    - type: Sprite
      layers:
        - state: green
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml
@@ -14,7 +14,7 @@
        Piercing: 18
        Heat: 18
    soundHit:
-      path: /Audio/Weapons/smash.ogg
+      path: /Audio/Weapons/eblade1.ogg
  - type: DamageOtherOnHit
    damage:
      types:
--- a/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
+++ b/Resources/Prototypes/_White/Entities/Structures/Storage/SenorsLockers.yml
@@ -39,7 +39,7 @@
        prob: 0.5
      - id: ClothingEyesGlassesSecurity
      - id: ClothingHeadsetAltSecurity
-      - id: ClothingHandsGlovesColorBlack
+      - id: ClothingHandsGlovesColorBlackSecurity # WD
      - id: ClothingShoesBootsJack
      - id: WeaponMeleeNeedle
        prob: 0.1
--- a/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/equipped-HAND-body-slim.png
+++ b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/equipped-HAND-body-slim.png
--- a/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/equipped-HAND.png
+++ b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/equipped-HAND.png
--- a/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/icon.png
+++ b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/icon.png
--- a/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/inhand-left.png
+++ b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/inhand-left.png
--- a/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/inhand-right.png
+++ b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/inhand-right.png
--- a/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/meta.json
+++ b/Resources/Textures/White/Clothing/Hands/Gloves/blacksecurity.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-HAND",
+            "directions": 4
+        },
+        {
+            "name": "equipped-HAND-body-slim",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}