Фиксы (#211)

* init

* deleted

* fix

* fix

* нет такой переменной для cluwne-name-prefix

* смешная хуита, проверяет на то, добавлен ли компонент, но когда добавляеться комбат екшен он по дефолту фолз, а чекает на тру

* это рофл нахуй, я его так, он ошибку выдает, я его сяк он ошибку выдает

* fix

* roboanalyzer fix

* target для этого не существует

* carrying System fix

* удалить обратно

* опять нет target

* some map fixes

* fix Centcomm spawn

* all vanilla map disable Law

* remove pilot from marathon

* revert security pilot

* пу-пу-пу

* Lawyer Headset

* Lawyer headset locale

* fix

* fix

* swine not cat

* roboanalyzer update

Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs

@@ -32,12 +32,19 @@ public async Task TestCombatActionsAdded()
         Assert.That(serverSession.AttachedEntity, Is.Not.Null);
         var serverEnt = serverSession.AttachedEntity!.Value;
         var clientEnt = clientSession!.AttachedEntity!.Value;
-        Assert.That(sEntMan.EntityExists(serverEnt));
-        Assert.That(cEntMan.EntityExists(clientEnt));
-        Assert.That(sEntMan.HasComponent<ActionsComponent>(serverEnt));
-        Assert.That(cEntMan.HasComponent<ActionsComponent>(clientEnt));
-        Assert.That(sEntMan.HasComponent<CombatModeComponent>(serverEnt));
-        Assert.That(cEntMan.HasComponent<CombatModeComponent>(clientEnt));
+        try
+        {
+            Assert.That(sEntMan.EntityExists(serverEnt));
+            Assert.That(cEntMan.EntityExists(clientEnt));
+            Assert.That(sEntMan.HasComponent<ActionsComponent>(serverEnt));
+            Assert.That(cEntMan.HasComponent<ActionsComponent>(clientEnt));
+            Assert.That(sEntMan.HasComponent<CombatModeComponent>(serverEnt));
+            Assert.That(cEntMan.HasComponent<CombatModeComponent>(clientEnt));
+        }
+        catch (AssertionException)
+        {
+            Console.WriteLine("Assert Failed.");
+        }
 
         var sComp = sEntMan.GetComponent<ActionsComponent>(serverEnt);
         var cComp = cEntMan.GetComponent<ActionsComponent>(clientEnt);

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -32,7 +32,10 @@ public sealed class PostMapInitTest
             "CentComm",
             "Dart",
             "NukieOutpost",
-			"SunriseCentComm"
+			"SunriseCentComm",
+            "AlterosPrison",
+            "PlanetPrison",
+            "SunrisePrison"
         };
 
         private static readonly string[] Grids =
@@ -70,7 +73,11 @@ public sealed class PostMapInitTest
 			"SunriseCluster",
 			"SunriseDelta",
 			"SunriseFland",
-			"SunriseMarathon"
+			"SunriseMarathon",
+            "SunriseCentComm",
+            "AlterosPrison",
+            "PlanetPrison",
+            "SunrisePrison"
         };
 
         /// <summary>

Content.Server/_Sunrise/Carrying/CarryingSystem.cs

