EE Merge + Early Merge Fixes

Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs

@@ -182,7 +182,7 @@ private void UpdatePanelInfo(ChemMasterBoundUserInterfaceState state)
             };
             bufferHBox.AddChild(bufferVol);
 
-            foreach (var (reagent, quantity) in state.BufferReagents)
+            foreach (var (reagent, quantity) in state.BufferReagents.OrderBy(x => x.Reagent.Prototype)) // Frontier: add OrderBy
             {
                 // Try to get the prototype for the given reagent. This gives us its name.
                 _prototypeManager.TryIndex(reagent.Prototype, out ReagentPrototype? proto);

Content.Server/Power/EntitySystems/PowerReceiverSystem.cs

@@ -13,6 +13,8 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Utility;
 using Content.Shared.Emp;
+using Content.Shared.Interaction;
+
 
 namespace Content.Server.Power.EntitySystems
 {
@@ -22,6 +24,7 @@ public sealed class PowerReceiverSystem : EntitySystem
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly AppearanceSystem _appearance = default!;
         [Dependency] private readonly AudioSystem _audio = default!;
+        [Dependency] private readonly SharedInteractionSystem _interaction = default!;
         private EntityQuery<ApcPowerReceiverComponent> _recQuery;
         private EntityQuery<ApcPowerProviderComponent> _provQuery;
 
@@ -120,12 +123,15 @@ private void OnReceiverDisconnected(EntityUid uid, ApcPowerProviderComponent pro
 
         private void AddSwitchPowerVerb(EntityUid uid, PowerSwitchComponent component, GetVerbsEvent<AlternativeVerb> args)
         {
-            if(!args.CanAccess || !args.CanInteract)
+            if (!args.CanAccess || !args.CanInteract)
                 return;
 
             if (!HasComp<HandsComponent>(args.User))
                 return;
 
+            if (!_interaction.SupportsComplexInteractions(args.User))
+                return;
+
             if (!_recQuery.TryGetComponent(uid, out var receiver))
                 return;
 

Content.Shared/Interaction/SharedInteractionSystem.cs

@@ -973,7 +973,7 @@ public void InteractUsing(
             bool checkCanInteract = true,
             bool checkCanUse = true)
         {
-            if ((IsDeleted(user) || IsDeleted(used) || IsDeleted(target)))
+            if (IsDeleted(user) || IsDeleted(used) || IsDeleted(target))
                 return;
 
             if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, target))
@@ -1002,10 +1002,10 @@ public void InteractUsing(
         ///     Used when clicking on an entity resulted in no other interaction. Used for low-priority interactions.
         /// </summary>
         public void InteractDoAfter(
-            EntityUid user, 
-            EntityUid used, 
-            EntityUid? target, 
-            EntityCoordinates clickLocation, 
+            EntityUid user,
+            EntityUid used,
+            EntityUid? target,
+            EntityCoordinates clickLocation,
             bool canReach,
             bool checkDeletion = false
         )
@@ -1097,10 +1097,6 @@ public bool InteractionActivate(
             if (checkAccess && !_containerSystem.IsInSameOrParentContainer(user, used) && !CanAccessViaStorage(user, used))
                 return false;
 
-            // Does the user have hands?
-            if (!HasComp<HandsComponent>(user))
-                return false;
-
             complexInteractions ??= SupportsComplexInteractions(user);
             var activateMsg = new ActivateInWorldEvent(user, used, complexInteractions.Value);
             RaiseLocalEvent(used, activateMsg, true);

Resources/Locale/en-US/game-ticking/game-rules/gamerule-admin.ftl

@@ -1,4 +1,4 @@
-#When an admin adds a game rule
+# When an admin adds a game rule
 add-gamerule-admin = Game rule({$rule}) added - {$admin}
 list-gamerule-admin-header = | Time       | Rule added
 list-gamerule-admin-no-rules = No game rules have been added.

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -403,6 +403,7 @@
     Telecrystal: 40
   categories:
   - UplinkMisc
+  - UplinkMisc
   conditions:
   - !type:StoreWhitelistCondition
     whitelist:
@@ -423,6 +424,7 @@
     Telecrystal: 6
   categories:
   - UplinkMisc
+  - UplinkMisc
   saleLimit: 1
 
 - type: listing
@@ -434,6 +436,7 @@
     Telecrystal: 5
   categories:
   - UplinkMisc
+  - UplinkMisc
   saleLimit: 1
 
 - type: listing
@@ -445,6 +448,7 @@
     Telecrystal: 4
   categories:
   - UplinkMisc
+  - UplinkMisc
   saleLimit: 1
 
 - type: listing
@@ -456,6 +460,7 @@
     Telecrystal: 4
   categories:
   - UplinkMisc
+  - UplinkMisc
   saleLimit: 1
 
 - type: listing
@@ -467,6 +472,7 @@
     Telecrystal: 12
   categories:
   - UplinkMisc
+  - UplinkMisc
   saleLimit: 1
 
 - type: listing
@@ -478,6 +484,7 @@
     Telecrystal: 2
   categories:
   - UplinkMisc
+  - UplinkMisc
 
 - type: listing
   id: UplinkMedsBundle
@@ -488,6 +495,7 @@
     Telecrystal: 20
   categories:
   - UplinkMisc
+  - UplinkMisc
   conditions:
     - !type:StoreWhitelistCondition
       whitelist:
@@ -510,6 +518,7 @@
     Telecrystal: 3
   categories:
   - UplinkUtility
+  - UplinkUtility
 
 - type: listing
   id: UplinkStealthBox
@@ -520,6 +529,7 @@
     Telecrystal: 5
   categories:
   - UplinkUtility
+  - UplinkUtility
 
 - type: listing
   id: UplinkChameleonProjector
@@ -530,6 +540,7 @@
     Telecrystal: 7
   categories:
   - UplinkUtility
+  - UplinkUtility
 
 - type: listing
   id: UplinkCyberpen
@@ -540,6 +551,7 @@
     Telecrystal: 1
   categories:
   - UplinkUtility
+  - UplinkUtility
 
 - type: listing
   id: UplinkDecoyDisk
@@ -550,6 +562,7 @@
     Telecrystal: 1
   categories:
   - UplinkUtility
+  - UplinkUtility
 
 - type: listing
   id: UplinkUltrabrightLantern
@@ -560,6 +573,7 @@
     Telecrystal: 2
   categories:
   - UplinkUtility
+  - UplinkUtility
 
 - type: listing
   id: UplinkBribe
@@ -570,6 +584,7 @@
     Telecrystal: 4
   categories:
     - UplinkUtility
+    - UplinkUtility
 
 # - type: listing
 #   id: UplinkGigacancerScanner
@@ -580,6 +595,7 @@
 #     Telecrystal: 5
 #   categories:
 #   - UplinkUtility
+#   - UplinkUtility
 
 - type: listing
   id: UplinkHolster

Resources/Prototypes/GameRules/events.yml

@@ -106,18 +106,18 @@
     minimumPlayers: 30 # Floof
   - type: NinjaSpawnRule
 
-#- type: entity
-#  parent: BaseGameRule
-#  id: RevenantSpawn
-#  categories: [ HideSpawnMenu ]
-#  components:
-#  - type: StationEvent
-#    weight: 7.5
-#    duration: 1
-#    earliestStart: 45
-#    minimumPlayers: 20
-#  - type: RandomSpawnRule
-#    prototype: MobRevenant
+- type: entity
+  parent: BaseGameRule
+  id: RevenantSpawn
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: StationEvent
+    weight: 7.5
+    duration: 1
+    earliestStart: 45
+    minimumPlayers: 20
+  - type: RandomSpawnRule
+    prototype: MobRevenant
 
 # disabled until event is rewritten to be more interesting
 #- type: entity

Resources/Prototypes/Nyanotrasen/GameRules/events.yml

@@ -155,17 +155,17 @@
     maximumGlimmer: 1000
   - type: GlimmerRandomSentienceRule
 
-#- type: entity
-#  parent: BaseGlimmerSignaturesEvent
-#  id: GlimmerRevenantSpawn
-#  categories: [ HideSpawnMenu ]
-#  components:
-#    - type: GlimmerEvent
-#      minimumGlimmer: 450
-#      maximumGlimmer: 900
-#      glimmerBurnLower: 50
-#      glimmerBurnUpper: 100 # Gives epi a chance to recover
-#    - type: GlimmerRevenantRule
+- type: entity
+  parent: BaseGlimmerSignaturesEvent
+  id: GlimmerRevenantSpawn
+  categories: [ HideSpawnMenu ]
+  components:
+    - type: GlimmerEvent
+      minimumGlimmer: 450
+      maximumGlimmer: 900
+      glimmerBurnLower: 50
+      glimmerBurnUpper: 100 # Gives epi a chance to recover
+    - type: GlimmerRevenantRule
 
 - type: entity
   parent: BaseGlimmerSignaturesEvent