обновление?

.github/workflows/auto-cl-update-atd.yml

@@ -34,7 +34,7 @@ jobs:
     - name: Run post-merge script
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: python Tools/ATD/auto_cl.py "${{ env.GITHUB_TOKEN }}" "${{ github.repository }}"
+      run: python Tools/ADT/auto_cl.py "${{ env.GITHUB_TOKEN }}" "${{ github.repository }}"
 
     - name: Configure Git
       run: |

Content.Server/ADT/SizeAttribute/SizeAttributeWhitelistComponent.cs

@@ -0,0 +1,40 @@
+using Robust.Shared.Physics.Collision.Shapes;
+
+namespace Content.Server.SizeAttribute
+{
+    [RegisterComponent]
+    public sealed partial class SizeAttributeWhitelistComponent : Component
+    {
+        // Short
+        [DataField("short")]
+        public bool Short = false;
+
+        [DataField("shortscale")]
+        public float ShortScale = 0f;
+
+        [DataField("shortDensity")]
+        public float ShortDensity = 0f;
+
+        [DataField("shortPseudoItem")]
+        public bool ShortPseudoItem = false;
+
+        [DataField("shortCosmeticOnly")]
+        public bool ShortCosmeticOnly = true;
+
+        // Tall
+        [DataField("tall")]
+        public bool Tall = false;
+
+        [DataField("tallscale")]
+        public float TallScale = 0f;
+
+        [DataField("tallDensity")]
+        public float TallDensity = 0f;
+
+        [DataField("tallPseudoItem")]
+        public bool TallPseudoItem = false;
+
+        [DataField("tallCosmeticOnly")]
+        public bool TallCosmeticOnly = true;
+    }
+}

Content.Server/ADT/Speech/Component/RoarAccentComponent.cs

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

Content.Server/ADT/Speech/EntitySystems/RoarAccentSystem.cs

@@ -0,0 +1,36 @@
+using System.Text.RegularExpressions;
+using Content.Server.Speech.Components;
+using Robust.Shared.Random;
+
+namespace Content.Server.Speech.EntitySystems;
+
+public sealed class RoarAccentSystem : EntitySystem
+{
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<RoarAccentComponent, AccentGetEvent>(OnAccent);
+    }
+
+    private void OnAccent(EntityUid uid, RoarAccentComponent component, AccentGetEvent args)
+    {
+        var message = args.Message;
+
+        // roarrr
+        message = Regex.Replace(message, "r+", "rrr");
+        // roarRR
+        message = Regex.Replace(message, "R+", "RRR");
+
+        // ADT-Localization-Start
+        // р => ррр
+        message = Regex.Replace(
+            message,
+            "р+",
+            _random.Pick(new List<string>() { "рр", "ррр" })
+        );
+        // ADT-Localization-End
+        args.Message = message;
+    }
+}

Content.Shared/Speech/Components/VocalComponent.cs → Content.Server/Speech/Components/VocalComponent.cs

@@ -1,3 +1,4 @@
+using Content.Server.Speech.EntitySystems;
 using Content.Shared.Chat.Prototypes;
 using Content.Shared.Humanoid;
 using Robust.Shared.Audio;
@@ -6,48 +7,41 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 
-namespace Content.Shared.Speech.Components;
+namespace Content.Server.Speech.Components; //ADT Tweak
 
 /// <summary>
 ///     Component required for entities to be able to do vocal emotions.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentState]