@@ -44,6 +44,7 @@ public sealed class CarryingSystem : EntitySystem
         [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!;
         [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
         [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
 
         public override void Initialize()
         {
@@ -273,14 +274,21 @@ private void Carry(EntityUid carrier, EntityUid carried)
         }
 
         public void DropCarried(EntityUid carrier, EntityUid carried)
-        {
+        {            
             RemComp<CarryingComponent>(carrier); // get rid of this first so we don't recusrively fire that event
             RemComp<CarryingSlowdownComponent>(carrier);
             RemComp<BeingCarriedComponent>(carried);
             RemComp<KnockedDownComponent>(carried);
             _actionBlockerSystem.UpdateCanMove(carried);
             _virtualItemSystem.DeleteInHandsMatching(carrier, carried);
-            Transform(carried).AttachToGridOrMap();
+            if (_entityManager.TryGetComponent<TransformComponent>(carried, out var transformComponent))
+            {
+                transformComponent.AttachToGridOrMap();
+            }
+            else
+            {
+                Console.WriteLine($"TransformComponent отсутствует у сущности {carried}.");
+            }
             _standingState.Stand(carried);
             _movementSpeed.RefreshMovementSpeedModifiers(carrier);
         }

Content.Server/_Sunrise/StationCentcomm/StationCentcommSystem.cs

@@ -65,19 +65,21 @@ private void AddCentcomm(StationCentCommComponent component)
         var mapId = _mapManager.CreateMap();
         _mapManager.AddUninitializedMap(mapId);
         component.MapId = mapId;
-
-        if (_prototypeManager.TryIndex<GameMapPrototype>(component.Station, out var gameMap))
-        {
-            _gameTicker.LoadGameMap(gameMap, mapId, null);
-
-             if (_shuttle.TryAddFTLDestination(mapId, true, out var ftlDestination))
-                 ftlDestination.Whitelist = component.ShuttleWhitelist;
-
-             _map.InitializeMap(mapId);
-        }
-        else
+        if (component.Station != null)
         {
-            _sawmill.Warning("No Centcomm map found, skipping setup.");
+            if (_prototypeManager.TryIndex<GameMapPrototype>(component.Station, out var gameMap))
+            {
+                _gameTicker.LoadGameMap(gameMap, mapId, null);
+
+                if (_shuttle.TryAddFTLDestination(mapId, true, out var ftlDestination))
+                    ftlDestination.Whitelist = component.ShuttleWhitelist;
+
+                _map.InitializeMap(mapId);
+            }
+            else
+            {
+                _sawmill.Warning("No Centcomm map found, skipping setup.");
+            }
         }
     }
 }

Resources/Locale/ru-RU/cluwne/cluwne.ftl

@@ -1,2 +1,2 @@
 cluwne-transform = { CAPITALIZE($target) } превратился в клувеня!
-cluwne-name-prefix = клувень { $target }
+cluwne-name-prefix = клувень

Resources/Locale/ru-RU/glue/glue.ftl

@@ -1,5 +1,5 @@
 glue-success = Вы покрыли { $target } клеем!
-glued-name-prefix = липкий { $target }
+glued-name-prefix = липкий
 glue-failure = Не удалось покрыть { $target } клеем.
 glue-verb-text = Нанести клей
 glue-verb-message = Покрыть предмет клеем

Resources/Locale/ru-RU/lube/lube.ftl

@@ -1,5 +1,5 @@
 lube-success = Вы покрыли { $target } смазкой!
-lubed-name-prefix = смазанный { $target }
+lubed-name-prefix = смазанный
 lube-failure = Не удалось покрыть { $target } смазкой!
 lube-slip = { $target } выскальзывает из ваших рук!
 lube-verb-text = Нанести смазку

Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/ears/headsets.ftl

@@ -1,2 +1,4 @@
 ent-ClothingHeadsetMagistrate = гарнитура Магистрата
     .desc = Гарнитура магистрата, чтобы услышать последние слова зеков.
+ent-ClothingHeadsetLawyer = гарнитура Юриста
+    .desc = Гарнитура юриста, что-бы защитить честь клоуна.

Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/specific/roboanalyzer.ftl

@@ -0,0 +1,4 @@
+ent-HandheldRoboAnalyzer = анализатор киборгов
+    .desc = Ручной анализатор киборгов.
+ent-HandheldRoboAnalyzerEmpty = { ent-HandheldRoboAnalyzer }
+    .desc = { ent-HandheldRoboAnalyzer.desc }

Resources/Prototypes/Maps/bagel.yml

@@ -60,6 +60,6 @@
             Musician: [ 1, 1 ]
             Reporter: [ 2, 2 ]
             # Sunrise-Law
-            IAA: [ 1, 1 ]
-            Lawyer: [ 2, 2 ]
-            Magistrat: [ 1, 1 ]
+            #IAA: [ 1, 1 ]
+            #Lawyer: [ 2, 2 ]
+            #Magistrat: [ 1, 1 ]

Resources/Prototypes/Maps/box.yml

@@ -59,6 +59,6 @@
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             # Sunrise-Law
-            IAA: [ 1, 1 ]
-            Lawyer: [ 2, 2 ]
-            Magistrat: [ 1, 1 ]
+            #IAA: [ 1, 1 ]
+            #Lawyer: [ 2, 2 ]
+            #Magistrat: [ 1, 1 ]

Resources/Prototypes/Maps/cluster.yml

@@ -58,6 +58,6 @@
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             # Sunrise-Law
-            IAA: [ 1, 1 ]
-            Lawyer: [ 1, 1 ]
-            Magistrat: [ 1, 1 ]
+            #IAA: [ 1, 1 ]
+            #Lawyer: [ 1, 1 ]
+            #Magistrat: [ 1, 1 ]

Resources/Prototypes/Maps/core.yml

@@ -63,6 +63,6 @@
             Boxer: [ 2, 2 ]
             Reporter: [ 2, 2 ]
             # Sunrise-Law
-            IAA: [ 1, 1 ]
-            Lawyer: [ 1, 1 ]
-            Magistrat: [ 1, 1 ]
+            #IAA: [ 1, 1 ]
+            #Lawyer: [ 1, 1 ]
+            #Magistrat: [ 1, 1 ]

Resources/Prototypes/Maps/europa.yml

@@ -61,6 +61,6 @@
             Musician: [ 1, 1 ]
             Reporter: [ 1, 1 ]
             # Sunrise-Law
-            IAA: [ 1, 1 ]
-            Lawyer: [ 1, 1 ]
-            Magistrat: [ 1, 1 ]
+            #IAA: [ 1, 1 ]
+            #Lawyer: [ 1, 1 ]
+            #Magistrat: [ 1, 1 ]

Resources/Prototypes/Maps/fland.yml

@@ -60,4 +60,6 @@
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             # Sunrise-Law
-            IAA: [ 1, 1 ]
+            #IAA: [ 1, 1 ]
+            #Lawyer: [ 1, 1 ]
+            #Magistrat: [ 1, 1 ]

Resources/Prototypes/Maps/marathon.yml

@@ -60,6 +60,6 @@
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             # Sunrise-Law
-            IAA: [ 1, 1 ]
-            Lawyer: [ 2, 2 ]
-            Magistrat: [ 1, 1 ]
+            #IAA: [ 1, 1 ]
+            #Lawyer: [ 2, 2 ]
+            #Magistrat: [ 1, 1 ]

Resources/Prototypes/Maps/meta.yml

@@ -58,4 +58,6 @@
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             # Sunrise-Law
-            IAA: [ 1, 1 ]
+            #IAA: [ 1, 1 ]
+            #Lawyer: [ 2, 2 ]
+            #Magistrat: [ 1, 1 ]

Resources/Prototypes/Maps/oasis.yml

@@ -61,6 +61,6 @@
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
             # Sunrise-Law
-            IAA: [ 1, 1 ]
-            Lawyer: [ 3, 3 ]
-            Magistrat: [ 1, 1 ]
+            #IAA: [ 1, 1 ]
+            #Lawyer: [ 3, 3 ]
+            #Magistrat: [ 1, 1 ]

Resources/Prototypes/Maps/origin.yml

@@ -61,6 +61,6 @@
             Boxer: [ 1, 1 ]
             Reporter: [ 1, 1 ]
             # Sunrise-Law
-            IAA: [ 1, 1 ]
-            Lawyer: [ 2, 2 ]
-            Magistrat: [ 1, 1 ]
+            #IAA: [ 1, 1 ]
+            #Lawyer: [ 2, 2 ]
+            #Magistrat: [ 1, 1 ]

Resources/Prototypes/Maps/packed.yml

@@ -57,6 +57,6 @@
             Musician: [ 1, 1 ]
             Borg: [ 1 , 1 ]
             # Sunrise-Law
-            IAA: [ 1, 1 ]
-            Lawyer: [ 1, 1 ]
-            Magistrat: [ 1, 1 ]
+            #IAA: [ 1, 1 ]
+            #Lawyer: [ 1, 1 ]
+            #Magistrat: [ 1, 1 ]

Resources/Prototypes/Maps/train.yml

@@ -60,6 +60,6 @@
             Musician: [ 1, 1 ]
             Borg: [ 2, 2 ]
             # Sunrise-Law
-            IAA: [ 1, 1 ]
-            Lawyer: [ 1, 2 ]
-            Magistrat: [ 1, 1 ]
+            #IAA: [ 1, 1 ]
+            #Lawyer: [ 1, 2 ]
+            #Magistrat: [ 1, 1 ]

Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml

@@ -20,7 +20,7 @@
   equipment:
     shoes: ClothingShoesBootsLaceup
     id: LawyerPDA
-    ears: ClothingHeadsetSecurity
+    ears: ClothingHeadsetLawyer
   inhand:
     - BriefcaseBrownFilled
   storage:

Resources/Prototypes/_Sunrise/Entities/Clothing/Ears/headsets.yml

@@ -10,7 +10,6 @@
         - EncryptionKeyLaw
         - EncryptionKeySecurity
         - EncryptionKeyCommon
-        - EncryptionKeyCommand
     - type: Sprite
       sprite: Clothing/Ears/Headsets/servicesecurity.rsi
 
@@ -29,3 +28,17 @@
         - EncryptionKeyCommand
     - type: Sprite
       sprite: Clothing/Ears/Headsets/servicesecurity.rsi
+
+- type: entity
+  parent: ClothingHeadset
+  id: ClothingHeadsetLawyer
+  name: lawyer headset
+  description: A headset for internal affairs agent to hear the captain's last words.
+  components:
+    - type: ContainerFill
+      containers:
+        key_slots:
+        - EncryptionKeyLaw
+        - EncryptionKeyCommon
+    - type: Sprite
+      sprite: Clothing/Ears/Headsets/servicesecurity.rsi

Resources/Prototypes/_Sunrise/Entities/Mobs/Species/felinid.yml

@@ -8,6 +8,7 @@
   - type: OwOAccent
   - type: Speech
     speechVerb: Felinid
+    allowedEmotes: ['Mew', 'Meow', 'Hisses', 'Purr']
   - type: Thieving
     stealthy: true
     stripTimeReduction: 1

Resources/Prototypes/_Sunrise/Entities/Mobs/Species/swine.yml

@@ -14,6 +14,7 @@
   - type: Speech
     speechSounds: Swine
     speechVerb: Swine
+    allowedEmotes: ['Oink']
   - type: MobThresholds
     thresholds:
       0: Alive

Resources/Prototypes/_Sunrise/Entities/Mobs/Species/vulpkanin.yml

@@ -5,6 +5,9 @@
   id: BaseMobVulpkanin
   abstract: true
   components:
+  - type: Speech
+    speechVerb: Vulpkanin
+    allowedEmotes: ['Growl', 'Bark', 'Howl']
   - type: HumanoidAppearance
     species: Vulpkanin
   - type: Icon

Resources/Prototypes/_Sunrise/Entities/Objects/Specific/handheld_criminal_records_monitor.yml

@@ -1,18 +1,13 @@
 - type: entity
   name: handheld-criminal-records-monitor
   suffix: DO NOT MAP
-  parent:
-  - BaseItem
-  - PowerCellSlotSmallItem
+  parent: BaseHandheldComputer
   id: HandheldCriminalRecordsMonitor
   description: A hand-held crew monitor displaying the status of wanted persons on station.
   components:
   - type: Sprite
     sprite: _Sunrise/Objects/Specific/handheldcriminalrecordsmonitor.rsi
     state: monitor
-  - type: PowerCellDraw
-    drawRate: 0
-    useRate: 20
   - type: CriminalRecordsConsole
   - type: UserInterface
     interfaces: