fix upstream

fixes raaagh
Rxup · Dec 19, 2024 · 1be2c8c · 1be2c8c
1 parent bb38e9e
commit 1be2c8c
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 119 deletions.
diff --git a/.github/workflows/validate-rgas.yml b/.github/workflows/validate-rgas.yml
diff --git a/.github/workflows/validate-rsis.yml b/.github/workflows/validate-rsis.yml
diff --git a/Content.Client/Holopad/HolopadSystem.cs b/Content.Client/Holopad/HolopadSystem.cs
@@ -53,7 +53,7 @@ private void OnTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs args)
         if (!HasComp<HolopadUserComponent>(uid))
             return;
 
-        var netEv = new HolopadUserTypingChangedEvent(GetNetEntity(uid.Value), ev.IsTyping);
+        var netEv = new HolopadUserTypingChangedEvent(GetNetEntity(uid.Value), ev.State == TypingIndicatorState.Typing);
         RaiseNetworkEvent(netEv);
     }
 

diff --git a/Content.Server/Backmen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Backmen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
@@ -54,7 +54,7 @@ public override void Initialize()
         SubscribeLocalEvent<MindSwappedComponent, ComponentInit>(OnSwapInit);
     }
 
-    [ValidatePrototypeId<EntityPrototype>] private const string ActionMindSwap = "ActionMindSwap";
+    [ValidatePrototypeId<EntityPrototype>] private const string ActionMindSwap = "ActionMindSwapPsionic";
     [ValidatePrototypeId<EntityPrototype>] private const string ActionMindSwapReturn = "ActionMindSwapReturn";
 
     private void OnInit(EntityUid uid, MindSwapPowerComponent component, ComponentInit args)

diff --git a/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs b/Content.Server/Chat/Systems/SpeakOnTriggerSystem.cs
@@ -1,4 +1,5 @@
 using Content.Server.Explosion.EntitySystems;
+using Content.Shared.Backmen.Chat;
 using Content.Shared.Timing;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;

diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
@@ -319,12 +319,6 @@ session.Status is SessionStatus.Connected or SessionStatus.InGame
 
                 foreach (var whitelist in _whitelists)
                 {
-                    if (!IsValid(whitelist, softPlayerCount))
-                    {
-                        // Not valid for current player count.
-                        continue;
-                    }
-
                     var whitelistStatus = await IsWhitelisted(whitelist, e.UserData, _sawmill);
                     if (!whitelistStatus.isWhitelisted)
                     {

diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs
@@ -296,7 +296,7 @@ private void OnTypingChanged(HolopadUserTypingChangedEvent ev, EntitySessionEven
                 if (receiverHolopad.Comp.Hologram == null)
                     continue;
 
-                _appearanceSystem.SetData(receiverHolopad.Comp.Hologram.Value.Owner, TypingIndicatorVisuals.IsTyping, ev.IsTyping);
+                _appearanceSystem.SetData(receiverHolopad.Comp.Hologram.Value.Owner, TypingIndicatorVisuals.State, ev.IsTyping);
             }
         }
     }
@@ -557,7 +557,7 @@ private void UnlinkHolopadFromUser(Entity<HolopadComponent> entity, Entity<Holop
         {
             if (linkedHolopad.Comp.Hologram != null)
             {
-                _appearanceSystem.SetData(linkedHolopad.Comp.Hologram.Value.Owner, TypingIndicatorVisuals.IsTyping, false);
+                _appearanceSystem.SetData(linkedHolopad.Comp.Hologram.Value.Owner, TypingIndicatorVisuals.State, false);
 
                 // Send message with no sprite data to the client
                 // This will set the holgram sprite to a generic icon

diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs
@@ -19,6 +19,7 @@
 using Robust.Shared.Random;
 using Robust.Shared.Replays;
 using System.Linq;
+using Content.Shared.Backmen.Chat;
 using Content.Shared.Silicons.StationAi;
 using Content.Shared.Silicons.Borgs.Components;
 
@@ -151,7 +152,7 @@ public override void Update(float frameTime)
 
                     break;
 
-                // Try to hang up if their has been no recent in-call activity 
+                // Try to hang up if their has been no recent in-call activity
                 case TelephoneState.InCall:
                     if (_timing.CurTime > telephone.StateStartTime + TimeSpan.FromSeconds(telephone.IdlingTimeout))
                         EndTelephoneCalls(entity);

diff --git a/Resources/Locale/ru-RU/backmen/actions/types.ftl b/Resources/Locale/ru-RU/backmen/actions/types.ftl
@@ -10,7 +10,7 @@ ent-ActionPsionicInvisibility = action-name-psionic-invisibility
     .desc = action-description-psionic-invisibility
 ent-ActionPsionicInvisibilityOff = action-description-psionic-invisibility-off
     .desc = action-description-psionic-invisibility
-ent-ActionMindSwap = action-name-mind-swap
+ent-ActionMindSwapPsionic = action-name-mind-swap
     .desc = action-description-mind-swap
 ent-ActionMindSwapReturn = action-name-mind-swap-return
     .desc = action-description-mind-swap-return

diff --git a/Resources/Prototypes/Corvax/Procedural/biome_templates.yml b/Resources/Prototypes/Corvax/Procedural/biome_templates.yml
@@ -31,21 +31,9 @@
       allowedTiles:
         - FloorPlanetGrass
       entities:
-        - FloraTree01
-        - FloraTree02
-        - FloraTree03
-        - FloraTree04
-        - FloraTree05
-        - FloraTree06
-        - FloraTreeLarge01
-        - FloraTreeLarge02
-        - FloraTreeLarge03
-        - FloraTreeLarge04
-        - FloraTreeLarge05
-        - FloraTreeLarge06
-        - FloraRockSolid01
-        - FloraRockSolid02
-        - FloraRockSolid03
+        - FloraTree
+        - FloraTreeLarge
+        - FloraRockSolid
         - FloraTreeStump
     - !type:BiomeDecalLayer
       allowedTiles:
@@ -89,14 +77,8 @@
       allowedTiles:
         - FloorCaveDrought
       entities:
-        - FloraStalagmite1
-        - FloraStalagmite2
-        - FloraStalagmite3
-        - FloraStalagmite4
-        - FloraStalagmite5
-        - FloraRockSolid01
-        - FloraRockSolid02
-        - FloraRockSolid03
+        - FloraStalagmite
+        - FloraRockSolid
         - CrystalOrange
     - !type:BiomeEntityLayer
       allowedTiles:
@@ -118,9 +100,7 @@
       allowedTiles:
         - FloorAsteroidSand
       entities:
-        - FloraRockSolid01
-        - FloraRockSolid02
-        - FloraRockSolid03
+        - FloraRockSolid
         - CrystalOrange
         - CrystalGrey
     - !type:BiomeEntityLayer
@@ -367,11 +347,8 @@
       allowedTiles:
         - FloorSnow
       entities:
-        - FloraTreeConifer01
-        - FloraTreeConifer02
-        - FloraTreeConifer03
-        - FloraTreeSnow01
-        - FloraTreeSnow06
+        - FloraTreeConifer
+        - FloraTreeSnow
     # Snow rock formations
     - !type:BiomeEntityLayer
       allowedTiles:

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -2437,16 +2437,16 @@
   - type: Sprite
     drawdepth: Mobs
     layers:
-    - map: [ "enum.DamageStateVisualLayers.Base", "movement" ]
+    - map: [ "enum.DamageStateVisualLayers.Base" ]
       state: tarantula
       sprite: Mobs/Animals/spider.rsi
-  - type: SpriteMovement
-    movementLayers:
-      movement:
-        state: tarantula-moving
-    noMovementLayers:
-      movement:
-        state: tarantula
+#  - type: SpriteMovement
+#    movementLayers:
+#      movement:
+#        state: tarantula-moving
+#    noMovementLayers:
+#      movement:
+#        state: tarantula
   - type: Physics
   - type: Arachne
   - type: Cocooner

diff --git a/Resources/Prototypes/Maps/gate.yml b/Resources/Prototypes/Maps/gate.yml
@@ -50,7 +50,7 @@
             SecurityOfficer: [ 6, 6 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            Lawyer: [ 2, 2 ]
+            IAA: [ 1, 1 ] # Corvax-IAA
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]

diff --git a/Resources/Prototypes/Maps/loop.yml b/Resources/Prototypes/Maps/loop.yml
@@ -49,7 +49,7 @@
             SecurityOfficer: [ 5, 5 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
-            Lawyer: [ 2, 2 ]
+            IAA: [ 1, 1 ] # Corvax-IAA
             #supply
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]

diff --git a/Resources/Prototypes/_Backmen/Actions/types.yml b/Resources/Prototypes/_Backmen/Actions/types.yml
@@ -69,7 +69,7 @@
       event: !type:PsionicInvisibilityPowerOffActionEvent
 
 - type: entity
-  id: ActionMindSwap
+  id: ActionMindSwapPsionic
   name: action-name-mind-swap
   description: action-description-mind-swap
   components:

diff --git a/Resources/Prototypes/_Backmen/Damage/types.yml b/Resources/Prototypes/_Backmen/Damage/types.yml
diff --git a/Resources/Prototypes/_Backmen/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/_Backmen/Entities/Objects/Devices/radio.yml
@@ -18,8 +18,8 @@
     delay: 10
   - type: Speech
     speechSounds: Combine
-  - type: SpeakOnUse
-    pack: ArtilleryComander
+#  - type: SpeakOnUse
+#    pack: ArtilleryComander
 
 - type: entity
   id: ActionCallAirSupportMissiles

diff --git a/Resources/Prototypes/_Backmen/Procedural/Shipwreck/biome_templates.yml b/Resources/Prototypes/_Backmen/Procedural/Shipwreck/biome_templates.yml
@@ -105,12 +105,7 @@
       allowedTiles:
         - FloorSnow
       entities:
-        - FloraTreeSnow01
-        - FloraTreeSnow02
-        - FloraTreeSnow03
-        - FloraTreeSnow04
-        - FloraTreeSnow05
-        - FloraTreeSnow06
+        - FloraTreeSnow
     - !type:BiomeDummyLayer
       id: Loot
     - !type:BiomeTileLayer