+[RegisterComponent] //ADT Tweak
+[Access(typeof(VocalSystem))] //ADT Tweak
 public sealed partial class VocalComponent : Component
 {
     /// <summary>
     ///     Emote sounds prototype id for each sex (not gender).
     ///     Entities without <see cref="HumanoidComponent"/> considered to be <see cref="Sex.Unsexed"/>.
     /// </summary>
     [DataField("sounds", customTypeSerializer: typeof(PrototypeIdValueDictionarySerializer<Sex, EmoteSoundsPrototype>))]
-    [AutoNetworkedField]
     public Dictionary<Sex, string>? Sounds;
 
     [DataField("screamId", customTypeSerializer: typeof(PrototypeIdSerializer<EmotePrototype>))]
-    [AutoNetworkedField]
     public string ScreamId = "Scream";
 
     [DataField("wilhelm")]
-    [AutoNetworkedField]
     public SoundSpecifier Wilhelm = new SoundPathSpecifier("/Audio/Voice/Human/wilhelm_scream.ogg");
 
     [DataField("wilhelmProbability")]
-    [AutoNetworkedField]
     public float WilhelmProbability = 0.0002f;
 
     [DataField("screamAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
-    [AutoNetworkedField]
     public string ScreamAction = "ActionScream";
 
     [DataField("screamActionEntity")]
-    [AutoNetworkedField]
     public EntityUid? ScreamActionEntity;
 
     /// <summary>
     ///     Currently loaded emote sounds prototype, based on entity sex.
     ///     Null if no valid prototype for entity sex was found.
     /// </summary>
     [ViewVariables]
-    [AutoNetworkedField]
     public EmoteSoundsPrototype? EmoteSounds = null;
-}
+}

Content.Server/Speech/EntitySystems/VocalSystem.cs

@@ -99,4 +99,4 @@ private void LoadSounds(EntityUid uid, VocalComponent component, Sex? sex = null
             return;
         _proto.TryIndex(protoId, out component.EmoteSounds);
     }
-}
+}

Resources/Audio/ADT/Voice/Doge/attributions.yml

