Test tester but goob

.github/workflows/labeler-review.yml

@@ -5,86 +5,28 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-name: "Labels: Approved"
-
-on:
-  pull_request_review:
-    types: [submitted]
-
-jobs:
-  label-on-approval:
-    permissions:
-      contents: read
-      issues: write
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Create JSON File
-        id: curling-reviews
-        run: |
-          PR_NUMBER=${{ github.event.pull_request.number }}
-          OWNER=${{ github.repository_owner }}
-          REPO=${{ github.event.repository.name }}
-          TOKEN=${{ secrets.GITHUB_TOKEN }}
-
-          # Fetch the reviews and place them into a json file.
-          curl -o reviews.json -L \
-                -H "Accept: application/vnd.github+json" \
-                -H "Authorization: Bearer $TOKEN" \
-                -H "X-GitHub-Api-Version: 2022-11-28" \
-                https://api.github.com/repos/$OWNER/$REPO/pulls/$PR_NUMBER/reviews
-
-      - name: Check for Approvals
-        id: check-approvals
-        run: |
-          # Count the number of approvals
-          APPROVALS=$(jq '[.[] | select(.state=="APPROVED")] | length' reviews.json)
-
-          echo "Number of approvals: $APPROVALS"
-          echo "::set-output name=approvals::$APPROVALS"
-
-      - name: Add Approved Label if Enough Approvals
-        if: steps.check-approvals.outputs.approvals >= 2  # Change the threshold here
-        uses: actions-ecosystem/action-add-labels@v1
-        env:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          labels: "S: Approved"
-
-      - name: Remove Other Labels on Approved
-        if: steps.check-approvals.outputs.approval >= 2
-        uses: actions-ecosystem/action-remove-labels@v1
-        env:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          labels: |
-            "S: Needs Review"
-            "S: Needs Second Approval"
-
-      - name: Add Second Approval Requirement on Approval
-        if: steps.check-approvals.outputs.approvals == 1
-        uses: actions-ecosystem/action-add-labels@v1
-        env:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          labels: |
-            "S: Needs Second Approval"
-            "S: Needs Review"
-
-      - name: Remove Other Labels on Second Approval Requirement
-        if: steps.check-approvals.outputs.approvals == 1
-        uses: actions-ecosystem/action-remove-labels@v1
-        env:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          labels: "S: Approved"
-
-      - name: Remove All Other Labels if No Approval
-        if: steps.check-approvals.outputs.approvals < 1
-        uses: actions-ecosystem/action-remove-labels@v1
-        env:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          labels: |
-            "S: Approved"
-            "S: Needs Second Approval"
+#name: "Labels: Approved"
+#
+#on:
+#  pull_request_review:
+#    types: [submitted]
+#
+#jobs:
+#  add_label:
+#    # Change the repository name after you've made sure the team name is correct for your fork!
+#    if: ${{ (github.repository == 'Goob-Station/Goob-Station') && (github.event.review.state == 'APPROVED') }}
+#    permissions:
+#      contents: read
+#      pull-requests: write
+#    runs-on: ubuntu-latest
+#    steps:
+#    - uses: tspascoal/get-user-teams-membership@v3
+#      id: checkUserMember
+#      with:
+#        username: ${{ github.actor }}
+#        team: "maintainers"
+#        GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+#    - if: ${{ steps.checkUserMember.outputs.isTeamMember == 'true' }}
+#      uses: actions-ecosystem/action-add-labels@v1
+#      with:
+#        labels: "S: Approved"

Content.Benchmarks/MapLoadBenchmark.cs

@@ -77,7 +77,7 @@ public async Task Cleanup()
         PoolManager.Shutdown();
     }
 
-    public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Atlas", "Core", "TestTeg", "Packed", "Origin", "Omega", "Cluster", "Reach", "Meta", "Marathon", "Europa", "MeteorArena", "Fland", "Oasis", "FlandHighPop", "OasisHighPop", "OriginHighPop", "Barratry", "Kettle", "Submarine", "Lambda", "Leonid", "Delta", "Amber", "Chloris", "Cog", "Glacier", "Serpentcrest"}; //Goobstation, readds maps
+    public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Atlas", "Core", "TestTeg", "Packed", "Origin", "Omega", "Cluster", "Reach", "Meta", "Marathon", "Europa", "MeteorArena", "Fland", "Oasis", "FlandHighPop", "OasisHighPop", "OriginHighPop", "Barratry", "Kettle", "Submarine", "Lambda", "Leonid", "Delta", "Amber", "Chloris", "Cog", "Serpentcrest"}; //Goobstation, readds maps
 
     [ParamsSource(nameof(MapsSource))]
     public string Map;

Content.Client/Inventory/StrippableBoundUserInterface.cs

@@ -66,7 +66,6 @@
 using Robust.Shared.Map;
 using static Content.Client.Inventory.ClientInventorySystem;
 using static Robust.Client.UserInterface.Control;
-using Content.Shared._Omu.Components; // Omu
 
 namespace Content.Client.Inventory
 {
@@ -239,7 +238,7 @@ private void AddHandButton(Entity<HandsComponent> ent, string handId, Hand hand)
             var isCard = EntMan.HasComponent<CardComponent>(heldEntity) ||
                          EntMan.HasComponent<CardHandComponent>(heldEntity);
             UpdateEntityIcon(button, isCard ? _virtualHiddenEntity : heldEntity);
-
+            
             _strippingMenu!.HandsContainer.AddChild(button);
             LayoutContainer.SetPosition(button, new Vector2i(_handCount, 0) * (SlotControl.DefaultButtonSize + ButtonSeparation));
             _handCount++;
@@ -280,8 +279,7 @@ private void AddInventoryButton(EntityUid invUid, string slotId, InventoryCompon
 
             // If this is a full pocket, obscure the real entity
             // this does not work for modified clients because they are still sent the real entity
-            if (entity != null && _strippable.IsStripHidden(slotDef, _player.LocalEntity)
-                && !EntMan.HasComponent<IgnorePocketHidingComponent>(PlayerManager.LocalEntity)) // Omu edit - recreating EE thieving
+            if (entity != null && _strippable.IsStripHidden(slotDef, _player.LocalEntity))
                 entity = _virtualHiddenEntity;
 
             // Goobstation: Playing Cards are always obscured in strip menu.
@@ -333,4 +331,4 @@ private void UpdateEntityIcon(SlotControl button, EntityUid? entity)
             button.SetEntity(viewEnt);
         }
     }
-}
+}