Несколько небольших исправлений (#3656)

2026-01-08 12:39:47 +05:00 · 2026-01-08 12:39:47 +05:00 · 68dedb6479
commit 68dedb6479
parent bf2da5e2b4
11 changed files with 362 additions and 48 deletions
--- a/Content.Shared/_Sunrise/Abilities/Resomi/SharedResomiAbilitySystem.cs
+++ b/Content.Shared/_Sunrise/Abilities/Resomi/SharedResomiAbilitySystem.cs
@ -5,18 +5,18 @@ namespace Content.Shared._Sunrise.Abilities.Resomi;

 public sealed partial class SharedResomiAbilitySystem : EntitySystem
 {
-	public override void Initialize()
-	{
-		base.Initialize();
+    public override void Initialize()
+    {
+        base.Initialize();

-		SubscribeLocalEvent<ResomiActiveAbilityComponent, FallAttemptEvent>(OnFallAttempt);
-	}
+        SubscribeLocalEvent<ResomiActiveAbilityComponent, FallAttemptEvent>(OnFallAttempt);
+    }

-	/// <summary>
-	/// Prevents falling while in an active Resomi ability.
-	/// </summary>
-	private void OnFallAttempt(EntityUid uid, ResomiActiveAbilityComponent component, ref FallAttemptEvent args)
-	{
-		args.Cancelled = true;
-	}
+    /// <summary>
+    /// Prevents falling while in an active Resomi ability.
+    /// </summary>
+    private void OnFallAttempt(EntityUid uid, ResomiActiveAbilityComponent component, ref FallAttemptEvent args)
+    {
+        args.Cancelled = true;
+    }
 }
--- a/Content.Shared/_Sunrise/FactionClothingBlockerSystem/FactionClothingBlockerSystem.cs
+++ b/Content.Shared/_Sunrise/FactionClothingBlockerSystem/FactionClothingBlockerSystem.cs
@ -1,11 +1,14 @@
 using Content.Shared._Sunrise.Biocode;
 using Content.Shared.Inventory.Events;
+using Robust.Shared.Network;
+using Robust.Shared.Timing;

 namespace Content.Shared._Sunrise.FactionClothingBlockerSystem;

 public sealed class FactionClothingBlockerSystem : EntitySystem
 {
    [Dependency] private readonly BiocodeSystem _biocodeSystem = default!;
+    [Dependency] private readonly INetManager _net = default!;

    public override void Initialize()
    {
@ -14,8 +17,12 @@ public sealed class FactionClothingBlockerSystem : EntitySystem
        SubscribeLocalEvent<FactionClothingBlockerComponent, BeingEquippedAttemptEvent>(OnEquippedAttempt);
    }

-    private async void OnEquippedAttempt(EntityUid uid, FactionClothingBlockerComponent component, BeingEquippedAttemptEvent args)
+    private void OnEquippedAttempt(EntityUid uid, FactionClothingBlockerComponent component, BeingEquippedAttemptEvent args)
    {
+        // Does not work correctly on the client due to poor serialization of NpcFactionMemberComponent
+        if (_net.IsClient)
+            return;
+
        if (TryComp<BiocodeComponent>(args.Equipment, out var biocodedComponent))
        {
            if (!_biocodeSystem.CanUse(args.EquipTarget, biocodedComponent.Factions))
--- a/Content.Shared/_Sunrise/FactionWeaponBlockerSystem/FactionWeaponBlockerSystem.cs
+++ b/Content.Shared/_Sunrise/FactionWeaponBlockerSystem/FactionWeaponBlockerSystem.cs
@ -25,9 +25,9 @@ public sealed class SharedFactionWeaponBlockerSystem : EntitySystem

        var canUse = npcFactionMemberComponent.Factions
            .Any(x => ent.Comp.Factions.Contains(x));
-
-        if (ent.Comp.CanUse == canUse)
-            return;
+        // Return when the serialization issues with NpcFactionMemberComponent are fixed
+        // if (ent.Comp.CanUse == canUse)
+        //     return;

        ent.Comp.CanUse = canUse;
        Dirty(ent);
--- a/Resources/Locale/ru-RU/_strings/chemistry/components/injector-component.ftl
+++ b/Resources/Locale/ru-RU/_strings/chemistry/components/injector-component.ftl
@ -1,12 +1,12 @@
 ## UI

-injector-draw-text = Забор
-injector-inject-text = Введение
-injector-invalid-injector-toggle-mode = Неверный режим
-injector-volume-label =
-    Объём: [color=white]{ $currentVolume }/{ $totalVolume }[/color]
-    Режим: [color=white]{ $modeString }[/color] ([color=white]{ $transferVolume } ед.[/color])
+injector-volume-transfer-label = Объём: [color=white]{$currentVolume}/{$totalVolume} ед.[/color]
+    Режим: [color=white]{$modeString}[/color] ([color=white]{$transferVolume} ед.[/color])
+injector-volume-label = Объём: [color=white]{$currentVolume}/{$totalVolume} ед.[/color]
+    Режим: [color=white]{$modeString}[/color]
+injector-toggle-verb-text = Переключить режим инъектора

+injector-invalid-injector-toggle-mode = Неверный режим
 ## Entity

 injector-component-drawing-text = Содержимое набирается
--- a/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml
@ -65,6 +65,7 @@
  - type: Sprite # Drawlayers. Top to bottom in order I believe.
    netsync: false
    layers:
+    # Sunrise-start
    - map: [ "enum.HumanoidVisualLayers.Chest" ]
    - map: [ "enum.HumanoidVisualLayers.Head" ]
    - map: [ "enum.HumanoidVisualLayers.Snout" ]
@ -73,30 +74,24 @@
    - map: [ "enum.HumanoidVisualLayers.LArm" ]
    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
-    # Sunrise-Start
+    - map: ["enum.HumanoidVisualLayers.LFoot"]
+    - map: ["enum.HumanoidVisualLayers.RFoot"]
    - map: ["bra"]
    - map: ["pants"]
    - map: ["socks"]
-    # Sunrise-End
-    - map: [ "jumpsuit" ]
-    - map: [ "enum.HumanoidVisualLayers.LHand" ]
-    - map: [ "enum.HumanoidVisualLayers.RHand" ]
-    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
-    - map: [ "enum.HumanoidVisualLayers.RFoot" ]
-    - map: [ "enum.HumanoidVisualLayers.Handcuffs" ]
-      color: "#ffffff"
-      sprite: Objects/Misc/handcuffs.rsi
-      state: body-overlay-2
-      visible: false
-    - map: [ "id" ]
+    - map: ["jumpsuit"]
+    - map: ["enum.HumanoidVisualLayers.LHand"]
+    - map: ["enum.HumanoidVisualLayers.RHand"]
    - map: [ "gloves" ]
    - map: [ "shoes" ]
    - map: [ "ears" ]
    - map: [ "outerClothing" ]
    - map: [ "eyes" ]
    - map: [ "belt" ]
-    - map: [ "neck" ]
+    - map: [ "id" ]
    - map: [ "back" ]
+    - map: [ "enum.HumanoidVisualLayers.Back" ]
+    - map: [ "neck" ]
    - map: [ "enum.HumanoidVisualLayers.SnoutCover" ]
    - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
    - map: [ "enum.HumanoidVisualLayers.Hair" ]
@ -107,10 +102,16 @@
    - map: [ "head" ]
    - map: [ "pocket1" ]
    - map: [ "pocket2" ]
+    - map: ["enum.HumanoidVisualLayers.Handcuffs"]
+      color: "#ffffff"
+      sprite: Objects/Misc/handcuffs.rsi
+      state: body-overlay-2
+      visible: false
    - map: [ "clownedon" ]
      sprite: "Effects/creampie.rsi"
      state: "creampie_vulpkanin"
      visible: false
+    # Sunrise-end
  - type: HumanoidAppearance
    species: Vulpkanin
    # Sunrise-Start
@ -130,6 +131,9 @@
          32:
            sprite: Mobs/Species/Vulpkanin/displacement.rsi
            state: hair
+  # Sunrise-start
+  - type: Carriable
+  # Sunrise-end
  - type: Inventory
 # SUNRISE EDIT
    speciesId: human
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Customization/Markings/tajaran.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Customization/Markings/tajaran.yml
@ -36,7 +36,7 @@

 - type: marking
  id: BodyStripes
-  bodyPart: [ Chest, RArm, LArm, RLeg, LLeg ]
+  bodyPart: Chest
  markingCategory: Overlay
  speciesRestriction: [Tajaran]
  sprites:
@ -45,7 +45,7 @@

 - type: marking
  id: BodyBlots
-  bodyPart: [ Chest, RArm, LArm, RLeg, LLeg ]
+  bodyPart: Chest
  markingCategory: Overlay
  speciesRestriction: [Tajaran]
  sprites:
@ -54,7 +54,7 @@

 - type: marking
  id: patch2
-  bodyPart: [ Chest, RLeg, LLeg ]
+  bodyPart: Chest
  markingCategory: Overlay
  speciesRestriction: [Tajaran]
  sprites:
@ -63,7 +63,7 @@

 - type: marking
  id: BodySkeleton
-  bodyPart: [ Chest, RArm, LArm, RLeg, LLeg ]
+  bodyPart: Chest
  markingCategory: Overlay
  speciesRestriction: [Tajaran]
  sprites:
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/humanoid_xeno.yml
@ -129,6 +129,79 @@
  - type: Inventory
    speciesId: reptilian
    templateId: humanoidxeno
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: jumpsuit-female
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: mask
+    displacements:
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: mask
+      shoes:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: shoes
+      socks:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: socks
+      outerClothing:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: outer
+      hardsuit:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: hardsuit
+    maleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: jumpsuit
+      shoes:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: shoes
+      socks:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: socks
+      outerClothing:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: outer
+      hardsuit-body-normal:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: hardsuit
  - type: HumanoidAppearance
    species: HumanoidXeno
  - type: Tag
@ -153,6 +226,79 @@
  - type: Inventory
    speciesId: reptilian
    templateId: humanoidxeno
+    femaleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: jumpsuit-female
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: mask
+    displacements:
+      head:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: head
+      mask:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: mask
+      shoes:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: shoes
+      socks:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: socks
+      outerClothing:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: outer
+      hardsuit:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: hardsuit
+    maleDisplacements:
+      jumpsuit:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: jumpsuit
+      shoes:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: shoes
+      socks:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: socks
+      outerClothing:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: outer
+      hardsuit-body-normal:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: hardsuit
  - type: Body
    prototype: HumanoidXeno

--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/resomi.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/resomi.yml
@ -6,7 +6,14 @@
  abstract: true
  components:
  - type: Interactions
-  - type: JumpSkill
+  - type: JumpAbility
+    jumpDistance: 5
+    jumpSound:
+      path: /Audio/Weapons/punchmiss.ogg
+      params:
+        pitch: 1.33
+        volume: -5
+        variation: 0.05
  - type: DamageVisuals
    thresholds: [ 10, 30, 50, 70]
    targetLayers:
--- a/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Mobs/Species/tajaran.yml
@ -65,6 +65,79 @@
      200: Dead
  - type: Inventory
    speciesId: human
+    femaleDisplacements:
+      jumpsuit-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: jumpsuit-female
+      head-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: head
+      mask-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: mask
+    displacements:
+      head-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: head
+      mask-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: mask
+      shoes-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: shoes
+      socks-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: socks
+      outerClothing-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: outer
+      hardsuit-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: hardsuit
+    maleDisplacements:
+      jumpsuit-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: jumpsuit
+      shoes-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: shoes
+      socks-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: socks
+      outerClothing-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: outer
+      hardsuit-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: hardsuit
  - type: FootprintEmitter
  - type: Carriable
  - type: ToggleableNightVision
@ -78,5 +151,80 @@
  categories: [ HideSpawnMenu ]
  description: A dummy tajaran meant to be used in character setup.
  components:
-    - type: HumanoidAppearance
-      species: Tajaran
+  - type: HumanoidAppearance
+    species: Tajaran
+  - type: Inventory
+    speciesId: human
+    femaleDisplacements:
+      jumpsuit-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: jumpsuit-female
+      head-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: head
+      mask-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: mask
+    displacements:
+      head-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: head
+      mask-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: Mobs/Species/Reptilian/displacement.rsi
+            state: mask
+      shoes-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: shoes
+      socks-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: socks
+      outerClothing-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: outer
+      hardsuit-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: hardsuit
+    maleDisplacements:
+      jumpsuit-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: jumpsuit
+      shoes-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: shoes
+      socks-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: socks
+      outerClothing-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: outer
+      hardsuit-body-curved-tajaran:
+        sizeMaps:
+          32:
+            sprite: _Sunrise/Mobs/Species/Reptilian/displacement.rsi
+            state: hardsuit
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/mechs.yml
@ -274,6 +274,8 @@
    interfaces:
      enum.StorageUiKey.Key:
        type: StorageBoundUserInterface
+      enum.MechUiKey.Key:
+        type: MechBoundUserInterface
  - type: ContainerContainer
    containers:
      storagebase: !type:Container
--- a/Resources/Prototypes/_Sunrise/Species/tajaran.yml
+++ b/Resources/Prototypes/_Sunrise/Species/tajaran.yml
@ -5,8 +5,8 @@
  prototype: MobTajaran
  bodyTypes:
  - TajaranNormal
-  # - TajaranCurved
-  # - TajaranSlim
+  - TajaranCurved
+  #- TajaranSlim
  markingLimits: MobTajaranMarkingLimits
  dollPrototype: MobTajaranDummy
  skinColoration: Hues
@ -46,7 +46,7 @@

 - type: bodyType
  id: TajaranCurved
-  name: body-curved
+  name: body-curved-tajaran
  sprites:
    Head: MobTajaranHead
    Hair: MobHumanoidAnyMarking
@ -67,7 +67,7 @@

 - type: bodyType
  id: TajaranSlim
-  name: body-slim
+  name: body-slim-tajaran
  sexRestrictions:
  - Male
  sprites: