Merge branch 'revert-d574bf0a' into 'master-ru'

Revert "Merge branch 'moths-fix' into 'master-ru'" See merge request Workbench-Team/space-station-14!108
Workbench-Team · Aug 5, 2023 · ca5ca82 · ca5ca82
2 parents d574bf0 + bea7ee3
commit ca5ca82
Show file tree

Hide file tree

Showing 1,433 changed files with 302,359 additions and 255,773 deletions.
diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
@@ -2,7 +2,7 @@ name: Build & Test Debug
 
 on:
   push:
-    branches: [ master, staging, trying, master-ru, arumoon-server ]
+    branches: [ master, staging, trying, master-ru ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]

diff --git a/.github/workflows/build-test-release.yml b/.github/workflows/build-test-release.yml
@@ -2,7 +2,7 @@ name: Build & Test Release
 
 on:
   push:
-    branches: [ master, staging, trying, master-ru, arumoon-server ]
+    branches: [ master, staging, trying, master-ru ]
   merge_group:
   pull_request:
     types: [ opened, reopened, synchronize, ready_for_review ]

diff --git a/.github/workflows/changelogs.yml b/.github/workflows/changelogs.yml
@@ -7,8 +7,6 @@ on:
   workflow_dispatch:
   schedule:
     - cron: '0 10 * * *'
-  push:
-    branches: [ arumoon-server ]
 
 jobs:
   build:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml
@@ -5,7 +5,6 @@ on:
     branches:
       - master
       - master-ru
-      - arumoon-server
   pull_request_target:
 
 jobs:

diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
@@ -2,7 +2,7 @@
 
 on:
   push:
-    branches: [ master, staging, trying, master-ru, arumoon-server ]
+    branches: [ master, staging, trying, master-ru ]
     paths:
       - '**.cs'
       - '**.csproj'

diff --git a/.github/workflows/update-wiki.yml b/.github/workflows/update-wiki.yml
@@ -3,7 +3,7 @@ name: Update Wiki
 on:
   workflow_dispatch:
   push:
-    branches: [ arumoon-server ]
+    branches: [ master, jsondump ]
     paths:
       - '.github/workflows/update-wiki.yml'
       - 'Content.Shared/Chemistry/**.cs'
@@ -56,7 +56,7 @@ jobs:
         wiki_text_file: ./bin/Content.Server/data/chem_prototypes.json
         edit_summary: Update chem_prototypes.json via GitHub Actions
         page_name: "${{ secrets.WIKI_PAGE_ROOT }}/chem_prototypes.json"
-        api_url: https://wiki.ss14.arumoon.ru/api.php
+        api_url: https://wiki.spacestation14.io/w/api.php
         username: ${{ secrets.WIKI_BOT_USER }}
         password: ${{ secrets.WIKI_BOT_PASS }}
 
@@ -66,7 +66,7 @@ jobs:
         wiki_text_file: ./bin/Content.Server/data/react_prototypes.json
         edit_summary: Update react_prototypes.json via GitHub Actions
         page_name: "${{ secrets.WIKI_PAGE_ROOT }}/react_prototypes.json"
-        api_url: https://wiki.ss14.arumoon.ru/api.php
+        api_url: https://wiki.spacestation14.io/w/api.php
         username: ${{ secrets.WIKI_BOT_USER }}
         password: ${{ secrets.WIKI_BOT_PASS }}
 
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -20,8 +20,7 @@
             "program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll",
             "args": [],
             "console": "integratedTerminal",
-            "stopAtEntry": false,
-            "requireExactSource": false,
+            "stopAtEntry": false
         },
         {
             "name": "YAML Linter",
@@ -44,4 +43,4 @@
             "preLaunchTask": "build"
         }
     ]
-}
+}
diff --git a/Content.Client/Access/UI/AccessStorageBoundUserInterface.cs b/Content.Client/Access/UI/AccessStorageBoundUserInterface.cs
diff --git a/Content.Client/Access/UI/AccessStorageWindow.xaml b/Content.Client/Access/UI/AccessStorageWindow.xaml
diff --git a/Content.Client/Access/UI/AccessStorageWindow.xaml.cs b/Content.Client/Access/UI/AccessStorageWindow.xaml.cs
diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml b/Content.Client/Access/UI/IdCardConsoleWindow.xaml
@@ -1,5 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
-            MinSize="800 390">
+            MinSize="650 290">
     <BoxContainer Orientation="Vertical">
         <GridContainer Columns="2">
             <GridContainer Columns="3" HorizontalExpand="True">