@@ -0,0 +1,29 @@
+- files: ["dog_bark1.ogg", "dog_bark2.ogg", "dog_bark3.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original sound by https://freesound.org/people/abhisheky948/sounds/625497/"
+  source: "https://freesound.org/people/abhisheky948/sounds/625497/"
+
+  files: ["dog_bark2.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original sound by https://freesound.org/people/michael_grinnell/sounds/464400/"
+  source: "https://freesound.org/people/michael_grinnell/sounds/464400/"
+
+  files: ["dog_bark3.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original sound by https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/"
+  source: "https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/"
+
+- files: ["dog_growl1.ogg", "dog_growl2.ogg", "dog_growl3.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original sound by https://freesound.org/people/Glitchedtones/sounds/372533/ - cut out three clips of dog growling, cleaned up, converted to ogg"
+  source: "https://freesound.org/people/Glitchedtones/sounds/372533/"  
+
+- files: ["dog_snarl1.ogg", "dog_snarl2.ogg", "dog_snarl3.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original sound by https://freesound.org/people/strongbot/sounds/341090/ - cut out three clips of dog snarling, cleaned up, converted to ogg"
+  source: "https://freesound.org/people/strongbot/sounds/341090/"
+
+  files: ["dog_whine.ogg"]
+  license: "CC0-1.0"
+  copyright: "Original sound by https://freesound.org/people/Sruddi1/sounds/34878/ - cleaned up, converted to ogg"
+  source: "https://freesound.org/people/Sruddi1/sounds/34878/"

Resources/Audio/ADT/Voice/Doge/license.txt

@@ -0,0 +1,10 @@
+dog_bark1.ogg licensed under CC0 1.0 taken from abhisheky948 at https://freesound.org/people/abhisheky948/sounds/625497/
+dog_bark2.ogg licensed under CC0 1.0 taken from michael_grinnell at https://freesound.org/people/michael_grinnell/sounds/464400/
+dog_bark3.ogg licensed under CC0 1.0 taken from Geoff-Bremner-Audio at https://freesound.org/people/Geoff-Bremner-Audio/sounds/688201/
+dog_growl1.ogg licensed under CC0 1.0 taken from GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/
+dog_growl2.ogg licensed under CC0 1.0 taken from GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/
+dog_growl3.ogg licensed under CC0 1.0 taken from GlitchedTones at https://freesound.org/people/Glitchedtones/sounds/372533/
+dog_snarl1.ogg licensed under CC0 1.0 taken from strongbot at https://freesound.org/people/strongbot/sounds/341090/
+dog_snarl2.ogg licensed under CC0 1.0 taken from strongbot at https://freesound.org/people/strongbot/sounds/341090/
+dog_snarl3.ogg licensed under CC0 1.0 taken from strongbot at https://freesound.org/people/strongbot/sounds/341090/
+dog_whine.ogg licensed under CC SAMPLING+ 1.0 DEED taken from Sruddil at https://freesound.org/people/Sruddi1/sounds/34878/

Resources/Audio/ADT/Voice/Vulpkanin/license.txt

@@ -0,0 +1,3 @@
+all taken from
+https://github.com/new-frontiers-14/frontier-station-14/tree/master/Resources/Audio/_NF/Vulpikanin
+licensed under CC BY-NC-SA 3.0

Resources/Audio/ADT/Voice/Vulpkanin_Talk/license.txt

@@ -0,0 +1,6 @@
+pug.ogg (Renamed to vulp.ogg)
+pug_ask.ogg (Renamed to vulp_ask.ogg)
+pug_exclaim.ogg (Renamed to vulp_exclaim.ogg)
+all taken from
+https://github.com/goonstation/goonstation/commit/da7c8965c4552ca53af367e6c83a83da2affe790
+licensed under CC BY-NC-SA 3.0

Resources/Changelog/ChangelogADT.yml

@@ -2051,3 +2051,37 @@ Entries:
       - {message: 'Upstream 27.06.24, подтянуты коммиты с корвакса.', type: Tweak}
     time: '2024-06-27T17:32:38Z'
     id: 214
+  - author: Darki255
+    changes:
+      - {message: Добавлен немецкий акцент, type: Add}
+    time: '2024-07-09T18:58:31Z'
+    id: 215
+  - author: Ratyyy
+    changes:
+      - {message: Изменены многие спрайты., type: Tweak}
+    time: '2024-07-14T08:59:33Z'
+    id: 216
+  - author: Шрёдька
+    changes:
+      - {message: 'Upstream 12.07.24, подтянуты коммиты с корвакса.', type: Tweak}
+    time: '2024-07-15T13:36:26Z'
+    id: 217
+  - author: Крыска
+    changes:
+      - {message: НТ начало поставлять новое снаряжение для ОБР., type: Add}
+      - {message: 'После собрания акционеров, было принято решение сформировать отдельные
+          отряды для борьбы с бунтами.', type: Add}
+      - {message: 'Величайшие умы НТ пришли к выводу, что в m-90 можно заряжать гранаты
+          в подствольный гранатомёт!', type: Add}
+    time: '2024-07-25T10:57:24Z'
+    id: 218
+  - author: Шрёдька
+    changes:
+      - {message: 'Подтянуты изменения с корвакса, 21.07.24.', type: Tweak}
+    time: '2024-07-26T23:39:11Z'
+    id: 219
+  - author: Шрёдька
+    changes:
+      - {message: 'Подтянуты коммиты с корвакса, 27.07.24', type: Tweak}
+    time: '2024-07-27T16:15:51Z'
+    id: 220

Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/vulpkanin.ftl

@@ -0,0 +1,2 @@
+ent-MobVulpkanin = Урист МакВульпканин
+    .desc = { ent-BaseMobVulpkanin.desc }

Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/vulpkanin.ftl

@@ -1,2 +1,2 @@
-ent-MobVulpkanin = Урист МакВульп
-    .desc = { ent-BaseMobVulpkanin.desc }
+### ent-MobVulpkanin = Урист МакВульп
+### .desc = { ent-BaseMobVulpkanin.desc }

Resources/Prototypes/ADT/Body/Organs/Vulpkanin.yml

@@ -0,0 +1,38 @@
+- type: entity
+  id: OrganVulpkaninStomach
+  parent: OrganAnimalStomach
+  noSpawn: true
+  components:
+    - type: Stomach
+    - type: SolutionContainerManager
+      solutions:
+        stomach:
+          maxVol: 50.0
+
+- type: entity
+  id: ADTOrganVulpkaninAnimalLiver
+  parent: BaseAnimalOrgan
+  name: liver
+  #noSpawn: true
+  components:
+  - type: Sprite
+    state: liver
+  - type: Organ
+  - type: Metabolizer
+    maxReagents: 1
+    metabolizerTypes: [ Animal ]
+    groups:
+    - id: Alcohol
+      rateModifier: 0.1
+
+- type: entity
+  id: OrganVulpkaninHeart
+  parent: OrganAnimalHeart
+  components:
+  - type: Metabolizer
+    maxReagents: 2
+    metabolizerTypes: [ Vulpkanin, Animal ]
+    groups:
+    - id: Medicine
+    - id: Poison
+    - id: Narcotic